correct tab order and remove duplicate shortcuts

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17550 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/QCitationUi.ui b/src/frontends/qt4/ui/QCitationUi.ui
index 41be799908f6db3f39ee481e8983c1453583fde0..a1be0eab50fa418c6285671d4784ed7f8412f545 100644 (file)
--- a/src/frontends/qt4/ui/QCitationUi.ui
+++ b/src/frontends/qt4/ui/QCitationUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>392</width>
-    <height>491</height>
+    <width>369</width>
+    <height>509</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -30,88 +30,6 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0" >
-    <widget class="QTextBrowser" name="infoML" />
-   </item>
-   <item row="2" column="0" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Search Citation</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QCheckBox" name="caseCB" >
-          <property name="text" >
-           <string>Case Sensitive</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="regexCB" >
-          <property name="text" >
-           <string>Regular Expression</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="findKeysLA" >
-          <property name="text" >
-           <string>&amp;Find:</string>
-          </property>
-          <property name="alignment" >
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-          </property>
-          <property name="buddy" >
-           <cstring>findLE</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="findLE" >
-          <property name="text" >
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="clearPB" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>&lt;- Clear</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" >
     <layout class="QGridLayout" >
      <property name="margin" >
@@ -120,41 +38,29 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <item row="0" column="0" colspan="2" >
-      <widget class="QLabel" name="availableKeysLA" >
-       <property name="text" >
-        <string>&amp;Available Citations:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>availableLV</cstring>
+     <item row="4" column="1" >
+      <widget class="QPushButton" name="upPB" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QPushButton" name="addPB" >
        <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Add</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
+        <string>Move the selected citation up</string>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="2" >
-      <widget class="QLabel" name="selectedKeysLA" >
        <property name="text" >
-        <string>&amp;Selected Citations:</string>
+        <string>&amp;Up</string>
        </property>
-       <property name="buddy" >
-        <cstring>selectedLV</cstring>
+       <property name="icon" >
+        <iconset/>
        </property>
       </widget>
      </item>
-     <item row="4" column="1" >
-      <widget class="QPushButton" name="upPB" >
+     <item row="5" column="1" >
+      <widget class="QPushButton" name="downPB" >
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>0</hsizetype>
@@ -164,23 +70,16 @@
         </sizepolicy>
        </property>
        <property name="toolTip" >
-        <string>Move the selected citation up</string>
+        <string>Move the selected citation down</string>
        </property>
        <property name="text" >
-        <string>&amp;Up</string>
+        <string>&amp;Down</string>
        </property>
        <property name="icon" >
         <iconset/>
        </property>
       </widget>
      </item>
-     <item rowspan="5" row="1" column="2" >
-      <widget class="QListView" name="selectedLV" >
-       <property name="editTriggers" >
-        <set>QAbstractItemView::NoEditTriggers</set>
-       </property>
-      </widget>
-     </item>
      <item row="3" column="1" >
       <spacer>
        <property name="orientation" >
@@ -188,12 +87,19 @@
        </property>
        <property name="sizeHint" >
         <size>
-         <width>20</width>
+         <width>77</width>
          <height>16</height>
         </size>
        </property>
       </spacer>
      </item>
+     <item row="2" column="1" >
+      <widget class="QPushButton" name="deletePB" >
+       <property name="text" >
+        <string>D&amp;elete</string>
+       </property>
+      </widget>
+     </item>
      <item rowspan="5" row="1" column="0" >
       <widget class="QListView" name="availableLV" >
        <property name="editTriggers" >
@@ -201,36 +107,55 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1" >
-      <widget class="QPushButton" name="downPB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
+     <item row="1" column="1" >
+      <widget class="QPushButton" name="addPB" >
        <property name="toolTip" >
-        <string>Move the selected citation down</string>
+        <string/>
        </property>
        <property name="text" >
-        <string>&amp;Down</string>
+        <string>&amp;Add</string>
        </property>
-       <property name="icon" >
-        <iconset/>
+       <property name="autoDefault" >
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" >
-      <widget class="QPushButton" name="deletePB" >
+     <item row="0" column="2" >
+      <widget class="QLabel" name="selectedKeysLA" >
        <property name="text" >
-        <string>D&amp;elete</string>
+        <string>&amp;Selected Citations:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>selectedLV</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="availableKeysLA" >
+       <property name="text" >
+        <string>A&amp;vailable Citations:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>availableLV</cstring>
+       </property>
+      </widget>
+     </item>
+     <item rowspan="5" row="1" column="2" >
+      <widget class="QListView" name="selectedLV" >
+       <property name="editTriggers" >
+        <set>QAbstractItemView::NoEditTriggers</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="1" column="0" >
+    <widget class="QTextBrowser" name="infoML" >
+     <property name="focusPolicy" >
+      <enum>Qt::NoFocus</enum>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="0" >
     <widget class="QGroupBox" name="styleGB" >
      <property name="title" >
@@ -264,7 +189,7 @@
       <item row="0" column="0" >
        <widget class="QLabel" name="citationStyleLA" >
         <property name="text" >
-         <string>Citation &amp;style:</string>
+         <string>Citation st&amp;yle:</string>
         </property>
         <property name="buddy" >
          <cstring>citationStyleCO</cstring>
@@ -277,7 +202,7 @@
          <string>List all authors</string>
         </property>
         <property name="text" >
-         <string>&amp;Full author list</string>
+         <string>Full aut&amp;hor list</string>
         </property>
        </widget>
       </item>
@@ -287,7 +212,7 @@
          <string>Force upper case in citation</string>
         </property>
         <property name="text" >
-         <string>Force &amp;upper case</string>
+         <string>&amp;Force upper case</string>
         </property>
        </widget>
       </item>
@@ -404,6 +329,78 @@
      </item>
     </layout>
    </item>
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Search Citation</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="1" column="1" >
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QCheckBox" name="caseCB" >
+          <property name="text" >
+           <string>Case Se&amp;nsitive</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="regexCB" >
+          <property name="text" >
+           <string>Regular E&amp;xpression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QPushButton" name="clearPB" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>&lt;- C&amp;lear</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="findLE" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="findKeysLA" >
+        <property name="text" >
+         <string>F&amp;ind:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy" >
+         <cstring>findLE</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -413,7 +410,10 @@
   <tabstop>deletePB</tabstop>
   <tabstop>upPB</tabstop>
   <tabstop>downPB</tabstop>
-  <tabstop>infoML</tabstop>
+  <tabstop>findLE</tabstop>
+  <tabstop>clearPB</tabstop>
+  <tabstop>caseCB</tabstop>
+  <tabstop>regexCB</tabstop>
   <tabstop>citationStyleCO</tabstop>
   <tabstop>textBeforeED</tabstop>
   <tabstop>textAfterED</tabstop>