#include "qt_helpers.h"
#include "debug.h"
-#include "lastfiles.h"
+#include "session.h"
#include "LColor.h"
#include "lyxfont.h"
#include "controllers/frnt_lang.h"
#include "controllers/helper_funcs.h"
+#include "frontends/Alert.h"
#include "frontends/lyx_gui.h"
#include "QPrefsDialog.h"
- asciiModule = new UiWidget<Ui::QPrefAsciiUi>(this);
+ asciiModule = new UiWidget<Ui::QPrefAsciiUi>;
connect(asciiModule->asciiLinelengthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
connect(asciiModule->asciiRoffED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-
- dateModule = new UiWidget<Ui::QPrefDateUi>(this);
+
+ dateModule = new UiWidget<Ui::QPrefDateUi>;
connect(dateModule->DateED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-
- keyboardModule = new UiWidget<Ui::QPrefKeyboardUi>(this);
+
+ keyboardModule = new UiWidget<Ui::QPrefKeyboardUi>;
connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
keyboardModule->firstKeymapLA, SLOT( setEnabled(bool) ) );
connect( keyboardModule->keymapCB, SIGNAL( toggled(bool) ),
- latexModule = new UiWidget<Ui::QPrefLatexUi>(this);
+ latexModule = new UiWidget<Ui::QPrefLatexUi>;
connect(latexModule->latexEncodingED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(latexModule->latexChecktexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(latexModule->latexBibtexED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(latexModule->latexAutoresetCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(latexModule->latexDviPaperED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(latexModule->latexPaperSizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-
- screenfontsModule = new UiWidget<Ui::QPrefScreenFontsUi>(this);
+
+ screenfontsModule = new UiWidget<Ui::QPrefScreenFontsUi>;
connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(select_roman(const QString&)));
connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(select_sans(const QString&)));
connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(select_typewriter(const QString&)));
screenfontsModule->screenHugerED));
-
- colorsModule = new UiWidget<Ui::QPrefColorsUi>(this);
+
+ colorsModule = new UiWidget<Ui::QPrefColorsUi>;
// FIXME: put in controller
for (int i = 0; i < LColor::ignore; ++i) {
LColor::color lc = static_cast<LColor::color>(i);
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
- cygwinpathModule = new UiWidget<Ui::QPrefCygwinPathUi>(this);
+ cygwinpathModule = new UiWidget<Ui::QPrefCygwinPathUi>;
connect(cygwinpathModule->pathCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
#endif
- displayModule = new UiWidget<Ui::QPrefDisplayUi>(this);
+ displayModule = new UiWidget<Ui::QPrefDisplayUi>;
connect(displayModule->instantPreviewCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(displayModule->displayGraphicsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
-
- pathsModule = new UiWidget<Ui::QPrefPathsUi>(this);
+
+ pathsModule = new UiWidget<Ui::QPrefPathsUi>;
connect(pathsModule->templateDirPB, SIGNAL(clicked()), this, SLOT(select_templatedir()));
connect(pathsModule->tempDirPB, SIGNAL(clicked()), this, SLOT(select_tempdir()));
connect(pathsModule->backupDirPB, SIGNAL(clicked()), this, SLOT(select_backupdir()));
connect(pathsModule->tempDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(pathsModule->lyxserverDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(pathsModule->pathPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-
- spellcheckerModule = new UiWidget<Ui::QPrefSpellcheckerUi>(this);
+
+ spellcheckerModule = new UiWidget<Ui::QPrefSpellcheckerUi>;
connect(spellcheckerModule->persDictionaryPB, SIGNAL(clicked()), this, SLOT(select_dict()));
#if defined (USE_ISPELL)
connect(spellcheckerModule->spellCommandCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
#endif
#endif
-
- convertersModule = new UiWidget<Ui::QPrefConvertersUi>(this);
+
+ convertersModule = new UiWidget<Ui::QPrefConvertersUi>;
connect(convertersModule->converterNewPB, SIGNAL(clicked()), this, SLOT(new_converter()));
connect(convertersModule->converterRemovePB, SIGNAL(clicked()), this, SLOT(remove_converter()));
connect(convertersModule->converterModifyPB, SIGNAL(clicked()), this, SLOT(modify_converter()));
connect(convertersModule->converterRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(convertersModule->converterModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
-
- copiersModule = new UiWidget<Ui::QPrefCopiersUi>(this);
+
+ copiersModule = new UiWidget<Ui::QPrefCopiersUi>;
connect(copiersModule->copierNewPB, SIGNAL(clicked()), this, SLOT(new_copier()));
connect(copiersModule->copierRemovePB, SIGNAL(clicked()), this, SLOT(remove_copier()));
connect(copiersModule->copierModifyPB, SIGNAL(clicked()), this, SLOT(modify_copier()));
connect(copiersModule->copierModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(copiersModule->copierFormatCO, SIGNAL(activated(const QString&)), this, SLOT(copiers_changed()));
connect(copiersModule->copierED, SIGNAL(textChanged(const QString&)), this, SLOT(copiers_changed()));
-
- fileformatsModule = new UiWidget<Ui::QPrefFileformatsUi>(this);
+
+ fileformatsModule = new UiWidget<Ui::QPrefFileformatsUi>;
connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(new_format()));
connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(remove_format()));
connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(modify_format()));
connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
-
- languageModule = new UiWidget<Ui::QPrefLanguageUi>(this);
+
+ languageModule = new UiWidget<Ui::QPrefLanguageUi>;
connect(languageModule->rtlCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(languageModule->markForeignCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(languageModule->autoBeginCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
-
-
- printerModule = new UiWidget<Ui::QPrefPrinterUi>(this);
+
+
+ printerModule = new UiWidget<Ui::QPrefPrinterUi>;
connect(printerModule->printerAdaptCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(printerModule->printerCommandED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(printerModule->printerNameED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(printerModule->printerExtraED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(printerModule->printerSpoolPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(printerModule->printerPaperSizeED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
-
- uiModule = new UiWidget<Ui::QPrefUi>(this);
+
+ uiModule = new UiWidget<Ui::QPrefUi>;
connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveLA, SLOT( setEnabled(bool) ) );
connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->autoSaveSB, SLOT( setEnabled(bool) ) );
connect( uiModule->autoSaveCB, SIGNAL( toggled(bool) ), uiModule->TextLabel1, SLOT( setEnabled(bool) ) );
connect(uiModule->bindFilePB, SIGNAL(clicked()), this, SLOT(select_bind()));
connect(uiModule->uiFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(uiModule->bindFileED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+ connect(uiModule->restoreCursorCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
+ connect(uiModule->loadSessionCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(uiModule->cursorFollowsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(uiModule->autoSaveSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
connect(uiModule->autoSaveCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
- identityModule = new UiWidget<Ui::QPrefIdentityUi>(this);
+ identityModule = new UiWidget<Ui::QPrefIdentityUi>;
connect(identityModule->nameED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(identityModule->emailED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
int const nr(fileformatsModule->formatsLB->currentItem());
if (nr < 0)
return;
- form_->formats().erase(form_->formats().get(nr).name());
+ string const current_text = form_->formats().get(nr).name();
+ if (form_->converters().formatIsUsed(current_text)) {
+ Alert::error(_("Format in use"),
+ _("Cannot remove a Format used by a Converter. "
+ "Remove the converter first."));
+ return;
+ }
+ form_->formats().erase(current_text);
updateFormats();
form_->converters().update(form_->formats());
QColor c(QColorDialog::getColor(ci->color(), qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget()));
if (c.isValid()) {
ci->color(c);
- lb->triggerUpdate(false);
+ lb->triggerUpdate(true);
change_adaptor();
}
}
rc.ui_file = internal_path(uiModule->uiFileED->text());
rc.bind_file = internal_path(uiModule->bindFileED->text());
+ rc.use_lastfilepos = uiModule->restoreCursorCB->isChecked();
+ rc.load_session = uiModule->loadSessionCB->isChecked();
rc.cursor_follows_scrollbar = uiModule->cursorFollowsCB->isChecked();
rc.autosave = uiModule->autoSaveSB->value() * 60;
rc.make_backup = uiModule->autoSaveCB->isChecked();
form_->controller().updateScreenFonts();
}
-
-
-
+
+
+
unsigned int i;
for (i = 0; i < colorsModule->lyxObjectsLB->count(); ++i) {
Q3ListBoxItem * ib(colorsModule->lyxObjectsLB->item(i));
font.setFamily(family.c_str());
} else {
lyxerr << "FAILED to find the default font: '"
- << foundry << "', '" << family << '\''<< endl;
+ << foundry << "', '" << family << '\''<< endl;
return;
}
}
lyxerr << "FAILED to find the font: '"
- << foundry << "', '" << family << '\'' <<endl;
+ << foundry << "', '" << family << '\'' <<endl;
}
} // end namespace anon
uiModule->uiFileED->setText(external_path(rc.ui_file));
uiModule->bindFileED->setText(external_path(rc.bind_file));
+ uiModule->restoreCursorCB->setChecked(rc.use_lastfilepos);
+ uiModule->loadSessionCB->setChecked(rc.load_session);
uiModule->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
// convert to minutes
int mins(rc.autosave / 60);