* development/scons/scons_manifest.py:

* src/frontends/qt4/Makefile.dialogs:
* src/frontends/qt4/QPrefsDialog.C:
* src/frontends/qt4/QPrefsDialog.h:
* src/frontends/qt4/ui/compile_uic.sh:
* src/frontends/qt4/ui/QPrefAsciiUi.ui:
* src/frontends/qt4/ui/QPrefPlaintextUi.ui: rename QPrefAsciiUi.ui to QPrefPlaintextUi.ui;
rename PrefAscii to PrefPlaintext

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 6adf61d1ccb45776c817f1b136a3f1bc173ad34a..8c552484fa0bee8177162e61098bd9ebe7b9f598 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -632,7 +632,7 @@ src_frontends_qt4_ui_files = Split('''
     QNomenclUi.ui
     QNoteUi.ui
     QParagraphUi.ui
-    QPrefAsciiUi.ui
+    QPrefPlaintextUi.ui
     QPrefColorsUi.ui
     QPrefConvertersUi.ui
     QPrefCopiersUi.ui

diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
index 0518515fdfda26f908b960f391793ebb7db4470b..93090810e6f679b97681ee501166798a4d8b7747 100644 (file)
--- a/src/frontends/qt4/Makefile.dialogs
+++ b/src/frontends/qt4/Makefile.dialogs
@@ -40,7 +40,6 @@ UIFILES = \
        QNomenclUi.ui \
        QNoteUi.ui \
        QParagraphUi.ui \
-       QPrefAsciiUi.ui \
        QPrefColorsUi.ui \
        QPrefConvertersUi.ui \
        QPrefCopiersUi.ui \
@@ -53,6 +52,7 @@ UIFILES = \
        QPrefLanguageUi.ui \
        QPrefLatexUi.ui \
        QPrefPathsUi.ui \
+       QPrefPlaintextUi.ui \
        QPrefPrinterUi.ui \
        QPrefScreenFontsUi.ui \
        QPrefsUi.ui \

diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index 86735acee94966103de87698d02374efb280d9fa..dbf7c7193a1904b381565ea14ff122e2556f3c78 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -190,7 +190,7 @@ string const internal_path_list(QString const & input)
 } // end namespace anon
 
 
-PrefAscii::PrefAscii(QWidget * parent)
+PrefPlaintext::PrefPlaintext(QWidget * parent)
 : PrefModule(_(Outputs), _("Plain text"), 0, parent)
 {
        setupUi(this);
@@ -201,14 +201,14 @@ PrefAscii::PrefAscii(QWidget * parent)
 }
 
 
-void PrefAscii::apply(LyXRC & rc) const
+void PrefPlaintext::apply(LyXRC & rc) const
 {
        rc.plaintext_linelen = plaintextLinelengthSB->value();
        rc.plaintext_roff_command = fromqstr(plaintextRoffED->text());
 }
 
 
-void PrefAscii::update(LyXRC const & rc)
+void PrefPlaintext::update(LyXRC const & rc)
 {
        plaintextLinelengthSB->setValue(rc.plaintext_linelen);
        plaintextRoffED->setText(toqstr(rc.plaintext_roff_command));
@@ -1800,7 +1800,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(restorePB, SIGNAL(clicked()),
                form, SLOT(slotRestore()));
 
-       add(new PrefAscii);
+       add(new PrefPlaintext);
        add(new PrefDate);
        add(new PrefKeyboard(form_));
        add(new PrefLatex(form_));

diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h
index bf6d3b5fce0c26f39e65aed0f60f8878ab195c78..eb03c5ffdf8c48c59d37a0a245912b1680b17f10 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.h
+++ b/src/frontends/qt4/QPrefsDialog.h
@@ -23,7 +23,7 @@
 #include <QDialog>
 #include <QCloseEvent>
 
-#include "ui/QPrefAsciiUi.h"
+#include "ui/QPrefPlaintextUi.h"
 #include "ui/QPrefDateUi.h"
 #include "ui/QPrefKeyboardUi.h"
 #include "ui/QPrefLatexUi.h"
@@ -87,12 +87,12 @@ Q_SIGNALS:
 };
 
 
-class PrefAscii :  public PrefModule, public Ui::QPrefAsciiUi
+class PrefPlaintext :  public PrefModule, public Ui::QPrefPlaintextUi
 {
        Q_OBJECT
 public:
-       PrefAscii(QWidget * parent = 0);
-       ~PrefAscii() {}
+       PrefPlaintext(QWidget * parent = 0);
+       ~PrefPlaintext() {}
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);

diff --git a/src/frontends/qt4/ui/QPrefAsciiUi.ui b/src/frontends/qt4/ui/QPrefAsciiUi.ui
deleted file mode 100644 (file)
index 828a72e..0000000
--- a/src/frontends/qt4/ui/QPrefAsciiUi.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>QPrefAsciiUi</class>
- <widget class="QWidget" name="QPrefAsciiUi" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>99</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>11</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="plaintextRoffLA" >
-       <property name="text" >
-        <string>&amp;roff command:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>plaintextRoffED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QSpinBox" name="plaintextLinelengthSB" >
-         <property name="toolTip" >
-          <string>Max. line length of exported plain text/LaTeX/SGML files</string>
-         </property>
-         <property name="maximum" >
-          <number>120</number>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="plaintextLinelengthLA" >
-       <property name="text" >
-        <string>Output &amp;line length:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>plaintextLinelengthSB</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="plaintextRoffED" >
-       <property name="toolTip" >
-        <string>External app for formating tables in plain text output</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
- <resources/>
- <connections/>
-</ui>

diff --git a/src/frontends/qt4/ui/QPrefPlaintextUi.ui b/src/frontends/qt4/ui/QPrefPlaintextUi.ui
new file mode 100644 (file)
index 0000000..338f33e
--- /dev/null
+++ b/src/frontends/qt4/ui/QPrefPlaintextUi.ui
@@ -0,0 +1,122 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>QPrefPlaintextUi</class>
+ <widget class="QWidget" name="QPrefPlaintextUi" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>340</width>
+    <height>99</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string/>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="plaintextRoffLA" >
+       <property name="text" >
+        <string>&amp;roff command:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>plaintextRoffED</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QSpinBox" name="plaintextLinelengthSB" >
+         <property name="toolTip" >
+          <string>Max. line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.</string>
+         </property>
+         <property name="maximum" >
+          <number>120</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="plaintextLinelengthLA" >
+       <property name="text" >
+        <string>Output &amp;line length:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>plaintextLinelengthSB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QLineEdit" name="plaintextRoffED" >
+       <property name="toolTip" >
+        <string>External app for formating tables in plain text output</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/frontends/qt4/ui/compile_uic.sh b/src/frontends/qt4/ui/compile_uic.sh
index 9baeca1ca2056c5f79d0da80a5b28ca5148727b7..5ab5521007b724bb0127459ebb6e3488187027ac 100644 (file)
--- a/src/frontends/qt4/ui/compile_uic.sh
+++ b/src/frontends/qt4/ui/compile_uic.sh
@@ -56,7 +56,7 @@ uic QErrorListUi.ui -o QErrorListUi.h
 uic QFloatUi.ui -o QFloatUi.h
 uic QIndexUi.ui -o QIndexUi.h
 uic QMathMatrixUi.ui -o QMathMatrixUi.h
-uic QPrefAsciiUi.ui -o QPrefAsciiUi.h
+uic QPrefPlaintextUi.ui -o QPrefPlaintextUi.h
 uic QPrefCopiersUi.ui -o QPrefCopiersUi.h
 uic QPrefDisplayUi.ui -o QPrefDisplayUi.h
 uic QPrefKeyboardUi.ui -o QPrefKeyboardUi.h