When the search toolbox button is clicked when the search dialog is already open...

[toast/confclerk.git] / src / gui / mainwindow.ui

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index e83cb0a7000cda4acf4747264211e06e78d18d61..e57763c5752f4ed2c6e805eb6c4d31ef1826fed8 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -19,26 +19,33 @@
   <property name="windowTitle">
    <string>ConfClerk</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="DayNavigatorWidget" name="dayNavigator" native="true">
+      <property name="minimumSize">
+       <size>
+        <width>20</width>
+        <height>0</height>
+       </size>
+      </property>
+     </widget>
+    </item>
+    <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
+      </property>
+      <property name="elideMode">
+       <enum>Qt::ElideRight</enum>
       </property>
-      <widget class="QWidget" name="nowTab">
-       <attribute name="title">
-        <string>Now</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_7">
-        <item row="0" column="0">
-         <widget class="NowTabContainer" name="nowTabContainer" native="true"/>
-        </item>
-       </layout>
-      </widget>
       <widget class="QWidget" name="favouritesTab">
        <attribute name="title">
-        <string>Favourites</string>
+        <string>&amp;Favourites</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
@@ -48,9 +55,9 @@
       </widget>
       <widget class="QWidget" name="dayViewTab">
        <attribute name="title">
-        <string>Day View</string>
+        <string>&amp;Days</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_2">
+       <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="DayViewTabContainer" name="dayTabContainer" native="true"/>
         </item>
@@ -58,7 +65,7 @@
       </widget>
       <widget class="QWidget" name="tracksTab">
        <attribute name="title">
-        <string>Tracks</string>
+        <string>&amp;Tracks</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_4">
         <item row="0" column="0">
@@ -68,7 +75,7 @@
       </widget>
       <widget class="QWidget" name="roomsTab">
        <attribute name="title">
-        <string>Rooms</string>
+        <string>&amp;Rooms</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_8">
         <item row="0" column="0">
@@ -78,7 +85,7 @@
       </widget>
       <widget class="QWidget" name="searchTab">
        <attribute name="title">
-        <string>Search</string>
+        <string>&amp;Search</string>
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_1">
         <item>
@@ -106,40 +113,114 @@
      <height>23</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuMenu">
-    <property name="title">
-     <string>Menu</string>
-    </property>
-    <addaction name="settingsAction"/>
-    <addaction name="aboutAction"/>
-    <addaction name="conferencesAction"/>
-    <addaction name="quitAction"/>
-   </widget>
-   <addaction name="menuMenu"/>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <addaction name="conferencesAction"/>
+   <addaction name="settingsAction"/>
+   <addaction name="aboutAction"/>
+   <addaction name="quitAction"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>RightToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="reloadAction"/>
+   <addaction name="nowAction"/>
+   <addaction name="searchAction"/>
+   <addaction name="expandAllAction"/>
+   <addaction name="collapseAllAction"/>
   </widget>
-  <action name="actionSettings">
+  <action name="conferencesAction">
    <property name="text">
-    <string>Settings</string>
+    <string>C&amp;onferences</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
    </property>
   </action>
   <action name="settingsAction">
    <property name="text">
-    <string>Settings</string>
+    <string>S&amp;ettings</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
    </property>
   </action>
   <action name="aboutAction">
    <property name="text">
-    <string>About</string>
+    <string>&amp;About</string>
    </property>
   </action>
-  <action name="conferencesAction">
+  <action name="quitAction">
    <property name="text">
-    <string>Conferences</string>
+    <string>&amp;Quit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="quitAction">
+  <action name="reloadAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/reload.png</normaloff>:/icons/reload.png</iconset>
+   </property>
    <property name="text">
-    <string>&amp;Quit</string>
+    <string>Reload Conference</string>
+   </property>
+   <property name="toolTip">
+    <string>Reload Conference</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
+  </action>
+  <action name="nowAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/today.png</normaloff>:/icons/today.png</iconset>
+   </property>
+   <property name="text">
+    <string>Jump to now</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="searchAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Search</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+  </action>
+  <action name="expandAllAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset>
+   </property>
+   <property name="text">
+    <string>Expand all</string>
+   </property>
+  </action>
+  <action name="collapseAllAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset>
+   </property>
+   <property name="text">
+    <string>Collapse all</string>
    </property>
   </action>
  </widget>
@@ -170,12 +251,14 @@
    <header>roomstabcontainer.h</header>
   </customwidget>
   <customwidget>
-   <class>NowTabContainer</class>
+   <class>DayNavigatorWidget</class>
    <extends>QWidget</extends>
-   <header>nowtabcontainer.h</header>
+   <header>daynavigatorwidget.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
+  <include location="../../data/data.qrc"/>
   <include location="../icons.qrc"/>
  </resources>
  <connections>