* src/frontends/qt4/GuiDocument.cpp:

* src/frontends/qt4/ui/LaTeXUi.ui:
	- hide the "browse local layout" button as discussed on
	  http://bugzilla.lyx.org/show_bug.cgi?id=4812
	  because the local layout feature can result in dataloss.

	  Whether the feature itself should be removed for 1.6.0 has
	  to be discussed.

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 9cbaec7436d01f5c9b03d1a537968002d92992ac..5c0f768a9470a06811d164b7647d7128a2454442 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -899,6 +899,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                latexModule->psdriverCO->addItem(enc);
        }
        // latex classes
+       // FIXME hide local layout button due to bug 4812.
+       latexModule->layoutPB->hide();
        latexModule->classCO->setModel(&classes_model_);
        LayoutFileList const & bcl = LayoutFileList::get();
        vector<LayoutFileIndex> classList = bcl.classList();

diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 7d4903376b3a0636d1be35591e3735c37526a526..24edcbf0d3731d97f71d39fe84c2f5f880d9b6f8 100644 (file)
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -160,19 +160,6 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="2" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>261</width>
-       <height>22</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="2" column="1" >
     <widget class="QComboBox" name="psdriverCO" >
      <property name="duplicatesEnabled" >
@@ -203,24 +190,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QPushButton" name="layoutPB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>1</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
-      <string>Click to select a local document class definition file</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Local Layout...</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" >
     <widget class="QLabel" name="classL" >
      <property name="text" >
@@ -231,7 +200,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
+   <item row="0" column="1" colspan="3" >
     <widget class="QComboBox" name="classCO" >
      <property name="maxVisibleItems" >
       <number>20</number>
@@ -251,6 +220,37 @@
      </property>
     </spacer>
    </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>31</width>
+       <height>23</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="layoutPB" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>Click to select a local document class definition file</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Local Layout...</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>