Merge branch 'trace-editing'

[apitrace] / gui / ui / mainwindow.ui

diff --git a/gui/ui/mainwindow.ui b/gui/ui/mainwindow.ui
index 06988c7de2646f623e22b6d8b7e7ce08d443910f..c0c623770b66bebd7fec46569a2af51f23264dd7 100644 (file)
--- a/gui/ui/mainwindow.ui
+++ b/gui/ui/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>787</width>
-    <height>758</height>
+    <height>756</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
    <set>QMainWindow::AnimatedDocks|QMainWindow::ForceTabbedDocks</set>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
+   <layout class="QVBoxLayout" name="centralLayout">
     <item>
      <widget class="QTreeView" name="callView">
       <property name="alternatingRowColors">
@@ -52,6 +52,7 @@
     <property name="title">
      <string>&amp;File</string>
     </property>
+    <addaction name="actionNew"/>
     <addaction name="actionOpen"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
@@ -127,13 +128,20 @@
      <item>
       <widget class="QTabWidget" name="stateTabWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="parametersTab">
         <attribute name="title">
          <string>Parameters</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <widget class="QCheckBox" name="nonDefaultsCB">
+           <property name="text">
+            <string>Only show non-defaults</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QTreeWidget" name="stateTreeWidget">
            <property name="editTriggers">
@@ -176,12 +184,12 @@
           <widget class="QTreeWidget" name="surfacesTreeWidget">
            <column>
             <property name="text">
-             <string>Type</string>
+             <string>Thumbnail</string>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>Size</string>
+             <string>Description</string>
             </property>
            </column>
           </widget>
@@ -437,6 +445,15 @@
     <string>Options</string>
    </property>
   </action>
+  <action name="actionNew">
+   <property name="icon">
+    <iconset resource="../qapitrace.qrc">
+     <normaloff>:/resources/document-new.png</normaloff>:/resources/document-new.png</iconset>
+   </property>
+   <property name="text">
+    <string>New</string>
+   </property>
+  </action>
   <zorder>stateDock</zorder>
   <zorder>vertexDataDock</zorder>
  </widget>