* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / ui / BranchesUi.ui

diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui
index d834b87d7b6181ff169aab74b07844d626e9a0f6..298931e1e55ad175c6b96e2dcf0aa4f730b18b15 100644 (file)
--- a/src/frontends/qt4/ui/BranchesUi.ui
+++ b/src/frontends/qt4/ui/BranchesUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BranchesUi</class>
  <widget class="QWidget" name="BranchesUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>344</width>
-    <height>297</height>
+    <width>401</width>
+    <height>327</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,105 +14,32 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item rowspan="5" row="1" column="0" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="availableLB" >
-       <property name="text" >
-        <string>A&amp;vailable Branches:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>branchesLV</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="Q3ListView" name="branchesLV" >
-       <property name="enabled" >
-        <bool>true</bool>
-       </property>
-       <property name="focusPolicy" >
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="toolTip" >
-        <string>The available branches</string>
-       </property>
-       <property name="resizePolicy" >
-        <enum>Q3ScrollView::AutoOneFit</enum>
-       </property>
-       <property name="vScrollBarMode" >
-        <enum>Q3ScrollView::Auto</enum>
-       </property>
-       <property name="hScrollBarMode" >
-        <enum>Q3ScrollView::Auto</enum>
-       </property>
-       <property name="allColumnsShowFocus" >
-        <bool>true</bool>
-       </property>
-       <property name="rootIsDecorated" >
-        <bool>false</bool>
-       </property>
-       <column>
-        <property name="text" >
-         <string>Name</string>
-        </property>
-       </column>
-       <column>
-        <property name="text" >
-         <string>Activated</string>
-        </property>
-       </column>
-       <column>
-        <property name="text" >
-         <string>Color</string>
-        </property>
-       </column>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QPushButton" name="activatePB" >
-     <property name="toolTip" >
-      <string>Toggle the selected branch</string>
-     </property>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="newBranchLA" >
      <property name="text" >
-      <string>(&amp;De)activate</string>
+      <string>&amp;New:</string>
      </property>
-    </widget>
-   </item>
-   <item row="4" column="1" >
-    <widget class="QPushButton" name="colorPB" >
-     <property name="toolTip" >
-      <string>Define or change background color</string>
-     </property>
-     <property name="text" >
-      <string>Alter Co&amp;lor...</string>
+     <property name="buddy" >
+      <cstring>newBranchLE</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="removePB" >
+   <item row="5" column="3" >
+    <widget class="QPushButton" name="suffixPB" >
      <property name="toolTip" >
-      <string>Remove the selected branch</string>
+      <string>Append the name of this branch to the output filename, given the branch is active.</string>
      </property>
      <property name="text" >
-      <string>&amp;Remove</string>
+      <string>Filename &amp;Suffix</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" >
+   <item row="6" column="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -125,76 +49,106 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>20</height>
+       <width>83</width>
+       <height>51</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="newBranchLA" >
-       <property name="text" >
-        <string>&amp;New:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>newBranchLE</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="newBranchLE" />
-     </item>
-     <item>
-      <widget class="QPushButton" name="addBranchPB" >
-       <property name="toolTip" >
-        <string>Add a new branch to the list</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Add</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="8" column="2" colspan="2" >
+    <widget class="QPushButton" name="unknownPB" >
+     <property name="toolTip" >
+      <string>Show undefined branches used in this document.</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Undefined Branches</string>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="1" >
+   <item row="8" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
+       <width>251</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLabel" name="availableLB" >
+     <property name="text" >
+      <string>A&amp;vailable Branches:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>branchesTW</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="3" >
+    <widget class="QPushButton" name="activatePB" >
+     <property name="toolTip" >
+      <string>Toggle the selected branch</string>
+     </property>
+     <property name="text" >
+      <string>(&amp;De)activate</string>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="6" row="2" column="0" colspan="3" >
+    <widget class="QTreeWidget" name="branchesTW" />
+   </item>
+   <item row="0" column="3" >
+    <widget class="QPushButton" name="addBranchPB" >
+     <property name="toolTip" >
+      <string>Add a new branch to the list</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLineEdit" name="newBranchLE" />
+   </item>
+   <item row="4" column="3" >
+    <widget class="QPushButton" name="colorPB" >
+     <property name="toolTip" >
+      <string>Define or change background color</string>
+     </property>
+     <property name="text" >
+      <string>Alter Co&amp;lor...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="removePB" >
+     <property name="toolTip" >
+      <string>Remove the selected branch</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Remove</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3" >
+    <widget class="QPushButton" name="renamePB" >
+     <property name="toolTip" >
+      <string>Change the name of the selected branch</string>
+     </property>
+     <property name="text" >
+      <string>Re&amp;name...</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ListView</class>
-   <extends></extends>
-   <header>q3listview.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>branchesLV</tabstop>
- </tabstops>
+ <includes>
+  <include location="local" >qt_i18n.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>