From 01df23ff94cddce809d0f0d4144b62518784c16f Mon Sep 17 00:00:00 2001 From: timkoma Date: Tue, 26 Jan 2010 10:09:37 +0000 Subject: [PATCH] search done --- src/gui/mainwindow.cpp | 10 ++- src/gui/mainwindow.ui | 151 +++++++++++++++++++++++++---------------- src/icons.qrc | 1 + src/icons/search.png | Bin 0 -> 1281 bytes 4 files changed, 102 insertions(+), 60 deletions(-) create mode 100644 src/icons/search.png diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1429731..17ae65b 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -260,7 +260,7 @@ void MainWindow::updateSearchView(const QDate &aDate) if( eventsCount || searchDayNavigator->getCurrentDate() != Conference::getById(AppSettings::confId()).start() ){ searchVerticalWidget->show(); - searchAgainButton->show(); + //searchAgainButton->show(); searchTreeView->show(); searchHead->hide(); } @@ -336,13 +336,19 @@ void MainWindow::searchClicked() qDebug() << "\nKeyword to search: " << keyword; mSqlEngine->searchEvent( AppSettings::confId(), columns, keyword ); + QDate aStartDate = Conference::getById(AppSettings::confId()).start(); + QDate aEndDate = Conference::getById(AppSettings::confId()).end(); + searchDayNavigator->setDates(aStartDate, aEndDate); updateSearchView( Conference::getById(AppSettings::confId()).start() ); } void MainWindow::searchAgainClicked() { searchHead->show(); - searchAgainButton->hide(); + //searchAgainButton->hide(); + searchVerticalWidget->hide(); + searchTreeView->hide(); + } void MainWindow::conferenceMapClicked() diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 76ef13c..d6932b2 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -118,39 +118,67 @@ - - + + Search - + - - + + true - - + + 0 0 - + + + 0 + - - + + + + 0 + 0 + + + Search again - + + false + + S - - Qt::ToolButtonTextOnly + + + :/icons/search.png:/icons/search.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly - - + + + + 0 + 0 + + + 16777215 16777215 @@ -162,104 +190,108 @@ - + - - - + + + 0 0 - + 16777215 16777215 - - + + QLayout::SetDefaultConstraint - - + + - - + + true - + type a keyword to search - - + + Search - + + + :/icons/search.png:/icons/search.png + + false - + true - + true - + false - - + + - - + + Title - + true - - + + Abstract - - + + Speaker - - + + Tag - - + + Room - - + + Qt::Horizontal - + 40 20 @@ -273,36 +305,39 @@ - - - + + + 0 1 - + 0 0 - + 16777215 16777215 + + 100 + - - + + Qt::Vertical - + QSizePolicy::Expanding - + 20 1 diff --git a/src/icons.qrc b/src/icons.qrc index 434d3a3..808d862 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -11,5 +11,6 @@ icons/exclamation-iconOn.png icons/exclamation-iconOff.png icons/info.png + icons/search.png diff --git a/src/icons/search.png b/src/icons/search.png new file mode 100644 index 0000000000000000000000000000000000000000..0dacd0006e418db574af0946fe276569015b2804 GIT binary patch literal 1281 zcmV+c1^)VpP)1a!#Er_GIKpo>Xf=Z}>1P!uG#V}C_o5^4#J`yx0buml>nP!O@ z2FOO-47v^1m2AL(NXPzg@_qy;YIqh}1}$x&a&I48&&5ui2Ivw_^3D0(^ZVuZ`Mu7$ zD6)f@OeX&F@^UIj=5RQiVzF4Sh>q?H;_)!#2@L&jp!UKAZkSAV)}O^HH5rZUO$*e!tueQsi`+9R4N0yXxwz-MS&&|CP#OKS%<1)<6 zeU_M#^68!c9K%qpMq`MGiVC$^t(F(k)2rbqSOh@?LN^oc0h+`ncq_apy3uH?q|@ot zvEkw0GPAQ4a3{pB060^@=;-Joo5P_8a=9Ifn3z_WOazk(pqmZtEoiTUUjc8LnVv3# zfMU^LaK*&LNQ5HM>Rtfp#Kgob)88MJ%jH)@BGCYZB_I)q2igLeK}L`PcJPMTY)*$< zA>v|V@YOcsmP0jp|;)rP}r#U#MHgH`ZG@C&muGv#KBC4PKt z4A0Ka7KzdL^~#x$ru1Z zY-V$LQAtUyPXKs5)H^LL4^q<7j*!XK-`9um`FwY@La_=SSz1~WEG{fiIe~%5`uaMe z>*^XfT~Uz|78d6A2|(J^AnmW2u_5EL{u_H?#O1dA#kbgDZO4pq0_TeDiwQZ zaNxbRwzlg-!z0T+10GpvVWHG!w`Z{e0-{KO-D>?Eo^Qvcrl$FLrSj#X*D}8^EiMX} z9_n1{(K~X=KUDWV5nwMX&51r=UY!5FP$EYrM}9FF1CBml`1YyUeFL<#X#Lw8DsNZ3 z`&LE}{{Yh0*E_^|=D13g`O@0H07%nnngt`RUw0QC&ppHr3`Xv>cXcKn`zS9qPKoUc zfV3-(4Nu!fZ|Gjh%?>4VsOiVn%ddY>cSTf_^UY?&;t0gOE5QwtNg30k7$n1@Rf`Uz0vBw)jM;>(L zpDjuICi%G+X?Ek3=lr$7{D$j4-F^h10w4~WWc?>AqaEZ#{;HyccM|f)69AHdI3OJK zSQf`040-j;iL5h{gNexHYprkopt;-p*bzbPp?fD`g2*nB(Ay00000NkvXXu0mjf&CF;3 literal 0 HcmV?d00001 -- 2.39.5