anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 19:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

And now, we can remove that icky "Misc" pane !

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5627 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-11-13 06:36:28 +00:00
parent 5091380d6b
commit 337d2453c9
5 changed files with 130 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt2/Makefile.dialogs
View File

@ -226,7 +226,6 @@ UIDIALOGS = \
QPrefScreenFontsModule.h QPrefScreenFontsModule.C \ QPrefScreenFontsModule.h QPrefScreenFontsModule.C \
QPrefColorsModule.h QPrefColorsModule.C \ QPrefColorsModule.h QPrefColorsModule.C \
QPrefDisplayModule.h QPrefDisplayModule.C \ QPrefDisplayModule.h QPrefDisplayModule.C \
QPrefLNFMiscModule.h QPrefLNFMiscModule.C \
QPrefPathsModule.h QPrefPathsModule.C \ QPrefPathsModule.h QPrefPathsModule.C \
QPrefSpellcheckerModule.h QPrefSpellcheckerModule.C \ QPrefSpellcheckerModule.h QPrefSpellcheckerModule.C \
QPrefConvertersModule.h QPrefConvertersModule.C \ QPrefConvertersModule.h QPrefConvertersModule.C \
@ -287,7 +286,6 @@ UIDIALOGS = \
QPrefScreenFontsModule_moc.C \ QPrefScreenFontsModule_moc.C \
QPrefColorsModule_moc.C \ QPrefColorsModule_moc.C \
QPrefDisplayModule_moc.C \ QPrefDisplayModule_moc.C \
QPrefLNFMiscModule_moc.C \
QPrefPathsModule_moc.C \ QPrefPathsModule_moc.C \
QPrefSpellcheckerModule_moc.C \ QPrefSpellcheckerModule_moc.C \
QPrefConvertersModule_moc.C \ QPrefConvertersModule_moc.C \

25
src/frontends/qt2/QPrefsDialog.C
View File

@ -27,7 +27,6 @@
#include "ui/QPrefScreenFontsModule.h" #include "ui/QPrefScreenFontsModule.h"
#include "ui/QPrefColorsModule.h" #include "ui/QPrefColorsModule.h"
#include "ui/QPrefDisplayModule.h" #include "ui/QPrefDisplayModule.h"
#include "ui/QPrefLNFMiscModule.h"
#include "ui/QPrefPathsModule.h" #include "ui/QPrefPathsModule.h"
#include "ui/QPrefSpellcheckerModule.h" #include "ui/QPrefSpellcheckerModule.h"
#include "ui/QPrefConvertersModule.h" #include "ui/QPrefConvertersModule.h"
@ -80,7 +79,6 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
screenfontsModule = new QPrefScreenFontsModule(prefsWS); screenfontsModule = new QPrefScreenFontsModule(prefsWS);
colorsModule = new QPrefColorsModule(prefsWS); colorsModule = new QPrefColorsModule(prefsWS);
displayModule = new QPrefDisplayModule(prefsWS); displayModule = new QPrefDisplayModule(prefsWS);
lnfmiscModule = new QPrefLNFMiscModule(prefsWS);
pathsModule = new QPrefPathsModule(prefsWS); pathsModule = new QPrefPathsModule(prefsWS);
spellcheckerModule = new QPrefSpellcheckerModule(prefsWS); spellcheckerModule = new QPrefSpellcheckerModule(prefsWS);
convertersModule = new QPrefConvertersModule(prefsWS); convertersModule = new QPrefConvertersModule(prefsWS);
@ -96,14 +94,13 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
prefsWS->addWidget(screenfontsModule, 4); prefsWS->addWidget(screenfontsModule, 4);
prefsWS->addWidget(colorsModule, 5); prefsWS->addWidget(colorsModule, 5);
prefsWS->addWidget(displayModule, 6); prefsWS->addWidget(displayModule, 6);
prefsWS->addWidget(lnfmiscModule, 7); prefsWS->addWidget(pathsModule, 7);
prefsWS->addWidget(pathsModule, 8); prefsWS->addWidget(spellcheckerModule, 8);
prefsWS->addWidget(spellcheckerModule, 9); prefsWS->addWidget(convertersModule, 9);
prefsWS->addWidget(convertersModule, 10); prefsWS->addWidget(fileformatsModule, 10);
prefsWS->addWidget(fileformatsModule, 11); prefsWS->addWidget(languageModule, 11);
prefsWS->addWidget(languageModule, 12); prefsWS->addWidget(printerModule, 12);
prefsWS->addWidget(printerModule, 13); prefsWS->addWidget(uiModule, 13);
prefsWS->addWidget(uiModule, 14);
QListViewItem * i; QListViewItem * i;
@ -130,16 +127,14 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
pane_map_[i] = screenfontsModule; pane_map_[i] = screenfontsModule;
i = new QListViewItem(lnf, i, _("Colors")); i = new QListViewItem(lnf, i, _("Colors"));
pane_map_[i] = colorsModule; pane_map_[i] = colorsModule;
i = new QListViewItem(lnf, i, _("Display")); i = new QListViewItem(lnf, i, _("Graphics"));
pane_map_[i] = displayModule; pane_map_[i] = displayModule;
i = new QListViewItem(lnf, i, _("Miscellaneous")); // YUCK !
pane_map_[i] = lnfmiscModule;
// rag bag of crap // rag bag of crap
i = new QListViewItem(prefsLV, lan, _("Ascii")); i = new QListViewItem(prefsLV, lan, _("Ascii output"));
pane_map_[i] = asciiModule; pane_map_[i] = asciiModule;
i = new QListViewItem(prefsLV, i, _("Date")); i = new QListViewItem(prefsLV, i, _("Date output"));
pane_map_[i] = dateModule; pane_map_[i] = dateModule;
i = new QListViewItem(prefsLV, i, _("Keyboard")); i = new QListViewItem(prefsLV, i, _("Keyboard"));
pane_map_[i] = keyboardModule; pane_map_[i] = keyboardModule;

21
src/frontends/qt2/QPrefsDialog.h
View File

@ -29,7 +29,6 @@ class QPrefLatexModule;
class QPrefScreenFontsModule; class QPrefScreenFontsModule;
class QPrefColorsModule; class QPrefColorsModule;
class QPrefDisplayModule; class QPrefDisplayModule;
class QPrefLNFMiscModule;
class QPrefPathsModule; class QPrefPathsModule;
class QPrefSpellcheckerModule; class QPrefSpellcheckerModule;
class QPrefConvertersModule; class QPrefConvertersModule;
@ -54,24 +53,6 @@ protected:
void closeEvent(QCloseEvent * e); void closeEvent(QCloseEvent * e);
private: private:
/*enum Panes {
ASCII,
DATE,
KEYBOARD,
LATEX,
SCREENFONTS,
COLORS,
DISPLAY,
LNFMISC,
PATHS,
SPELLCHECKER,
CONVERTERS,
FILEFORMATS,
LANGUAGE,
PRINTER,
UI
};*/
typedef std::map<QListViewItem *, QWidget *> PaneMap; typedef std::map<QListViewItem *, QWidget *> PaneMap;
PaneMap pane_map_; PaneMap pane_map_;
@ -84,7 +65,6 @@ QPrefLatexModule
QPrefScreenFontsModule QPrefScreenFontsModule
QPrefColorsModule QPrefColorsModule
QPrefDisplayModule QPrefDisplayModule
QPrefLNFMiscModule
QPrefPathsModule QPrefPathsModule
QPrefSpellcheckerModule QPrefSpellcheckerModule
QPrefConvertersModule QPrefConvertersModule
@ -100,7 +80,6 @@ QPrefUIModule
QPrefScreenFontsModule * screenfontsModule; QPrefScreenFontsModule * screenfontsModule;
QPrefColorsModule * colorsModule; QPrefColorsModule * colorsModule;
QPrefDisplayModule * displayModule; QPrefDisplayModule * displayModule;
QPrefLNFMiscModule * lnfmiscModule;
QPrefPathsModule * pathsModule; QPrefPathsModule * pathsModule;
QPrefSpellcheckerModule * spellcheckerModule; QPrefSpellcheckerModule * spellcheckerModule;
QPrefConvertersModule * convertersModule; QPrefConvertersModule * convertersModule;

174
src/frontends/qt2/ui/QPrefLNFMiscModule.ui
View File

@ -1,174 +0,0 @@
<!DOCTYPE UI><UI>
<class>QPrefLNFMiscModule</class>
<include location="global">config.h</include>
<include location="local">gettext.h</include>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>QPrefLNFMiscModule</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
<width>240</width>
<height>211</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form2</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>cursorFollowsCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Cursor follo&amp;ws scrollbar</string>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout2</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout1</cstring>
</property>
<grid>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="0" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>1200</number>
</property>
</widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Autosa&amp;ve Interval:</string>
</property>
<property>
<name>buddy</name>
<cstring>autoSaveSB</cstring>
</property>
</widget>
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>W&amp;heel mouse jump:</string>
</property>
<property>
<name>buddy</name>
<cstring>wheelMouseSB</cstring>
</property>
</widget>
<widget row="1" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>250</number>
</property>
</widget>
</grid>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</hbox>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer3</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</vbox>
</widget>
</UI>

122
src/frontends/qt2/ui/QPrefUIModule.ui
View File

@ -13,8 +13,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>320</width> <width>236</width>
<height>191</height> <height>212</height>
</rect> </rect>
</property> </property>
<property stdset="1"> <property stdset="1">
@ -177,6 +177,124 @@
</spacer> </spacer>
</hbox> </hbox>
</widget> </widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout2_2</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout1_2</cstring>
</property>
<grid>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="0" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>1200</number>
</property>
</widget>
<widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>autoSaveLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Autosa&amp;ve Interval:</string>
</property>
<property>
<name>buddy</name>
<cstring>autoSaveSB</cstring>
</property>
</widget>
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>W&amp;heel mouse jump:</string>
</property>
<property>
<name>buddy</name>
<cstring>wheelMouseSB</cstring>
</property>
</widget>
<widget row="1" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>wheelMouseSB</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>250</number>
</property>
</widget>
</grid>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer2_2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</hbox>
</widget>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>cursorFollowsCB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Cursor follo&amp;ws scrollbar</string>
</property>
</widget>
<spacer> <spacer>
<property> <property>
<name>name</name> <name>name</name>