brute fix weird bug 4936.

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 9cbaec7436d01f5c9b03d1a537968002d92992ac..ab3b065cab5cb5a8d5283095f9c5016850283676 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -933,7 +933,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
 
        connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)),
-               this, SLOT(change_adaptor()));
+               this, SLOT(useHyperrefClicked()));
        connect(pdfSupportModule->titleLE, SIGNAL(textChanged(const QString &)),
                this, SLOT(change_adaptor()));
        connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)),
@@ -1013,6 +1013,15 @@ void GuiDocument::useDefaultsClicked()
 }
 
 
+void GuiDocument::useHyperrefClicked()
+{
+       // strange as it is, Qt seems to be unable to handle this by itself
+       pdfSupportModule->bookmarksopenlevelLA->setEnabled(
+               pdfSupportModule->bookmarksopenlevelSB->isEnabled());
+       change_adaptor();
+}
+
+
 void GuiDocument::change_adaptor()
 {
        changed();

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 5ce411e3a8dffa3b5d7f01c975776b10c947be58..a37abda82410597ea877423eb18fd55e0121d6aa 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -120,6 +120,7 @@ private Q_SLOTS:
        void set_listings_msg();
        void saveDefaultClicked();
        void useDefaultsClicked();
+       void useHyperrefClicked();
        void setLSpacing(int);
        void setMargins(bool);
        void setCustomPapersize(int);

diff --git a/src/frontends/qt4/ui/PDFSupportUi.ui b/src/frontends/qt4/ui/PDFSupportUi.ui
index baa9e1d66788cb85e51dfb64d8cb1449d3d28f4f..69231fa8e5d0a5cc5c605837e7f5644351e98d23 100644 (file)
--- a/src/frontends/qt4/ui/PDFSupportUi.ui
+++ b/src/frontends/qt4/ui/PDFSupportUi.ui
@@ -19,19 +19,6 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>31</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="0" column="0" >
     <widget class="QGroupBox" name="use_hyperrefGB" >
      <property name="focusPolicy" >
@@ -51,50 +38,11 @@
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
-       <number>0</number>
+       <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="1" column="0" >
-       <widget class="QGroupBox" name="groupBox_3" >
-        <property name="title" >
-         <string>Additional o&amp;ptions</string>
-        </property>
-        <property name="flat" >
-         <bool>false</bool>
-        </property>
-        <property name="checkable" >
-         <bool>false</bool>
-        </property>
-        <property name="checked" >
-         <bool>false</bool>
-        </property>
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="0" >
-          <widget class="QLineEdit" name="optionsLE" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>7</hsizetype>
-             <vsizetype>0</vsizetype>
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip" >
-            <string>e.g.: pdfstartview=XYZ, plainpages=false, pdfpagelabels</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
       <item row="0" column="0" >
        <widget class="QTabWidget" name="tabWidget" >
         <property name="currentIndex" >
@@ -364,14 +312,51 @@
              <property name="spacing" >
               <number>6</number>
              </property>
-             <item row="1" column="0" colspan="3" >
+             <item row="0" column="0" colspan="2" >
+              <widget class="QCheckBox" name="bookmarksnumberedCB" >
+               <property name="text" >
+                <string>&amp;Numbered bookmarks</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0" >
+              <layout class="QHBoxLayout" >
+               <property name="margin" >
+                <number>0</number>
+               </property>
+               <property name="spacing" >
+                <number>6</number>
+               </property>
+               <item>
+                <widget class="QLabel" name="bookmarksopenlevelLA" >
+                 <property name="enabled" >
+                  <bool>false</bool>
+                 </property>
+                 <property name="text" >
+                  <string>&amp;Level:</string>
+                 </property>
+                 <property name="buddy" >
+                  <cstring>bookmarksopenlevelSB</cstring>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QSpinBox" name="bookmarksopenlevelSB" >
+                 <property name="toolTip" >
+                  <string>Number of levels</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="1" column="0" >
               <widget class="QCheckBox" name="bookmarksopenGB" >
                <property name="text" >
                 <string>&amp;Open bookmarks</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="3" >
+             <item row="2" column="1" >
               <spacer>
                <property name="orientation" >
                 <enum>Qt::Horizontal</enum>
@@ -384,33 +369,6 @@
                </property>
               </spacer>
              </item>
-             <item row="2" column="2" >
-              <widget class="QSpinBox" name="bookmarksopenlevelSB" >
-               <property name="toolTip" >
-                <string>Number of levels</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1" >
-              <widget class="QLabel" name="label" >
-               <property name="enabled" >
-                <bool>false</bool>
-               </property>
-               <property name="text" >
-                <string>&amp;Level:</string>
-               </property>
-               <property name="buddy" >
-                <cstring>bookmarksopenlevelSB</cstring>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0" colspan="4" >
-              <widget class="QCheckBox" name="bookmarksnumberedCB" >
-               <property name="text" >
-                <string>&amp;Numbered bookmarks</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
@@ -431,10 +389,80 @@
         </widget>
        </widget>
       </item>
+      <item row="1" column="0" >
+       <widget class="QGroupBox" name="groupBox_3" >
+        <property name="title" >
+         <string>Additional o&amp;ptions</string>
+        </property>
+        <property name="flat" >
+         <bool>false</bool>
+        </property>
+        <property name="checkable" >
+         <bool>false</bool>
+        </property>
+        <property name="checked" >
+         <bool>false</bool>
+        </property>
+        <layout class="QGridLayout" >
+         <property name="margin" >
+          <number>9</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item row="0" column="0" >
+          <widget class="QLineEdit" name="optionsLE" >
+           <property name="sizePolicy" >
+            <sizepolicy>
+             <hsizetype>7</hsizetype>
+             <vsizetype>0</vsizetype>
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip" >
+            <string>e.g.: pdfstartview=XYZ, plainpages=false, pdfpagelabels</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>402</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
+ <connections>
+  <connection>
+   <sender>bookmarksGB</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>bookmarksopenlevelLA</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>209</x>
+     <y>131</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>71</x>
+     <y>168</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>