From af05d3ffa3288d7a012aa16fd59168396c39f3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Sun, 16 Nov 2008 19:22:06 +0000
Subject: [PATCH] remove unneeded "default language" option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27576 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Thesaurus.h                        |  3 +-
 src/frontends/qt4/GuiPrefs.cpp         | 10 +--
 src/frontends/qt4/ui/PrefLanguageUi.ui | 87 +++++++++-----------------
 3 files changed, 31 insertions(+), 69 deletions(-)

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 9a238ce5ab..9808a455ff 100644
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -33,7 +33,8 @@ namespace lyx {
  * This class provides an interface to whatever thesauri we might support.
  */
 
-class Thesaurus {
+class Thesaurus
+{
 public:
 	///
 	Thesaurus();
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index bc83600bc9..8aa728af9a 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1659,18 +1659,14 @@ PrefLanguage::PrefLanguage(GuiPreferences * form)
 		this, SIGNAL(changed()));
 	connect(endCommandED, SIGNAL(textChanged(QString)),
 		this, SIGNAL(changed()));
-	connect(defaultLanguageCO, SIGNAL(activated(int)),
-		this, SIGNAL(changed()));
 	connect(uiLanguageCO, SIGNAL(activated(int)),
 		this, SIGNAL(changed()));
 
-	defaultLanguageCO->clear();
 	uiLanguageCO->clear();
 
 	QAbstractItemModel * language_model = guiApp->languageModel();
 	// FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
 	language_model->sort(0);
-	defaultLanguageCO->setModel(language_model);
 
 	// FIXME: This is wrong, we need filter this list based on the available
 	// translation.
@@ -1706,8 +1702,6 @@ void PrefLanguage::apply(LyXRC & rc) const
 	rc.language_package = fromqstr(languagePackageED->text());
 	rc.language_command_begin = fromqstr(startCommandED->text());
 	rc.language_command_end = fromqstr(endCommandED->text());
-	rc.default_language = fromqstr(
-		defaultLanguageCO->itemData(defaultLanguageCO->currentIndex()).toString());
 	rc.gui_language = fromqstr(
 		uiLanguageCO->itemData(uiLanguageCO->currentIndex()).toString());
 }
@@ -1730,9 +1724,7 @@ void PrefLanguage::update(LyXRC const & rc)
 	startCommandED->setText(toqstr(rc.language_command_begin));
 	endCommandED->setText(toqstr(rc.language_command_end));
 
-	int pos = defaultLanguageCO->findData(toqstr(rc.default_language));
-	defaultLanguageCO->setCurrentIndex(pos);
-	pos = uiLanguageCO->findData(toqstr(rc.gui_language));
+	int pos = uiLanguageCO->findData(toqstr(rc.gui_language));
 	uiLanguageCO->blockSignals(true);
 	uiLanguageCO->setCurrentIndex(pos);
 	uiLanguageCO->blockSignals(false);
diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui
index 3628bbe23e..fdf1ab5c15 100644
--- a/src/frontends/qt4/ui/PrefLanguageUi.ui
+++ b/src/frontends/qt4/ui/PrefLanguageUi.ui
@@ -5,22 +5,25 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>410</width>
-    <height>424</height>
+    <width>326</width>
+    <height>411</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" colspan="2" >
     <widget class="QLabel" name="uiLanguageLA" >
      <property name="text" >
       <string>&amp;User Interface language:</string>
      </property>
-     <property name="buddy" >
-      <cstring>defaultLanguageCO</cstring>
-     </property>
     </widget>
    </item>
    <item row="0" column="2" >
@@ -34,26 +37,6 @@
     </widget>
    </item>
    <item row="1" column="0" colspan="2" >
-    <widget class="QLabel" name="defaultLanguageLA" >
-     <property name="text" >
-      <string>&amp;Default language:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>defaultLanguageCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2" >
-    <widget class="QComboBox" name="defaultLanguageCO" >
-     <property name="toolTip" >
-      <string>Select the default language of your documents</string>
-     </property>
-     <property name="maxVisibleItems" >
-      <number>20</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2" >
     <widget class="QLabel" name="languagePackageLA" >
      <property name="text" >
       <string>Language pac&amp;kage:</string>
@@ -63,14 +46,14 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
+   <item row="1" column="2" >
     <widget class="QLineEdit" name="languagePackageED" >
      <property name="toolTip" >
       <string>Enter the command to load the language package (default: babel)</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="2" column="0" colspan="2" >
     <widget class="QLabel" name="startCommandLA" >
      <property name="text" >
       <string>Command s&amp;tart:</string>
@@ -80,14 +63,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
+   <item row="2" column="2" >
     <widget class="QLineEdit" name="startCommandED" >
      <property name="toolTip" >
       <string>The LaTeX command that starts a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="3" column="0" colspan="2" >
     <widget class="QLabel" name="endCommandLA" >
      <property name="text" >
       <string>Command e&amp;nd:</string>
@@ -97,14 +80,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
+   <item row="3" column="2" >
     <widget class="QLineEdit" name="endCommandED" >
      <property name="toolTip" >
       <string>The LaTeX command that ends a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
+   <item row="4" column="0" colspan="3" >
     <widget class="QCheckBox" name="useBabelCB" >
      <property name="toolTip" >
       <string>Use the babel package for multilingual support</string>
@@ -114,7 +97,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3" >
+   <item row="5" column="0" colspan="3" >
     <widget class="QCheckBox" name="globalCB" >
      <property name="toolTip" >
       <string>Check to pass the language globally (to the document class), not locally (to the language package)</string>
@@ -124,7 +107,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3" >
+   <item row="6" column="0" colspan="3" >
     <widget class="QCheckBox" name="autoBeginCB" >
      <property name="toolTip" >
       <string>If checked, the document language is not explicitely set by a language switch command</string>
@@ -134,7 +117,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="3" >
+   <item row="7" column="0" colspan="3" >
     <widget class="QCheckBox" name="autoEndCB" >
      <property name="toolTip" >
       <string>If checked, the document language is not explicitely closed by a language switch command</string>
@@ -144,7 +127,7 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="4" >
+   <item row="8" column="0" colspan="3" >
     <widget class="QCheckBox" name="markForeignCB" >
      <property name="toolTip" >
       <string>Check to highlight foreign languages visually in the work area</string>
@@ -154,7 +137,7 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="0" >
+   <item row="9" column="0" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -162,7 +145,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>16</height>
@@ -170,7 +153,7 @@
      </property>
     </spacer>
    </item>
-   <item row="11" column="0" colspan="3" >
+   <item row="10" column="0" colspan="3" >
     <widget class="QGroupBox" name="rtlGB2" >
      <property name="toolTip" >
       <string/>
@@ -206,7 +189,7 @@
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" >
          <size>
           <width>101</width>
           <height>20</height>
@@ -216,12 +199,12 @@
       </item>
       <item row="1" column="0" >
        <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <property name="margin" >
          <number>0</number>
         </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QLabel" name="cursorMovementLA" >
           <property name="text" >
@@ -254,7 +237,7 @@
      </layout>
     </widget>
    </item>
-   <item row="12" column="1" >
+   <item row="11" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -262,7 +245,7 @@
      <property name="sizeType" >
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>20</height>
@@ -270,23 +253,9 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>defaultLanguageCO</tabstop>
   <tabstop>languagePackageED</tabstop>
   <tabstop>startCommandED</tabstop>
   <tabstop>endCommandED</tabstop>