X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FBranchesUi.ui;h=4c83b18f16421354025c2531cc8c6737cfa7c646;hb=0de23da9cd0ff804d5ee53133138e1acab217158;hp=4ceab17015d3146fc302b4a7c741b4b26210aae1;hpb=17986e7509f05a79446423a9a32c762cb19a3429;p=lyx.git

diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui
index 4ceab17015..4c83b18f16 100644
--- a/src/frontends/qt4/ui/BranchesUi.ui
+++ b/src/frontends/qt4/ui/BranchesUi.ui
@@ -19,17 +19,27 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="7" column="2" colspan="2" >
-    <widget class="QPushButton" name="unknownPB" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="newBranchLA" >
+     <property name="text" >
+      <string>&amp;New:[[branch]]</string>
+     </property>
+     <property name="buddy" >
+      <cstring>newBranchLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="3" >
+    <widget class="QPushButton" name="suffixPB" >
      <property name="toolTip" >
-      <string>Show undefined branches used in this document.</string>
+      <string>Append the name of this branch to the output filename, given the branch is active.</string>
      </property>
      <property name="text" >
-      <string>&amp;Undefined Branches</string>
+      <string>Filename &amp;Suffix</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="6" column="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -39,13 +49,23 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>20</height>
+       <width>83</width>
+       <height>51</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="7" column="0" colspan="2" >
+   <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="8" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -68,27 +88,36 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3" >
-    <widget class="QPushButton" name="removePB" >
+   <item row="7" column="3" >
+    <widget class="QPushButton" name="activatePB" >
      <property name="toolTip" >
-      <string>Remove the selected branch</string>
+      <string>Toggle the selected branch</string>
      </property>
      <property name="text" >
-      <string>&amp;Remove</string>
+      <string>(&amp;De)activate</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="3" >
-    <widget class="QPushButton" name="activatePB" >
+   <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="enabled">
+      <bool>false</bool>
+     </property>
      <property name="toolTip" >
-      <string>Toggle the selected branch</string>
+      <string>Add a new branch to the list</string>
      </property>
      <property name="text" >
-      <string>(&amp;De)activate</string>
+      <string>&amp;Add</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="3" >
+   <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>
@@ -98,34 +127,39 @@
      </property>
     </widget>
    </item>
-   <item rowspan="5" row="2" column="0" colspan="3" >
-    <widget class="QTreeWidget" name="branchesTW" />
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="newBranchLA" >
-     <property name="text" >
-      <string>&amp;New:</string>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="removePB" >
+     <property name="toolTip" >
+      <string>Remove the selected branch</string>
      </property>
-     <property name="buddy" >
-      <cstring>newBranchLE</cstring>
+     <property name="text" >
+      <string>&amp;Remove</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QPushButton" name="addBranchPB" >
+   <item row="3" column="3" >
+    <widget class="QPushButton" name="renamePB" >
      <property name="toolTip" >
-      <string>Add a new branch to the list</string>
+      <string>Change the name of the selected branch</string>
      </property>
      <property name="text" >
-      <string>&amp;Add</string>
+      <string>Re&amp;name...</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QLineEdit" name="newBranchLE" />
-   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>newBranchLE</tabstop>
+  <tabstop>addBranchPB</tabstop>
+  <tabstop>branchesTW</tabstop>
+  <tabstop>removePB</tabstop>
+  <tabstop>renamePB</tabstop>
+  <tabstop>colorPB</tabstop>
+  <tabstop>suffixPB</tabstop>
+  <tabstop>activatePB</tabstop>
+  <tabstop>unknownPB</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>