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

diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui
index c0579605ad..4c83b18f16 100644
--- a/src/frontends/qt4/ui/BranchesUi.ui
+++ b/src/frontends/qt4/ui/BranchesUi.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BranchesUi</class>
  <widget class="QWidget" name="BranchesUi" >
   <property name="geometry" >
@@ -9,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>401</width>
-    <height>300</height>
+    <height>327</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,10 +19,27 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="newBranchLE" />
+   <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="2" >
+   <item row="5" column="3" >
+    <widget class="QPushButton" name="suffixPB" >
+     <property name="toolTip" >
+      <string>Append the name of this branch to the output filename, given the branch is active.</string>
+     </property>
+     <property name="text" >
+      <string>Filename &amp;Suffix</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -35,23 +49,36 @@
      </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="2" >
-    <widget class="QPushButton" name="addBranchPB" >
+   <item row="8" column="2" colspan="2" >
+    <widget class="QPushButton" name="unknownPB" >
      <property name="toolTip" >
-      <string>Add a new branch to the list</string>
+      <string>Show undefined branches used in this document.</string>
      </property>
      <property name="text" >
-      <string>&amp;Add</string>
+      <string>&amp;Undefined Branches</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
+   <item row="8" column="0" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <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>
@@ -61,52 +88,78 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="newBranchLA" >
-     <property name="text" >
-      <string>&amp;New:</string>
+   <item row="7" column="3" >
+    <widget class="QPushButton" name="activatePB" >
+     <property name="toolTip" >
+      <string>Toggle the selected branch</string>
      </property>
-     <property name="buddy" >
-      <cstring>newBranchLE</cstring>
+     <property name="text" >
+      <string>(&amp;De)activate</string>
      </property>
     </widget>
    </item>
-   <item rowspan="4" row="2" column="0" colspan="2" >
+   <item rowspan="6" row="2" column="0" colspan="3" >
     <widget class="QTreeWidget" name="branchesTW" />
    </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="removePB" >
+   <item row="0" column="3" >
+    <widget class="QPushButton" name="addBranchPB" >
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="toolTip" >
-      <string>Remove the selected branch</string>
+      <string>Add a new branch to the list</string>
      </property>
      <property name="text" >
-      <string>&amp;Remove</string>
+      <string>&amp;Add</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <widget class="QPushButton" name="activatePB" >
+   <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>Toggle the selected branch</string>
+      <string>Define or change background color</string>
      </property>
      <property name="text" >
-      <string>(&amp;De)activate</string>
+      <string>Alter Co&amp;lor...</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
-    <widget class="QPushButton" name="colorPB" >
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="removePB" >
      <property name="toolTip" >
-      <string>Define or change background color</string>
+      <string>Remove the selected branch</string>
      </property>
      <property name="text" >
-      <string>Alter Co&amp;lor...</string>
+      <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></pixmapfunction>
+ <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>