Fix tab order and shortcuts for crossref dialog (#7576).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39600 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/RefUi.ui b/src/frontends/qt4/ui/RefUi.ui
index 2401f2e4d0e7cc01ff724759a1794ed7a7c48698..40bd8c53cc3ff899226df2df2907dfeca451df3b 100644 (file)
--- a/src/frontends/qt4/ui/RefUi.ui
+++ b/src/frontends/qt4/ui/RefUi.ui
@@ -1,193 +1,156 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>RefUi</class>
- <widget class="QDialog" name="RefUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="RefUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>435</width>
-    <height>443</height>
+    <height>500</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="refsL">
+     <property name="text">
+      <string>La&amp;bels in:</string>
+     </property>
+     <property name="buddy">
+      <cstring>bufferCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QComboBox" name="bufferCO">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&amp;References</string>
+     </property>
+     <property name="buddy">
+      <cstring>refsTW</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QTreeWidget" name="refsTW">
+     <column>
+      <property name="text">
+       <string>1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="findKeysLA" >
-       <property name="text" >
+      <widget class="QLabel" name="findKeysLA">
+       <property name="text">
         <string>Fil&amp;ter:</string>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>findLE</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="findLE" >
-       <property name="toolTip" >
+      <widget class="QLineEdit" name="findLE">
+       <property name="toolTip">
         <string>Enter string to filter the label list</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="csFindCB" >
-       <property name="toolTip" >
+      <widget class="QCheckBox" name="csFindCB">
+       <property name="toolTip">
         <string>Filter case-sensitively</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Case-sensiti&amp;ve</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="7" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="updatePB" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>Update the label list</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Update</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>31</width>
-         <height>30</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+   <item row="5" column="0" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QCheckBox" name="sortCB" >
-         <property name="toolTip" >
+        <widget class="QCheckBox" name="sortCB">
+         <property name="toolTip">
           <string>Sort labels in alphabetical order (case-insensitively unless the Case-sensitive option is checked)</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>&amp;Sort</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="caseSensitiveCB" >
-         <property name="enabled" >
+        <widget class="QCheckBox" name="caseSensitiveCB">
+         <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="toolTip" >
+         <property name="toolTip">
           <string>Sort labels case-sensitively in alphabetical order</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Cas&amp;e-sensitive</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="groupCB" >
-         <property name="toolTip" >
-          <string>Group labels by prefix (e.g. "sec:")</string>
+        <widget class="QCheckBox" name="groupCB">
+         <property name="toolTip">
+          <string>Group labels by prefix (e.g. &quot;sec:&quot;)</string>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Grou&amp;p</string>
          </property>
         </widget>
@@ -196,10 +159,10 @@
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -208,165 +171,219 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="gotoPB" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+      <widget class="QPushButton" name="gotoPB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>&amp;Go to Label</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="refsL" >
-     <property name="text" >
-      <string>La&amp;bels in:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>bufferCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2" >
-    <widget class="QComboBox" name="bufferCO" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" >
-    <widget class="QLabel" name="nameL" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="text" >
-      <string>&amp;Name:</string>
+   <item row="6" column="0">
+    <widget class="QLabel" name="referenceL">
+     <property name="text">
+      <string>&amp;Label:</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
-     <property name="buddy" >
-      <cstring>nameED</cstring>
+     <property name="buddy">
+      <cstring>referenceED</cstring>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="2" >
-    <widget class="QLineEdit" name="nameED" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-    </widget>
+   <item row="6" column="1" colspan="2">
+    <widget class="QLineEdit" name="referenceED"/>
    </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="typeLA" >
-     <property name="text" >
-      <string>&amp;Format:</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy" >
-      <cstring>typeLA</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" colspan="2" >
-    <widget class="QComboBox" name="typeCO" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+   <item row="7" column="1" colspan="2">
+    <widget class="QComboBox" name="typeCO">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Cross-reference as it appears in output</string>
      </property>
      <item>
-      <property name="text" >
-       <string>&lt;reference></string>
+      <property name="text">
+       <string>&lt;reference&gt;</string>
       </property>
      </item>
      <item>
-      <property name="text" >
-       <string>(&lt;reference>)</string>
+      <property name="text">
+       <string>(&lt;reference&gt;)</string>
       </property>
      </item>
      <item>
-      <property name="text" >
-       <string>&lt;page></string>
+      <property name="text">
+       <string>&lt;page&gt;</string>
       </property>
      </item>
      <item>
-      <property name="text" >
-       <string>on page &lt;page></string>
+      <property name="text">
+       <string>on page &lt;page&gt;</string>
       </property>
      </item>
      <item>
-      <property name="text" >
-       <string>&lt;reference> on page &lt;page></string>
+      <property name="text">
+       <string>&lt;reference&gt; on page &lt;page&gt;</string>
       </property>
      </item>
      <item>
-      <property name="text" >
+      <property name="text">
        <string>Formatted reference</string>
       </property>
      </item>
      <item>
-      <property name="text" >
+      <property name="text">
        <string>Textual reference</string>
       </property>
      </item>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="referenceL" >
-     <property name="text" >
-      <string>&amp;Label:</string>
+   <item row="8" column="0">
+    <widget class="QLabel" name="nameL">
+     <property name="enabled">
+      <bool>false</bool>
      </property>
-     <property name="alignment" >
+     <property name="text">
+      <string>&amp;Name:</string>
+     </property>
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
-     <property name="buddy" >
-      <cstring>referenceED</cstring>
+     <property name="buddy">
+      <cstring>nameED</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="2" >
-    <widget class="QLineEdit" name="referenceED" />
+   <item row="8" column="1" colspan="2">
+    <widget class="QLineEdit" name="nameED">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QTreeWidget" name="refsTW" >
-     <column>
-      <property name="text" >
-       <string>1</string>
-      </property>
-     </column>
+   <item row="9" column="0" colspan="3">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="updatePB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Update the label list</string>
+       </property>
+       <property name="text">
+        <string>&amp;Update</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>31</width>
+         <height>30</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okPB">
+       <property name="text">
+        <string>&amp;OK</string>
+       </property>
+       <property name="autoDefault">
+        <bool>true</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB">
+       <property name="text">
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closePB">
+       <property name="text">
+        <string>&amp;Close</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="typeLA">
+     <property name="text">
+      <string>&amp;Format:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>typeCO</cstring>
+     </property>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>bufferCO</tabstop>
+  <tabstop>refsTW</tabstop>
+  <tabstop>findLE</tabstop>
+  <tabstop>csFindCB</tabstop>
   <tabstop>sortCB</tabstop>
-  <tabstop>updatePB</tabstop>
+  <tabstop>caseSensitiveCB</tabstop>
+  <tabstop>groupCB</tabstop>
   <tabstop>gotoPB</tabstop>
   <tabstop>referenceED</tabstop>
   <tabstop>typeCO</tabstop>
   <tabstop>nameED</tabstop>
+  <tabstop>updatePB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/status.20x b/status.20x
index 07a4ca1412f1c43925a473c590b9ca7b1e22ed81..222fb0e86a2974b7d88708be54e81487561cbf15 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -67,6 +67,8 @@ What's new
 - Mark buffer dirty when a label is changed, so the file can be saved and
   the change can be reverted (bug 7655).
 
+- Fix shortcuts in cross reference dialog (bug 7576).
+
 
 * ADVANCED FIND AND REPLACE