search done

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 1429731888bdba93923bd73906a1abc6a7c33d16..17ae65bd6e3bfd08dd40f6230579de91495db5e1 100644 (file)
--- 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();
     if( eventsCount ||
             searchDayNavigator->getCurrentDate() != Conference::getById(AppSettings::confId()).start() ){
         searchVerticalWidget->show();

-        searchAgainButton->show();
+        //searchAgainButton->show();

         searchTreeView->show();
         searchHead->hide();
     }
         searchTreeView->show();
         searchHead->hide();
     }


@@ -336,13 +336,19 @@ void MainWindow::searchClicked()
     qDebug() << "\nKeyword to search: " << keyword;
     mSqlEngine->searchEvent( AppSettings::confId(), columns, keyword );
 
     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();
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }
 
 void MainWindow::searchAgainClicked()
 {
     searchHead->show();

-    searchAgainButton->hide();
+    //searchAgainButton->hide();
+    searchVerticalWidget->hide();
+    searchTreeView->hide();
+

 }
 
 void MainWindow::conferenceMapClicked()
 }
 
 void MainWindow::conferenceMapClicked()

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 76ef13c5bce21fe1fec239800a2a6aefce4e3dfd..d6932b2b705d3f0dfd76c076937940c23c992f66 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -118,39 +118,67 @@
         </item>
        </layout>
       </widget>
         </item>
        </layout>
       </widget>

-      <widget class="QWidget" name="searchTab" >
-       <attribute name="title" >
+      <widget class="QWidget" name="searchTab">
+       <attribute name="title">

         <string>Search</string>
        </attribute>
         <string>Search</string>
        </attribute>

-       <layout class="QHBoxLayout" name="horizontalLayout_1" >
+       <layout class="QHBoxLayout" name="horizontalLayout_1">

         <item>
         <item>

-         <widget class="QWidget" native="1" name="searchVerticalWidget" >
-          <property name="enabled" >
+         <widget class="QWidget" name="searchVerticalWidget" native="true">
+          <property name="enabled">

            <bool>true</bool>
           </property>
            <bool>true</bool>
           </property>

-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">

             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>

-          <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout" >
+          <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout">
+           <property name="margin">
+            <number>0</number>
+           </property>

            <item>
            <item>

-            <widget class="QToolButton" name="searchAgainButton" >
-             <property name="toolTip" >
+            <widget class="QToolButton" name="searchAgainButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="toolTip">

               <string>Search again</string>
              </property>
               <string>Search again</string>
              </property>

-             <property name="text" >
+             <property name="autoFillBackground">
+              <bool>false</bool>
+             </property>
+             <property name="text">

               <string>S</string>
              </property>
               <string>S</string>
              </property>

-             <property name="toolButtonStyle" >
-              <enum>Qt::ToolButtonTextOnly</enum>
+             <property name="icon">
+              <iconset resource="../icons.qrc">
+               <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonIconOnly</enum>

              </property>
             </widget>
            </item>
            <item>
              </property>
             </widget>
            </item>
            <item>

-            <widget class="DayNavigatorWidget" native="1" name="searchDayNavigator" >
-             <property name="maximumSize" >
+            <widget class="DayNavigatorWidget" name="searchDayNavigator" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">

               <size>
                <width>16777215</width>
                <height>16777215</height>
               <size>
                <width>16777215</width>
                <height>16777215</height>


@@ -162,104 +190,108 @@
          </widget>
         </item>
         <item>
          </widget>
         </item>
         <item>

-         <layout class="QVBoxLayout" name="verticalLayout_3" >
+         <layout class="QVBoxLayout" name="verticalLayout_3">

           <item>
           <item>

-           <widget class="QWidget" native="1" name="searchHead" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+           <widget class="QWidget" name="searchHead" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>

-            <property name="maximumSize" >
+            <property name="maximumSize">

              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>
              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>

-            <layout class="QGridLayout" name="searchHeadLayout" >
-             <property name="sizeConstraint" >
+            <layout class="QGridLayout" name="searchHeadLayout">
+             <property name="sizeConstraint">

               <enum>QLayout::SetDefaultConstraint</enum>
              </property>
               <enum>QLayout::SetDefaultConstraint</enum>
              </property>

-             <item row="2" column="0" >
-              <layout class="QHBoxLayout" name="horizontalLayout" >
+             <item row="2" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout">

                <item>
                <item>

-                <widget class="QLineEdit" name="searchEdit" >
-                 <property name="enabled" >
+                <widget class="QLineEdit" name="searchEdit">
+                 <property name="enabled">

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="toolTip" >
+                 <property name="toolTip">

                   <string>type a keyword to search</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>type a keyword to search</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QPushButton" name="searchButton" >
-                 <property name="text" >
+                <widget class="QPushButton" name="searchButton">
+                 <property name="text">

                   <string>Search</string>
                  </property>
                   <string>Search</string>
                  </property>

-                 <property name="checkable" >
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
+                 </property>
+                 <property name="checkable">

                   <bool>false</bool>
                  </property>
                   <bool>false</bool>
                  </property>

-                 <property name="autoDefault" >
+                 <property name="autoDefault">

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="default" >
+                 <property name="default">

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="flat" >
+                 <property name="flat">

                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>

-             <item row="0" column="0" >
-              <layout class="QHBoxLayout" name="horizontalLayout_6" >
+             <item row="0" column="0">
+              <layout class="QHBoxLayout" name="horizontalLayout_6">

                <item>
                <item>

-                <widget class="QCheckBox" name="searchTitle" >
-                 <property name="text" >
+                <widget class="QCheckBox" name="searchTitle">
+                 <property name="text">

                   <string>Title</string>
                  </property>
                   <string>Title</string>
                  </property>

-                 <property name="checked" >
+                 <property name="checked">

                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item>
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchAbstract" >
-                 <property name="text" >
+                <widget class="QCheckBox" name="searchAbstract">
+                 <property name="text">

                   <string>Abstract</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Abstract</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchSpeaker" >
-                 <property name="text" >
+                <widget class="QCheckBox" name="searchSpeaker">
+                 <property name="text">

                   <string>Speaker</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Speaker</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchTag" >
-                 <property name="text" >
+                <widget class="QCheckBox" name="searchTag">
+                 <property name="text">

                   <string>Tag</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Tag</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchRoom" >
-                 <property name="text" >
+                <widget class="QCheckBox" name="searchRoom">
+                 <property name="text">

                   <string>Room</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Room</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <spacer name="horizontalSpacer" >
-                 <property name="orientation" >
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">

                   <enum>Qt::Horizontal</enum>
                  </property>
                   <enum>Qt::Horizontal</enum>
                  </property>

-                 <property name="sizeHint" stdset="0" >
+                 <property name="sizeHint" stdset="0">

                   <size>
                    <width>40</width>
                    <height>20</height>
                   <size>
                    <width>40</width>
                    <height>20</height>


@@ -273,36 +305,39 @@
            </widget>
           </item>
           <item>
            </widget>
           </item>
           <item>

-           <widget class="TreeView" name="searchTreeView" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+           <widget class="TreeView" name="searchTreeView">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">

               <horstretch>0</horstretch>
               <verstretch>1</verstretch>
              </sizepolicy>
             </property>
               <horstretch>0</horstretch>
               <verstretch>1</verstretch>
              </sizepolicy>
             </property>

-            <property name="minimumSize" >
+            <property name="minimumSize">

              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>
              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>

-            <property name="maximumSize" >
+            <property name="maximumSize">

              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>
              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>

+            <attribute name="headerDefaultSectionSize">
+             <number>100</number>
+            </attribute>

            </widget>
           </item>
           <item>
            </widget>
           </item>
           <item>

-           <spacer name="verticalSpacer_2" >
-            <property name="orientation" >
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">

              <enum>Qt::Vertical</enum>
             </property>
              <enum>Qt::Vertical</enum>
             </property>

-            <property name="sizeType" >
+            <property name="sizeType">

              <enum>QSizePolicy::Expanding</enum>
             </property>
              <enum>QSizePolicy::Expanding</enum>
             </property>

-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">

              <size>
               <width>20</width>
               <height>1</height>
              <size>
               <width>20</width>
               <height>1</height>

diff --git a/src/icons.qrc b/src/icons.qrc
index 434d3a3b2c3bae3fb5c1ce6c259a66bab45963da..808d862b845f31411651cac8e8f167fe29b4bccb 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -11,5 +11,6 @@
         <file>icons/exclamation-iconOn.png</file>
         <file>icons/exclamation-iconOff.png</file>
         <file>icons/info.png</file>
         <file>icons/exclamation-iconOn.png</file>
         <file>icons/exclamation-iconOff.png</file>
         <file>icons/info.png</file>

+        <file>icons/search.png</file>

     </qresource>
 </RCC>
     </qresource>
 </RCC>

diff --git a/src/icons/search.png b/src/icons/search.png
new file mode 100644 (file)
index 0000000..0dacd00
Binary files /dev/null and b/src/icons/search.png differ