anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changelog:

Browse Source 
* QDialogView.h: interface methods and slots are now public instead of protected. This allow to avoid making friend classes.
* QPrefs.[Ch]: removed everything GUI related. The controller does not know anything about what the Dialog is doing, it is here only to transfer request one way or the other.
* QPrefsDialogs.[Ch]: transfered everything GUI related here. Things are gathered per module in contructor, apply() and update() methods so that it will be easy to transfer code to separate class afterward
  - QPrefsDialogs::apply(LyXRC & rc): fill in rc parameters from GUI.
  - QPrefsDialogs::update(LyXRC const & rc): update GUI from rc parameters.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13453 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-03-22 18:59:17 +00:00
parent cc91bd643f
commit 29564e5f54
5 changed files with 839 additions and 849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/qt4/QDialogView.h
View File

@ -40,6 +40,9 @@ public:
/// the dialog has changed contents /// the dialog has changed contents
virtual void changed(); virtual void changed();
///
Qt2BC & bcview();
protected: protected:
/// build the actual dialog /// build the actual dialog
virtual void build_dialog() = 0; virtual void build_dialog() = 0;
@ -57,12 +60,10 @@ protected:
/// is the dialog currently valid ? /// is the dialog currently valid ?
virtual bool isValid(); virtual bool isValid();
///
Qt2BC & bcview();
/// are we updating ? /// are we updating ?
bool updating_; bool updating_;
protected slots:
public slots:
// dialog closed from WM // dialog closed from WM
void slotWMHide(); void slotWMHide();

604
src/frontends/qt4/QPrefs.C
View File

@ -17,23 +17,6 @@
#include "Qt2BC.h" #include "Qt2BC.h"
#include "qt_helpers.h" #include "qt_helpers.h"
#include "ui/QPrefAsciiUi.h"
#include "ui/QPrefDateUi.h"
#include "ui/QPrefKeyboardUi.h"
#include "ui/QPrefLatexUi.h"
#include "ui/QPrefScreenFontsUi.h"
#include "ui/QPrefColorsUi.h"
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
#include "ui/QPrefCygwinPathUi.h"
#endif
#include "ui/QPrefDisplayUi.h"
#include "ui/QPrefPathsUi.h"
#include "ui/QPrefSpellcheckerUi.h"
#include "ui/QPrefLanguageUi.h"
#include "ui/QPrefPrinterUi.h"
#include "ui/QPrefUi.h"
#include "ui/QPrefIdentityUi.h"
#include "debug.h" #include "debug.h"
#include "lastfiles.h" #include "lastfiles.h"
#include "LColor.h" #include "LColor.h"
@ -48,29 +31,6 @@
#include "frontends/lyx_gui.h" #include "frontends/lyx_gui.h"
#include <qcheckbox.h>
#include "qcoloritem.h"
#include <qlabel.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <boost/tuple/tuple.hpp>
#include <iomanip>
#include <sstream>
using lyx::support::compare_no_case;
using std::distance;
using std::endl;
using std::setfill;
using std::setw;
using std::string;
using std::ostringstream;
using std::pair;
using std::vector;
using namespace Ui; using namespace Ui;
namespace lyx { namespace lyx {
@ -81,595 +41,37 @@ typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
QPrefs::QPrefs(Dialog & parent) QPrefs::QPrefs(Dialog & parent)
: base_class(parent, _("Preferences")) : base_class(parent, _("Preferences"))
{ {
}
}
Converters & QPrefs::converters() Converters & QPrefs::converters()
{ {
return controller().converters(); return controller().converters();
} }
Formats & QPrefs::formats() Formats & QPrefs::formats()
{ {
return controller().formats(); return controller().formats();
} }
Movers & QPrefs::movers() Movers & QPrefs::movers()
{ {
return controller().movers(); return controller().movers();
} }
void QPrefs::build_dialog() void QPrefs::build_dialog()
{ {
dialog_.reset(new QPrefsDialog(this)); dialog_.reset(new QPrefsDialog(this));
bcview().setOK(dialog_->savePB);
bcview().setApply(dialog_->applyPB);
bcview().setCancel(dialog_->closePB);
bcview().setRestore(dialog_->restorePB);
dialog_->uiModule->lastfilesSB->setMaxValue(maxlastfiles);
Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
langmod->defaultLanguageCO->clear();
// store the lang identifiers for later
using lyx::frontend::LanguagePair;
vector<LanguagePair> const langs =
lyx::frontend::getLanguageData(false);
lang_ = getSecond(langs);
vector<LanguagePair>::const_iterator lit = langs.begin();
vector<LanguagePair>::const_iterator lend = langs.end();
for (; lit != lend; ++lit) {
langmod->defaultLanguageCO->insertItem(toqstr(lit->first));
} }
Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
spellmod->spellCommandCO->insertItem(qt_("ispell"));
spellmod->spellCommandCO->insertItem(qt_("aspell"));
spellmod->spellCommandCO->insertItem(qt_("hspell"));
#ifdef USE_PSPELL
spellmod->spellCommandCO->insertItem(qt_("pspell (library)"));
#else
#ifdef USE_ASPELL
spellmod->spellCommandCO->insertItem(qt_("aspell (library)"));
#endif
#endif
}
namespace {
string const internal_path(QString const & input)
{
return lyx::support::os::internal_path(fromqstr(input));
}
}
void QPrefs::apply() void QPrefs::apply()
{ {
LyXRC & rc(controller().rc()); dialog_->apply(controller().rc());
Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
// FIXME: remove rtl_support bool
rc.rtl_support = langmod->rtlCB->isChecked();
rc.mark_foreign_language = langmod->markForeignCB->isChecked();
rc.language_auto_begin = langmod->autoBeginCB->isChecked();
rc.language_auto_end = langmod->autoEndCB->isChecked();
rc.language_use_babel = langmod->useBabelCB->isChecked();
rc.language_global_options = langmod->globalCB->isChecked();
rc.language_package = fromqstr(langmod->languagePackageED->text());
rc.language_command_begin = fromqstr(langmod->startCommandED->text());
rc.language_command_end = fromqstr(langmod->endCommandED->text());
rc.default_language = lang_[langmod->defaultLanguageCO->currentItem()];
Ui::QPrefUi * uimod(dialog_->uiModule);
rc.ui_file = internal_path(uimod->uiFileED->text());
rc.bind_file = internal_path(uimod->bindFileED->text());
rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked();
rc.wheel_jump = uimod->wheelMouseSB->value();
rc.autosave = uimod->autoSaveSB->value() * 60;
rc.make_backup = uimod->autoSaveCB->isChecked();
rc.num_lastfiles = uimod->lastfilesSB->value();
Ui::QPrefKeyboardUi * keymod(dialog_->keyboardModule);
// FIXME: can derive CB from the two EDs
rc.use_kbmap = keymod->keymapCB->isChecked();
rc.primary_kbmap = internal_path(keymod->firstKeymapED->text());
rc.secondary_kbmap = internal_path(keymod->secondKeymapED->text());
Ui::QPrefAsciiUi * ascmod(dialog_->asciiModule);
rc.ascii_linelen = ascmod->asciiLinelengthSB->value();
rc.ascii_roff_command = fromqstr(ascmod->asciiRoffED->text());
Ui::QPrefDateUi * datemod(dialog_->dateModule);
rc.date_insert_format = fromqstr(datemod->DateED->text());
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
Ui::QPrefCygwinPathUi * cygwinmod(dialog_->cygwinpathModule);
rc.cygwin_path_fix = cygwinmod->pathCB->isChecked();
#endif
Ui::QPrefLatexUi * latexmod(dialog_->latexModule);
rc.fontenc = fromqstr(latexmod->latexEncodingED->text());
rc.chktex_command = fromqstr(latexmod->latexChecktexED->text());
rc.bibtex_command = fromqstr(latexmod->latexBibtexED->text());
rc.index_command = fromqstr(latexmod->latexIndexED->text());
rc.auto_reset_options = latexmod->latexAutoresetCB->isChecked();
rc.view_dvi_paper_option = fromqstr(latexmod->latexDviPaperED->text());
rc.default_papersize =
controller().toPaperSize(latexmod->latexPaperSizeCO->currentItem());
Ui::QPrefDisplayUi * displaymod(dialog_->displayModule);
switch (displaymod->instantPreviewCO->currentItem()) {
case 0:
rc.preview = LyXRC::PREVIEW_OFF;
break;
case 1:
rc.preview = LyXRC::PREVIEW_NO_MATH;
break;
case 2:
rc.preview = LyXRC::PREVIEW_ON;
break;
} }
lyx::graphics::DisplayType dtype(lyx::graphics::ColorDisplay);
switch (displaymod->displayGraphicsCO->currentItem()) {
case 3: dtype = lyx::graphics::NoDisplay; break;
case 2: dtype = lyx::graphics::ColorDisplay; break;
case 1: dtype = lyx::graphics::GrayscaleDisplay; break;
case 0: dtype = lyx::graphics::MonochromeDisplay; break;
}
rc.display_graphics = dtype;
#ifdef WITH_WARNINGS
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
if (old_value != rc.display_graphics) {
lyx::graphics::GCache & gc = lyx::graphics::GCache::get();
gc.changeDisplay();
}
#endif
Ui::QPrefPathsUi * pathsmod(dialog_->pathsModule);
rc.document_path = internal_path(pathsmod->workingDirED->text());
rc.template_path = internal_path(pathsmod->templateDirED->text());
rc.backupdir_path = internal_path(pathsmod->backupDirED->text());
rc.tempdir_path = internal_path(pathsmod->tempDirED->text());
rc.path_prefix = fromqstr(pathsmod->pathPrefixED->text());
// FIXME: should be a checkbox only
rc.lyxpipes = internal_path(pathsmod->lyxserverDirED->text());
Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
switch (spellmod->spellCommandCO->currentItem()) {
case 0:
case 1:
case 2:
rc.use_spell_lib = false;
rc.isp_command = fromqstr(spellmod->spellCommandCO->currentText());
break;
case 3:
rc.use_spell_lib = true;
break;
}
// FIXME: remove isp_use_alt_lang
rc.isp_alt_lang = fromqstr(spellmod->altLanguageED->text());
rc.isp_use_alt_lang = !rc.isp_alt_lang.empty();
// FIXME: remove isp_use_esc_chars
rc.isp_esc_chars = fromqstr(spellmod->escapeCharactersED->text());
rc.isp_use_esc_chars = !rc.isp_esc_chars.empty();
// FIXME: remove isp_use_pers_dict
rc.isp_pers_dict = internal_path(spellmod->persDictionaryED->text());
rc.isp_use_pers_dict = !rc.isp_pers_dict.empty();
rc.isp_accept_compound = spellmod->compoundWordCB->isChecked();
rc.isp_use_input_encoding = spellmod->inputEncodingCB->isChecked();
Ui::QPrefPrinterUi * printmod(dialog_->printerModule);
rc.print_adapt_output = printmod->printerAdaptCB->isChecked();
rc.print_command = fromqstr(printmod->printerCommandED->text());
rc.printer = fromqstr(printmod->printerNameED->text());
rc.print_pagerange_flag = fromqstr(printmod->printerPageRangeED->text());
rc.print_copies_flag = fromqstr(printmod->printerCopiesED->text());
rc.print_reverse_flag = fromqstr(printmod->printerReverseED->text());
rc.print_to_printer = fromqstr(printmod->printerToPrinterED->text());
rc.print_file_extension = fromqstr(printmod->printerExtensionED->text());
rc.print_spool_command = fromqstr(printmod->printerSpoolCommandED->text());
rc.print_paper_flag = fromqstr(printmod->printerPaperTypeED->text());
rc.print_evenpage_flag = fromqstr(printmod->printerEvenED->text());
rc.print_oddpage_flag = fromqstr(printmod->printerOddED->text());
rc.print_collcopies_flag = fromqstr(printmod->printerCollatedED->text());
rc.print_landscape_flag = fromqstr(printmod->printerLandscapeED->text());
rc.print_to_file = internal_path(printmod->printerToFileED->text());
rc.print_extra_options = fromqstr(printmod->printerExtraED->text());
rc.print_spool_printerprefix = fromqstr(printmod->printerSpoolPrefixED->text());
rc.print_paper_dimension_flag = fromqstr(printmod->printerPaperSizeED->text());
Ui::QPrefIdentityUi * idmod(dialog_->identityModule);
rc.user_name = fromqstr(idmod->nameED->text());
rc.user_email = fromqstr(idmod->emailED->text());
Ui::QPrefScreenFontsUi * fontmod(dialog_->screenfontsModule);
LyXRC const oldrc(rc);
boost::tie(rc.roman_font_name, rc.roman_font_foundry)
= parseFontName(fromqstr(fontmod->screenRomanCO->currentText()));
boost::tie(rc.sans_font_name, rc.sans_font_foundry) =
parseFontName(fromqstr(fontmod->screenSansCO->currentText()));
boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) =
parseFontName(fromqstr(fontmod->screenTypewriterCO->currentText()));
rc.zoom = fontmod->screenZoomSB->value();
rc.dpi = fontmod->screenDpiSB->value();
rc.font_sizes[LyXFont::SIZE_TINY] = fromqstr(fontmod->screenTinyED->text());
rc.font_sizes[LyXFont::SIZE_SCRIPT] = fromqstr(fontmod->screenSmallestED->text());
rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = fromqstr(fontmod->screenSmallerED->text());
rc.font_sizes[LyXFont::SIZE_SMALL] = fromqstr(fontmod->screenSmallED->text());
rc.font_sizes[LyXFont::SIZE_NORMAL] = fromqstr(fontmod->screenNormalED->text());
rc.font_sizes[LyXFont::SIZE_LARGE] = fromqstr(fontmod->screenLargeED->text());
rc.font_sizes[LyXFont::SIZE_LARGER] = fromqstr(fontmod->screenLargerED->text());
rc.font_sizes[LyXFont::SIZE_LARGEST] = fromqstr(fontmod->screenLargestED->text());
rc.font_sizes[LyXFont::SIZE_HUGE] = fromqstr(fontmod->screenHugeED->text());
rc.font_sizes[LyXFont::SIZE_HUGER] = fromqstr(fontmod->screenHugerED->text());
if (rc.font_sizes != oldrc.font_sizes
|| rc.roman_font_name != oldrc.roman_font_name
|| rc.sans_font_name != oldrc.sans_font_name
|| rc.typewriter_font_name != oldrc.typewriter_font_name
|| rc.zoom != oldrc.zoom || rc.dpi != oldrc.dpi) {
controller().updateScreenFonts();
}
Ui::QPrefColorsUi * colmod(dialog_->colorsModule);
unsigned int i;
for (i = 0; i < colmod->lyxObjectsLB->count(); ++i) {
Q3ListBoxItem * ib(colmod->lyxObjectsLB->item(i));
QColorItem * ci(static_cast<QColorItem*>(ib));
LColor::color const col(dialog_->colors_[i]);
QColor const & qcol(lcolorcache.get(col));
// FIXME: dubious, but it's what xforms does
if (qcol != ci->color()) {
ostringstream ostr;
ostr << '#' << std::setbase(16) << setfill('0')
<< setw(2) << ci->color().red()
<< setw(2) << ci->color().green()
<< setw(2) << ci->color().blue();
string newhex(ostr.str());
controller().setColor(col, newhex);
}
}
}
// FIXME: move to helper_funcs.h
namespace {
template<class A>
typename std::vector<A>::size_type
findPos(std::vector<A> const & vec, A const & val)
{
typedef typename std::vector<A>::const_iterator Cit;
Cit it = std::find(vec.begin(), vec.end(), val);
if (it == vec.end())
return 0;
return distance(vec.begin(), it);
}
void setComboxFont(QComboBox * cb, string const & family, string const & foundry)
{
string const name = makeFontName(family, foundry);
for (int i = 0; i < cb->count(); ++i) {
if (fromqstr(cb->text(i)) == name) {
cb->setCurrentItem(i);
return;
}
}
// Try matching without foundry name
// We count in reverse in order to prefer the Xft foundry
for (int i = cb->count() - 1; i >= 0; --i) {
pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
if (compare_no_case(tmp.first, family) == 0) {
cb->setCurrentItem(i);
return;
}
}
// family alone can contain e.g. "Helvetica [Adobe]"
pair<string, string> tmpfam = parseFontName(family);
// We count in reverse in order to prefer the Xft foundry
for (int i = cb->count() - 1; i >= 0; --i) {
pair<string, string> tmp = parseFontName(fromqstr(cb->text(i)));
if (compare_no_case(tmp.first, tmpfam.first) == 0) {
cb->setCurrentItem(i);
return;
}
}
// Bleh, default fonts, and the names couldn't be found. Hack
// for bug 1063. Qt makes baby Jesus cry.
QFont font;
if (family == lyx_gui::roman_font_name()) {
font.setStyleHint(QFont::Serif);
font.setFamily(family.c_str());
} else if (family == lyx_gui::sans_font_name()) {
font.setStyleHint(QFont::SansSerif);
font.setFamily(family.c_str());
} else if (family == lyx_gui::typewriter_font_name()) {
font.setStyleHint(QFont::TypeWriter);
font.setFamily(family.c_str());
} else {
lyxerr << "FAILED to find the default font: '"
<< foundry << "', '" << family << '\''<< endl;
return;
}
QFontInfo info(font);
pair<string, string> tmp = parseFontName(fromqstr(info.family()));
string const & default_font_name = tmp.first;
lyxerr << "Apparent font is " << default_font_name << endl;
for (int i = 0; i < cb->count(); ++i) {
lyxerr << "Looking at " << fromqstr(cb->text(i)) << endl;
if (compare_no_case(fromqstr(cb->text(i)),
default_font_name) == 0) {
cb->setCurrentItem(i);
return;
}
}
lyxerr << "FAILED to find the font: '"
<< foundry << "', '" << family << '\'' <<endl;
}
} // end namespace anon
namespace {
QString const external_path(string const & input)
{
return toqstr(lyx::support::os::external_path(input));
}
}
void QPrefs::update_contents() void QPrefs::update_contents()
{ {
LyXRC const & rc(controller().rc()); dialog_->update(controller().rc());
Ui::QPrefLanguageUi * langmod(dialog_->languageModule);
// FIXME: remove rtl_support bool
langmod->rtlCB->setChecked(rc.rtl_support);
langmod->markForeignCB->setChecked(rc.mark_foreign_language);
langmod->autoBeginCB->setChecked(rc.language_auto_begin);
langmod->autoEndCB->setChecked(rc.language_auto_end);
langmod->useBabelCB->setChecked(rc.language_use_babel);
langmod->globalCB->setChecked(rc.language_global_options);
langmod->languagePackageED->setText(toqstr(rc.language_package));
langmod->startCommandED->setText(toqstr(rc.language_command_begin));
langmod->endCommandED->setText(toqstr(rc.language_command_end));
int const pos = int(findPos(lang_, rc.default_language));
langmod->defaultLanguageCO->setCurrentItem(pos);
Ui::QPrefUi * uimod(dialog_->uiModule);
uimod->uiFileED->setText(external_path(rc.ui_file));
uimod->bindFileED->setText(external_path(rc.bind_file));
uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
uimod->wheelMouseSB->setValue(rc.wheel_jump);
// convert to minutes
int mins(rc.autosave / 60);
if (rc.autosave && !mins)
mins = 1;
uimod->autoSaveSB->setValue(mins);
uimod->autoSaveCB->setChecked(rc.make_backup);
uimod->lastfilesSB->setValue(rc.num_lastfiles);
Ui::QPrefIdentityUi * idmod(dialog_->identityModule);
idmod->nameED->setText(toqstr(rc.user_name));
idmod->emailED->setText(toqstr(rc.user_email));
Ui::QPrefKeyboardUi * keymod(dialog_->keyboardModule);
// FIXME: can derive CB from the two EDs
keymod->keymapCB->setChecked(rc.use_kbmap);
// no idea why we need these. Fscking Qt.
keymod->firstKeymapED->setEnabled(rc.use_kbmap);
keymod->firstKeymapPB->setEnabled(rc.use_kbmap);
keymod->firstKeymapLA->setEnabled(rc.use_kbmap);
keymod->secondKeymapED->setEnabled(rc.use_kbmap);
keymod->secondKeymapPB->setEnabled(rc.use_kbmap);
keymod->secondKeymapLA->setEnabled(rc.use_kbmap);
keymod->firstKeymapED->setText(external_path(rc.primary_kbmap));
keymod->secondKeymapED->setText(external_path(rc.secondary_kbmap));
Ui::QPrefAsciiUi * ascmod(dialog_->asciiModule);
ascmod->asciiLinelengthSB->setValue(rc.ascii_linelen);
ascmod->asciiRoffED->setText(toqstr(rc.ascii_roff_command));
Ui::QPrefDateUi * datemod(dialog_->dateModule);
datemod->DateED->setText(toqstr(rc.date_insert_format));
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
Ui::QPrefCygwinPathUi * cygwinmod(dialog_->cygwinpathModule);
cygwinmod->pathCB->setChecked(rc.cygwin_path_fix);
#endif
Ui::QPrefLatexUi * latexmod(dialog_->latexModule);
latexmod->latexEncodingED->setText(toqstr(rc.fontenc));
latexmod->latexChecktexED->setText(toqstr(rc.chktex_command));
latexmod->latexBibtexED->setText(toqstr(rc.bibtex_command));
latexmod->latexIndexED->setText(toqstr(rc.index_command));
latexmod->latexAutoresetCB->setChecked(rc.auto_reset_options);
latexmod->latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option));
latexmod->latexPaperSizeCO->setCurrentItem(
controller().fromPaperSize(rc.default_papersize));
Ui::QPrefDisplayUi * displaymod(dialog_->displayModule);
switch (rc.preview) {
case LyXRC::PREVIEW_OFF:
displaymod->instantPreviewCO->setCurrentItem(0);
break;
case LyXRC::PREVIEW_NO_MATH :
displaymod->instantPreviewCO->setCurrentItem(1);
break;
case LyXRC::PREVIEW_ON :
displaymod->instantPreviewCO->setCurrentItem(2);
break;
}
int item = 2;
switch (rc.display_graphics) {
case lyx::graphics::NoDisplay: item = 3; break;
case lyx::graphics::ColorDisplay: item = 2; break;
case lyx::graphics::GrayscaleDisplay: item = 1; break;
case lyx::graphics::MonochromeDisplay: item = 0; break;
default: break;
}
displaymod->displayGraphicsCO->setCurrentItem(item);
Ui::QPrefPathsUi * pathsmod(dialog_->pathsModule);
pathsmod->workingDirED->setText(external_path(rc.document_path));
pathsmod->templateDirED->setText(external_path(rc.template_path));
pathsmod->backupDirED->setText(external_path(rc.backupdir_path));
pathsmod->tempDirED->setText(external_path(rc.tempdir_path));
pathsmod->pathPrefixED->setText(toqstr(rc.path_prefix));
// FIXME: should be a checkbox only
pathsmod->lyxserverDirED->setText(external_path(rc.lyxpipes));
Ui::QPrefSpellcheckerUi * spellmod(dialog_->spellcheckerModule);
spellmod->spellCommandCO->setCurrentItem(0);
if (rc.isp_command == "ispell") {
spellmod->spellCommandCO->setCurrentItem(0);
} else if (rc.isp_command == "aspell") {
spellmod->spellCommandCO->setCurrentItem(1);
} else if (rc.isp_command == "hspell") {
spellmod->spellCommandCO->setCurrentItem(2);
}
if (rc.use_spell_lib) {
#if defined(USE_ASPELL) || defined(USE_PSPELL)
spellmod->spellCommandCO->setCurrentItem(3);
#endif
}
// FIXME: remove isp_use_alt_lang
spellmod->altLanguageED->setText(toqstr(rc.isp_alt_lang));
// FIXME: remove isp_use_esc_chars
spellmod->escapeCharactersED->setText(toqstr(rc.isp_esc_chars));
// FIXME: remove isp_use_pers_dict
spellmod->persDictionaryED->setText(external_path(rc.isp_pers_dict));
spellmod->compoundWordCB->setChecked(rc.isp_accept_compound);
spellmod->inputEncodingCB->setChecked(rc.isp_use_input_encoding);
Ui::QPrefPrinterUi * printmod(dialog_->printerModule);
printmod->printerAdaptCB->setChecked(rc.print_adapt_output);
printmod->printerCommandED->setText(toqstr(rc.print_command));
printmod->printerNameED->setText(toqstr(rc.printer));
printmod->printerPageRangeED->setText(toqstr(rc.print_pagerange_flag));
printmod->printerCopiesED->setText(toqstr(rc.print_copies_flag));
printmod->printerReverseED->setText(toqstr(rc.print_reverse_flag));
printmod->printerToPrinterED->setText(toqstr(rc.print_to_printer));
printmod->printerExtensionED->setText(toqstr(rc.print_file_extension));
printmod->printerSpoolCommandED->setText(toqstr(rc.print_spool_command));
printmod->printerPaperTypeED->setText(toqstr(rc.print_paper_flag));
printmod->printerEvenED->setText(toqstr(rc.print_evenpage_flag));
printmod->printerOddED->setText(toqstr(rc.print_oddpage_flag));
printmod->printerCollatedED->setText(toqstr(rc.print_collcopies_flag));
printmod->printerLandscapeED->setText(toqstr(rc.print_landscape_flag));
printmod->printerToFileED->setText(external_path(rc.print_to_file));
printmod->printerExtraED->setText(toqstr(rc.print_extra_options));
printmod->printerSpoolPrefixED->setText(toqstr(rc.print_spool_printerprefix));
printmod->printerPaperSizeED->setText(toqstr(rc.print_paper_dimension_flag));
Ui::QPrefScreenFontsUi * fontmod(dialog_->screenfontsModule);
setComboxFont(fontmod->screenRomanCO, rc.roman_font_name,
rc.roman_font_foundry);
setComboxFont(fontmod->screenSansCO, rc.sans_font_name,
rc.sans_font_foundry);
setComboxFont(fontmod->screenTypewriterCO, rc.typewriter_font_name,
rc.typewriter_font_foundry);
dialog_->select_roman(fontmod->screenRomanCO->currentText());
dialog_->select_sans(fontmod->screenSansCO->currentText());
dialog_->select_typewriter(fontmod->screenTypewriterCO->currentText());
fontmod->screenZoomSB->setValue(rc.zoom);
fontmod->screenDpiSB->setValue(rc.dpi);
fontmod->screenTinyED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_TINY]));
fontmod->screenSmallestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SCRIPT]));
fontmod->screenSmallerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]));
fontmod->screenSmallED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_SMALL]));
fontmod->screenNormalED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_NORMAL]));
fontmod->screenLargeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGE]));
fontmod->screenLargerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGER]));
fontmod->screenLargestED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_LARGEST]));
fontmod->screenHugeED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGE]));
fontmod->screenHugerED->setText(toqstr(rc.font_sizes[LyXFont::SIZE_HUGER]));
dialog_->updateFormats();
dialog_->updateConverters();
dialog_->updateCopiers();
} }
} // namespace frontend } // namespace frontend

13
src/frontends/qt4/QPrefs.h
View File

@ -29,11 +29,12 @@ class QPrefs
: public QController<ControlPrefs, QView<QPrefsDialog> > : public QController<ControlPrefs, QView<QPrefsDialog> >
{ {
public: public:
friend class QPrefsDialog;
QPrefs(Dialog &); QPrefs(Dialog &);
Converters & converters();
Formats & formats();
Movers & movers();
private: private:
/// Apply changes /// Apply changes
virtual void apply(); virtual void apply();
@ -44,12 +45,6 @@ private:
/// build the dialog /// build the dialog
virtual void build_dialog(); virtual void build_dialog();
Converters & converters();
Formats & formats();
Movers & movers();
/// languages
std::vector<std::string> lang_;
}; };
} // namespace frontend } // namespace frontend

1014
src/frontends/qt4/QPrefsDialog.C
View File

File diff suppressed because it is too large Load Diff

12
src/frontends/qt4/QPrefsDialog.h
View File

@ -14,6 +14,7 @@
#define QPREFSDIALOG_H #define QPREFSDIALOG_H
#include "LColor.h" #include "LColor.h"
#include "lyxrc.h"
#include "ui/QPrefsUi.h" #include "ui/QPrefsUi.h"
@ -52,21 +53,23 @@ template<class UI>
} }
}; };
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
class QPrefs; class QPrefs;
///
class QPrefsDialog : public QDialog, public Ui::QPrefsUi { class QPrefsDialog : public QDialog, public Ui::QPrefsUi {
Q_OBJECT Q_OBJECT
public: public:
friend class QPrefs;
QPrefsDialog(QPrefs *); QPrefsDialog(QPrefs *);
~QPrefsDialog(); ~QPrefsDialog();
void apply(LyXRC & rc) const;
void update(LyXRC const & rc);
protected:
void updateConverters(); void updateConverters();
void updateConverterButtons(); void updateConverterButtons();
void updateCopiers(); void updateCopiers();
@ -118,6 +121,9 @@ protected:
private: private:
/// languages
std::vector<std::string> lang_;
std::vector<LColor_color> colors_; std::vector<LColor_color> colors_;
UiWidget<Ui::QPrefAsciiUi> * asciiModule; UiWidget<Ui::QPrefAsciiUi> * asciiModule;