The conflict editor works again.

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

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 0b56fc5802e65538a4c4c64e981949ec475474c0..49eacca6d9e2276ff318ed6142bd34655286252c 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -6,157 +6,260 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>534</width>
-    <height>375</height>
+    <width>903</width>
+    <height>498</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>300</height>
+   </size>
+  </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <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>0</number>
       </property>
-      <widget class="QWidget" name="dayViewTab">
+      <property name="elideMode">
+       <enum>Qt::ElideRight</enum>
+      </property>
+      <widget class="QWidget" name="favouritesTab">
        <attribute name="title">
-        <string>Day View</string>
+        <string>&amp;Favourites</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_2">
+       <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="DayNavigatorWidget" name="dayNavigator" native="true"/>
-          </item>
-          <item>
-           <widget class="TreeView" name="dayTreeView">
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         <widget class="FavTabContainer" name="favsTabContainer" native="true"/>
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="favouritesTab">
+      <widget class="QWidget" name="dayViewTab">
        <attribute name="title">
-        <string>Favourites</string>
+        <string>&amp;Days</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_3">
+       <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
-         <widget class="TreeView" name="favTreeView"/>
+         <widget class="DayViewTabContainer" name="dayTabContainer" native="true"/>
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="activitiesTab">
+      <widget class="QWidget" name="tracksTab">
        <attribute name="title">
-        <string>Activities</string>
+        <string>&amp;Tracks</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_4">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="activitiesVerticalLayout">
-          <item>
-           <widget class="DayNavigatorWidget" name="activityDayNavigator" native="true"/>
-          </item>
-          <item>
-           <widget class="TreeView" name="actTreeView">
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         <widget class="TracksTabContainer" name="tracksTabContainer" native="true"/>
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="searchTab">
+      <widget class="QWidget" name="roomsTab">
        <attribute name="title">
-        <string>Search</string>
+        <string>&amp;Rooms</string>
        </attribute>
+       <layout class="QGridLayout" name="gridLayout_8">
+        <item row="0" column="0">
+         <widget class="RoomsTabContainer" name="roomsTabContainer" native="true"/>
+        </item>
+       </layout>
       </widget>
-      <widget class="QWidget" name="mapTab">
+      <widget class="QWidget" name="searchTab">
        <attribute name="title">
-        <string>Map</string>
+        <string>&amp;Search</string>
        </attribute>
+       <layout class="QHBoxLayout" name="horizontalLayout_1">
+        <item>
+         <widget class="SearchTabContainer" name="searchTabContainer" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
+  <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>534</width>
-     <height>24</height>
+     <width>903</width>
+     <height>23</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionImportSchedule"/>
-    <addaction name="actionQuit"/>
-   </widget>
-   <widget class="QMenu" name="menuAbout">
-    <property name="title">
-     <string>Help</string>
-    </property>
-    <addaction name="actionAboutQt"/>
-    <addaction name="actionAboutApplication"/>
-   </widget>
-   <addaction name="menuAbout"/>
-   <addaction name="menuFile"/>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <addaction name="conferencesAction"/>
+   <addaction name="settingsAction"/>
+   <addaction name="aboutAction"/>
+   <addaction name="quitAction"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionImportSchedule">
+  <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"/>
+  </widget>
+  <action name="conferencesAction">
+   <property name="text">
+    <string>C&amp;onferences</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="settingsAction">
+   <property name="text">
+    <string>S&amp;ettings</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
+  <action name="aboutAction">
    <property name="text">
-    <string>Import Schedule</string>
+    <string>&amp;About</string>
    </property>
   </action>
-  <action name="actionAboutQt">
+  <action name="quitAction">
    <property name="text">
-    <string>About Qt</string>
+    <string>&amp;Quit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionAboutApplication">
+  <action name="reloadAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/reload.png</normaloff>:/icons/reload.png</iconset>
+   </property>
    <property name="text">
-    <string>About application</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="actionQuit">
+  <action name="nowAction">
+   <property name="icon">
+    <iconset resource="../icons.qrc">
+     <normaloff>:/icons/today.png</normaloff>:/icons/today.png</iconset>
+   </property>
    <property name="text">
-    <string>Quit</string>
+    <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>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SearchTabContainer</class>
+   <extends>QWidget</extends>
+   <header>searchtabcontainer.h</header>
+  </customwidget>
+  <customwidget>
+   <class>DayViewTabContainer</class>
+   <extends>QWidget</extends>
+   <header>dayviewtabcontainer.h</header>
+  </customwidget>
+  <customwidget>
+   <class>FavTabContainer</class>
+   <extends>QWidget</extends>
+   <header>favtabcontainer.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TracksTabContainer</class>
+   <extends>QWidget</extends>
+   <header>trackstabcontainer.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RoomsTabContainer</class>
+   <extends>QWidget</extends>
+   <header>roomstabcontainer.h</header>
+  </customwidget>
   <customwidget>
    <class>DayNavigatorWidget</class>
    <extends>QWidget</extends>
    <header>daynavigatorwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>TreeView</class>
-   <extends>QTreeView</extends>
-   <header>../mvc/treeview.h</header>
-  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../data/data.qrc"/>
+  <include location="../icons.qrc"/>
+ </resources>
  <connections>
   <connection>
-   <sender>actionQuit</sender>
+   <sender>quitAction</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>451</x>
+     <y>248</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>reloadAction</sender>
    <signal>triggered()</signal>
    <receiver>MainWindow</receiver>
    <slot>close()</slot>
@@ -166,8 +269,8 @@
      <y>-1</y>
     </hint>
     <hint type="destinationlabel">
-     <x>266</x>
-     <y>187</y>
+     <x>451</x>
+     <y>248</y>
     </hint>
    </hints>
   </connection>