* Licence details can be found in the file COPYING.
*
* \author John Levon
+ * \author Bo Peng
*
* Full author contact details are available in file CREDITS.
*/
#include "GuiPrefs.h"
-#include "qt_helpers.h"
+#include "ColorCache.h"
+#include "FileDialog.h"
#include "GuiApplication.h"
+#include "GuiFontExample.h"
#include "GuiFontLoader.h"
+#include "GuiKeySymbol.h"
+#include "qt_helpers.h"
#include "BufferList.h"
#include "Color.h"
+#include "ColorSet.h"
#include "ConverterCache.h"
-#include "debug.h"
-#include "Font.h"
+#include "FontEnums.h"
#include "FuncRequest.h"
-#include "gettext.h"
-#include "GuiFontExample.h"
#include "KeyMap.h"
#include "KeySequence.h"
+#include "Language.h"
#include "LyXAction.h"
#include "PanelStack.h"
#include "paper.h"
#include "Session.h"
+#include "SpellChecker.h"
+#include "support/debug.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/foreach.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/FileFilterList.h"
-#include "frontend_helpers.h"
+#include "graphics/GraphicsTypes.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
+#include "frontends/FontLoader.h"
+#include <QAbstractItemModel>
#include <QCheckBox>
#include <QColorDialog>
#include <QFontDatabase>
#include <QHeaderView>
#include <QLineEdit>
+#include <QMessageBox>
#include <QPixmapCache>
#include <QPushButton>
#include <QSpinBox>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QValidator>
-#include <QCloseEvent>
#include <iomanip>
#include <sstream>
#include <algorithm>
-#include <utility>
using namespace Ui;
-using std::endl;
-using std::ostringstream;
-using std::pair;
-using std::string;
-using std::vector;
+using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
namespace lyx {
namespace frontend {
-using support::compare_ascii_no_case;
-using support::os::external_path;
-using support::os::external_path_list;
-using support::os::internal_path;
-using support::os::internal_path_list;
-using support::FileName;
-using support::FileFilterList;
-using support::addPath;
-using support::addName;
-using support::mkdir;
-using support::package;
-
-
/////////////////////////////////////////////////////////////////////
//
-// Helpers
+// Browser Helpers
//
/////////////////////////////////////////////////////////////////////
-template<class A>
-static size_t findPos_helper(std::vector<A> const & vec, A const & val)
+/** Launch a file dialog and return the chosen file.
+ filename: a suggested filename.
+ title: the title of the dialog.
+ pattern: *.ps etc.
+ dir1 = (name, dir), dir2 = (name, dir): extra buttons on the dialog.
+*/
+QString browseFile(QString const & filename,
+ QString const & title,
+ QStringList const & filters,
+ bool save = false,
+ QString const & label1 = QString(),
+ QString const & dir1 = QString(),
+ QString const & label2 = QString(),
+ QString const & dir2 = QString(),
+ QString const & fallback_dir = QString())
+{
+ QString lastPath = ".";
+ if (!filename.isEmpty())
+ lastPath = onlyPath(filename);
+ else if(!fallback_dir.isEmpty())
+ lastPath = fallback_dir;
+
+ FileDialog dlg(title, LFUN_SELECT_FILE_SYNC);
+ dlg.setButton2(label1, dir1);
+ dlg.setButton2(label2, dir2);
+
+ FileDialog::Result result;
+
+ if (save)
+ result = dlg.save(lastPath, filters, onlyFilename(filename));
+ else
+ result = dlg.open(lastPath, filters, onlyFilename(filename));
+
+ return result.second;
+}
+
+
+/** Wrapper around browseFile which tries to provide a filename
+* relative to the user or system directory. The dir, name and ext
+* parameters have the same meaning as in the
+* support::LibFileSearch function.
+*/
+QString browseLibFile(QString const & dir,
+ QString const & name,
+ QString const & ext,
+ QString const & title,
+ QStringList const & filters)
{
- typedef typename std::vector<A>::const_iterator Cit;
+ // FIXME UNICODE
+ QString const label1 = qt_("System files|#S#s");
+ QString const dir1 =
+ toqstr(addName(package().system_support().absFilename(), fromqstr(dir)));
+
+ QString const label2 = qt_("User files|#U#u");
+ QString const dir2 =
+ toqstr(addName(package().user_support().absFilename(), fromqstr(dir)));
+
+ QString const result = browseFile(toqstr(
+ libFileSearch(dir, name, ext).absFilename()),
+ title, filters, false, dir1, dir2, QString(), QString(), dir1);
+
+ // remove the extension if it is the default one
+ QString noextresult;
+ if (getExtension(result) == ext)
+ noextresult = removeExtension(result);
+ else
+ noextresult = result;
- Cit it = std::find(vec.begin(), vec.end(), val);
- if (it == vec.end())
- return 0;
- return std::distance(vec.begin(), it);
+ // remove the directory, if it is the default one
+ QString const file = onlyFilename(noextresult);
+ if (toqstr(libFileSearch(dir, file, ext).absFilename()) == result)
+ return file;
+ else
+ return noextresult;
+}
+
+
+/** Launch a file dialog and return the chosen directory.
+ pathname: a suggested pathname.
+ title: the title of the dialog.
+ dir1 = (name, dir), dir2 = (name, dir): extra buttons on the dialog.
+*/
+QString browseDir(QString const & pathname,
+ QString const & title,
+ QString const & label1 = QString(),
+ QString const & dir1 = QString(),
+ QString const & label2 = QString(),
+ QString const & dir2 = QString())
+{
+ QString lastPath = ".";
+ if (!pathname.isEmpty())
+ lastPath = onlyPath(pathname);
+
+ FileDialog dlg(title, LFUN_SELECT_FILE_SYNC);
+ dlg.setButton1(label1, dir1);
+ dlg.setButton2(label2, dir2);
+
+ FileDialog::Result const result =
+ dlg.opendir(lastPath, onlyFilename(pathname));
+
+ return result.second;
+}
+
+
+} // namespace frontend
+
+
+QString browseRelFile(QString const & filename, QString const & refpath,
+ QString const & title, QStringList const & filters, bool save,
+ QString const & label1, QString const & dir1,
+ QString const & label2, QString const & dir2)
+{
+ QString const fname = makeAbsPath(filename, refpath);
+
+
+ QString const outname =
+ frontend::browseFile(fname, title, filters, save, label1, dir1, label2, dir2);
+
+ QString const reloutname =
+ toqstr(makeRelPath(qstring_to_ucs4(outname), qstring_to_ucs4(refpath)));
+
+ if (reloutname.startsWith("../"))
+ return outname;
+ else
+ return reloutname;
}
-static std::pair<string, string> parseFontName(string const & name)
+
+/////////////////////////////////////////////////////////////////////
+//
+// Helpers
+//
+/////////////////////////////////////////////////////////////////////
+
+namespace frontend {
+
+string const catLookAndFeel = N_("Look & Feel");
+string const catEditing = N_("Editing");
+string const catLanguage = N_("Language Settings");
+string const catOutput = N_("Output");
+string const catFiles = N_("File Handling");
+
+static void parseFontName(QString const & mangled0,
+ string & name, string & foundry)
{
- string::size_type const idx = name.find('[');
- if (idx == string::npos || idx == 0)
- return make_pair(name, string());
- return make_pair(name.substr(0, idx - 1),
- name.substr(idx + 1, name.size() - idx - 2));
+ string mangled = fromqstr(mangled0);
+ size_t const idx = mangled.find('[');
+ if (idx == string::npos || idx == 0) {
+ name = mangled;
+ foundry.clear();
+ } else {
+ name = mangled.substr(0, idx - 1),
+ foundry = mangled.substr(idx + 1, mangled.size() - idx - 2);
+ }
}
if (!foundry.empty())
fontname += " [" + toqstr(foundry) + ']';
- for (int i = 0; i < cb->count(); ++i) {
+ for (int i = 0; i != cb->count(); ++i) {
if (cb->itemText(i) == fontname) {
cb->setCurrentIndex(i);
return;
// We count in reverse in order to prefer the Xft foundry
for (int i = cb->count(); --i >= 0;) {
- pair<string, string> tmp = parseFontName(fromqstr(cb->itemText(i)));
- if (compare_ascii_no_case(tmp.first, family) == 0) {
+ string name, foundry;
+ parseFontName(cb->itemText(i), name, foundry);
+ if (compare_ascii_no_case(name, family) == 0) {
cb->setCurrentIndex(i);
return;
}
}
// family alone can contain e.g. "Helvetica [Adobe]"
- pair<string, string> tmpfam = parseFontName(family);
+ string tmpname, tmpfoundry;
+ parseFontName(toqstr(family), tmpname, tmpfoundry);
// 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->itemText(i)));
- if (compare_ascii_no_case(tmp.first, tmpfam.first) == 0) {
+ for (int i = cb->count(); --i >= 0; ) {
+ string name, foundry;
+ parseFontName(cb->itemText(i), name, foundry);
+ if (compare_ascii_no_case(name, foundry) == 0) {
cb->setCurrentIndex(i);
return;
}
QFont font;
font.setKerning(false);
- if (family == theApp()->romanFontName()) {
+ QString const font_family = toqstr(family);
+ if (font_family == guiApp->romanFontName()) {
font.setStyleHint(QFont::Serif);
- font.setFamily(family.c_str());
- } else if (family == theApp()->sansFontName()) {
+ font.setFamily(font_family);
+ } else if (font_family == guiApp->sansFontName()) {
font.setStyleHint(QFont::SansSerif);
- font.setFamily(family.c_str());
- } else if (family == theApp()->typewriterFontName()) {
+ font.setFamily(font_family);
+ } else if (font_family == guiApp->typewriterFontName()) {
font.setStyleHint(QFont::TypeWriter);
- font.setFamily(family.c_str());
+ font.setFamily(font_family);
} else {
- lyxerr << "FAILED to find the default font: '"
- << foundry << "', '" << family << '\''<< endl;
+ LYXERR0("FAILED to find the default font: '"
+ << foundry << "', '" << family << '\'');
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;
+ string default_font_name, dummyfoundry;
+ parseFontName(info.family(), default_font_name, dummyfoundry);
+ LYXERR0("Apparent font is " << default_font_name);
for (int i = 0; i < cb->count(); ++i) {
- lyxerr << "Looking at " << fromqstr(cb->itemText(i)) << endl;
+ LYXERR0("Looking at " << cb->itemText(i));
if (compare_ascii_no_case(fromqstr(cb->itemText(i)),
default_font_name) == 0) {
cb->setCurrentIndex(i);
}
}
- lyxerr << "FAILED to find the font: '"
- << foundry << "', '" << family << '\'' <<endl;
+ LYXERR0("FAILED to find the font: '"
+ << foundry << "', '" << family << '\'');
}
+
/////////////////////////////////////////////////////////////////////
//
// PrefPlaintext
//
/////////////////////////////////////////////////////////////////////
-PrefPlaintext::PrefPlaintext(QWidget * parent)
- : PrefModule(_("Plain text"), 0, parent)
+PrefPlaintext::PrefPlaintext(GuiPreferences * form)
+ : PrefModule(qt_(catOutput), qt_("Plain text"), form)
{
setupUi(this);
connect(plaintextLinelengthSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
- connect(plaintextRoffED, SIGNAL(textChanged(const QString&)),
- this, SIGNAL(changed()));
}
void PrefPlaintext::apply(LyXRC & rc) const
{
rc.plaintext_linelen = plaintextLinelengthSB->value();
- rc.plaintext_roff_command = fromqstr(plaintextRoffED->text());
}
void PrefPlaintext::update(LyXRC const & rc)
{
plaintextLinelengthSB->setValue(rc.plaintext_linelen);
- plaintextRoffED->setText(toqstr(rc.plaintext_roff_command));
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// StrftimeValidator
+//
+/////////////////////////////////////////////////////////////////////
+
+class StrftimeValidator : public QValidator
+{
+public:
+ StrftimeValidator(QWidget *);
+ QValidator::State validate(QString & input, int & pos) const;
+};
+
+
+StrftimeValidator::StrftimeValidator(QWidget * parent)
+ : QValidator(parent)
+{
+}
+
+
+QValidator::State StrftimeValidator::validate(QString & input, int & /*pos*/) const
+{
+ if (is_valid_strftime(fromqstr(input)))
+ return QValidator::Acceptable;
+ else
+ return QValidator::Intermediate;
}
//
/////////////////////////////////////////////////////////////////////
-PrefDate::PrefDate(QWidget * parent)
- : PrefModule(_("Date format"), 0, parent)
+PrefDate::PrefDate(GuiPreferences * form)
+ : PrefModule(qt_(catOutput), qt_("Date format"), form)
{
setupUi(this);
- connect(DateED, SIGNAL(textChanged(const QString &)),
+ DateED->setValidator(new StrftimeValidator(DateED));
+ connect(DateED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
+void PrefDate::on_DateED_textChanged(const QString &)
+{
+ QString t = DateED->text();
+ int p = 0;
+ bool valid = DateED->validator()->validate(t, p)
+ == QValidator::Acceptable;
+ setValid(DateLA, valid);
+}
+
+
void PrefDate::apply(LyXRC & rc) const
{
rc.date_insert_format = fromqstr(DateED->text());
/////////////////////////////////////////////////////////////////////
//
-// PrefKeyboard
+// PrefInput
//
/////////////////////////////////////////////////////////////////////
-PrefKeyboard::PrefKeyboard(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Keyboard"), form, parent)
+PrefInput::PrefInput(GuiPreferences * form)
+ : PrefModule(qt_(catEditing), qt_("Keyboard/Mouse"), form)
{
setupUi(this);
connect(keymapCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(firstKeymapED, SIGNAL(textChanged(const QString&)),
+ connect(firstKeymapED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(secondKeymapED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(secondKeymapED, SIGNAL(textChanged(const QString&)),
+ connect(mouseWheelSpeedSB, SIGNAL(valueChanged(double)),
this, SIGNAL(changed()));
}
-void PrefKeyboard::apply(LyXRC & rc) const
+void PrefInput::apply(LyXRC & rc) const
{
// FIXME: can derive CB from the two EDs
rc.use_kbmap = keymapCB->isChecked();
rc.primary_kbmap = internal_path(fromqstr(firstKeymapED->text()));
rc.secondary_kbmap = internal_path(fromqstr(secondKeymapED->text()));
+ rc.mouse_wheel_speed = mouseWheelSpeedSB->value();
}
-void PrefKeyboard::update(LyXRC const & rc)
+void PrefInput::update(LyXRC const & rc)
{
// FIXME: can derive CB from the two EDs
keymapCB->setChecked(rc.use_kbmap);
firstKeymapED->setText(toqstr(external_path(rc.primary_kbmap)));
secondKeymapED->setText(toqstr(external_path(rc.secondary_kbmap)));
+ mouseWheelSpeedSB->setValue(rc.mouse_wheel_speed);
}
-QString PrefKeyboard::testKeymap(QString keymap)
+QString PrefInput::testKeymap(QString const & keymap)
{
- return toqstr(form_->browsekbmap(from_utf8(internal_path(fromqstr(keymap)))));
+ return form_->browsekbmap(internalPath(keymap));
}
-void PrefKeyboard::on_firstKeymapPB_clicked(bool)
+void PrefInput::on_firstKeymapPB_clicked(bool)
{
QString const file = testKeymap(firstKeymapED->text());
if (!file.isEmpty())
}
-void PrefKeyboard::on_secondKeymapPB_clicked(bool)
+void PrefInput::on_secondKeymapPB_clicked(bool)
{
QString const file = testKeymap(secondKeymapED->text());
if (!file.isEmpty())
}
-void PrefKeyboard::on_keymapCB_toggled(bool keymap)
+void PrefInput::on_keymapCB_toggled(bool keymap)
{
firstKeymapLA->setEnabled(keymap);
secondKeymapLA->setEnabled(keymap);
}
+/////////////////////////////////////////////////////////////////////
+//
+// PrefCompletion
+//
+/////////////////////////////////////////////////////////////////////
+
+PrefCompletion::PrefCompletion(GuiPreferences * form)
+ : PrefModule(qt_(catEditing), qt_("Input Completion"), form)
+{
+ setupUi(this);
+
+ connect(inlineDelaySB, SIGNAL(valueChanged(double)),
+ this, SIGNAL(changed()));
+ connect(inlineMathCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(inlineTextCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(inlineDotsCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(popupDelaySB, SIGNAL(valueChanged(double)),
+ this, SIGNAL(changed()));
+ connect(popupMathCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(autocorrectionCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(popupTextCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(popupAfterCompleteCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(cursorTextCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+}
+
+
+void PrefCompletion::on_inlineTextCB_clicked()
+{
+ enableCB();
+}
+
+
+void PrefCompletion::on_popupTextCB_clicked()
+{
+ enableCB();
+}
+
+
+void PrefCompletion::enableCB()
+{
+ cursorTextCB->setEnabled(
+ popupTextCB->isChecked() || inlineTextCB->isChecked());
+}
+
+
+void PrefCompletion::apply(LyXRC & rc) const
+{
+ rc.completion_inline_delay = inlineDelaySB->value();
+ rc.completion_inline_math = inlineMathCB->isChecked();
+ rc.completion_inline_text = inlineTextCB->isChecked();
+ rc.completion_inline_dots = inlineDotsCB->isChecked() ? 13 : -1;
+ rc.completion_popup_delay = popupDelaySB->value();
+ rc.completion_popup_math = popupMathCB->isChecked();
+ rc.autocorrection_math = autocorrectionCB->isChecked();
+ rc.completion_popup_text = popupTextCB->isChecked();
+ rc.completion_cursor_text = cursorTextCB->isChecked();
+ rc.completion_popup_after_complete =
+ popupAfterCompleteCB->isChecked();
+}
+
+
+void PrefCompletion::update(LyXRC const & rc)
+{
+ inlineDelaySB->setValue(rc.completion_inline_delay);
+ inlineMathCB->setChecked(rc.completion_inline_math);
+ inlineTextCB->setChecked(rc.completion_inline_text);
+ inlineDotsCB->setChecked(rc.completion_inline_dots != -1);
+ popupDelaySB->setValue(rc.completion_popup_delay);
+ popupMathCB->setChecked(rc.completion_popup_math);
+ autocorrectionCB->setChecked(rc.autocorrection_math);
+ popupTextCB->setChecked(rc.completion_popup_text);
+ cursorTextCB->setChecked(rc.completion_cursor_text);
+ popupAfterCompleteCB->setChecked(rc.completion_popup_after_complete);
+ enableCB();
+}
+
+
+
/////////////////////////////////////////////////////////////////////
//
// PrefLatex
//
/////////////////////////////////////////////////////////////////////
-PrefLatex::PrefLatex(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("LaTeX"), form, parent)
+PrefLatex::PrefLatex(GuiPreferences * form)
+ : PrefModule(qt_(catOutput), qt_("LaTeX"), form)
{
setupUi(this);
- connect(latexEncodingED, SIGNAL(textChanged(const QString&)),
+ connect(latexEncodingCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(latexEncodingED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(latexChecktexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(latexChecktexED, SIGNAL(textChanged(const QString&)),
+ connect(latexBibtexCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
- connect(latexBibtexED, SIGNAL(textChanged(const QString&)),
+ connect(latexBibtexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(latexIndexED, SIGNAL(textChanged(const QString&)),
+ connect(latexJBibtexED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(latexIndexCO, SIGNAL(activated(int)),
+ this, SIGNAL(changed()));
+ connect(latexIndexED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(latexJIndexED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(latexAutoresetCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(latexDviPaperED, SIGNAL(textChanged(const QString&)),
+ connect(latexDviPaperED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(latexPaperSizeCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
#if defined(__CYGWIN__) || defined(_WIN32)
pathCB->setVisible(true);
- connect(pathCB, SIGNAL(clicked()),
+ connect(pathCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
#else
pathCB->setVisible(false);
}
+void PrefLatex::on_latexEncodingCB_stateChanged(int state)
+{
+ latexEncodingED->setEnabled(state == Qt::Checked);
+}
+
+
+void PrefLatex::on_latexBibtexCO_activated(int n)
+{
+ QString const bibtex = latexBibtexCO->itemData(n).toString();
+ if (bibtex.isEmpty()) {
+ latexBibtexED->clear();
+ latexBibtexOptionsLA->setText(qt_("Co&mmand:"));
+ return;
+ }
+ for (LyXRC::CommandSet::const_iterator it = bibtex_alternatives.begin();
+ it != bibtex_alternatives.end(); ++it) {
+ QString const bib = toqstr(*it);
+ int ind = bib.indexOf(" ");
+ QString sel_command = bib.left(ind);
+ QString sel_options = ind < 0 ? QString() : bib.mid(ind + 1);
+ if (bibtex == sel_command) {
+ if (ind < 0)
+ latexBibtexED->clear();
+ else
+ latexBibtexED->setText(sel_options.trimmed());
+ }
+ }
+ latexBibtexOptionsLA->setText(qt_("&Options:"));
+}
+
+
+void PrefLatex::on_latexIndexCO_activated(int n)
+{
+ QString const index = latexIndexCO->itemData(n).toString();
+ if (index.isEmpty()) {
+ latexIndexED->clear();
+ latexIndexOptionsLA->setText(qt_("Co&mmand:"));
+ return;
+ }
+ for (LyXRC::CommandSet::const_iterator it = index_alternatives.begin();
+ it != index_alternatives.end(); ++it) {
+ QString const idx = toqstr(*it);
+ int ind = idx.indexOf(" ");
+ QString sel_command = idx.left(ind);
+ QString sel_options = ind < 0 ? QString() : idx.mid(ind + 1);
+ if (index == sel_command) {
+ if (ind < 0)
+ latexIndexED->clear();
+ else
+ latexIndexED->setText(sel_options.trimmed());
+ }
+ }
+ latexIndexOptionsLA->setText(qt_("Op&tions:"));
+}
+
+
void PrefLatex::apply(LyXRC & rc) const
{
- rc.fontenc = fromqstr(latexEncodingED->text());
+ // If bibtex is not empty, bibopt contains the options, otherwise
+ // it is a customized bibtex command with options.
+ QString const bibtex = latexBibtexCO->itemData(
+ latexBibtexCO->currentIndex()).toString();
+ QString const bibopt = latexBibtexED->text();
+ if (bibtex.isEmpty())
+ rc.bibtex_command = fromqstr(bibopt);
+ else if (bibopt.isEmpty())
+ rc.bibtex_command = fromqstr(bibtex);
+ else
+ rc.bibtex_command = fromqstr(bibtex) + " " + fromqstr(bibopt);
+
+ // If index is not empty, idxopt contains the options, otherwise
+ // it is a customized index command with options.
+ QString const index = latexIndexCO->itemData(
+ latexIndexCO->currentIndex()).toString();
+ QString const idxopt = latexIndexED->text();
+ if (index.isEmpty())
+ rc.index_command = fromqstr(idxopt);
+ else if (idxopt.isEmpty())
+ rc.index_command = fromqstr(index);
+ else
+ rc.index_command = fromqstr(index) + " " + fromqstr(idxopt);
+
+ if (latexEncodingCB->isChecked())
+ rc.fontenc = fromqstr(latexEncodingED->text());
+ else
+ rc.fontenc = "default";
rc.chktex_command = fromqstr(latexChecktexED->text());
- rc.bibtex_command = fromqstr(latexBibtexED->text());
- rc.index_command = fromqstr(latexIndexED->text());
+ rc.jbibtex_command = fromqstr(latexJBibtexED->text());
+ rc.jindex_command = fromqstr(latexJIndexED->text());
+ rc.nomencl_command = fromqstr(latexNomenclED->text());
rc.auto_reset_options = latexAutoresetCB->isChecked();
rc.view_dvi_paper_option = fromqstr(latexDviPaperED->text());
rc.default_papersize =
void PrefLatex::update(LyXRC const & rc)
{
- latexEncodingED->setText(toqstr(rc.fontenc));
+ latexBibtexCO->clear();
+
+ latexBibtexCO->addItem(qt_("Custom"), QString());
+ for (LyXRC::CommandSet::const_iterator it = rc.bibtex_alternatives.begin();
+ it != rc.bibtex_alternatives.end(); ++it) {
+ QString const command = toqstr(*it).left(toqstr(*it).indexOf(" "));
+ latexBibtexCO->addItem(command, command);
+ }
+
+ bibtex_alternatives = rc.bibtex_alternatives;
+
+ QString const bib = toqstr(rc.bibtex_command);
+ int ind = bib.indexOf(" ");
+ QString sel_command = bib.left(ind);
+ QString sel_options = ind < 0 ? QString() : bib.mid(ind + 1);
+
+ int pos = latexBibtexCO->findData(sel_command);
+ if (pos != -1) {
+ latexBibtexCO->setCurrentIndex(pos);
+ latexBibtexED->setText(sel_options.trimmed());
+ latexBibtexOptionsLA->setText(qt_("&Options:"));
+ } else {
+ latexBibtexED->setText(toqstr(rc.bibtex_command));
+ latexBibtexCO->setCurrentIndex(0);
+ latexBibtexOptionsLA->setText(qt_("Co&mmand:"));
+ }
+
+ latexIndexCO->clear();
+
+ latexIndexCO->addItem(qt_("Custom"), QString());
+ for (LyXRC::CommandSet::const_iterator it = rc.index_alternatives.begin();
+ it != rc.index_alternatives.end(); ++it) {
+ QString const command = toqstr(*it).left(toqstr(*it).indexOf(" "));
+ latexIndexCO->addItem(command, command);
+ }
+
+ index_alternatives = rc.index_alternatives;
+
+ QString const idx = toqstr(rc.index_command);
+ ind = idx.indexOf(" ");
+ sel_command = idx.left(ind);
+ sel_options = ind < 0 ? QString() : idx.mid(ind + 1);
+
+ pos = latexIndexCO->findData(sel_command);
+ if (pos != -1) {
+ latexIndexCO->setCurrentIndex(pos);
+ latexIndexED->setText(sel_options.trimmed());
+ latexIndexOptionsLA->setText(qt_("Op&tions:"));
+ } else {
+ latexIndexED->setText(toqstr(rc.index_command));
+ latexIndexCO->setCurrentIndex(0);
+ latexIndexOptionsLA->setText(qt_("Co&mmand:"));
+ }
+
+ if (rc.fontenc == "default") {
+ latexEncodingCB->setChecked(false);
+ latexEncodingED->setEnabled(false);
+ } else {
+ latexEncodingCB->setChecked(true);
+ latexEncodingED->setEnabled(true);
+ latexEncodingED->setText(toqstr(rc.fontenc));
+ }
latexChecktexED->setText(toqstr(rc.chktex_command));
- latexBibtexED->setText(toqstr(rc.bibtex_command));
- latexIndexED->setText(toqstr(rc.index_command));
+ latexJBibtexED->setText(toqstr(rc.jbibtex_command));
+ latexJIndexED->setText(toqstr(rc.jindex_command));
+ latexNomenclED->setText(toqstr(rc.nomencl_command));
latexAutoresetCB->setChecked(rc.auto_reset_options);
latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option));
latexPaperSizeCO->setCurrentIndex(
//
/////////////////////////////////////////////////////////////////////
-PrefScreenFonts::PrefScreenFonts(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Screen fonts"), form, parent)
+PrefScreenFonts::PrefScreenFonts(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Screen fonts"), form)
{
setupUi(this);
- connect(screenRomanCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_roman(const QString&)));
- connect(screenSansCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_sans(const QString&)));
- connect(screenTypewriterCO, SIGNAL(activated(const QString&)),
- this, SLOT(select_typewriter(const QString&)));
+ connect(screenRomanCO, SIGNAL(activated(QString)),
+ this, SLOT(selectRoman(QString)));
+ connect(screenSansCO, SIGNAL(activated(QString)),
+ this, SLOT(selectSans(QString)));
+ connect(screenTypewriterCO, SIGNAL(activated(QString)),
+ this, SLOT(selectTypewriter(QString)));
QFontDatabase fontdb;
QStringList families(fontdb.families());
screenSansCO->addItem(*it);
screenTypewriterCO->addItem(*it);
}
- connect(screenRomanCO, SIGNAL(activated(const QString&)),
+ connect(screenRomanCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
- connect(screenSansCO, SIGNAL(activated(const QString&)),
+ connect(screenSansCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
- connect(screenTypewriterCO, SIGNAL(activated(const QString&)),
+ connect(screenTypewriterCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(screenZoomSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(screenDpiSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
- connect(screenTinyED, SIGNAL(textChanged(const QString&)),
+ connect(screenTinyED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenSmallestED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallestED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenSmallerED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenSmallED, SIGNAL(textChanged(const QString&)),
+ connect(screenSmallED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenNormalED, SIGNAL(textChanged(const QString&)),
+ connect(screenNormalED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenLargeED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenLargerED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenLargestED, SIGNAL(textChanged(const QString&)),
+ connect(screenLargestED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenHugeED, SIGNAL(textChanged(const QString&)),
+ connect(screenHugeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(screenHugerED, SIGNAL(textChanged(const QString&)),
+ connect(screenHugerED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(pixmapCacheCB, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
screenTinyED->setValidator(new QDoubleValidator(screenTinyED));
void PrefScreenFonts::apply(LyXRC & rc) const
{
- LyXRC const oldrc(rc);
+ LyXRC const oldrc = rc;
- boost::tie(rc.roman_font_name, rc.roman_font_foundry)
- = parseFontName(fromqstr(screenRomanCO->currentText()));
- boost::tie(rc.sans_font_name, rc.sans_font_foundry) =
- parseFontName(fromqstr(screenSansCO->currentText()));
- boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) =
- parseFontName(fromqstr(screenTypewriterCO->currentText()));
+ parseFontName(screenRomanCO->currentText(),
+ rc.roman_font_name, rc.roman_font_foundry);
+ parseFontName(screenSansCO->currentText(),
+ rc.sans_font_name, rc.sans_font_foundry);
+ parseFontName(screenTypewriterCO->currentText(),
+ rc.typewriter_font_name, rc.typewriter_font_foundry);
rc.zoom = screenZoomSB->value();
rc.dpi = screenDpiSB->value();
- rc.font_sizes[Font::SIZE_TINY] = fromqstr(screenTinyED->text());
- rc.font_sizes[Font::SIZE_SCRIPT] = fromqstr(screenSmallestED->text());
- rc.font_sizes[Font::SIZE_FOOTNOTE] = fromqstr(screenSmallerED->text());
- rc.font_sizes[Font::SIZE_SMALL] = fromqstr(screenSmallED->text());
- rc.font_sizes[Font::SIZE_NORMAL] = fromqstr(screenNormalED->text());
- rc.font_sizes[Font::SIZE_LARGE] = fromqstr(screenLargeED->text());
- rc.font_sizes[Font::SIZE_LARGER] = fromqstr(screenLargerED->text());
- rc.font_sizes[Font::SIZE_LARGEST] = fromqstr(screenLargestED->text());
- rc.font_sizes[Font::SIZE_HUGE] = fromqstr(screenHugeED->text());
- rc.font_sizes[Font::SIZE_HUGER] = fromqstr(screenHugerED->text());
+ rc.font_sizes[FONT_SIZE_TINY] = widgetToDoubleStr(screenTinyED);
+ rc.font_sizes[FONT_SIZE_SCRIPT] = widgetToDoubleStr(screenSmallestED);
+ rc.font_sizes[FONT_SIZE_FOOTNOTE] = widgetToDoubleStr(screenSmallerED);
+ rc.font_sizes[FONT_SIZE_SMALL] = widgetToDoubleStr(screenSmallED);
+ rc.font_sizes[FONT_SIZE_NORMAL] = widgetToDoubleStr(screenNormalED);
+ rc.font_sizes[FONT_SIZE_LARGE] = widgetToDoubleStr(screenLargeED);
+ rc.font_sizes[FONT_SIZE_LARGER] = widgetToDoubleStr(screenLargerED);
+ rc.font_sizes[FONT_SIZE_LARGEST] = widgetToDoubleStr(screenLargestED);
+ rc.font_sizes[FONT_SIZE_HUGE] = widgetToDoubleStr(screenHugeED);
+ rc.font_sizes[FONT_SIZE_HUGER] = widgetToDoubleStr(screenHugerED);
+ rc.use_pixmap_cache = pixmapCacheCB->isChecked();
if (rc.font_sizes != oldrc.font_sizes
|| rc.roman_font_name != oldrc.roman_font_name
setComboxFont(screenTypewriterCO, rc.typewriter_font_name,
rc.typewriter_font_foundry);
- select_roman(screenRomanCO->currentText());
- select_sans(screenSansCO->currentText());
- select_typewriter(screenTypewriterCO->currentText());
+ selectRoman(screenRomanCO->currentText());
+ selectSans(screenSansCO->currentText());
+ selectTypewriter(screenTypewriterCO->currentText());
screenZoomSB->setValue(rc.zoom);
screenDpiSB->setValue(rc.dpi);
- screenTinyED->setText(toqstr(rc.font_sizes[Font::SIZE_TINY]));
- screenSmallestED->setText(toqstr(rc.font_sizes[Font::SIZE_SCRIPT]));
- screenSmallerED->setText(toqstr(rc.font_sizes[Font::SIZE_FOOTNOTE]));
- screenSmallED->setText(toqstr(rc.font_sizes[Font::SIZE_SMALL]));
- screenNormalED->setText(toqstr(rc.font_sizes[Font::SIZE_NORMAL]));
- screenLargeED->setText(toqstr(rc.font_sizes[Font::SIZE_LARGE]));
- screenLargerED->setText(toqstr(rc.font_sizes[Font::SIZE_LARGER]));
- screenLargestED->setText(toqstr(rc.font_sizes[Font::SIZE_LARGEST]));
- screenHugeED->setText(toqstr(rc.font_sizes[Font::SIZE_HUGE]));
- screenHugerED->setText(toqstr(rc.font_sizes[Font::SIZE_HUGER]));
+ doubleToWidget(screenTinyED, rc.font_sizes[FONT_SIZE_TINY]);
+ doubleToWidget(screenSmallestED, rc.font_sizes[FONT_SIZE_SCRIPT]);
+ doubleToWidget(screenSmallerED, rc.font_sizes[FONT_SIZE_FOOTNOTE]);
+ doubleToWidget(screenSmallED, rc.font_sizes[FONT_SIZE_SMALL]);
+ doubleToWidget(screenNormalED, rc.font_sizes[FONT_SIZE_NORMAL]);
+ doubleToWidget(screenLargeED, rc.font_sizes[FONT_SIZE_LARGE]);
+ doubleToWidget(screenLargerED, rc.font_sizes[FONT_SIZE_LARGER]);
+ doubleToWidget(screenLargestED, rc.font_sizes[FONT_SIZE_LARGEST]);
+ doubleToWidget(screenHugeED, rc.font_sizes[FONT_SIZE_HUGE]);
+ doubleToWidget(screenHugerED, rc.font_sizes[FONT_SIZE_HUGER]);
+
+ pixmapCacheCB->setChecked(rc.use_pixmap_cache);
+#if defined(Q_WS_X11)
+ pixmapCacheCB->setEnabled(false);
+#endif
+
}
-void PrefScreenFonts::select_roman(const QString& name)
+
+void PrefScreenFonts::selectRoman(const QString & name)
{
screenRomanFE->set(QFont(name), name);
}
-void PrefScreenFonts::select_sans(const QString& name)
+void PrefScreenFonts::selectSans(const QString & name)
{
screenSansFE->set(QFont(name), name);
}
-void PrefScreenFonts::select_typewriter(const QString& name)
+void PrefScreenFonts::selectTypewriter(const QString & name)
{
screenTypewriterFE->set(QFont(name), name);
}
struct ColorSorter
{
- bool operator()(Color::color const & lhs, Color::color const & rhs) const {
- return lcolor.getGUIName(lhs) < lcolor.getGUIName(rhs);
+ bool operator()(ColorCode lhs, ColorCode rhs) const {
+ return
+ compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
}
};
} // namespace anon
-PrefColors::PrefColors(GuiPreferences * form, QWidget * parent)
- : PrefModule( _("Colors"), form, parent)
+PrefColors::PrefColors(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Colors"), form)
{
setupUi(this);
// See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg113301.html
// for some discussion of why that is not trivial.
QPixmap icon(32, 32);
- for (int i = 0; i < Color::ignore; ++i) {
- Color::color lc = static_cast<Color::color>(i);
- if (lc == Color::none
- || lc == Color::black
- || lc == Color::white
- || lc == Color::red
- || lc == Color::green
- || lc == Color::blue
- || lc == Color::cyan
- || lc == Color::magenta
- || lc == Color::yellow
- || lc == Color::inherit
- || lc == Color::ignore) continue;
+ for (int i = 0; i < Color_ignore; ++i) {
+ ColorCode lc = static_cast<ColorCode>(i);
+ if (lc == Color_none
+ || lc == Color_black
+ || lc == Color_white
+ || lc == Color_red
+ || lc == Color_green
+ || lc == Color_blue
+ || lc == Color_cyan
+ || lc == Color_magenta
+ || lc == Color_yellow
+ || lc == Color_inherit
+ || lc == Color_ignore) continue;
lcolors_.push_back(lc);
}
- std::sort(lcolors_.begin(), lcolors_.end(), ColorSorter());
- vector<Color_color>::const_iterator cit = lcolors_.begin();
- vector<Color_color>::const_iterator const end = lcolors_.end();
+ sort(lcolors_.begin(), lcolors_.end(), ColorSorter());
+ vector<ColorCode>::const_iterator cit = lcolors_.begin();
+ vector<ColorCode>::const_iterator const end = lcolors_.end();
for (; cit != end; ++cit) {
(void) new QListWidgetItem(QIcon(icon),
toqstr(lcolor.getGUIName(*cit)), lyxObjectsLW);
// End initialization
connect(colorChangePB, SIGNAL(clicked()),
- this, SLOT(change_color()));
+ this, SLOT(changeColor()));
connect(lyxObjectsLW, SIGNAL(itemSelectionChanged()),
- this, SLOT(change_lyxObjects_selection()));
+ this, SLOT(changeLyxObjectsSelection()));
connect(lyxObjectsLW, SIGNAL(itemActivated(QListWidgetItem*)),
- this, SLOT(change_color()));
+ this, SLOT(changeColor()));
}
{
for (unsigned int i = 0; i < lcolors_.size(); ++i)
if (curcolors_[i] != newcolors_[i])
- form_->setColor(lcolors_[i], fromqstr(newcolors_[i]));
+ form_->setColor(lcolors_[i], newcolors_[i]);
}
lyxObjectsLW->item(i)->setIcon(QIcon(coloritem));
newcolors_[i] = curcolors_[i] = color.name();
}
- change_lyxObjects_selection();
+ changeLyxObjectsSelection();
}
-void PrefColors::change_color()
+
+void PrefColors::changeColor()
{
int const row = lyxObjectsLW->currentRow();
}
}
-void PrefColors::change_lyxObjects_selection()
+void PrefColors::changeLyxObjectsSelection()
{
colorChangePB->setDisabled(lyxObjectsLW->currentRow() < 0);
}
//
/////////////////////////////////////////////////////////////////////
-PrefDisplay::PrefDisplay(QWidget * parent)
- : PrefModule(_("Graphics"), 0, parent)
+PrefDisplay::PrefDisplay(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Display"), form)
{
setupUi(this);
- connect(instantPreviewCO, SIGNAL(activated(int)),
- this, SIGNAL(changed()));
- connect(displayGraphicsCO, SIGNAL(activated(int)),
- this, SIGNAL(changed()));
+ connect(displayGraphicsCB, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+ connect(instantPreviewCO, SIGNAL(activated(int)), this, SIGNAL(changed()));
+ connect(previewSizeSB, SIGNAL(valueChanged(double)), this, SIGNAL(changed()));
+ connect(paragraphMarkerCB, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+ if (instantPreviewCO->currentIndex() == 0)
+ previewSizeSB->setEnabled(false);
+ else
+ previewSizeSB->setEnabled(true);
+}
+
+
+void PrefDisplay::on_instantPreviewCO_currentIndexChanged(int index)
+{
+ if (index == 0)
+ previewSizeSB->setEnabled(false);
+ else
+ previewSizeSB->setEnabled(true);
}
case 2: rc.preview = LyXRC::PREVIEW_ON; break;
}
- lyx::graphics::DisplayType dtype;
- switch (displayGraphicsCO->currentIndex()) {
- 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;
- default: dtype = lyx::graphics::GrayscaleDisplay;
- }
- rc.display_graphics = dtype;
+ rc.display_graphics = displayGraphicsCB->isChecked();
+ rc.preview_scale_factor = previewSizeSB->value();
+ rc.paragraph_markers = paragraphMarkerCB->isChecked();
// FIXME!! The graphics cache no longer has a changeDisplay method.
#if 0
if (old_value != rc.display_graphics) {
- lyx::graphics::GCache & gc = lyx::graphics::GCache::get();
+ graphics::GCache & gc = graphics::GCache::get();
gc.changeDisplay();
}
#endif
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;
- }
- displayGraphicsCO->setCurrentIndex(item);
+ displayGraphicsCB->setChecked(rc.display_graphics);
+ instantPreviewCO->setEnabled(rc.display_graphics);
+ previewSizeSB->setValue(rc.preview_scale_factor);
+ paragraphMarkerCB->setChecked(rc.paragraph_markers);
}
//
/////////////////////////////////////////////////////////////////////
-PrefPaths::PrefPaths(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Paths"), form, parent)
+PrefPaths::PrefPaths(GuiPreferences * form)
+ : PrefModule(QString(), qt_("Paths"), form)
{
setupUi(this);
- connect(templateDirPB, SIGNAL(clicked()), this, SLOT(select_templatedir()));
- connect(tempDirPB, SIGNAL(clicked()), this, SLOT(select_tempdir()));
- connect(backupDirPB, SIGNAL(clicked()), this, SLOT(select_backupdir()));
- connect(workingDirPB, SIGNAL(clicked()), this, SLOT(select_workingdir()));
- connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
- connect(workingDirED, SIGNAL(textChanged(const QString&)),
+
+ connect(workingDirPB, SIGNAL(clicked()), this, SLOT(selectWorkingdir()));
+ connect(workingDirED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+
+ connect(templateDirPB, SIGNAL(clicked()), this, SLOT(selectTemplatedir()));
+ connect(templateDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(templateDirED, SIGNAL(textChanged(const QString&)),
+
+ connect(exampleDirPB, SIGNAL(clicked()), this, SLOT(selectExampledir()));
+ connect(exampleDirED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+
+ connect(backupDirPB, SIGNAL(clicked()), this, SLOT(selectBackupdir()));
+ connect(backupDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(backupDirED, SIGNAL(textChanged(const QString&)),
+
+ connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(selectLyxPipe()));
+ connect(lyxserverDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(tempDirED, SIGNAL(textChanged(const QString&)),
+
+ connect(thesaurusDirPB, SIGNAL(clicked()), this, SLOT(selectThesaurusdir()));
+ connect(thesaurusDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(lyxserverDirED, SIGNAL(textChanged(const QString&)),
+
+ connect(tempDirPB, SIGNAL(clicked()), this, SLOT(selectTempdir()));
+ connect(tempDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(pathPrefixED, SIGNAL(textChanged(const QString&)),
+
+ connect(hunspellDirPB, SIGNAL(clicked()), this, SLOT(selectHunspelldir()));
+ connect(hunspellDirED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+
+ connect(pathPrefixED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
void PrefPaths::apply(LyXRC & rc) const
{
rc.document_path = internal_path(fromqstr(workingDirED->text()));
+ rc.example_path = internal_path(fromqstr(exampleDirED->text()));
rc.template_path = internal_path(fromqstr(templateDirED->text()));
rc.backupdir_path = internal_path(fromqstr(backupDirED->text()));
rc.tempdir_path = internal_path(fromqstr(tempDirED->text()));
+ rc.thesaurusdir_path = internal_path(fromqstr(thesaurusDirED->text()));
+ rc.hunspelldir_path = internal_path(fromqstr(hunspellDirED->text()));
rc.path_prefix = internal_path_list(fromqstr(pathPrefixED->text()));
// FIXME: should be a checkbox only
rc.lyxpipes = internal_path(fromqstr(lyxserverDirED->text()));
void PrefPaths::update(LyXRC const & rc)
{
workingDirED->setText(toqstr(external_path(rc.document_path)));
+ exampleDirED->setText(toqstr(external_path(rc.example_path)));
templateDirED->setText(toqstr(external_path(rc.template_path)));
backupDirED->setText(toqstr(external_path(rc.backupdir_path)));
tempDirED->setText(toqstr(external_path(rc.tempdir_path)));
+ thesaurusDirED->setText(toqstr(external_path(rc.thesaurusdir_path)));
+ hunspellDirED->setText(toqstr(external_path(rc.hunspelldir_path)));
pathPrefixED->setText(toqstr(external_path_list(rc.path_prefix)));
// FIXME: should be a checkbox only
lyxserverDirED->setText(toqstr(external_path(rc.lyxpipes)));
}
-void PrefPaths::select_templatedir()
+void PrefPaths::selectExampledir()
+{
+ QString file = browseDir(internalPath(exampleDirED->text()),
+ qt_("Select directory for example files"));
+ if (!file.isEmpty())
+ exampleDirED->setText(file);
+}
+
+
+void PrefPaths::selectTemplatedir()
+{
+ QString file = browseDir(internalPath(templateDirED->text()),
+ qt_("Select a document templates directory"));
+ if (!file.isEmpty())
+ templateDirED->setText(file);
+}
+
+
+void PrefPaths::selectTempdir()
+{
+ QString file = browseDir(internalPath(tempDirED->text()),
+ qt_("Select a temporary directory"));
+ if (!file.isEmpty())
+ tempDirED->setText(file);
+}
+
+
+void PrefPaths::selectBackupdir()
{
- docstring file(form_->browsedir(
- from_utf8(internal_path(fromqstr(templateDirED->text()))),
- _("Select a document templates directory")));
- if (!file.empty())
- templateDirED->setText(toqstr(file));
+ QString file = browseDir(internalPath(backupDirED->text()),
+ qt_("Select a backups directory"));
+ if (!file.isEmpty())
+ backupDirED->setText(file);
}
-void PrefPaths::select_tempdir()
+void PrefPaths::selectWorkingdir()
{
- docstring file(form_->browsedir(
- from_utf8(internal_path(fromqstr(tempDirED->text()))),
- _("Select a temporary directory")));
- if (!file.empty())
- tempDirED->setText(toqstr(file));
+ QString file = browseDir(internalPath(workingDirED->text()),
+ qt_("Select a document directory"));
+ if (!file.isEmpty())
+ workingDirED->setText(file);
}
-void PrefPaths::select_backupdir()
+void PrefPaths::selectThesaurusdir()
{
- docstring file(form_->browsedir(
- from_utf8(internal_path(fromqstr(backupDirED->text()))),
- _("Select a backups directory")));
- if (!file.empty())
- backupDirED->setText(toqstr(file));
+ QString file = browseDir(internalPath(thesaurusDirED->text()),
+ qt_("Set the path to the thesaurus dictionaries"));
+ if (!file.isEmpty())
+ thesaurusDirED->setText(file);
}
-void PrefPaths::select_workingdir()
+void PrefPaths::selectHunspelldir()
{
- docstring file(form_->browsedir(
- from_utf8(internal_path(fromqstr(workingDirED->text()))),
- _("Select a document directory")));
- if (!file.empty())
- workingDirED->setText(toqstr(file));
+ QString file = browseDir(internalPath(hunspellDirED->text()),
+ qt_("Set the path to the Hunspell dictionaries"));
+ if (!file.isEmpty())
+ hunspellDirED->setText(file);
}
-void PrefPaths::select_lyxpipe()
+void PrefPaths::selectLyxPipe()
{
- docstring file(form_->browse(
- from_utf8(internal_path(fromqstr(lyxserverDirED->text()))),
- _("Give a filename for the LyX server pipe")));
- if (!file.empty())
- lyxserverDirED->setText(toqstr(file));
+ QString file = form_->browse(internalPath(lyxserverDirED->text()),
+ qt_("Give a filename for the LyX server pipe"));
+ if (!file.isEmpty())
+ lyxserverDirED->setText(file);
}
//
/////////////////////////////////////////////////////////////////////
-PrefSpellchecker::PrefSpellchecker(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Spellchecker"), form, parent)
+PrefSpellchecker::PrefSpellchecker(GuiPreferences * form)
+ : PrefModule(qt_(catLanguage), qt_("Spellchecker"), form)
{
setupUi(this);
- connect(persDictionaryPB, SIGNAL(clicked()), this, SLOT(select_dict()));
-#if defined (USE_ISPELL)
- connect(spellCommandCO, SIGNAL(activated(int)),
- this, SIGNAL(changed()));
-#else
- spellCommandCO->setEnabled(false);
+#if defined(USE_ASPELL)
+ spellcheckerCB->addItem(qt_("aspell"), QString("aspell"));
#endif
- connect(altLanguageED, SIGNAL(textChanged(const QString&)),
- this, SIGNAL(changed()));
- connect(escapeCharactersED, SIGNAL(textChanged(const QString&)),
- this, SIGNAL(changed()));
- connect(persDictionaryED, SIGNAL(textChanged(const QString&)),
- this, SIGNAL(changed()));
- connect(compoundWordCB, SIGNAL(clicked()),
- this, SIGNAL(changed()));
- connect(inputEncodingCB, SIGNAL(clicked()),
- this, SIGNAL(changed()));
-
- spellCommandCO->addItem(qt_("ispell"));
- spellCommandCO->addItem(qt_("aspell"));
- spellCommandCO->addItem(qt_("hspell"));
-#ifdef USE_PSPELL
- spellCommandCO->addItem(qt_("pspell (library)"));
-#else
-#ifdef USE_ASPELL
- spellCommandCO->addItem(qt_("aspell (library)"));
+#if defined(USE_ENCHANT)
+ spellcheckerCB->addItem(qt_("enchant"), QString("enchant"));
#endif
+#if defined(USE_HUNSPELL)
+ spellcheckerCB->addItem(qt_("hunspell"), QString("hunspell"));
#endif
-}
-
-void PrefSpellchecker::apply(LyXRC & rc) const
-{
- switch (spellCommandCO->currentIndex()) {
- case 0:
- case 1:
- case 2:
- rc.use_spell_lib = false;
- rc.isp_command = fromqstr(spellCommandCO->currentText());
- break;
- case 3:
- rc.use_spell_lib = true;
- break;
+ if (theSpellChecker()) {
+ connect(spellcheckerCB, SIGNAL(currentIndexChanged(int)),
+ this, SIGNAL(changed()));
+ connect(altLanguageED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(escapeCharactersED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
+ connect(compoundWordCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(spellcheckContinuouslyCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ } else {
+ spellcheckerCB->setEnabled(false);
+ altLanguageED->setEnabled(false);
+ escapeCharactersED->setEnabled(false);
+ compoundWordCB->setEnabled(false);
+ spellcheckContinuouslyCB->setEnabled(false);
}
-
- // FIXME: remove isp_use_alt_lang
- rc.isp_alt_lang = fromqstr(altLanguageED->text());
- rc.isp_use_alt_lang = !rc.isp_alt_lang.empty();
- // FIXME: remove isp_use_esc_chars
- rc.isp_esc_chars = fromqstr(escapeCharactersED->text());
- rc.isp_use_esc_chars = !rc.isp_esc_chars.empty();
- // FIXME: remove isp_use_pers_dict
- rc.isp_pers_dict = internal_path(fromqstr(persDictionaryED->text()));
- rc.isp_use_pers_dict = !rc.isp_pers_dict.empty();
- rc.isp_accept_compound = compoundWordCB->isChecked();
- rc.isp_use_input_encoding = inputEncodingCB->isChecked();
}
-void PrefSpellchecker::update(LyXRC const & rc)
+void PrefSpellchecker::apply(LyXRC & rc) const
{
- spellCommandCO->setCurrentIndex(0);
-
- if (rc.isp_command == "ispell") {
- spellCommandCO->setCurrentIndex(0);
- } else if (rc.isp_command == "aspell") {
- spellCommandCO->setCurrentIndex(1);
- } else if (rc.isp_command == "hspell") {
- spellCommandCO->setCurrentIndex(2);
- }
-
- if (rc.use_spell_lib) {
-#if defined(USE_ASPELL) || defined(USE_PSPELL)
- spellCommandCO->setCurrentIndex(3);
-#endif
- }
-
- // FIXME: remove isp_use_alt_lang
- altLanguageED->setText(toqstr(rc.isp_alt_lang));
- // FIXME: remove isp_use_esc_chars
- escapeCharactersED->setText(toqstr(rc.isp_esc_chars));
- // FIXME: remove isp_use_pers_dict
- persDictionaryED->setText(toqstr(external_path(rc.isp_pers_dict)));
- compoundWordCB->setChecked(rc.isp_accept_compound);
- inputEncodingCB->setChecked(rc.isp_use_input_encoding);
+ rc.spellchecker = fromqstr(spellcheckerCB->itemData(
+ spellcheckerCB->currentIndex()).toString());
+ rc.spellchecker_alt_lang = fromqstr(altLanguageED->text());
+ rc.spellchecker_esc_chars = fromqstr(escapeCharactersED->text());
+ rc.spellchecker_accept_compound = compoundWordCB->isChecked();
+ rc.spellcheck_continuously = spellcheckContinuouslyCB->isChecked();
}
-void PrefSpellchecker::select_dict()
+void PrefSpellchecker::update(LyXRC const & rc)
{
- docstring file(form_->browsedict(
- from_utf8(internal_path(fromqstr(persDictionaryED->text())))));
- if (!file.empty())
- persDictionaryED->setText(toqstr(file));
+ spellcheckerCB->setCurrentIndex(
+ spellcheckerCB->findData(toqstr(rc.spellchecker)));
+ altLanguageED->setText(toqstr(rc.spellchecker_alt_lang));
+ escapeCharactersED->setText(toqstr(rc.spellchecker_esc_chars));
+ compoundWordCB->setChecked(rc.spellchecker_accept_compound);
+ spellcheckContinuouslyCB->setChecked(rc.spellcheck_continuously);
}
/////////////////////////////////////////////////////////////////////
-PrefConverters::PrefConverters(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Converters"), form, parent)
+PrefConverters::PrefConverters(GuiPreferences * form)
+ : PrefModule(qt_(catFiles), qt_("Converters"), form)
{
setupUi(this);
connect(converterNewPB, SIGNAL(clicked()),
- this, SLOT(update_converter()));
+ this, SLOT(updateConverter()));
connect(converterRemovePB, SIGNAL(clicked()),
- this, SLOT(remove_converter()));
+ this, SLOT(removeConverter()));
connect(converterModifyPB, SIGNAL(clicked()),
- this, SLOT(update_converter()));
+ this, SLOT(updateConverter()));
connect(convertersLW, SIGNAL(currentRowChanged(int)),
- this, SLOT(switch_converter()));
- connect(converterFromCO, SIGNAL(activated(const QString&)),
- this, SLOT(converter_changed()));
- connect(converterToCO, SIGNAL(activated(const QString&)),
- this, SLOT(converter_changed()));
- connect(converterED, SIGNAL(textEdited(const QString&)),
- this, SLOT(converter_changed()));
- connect(converterFlagED, SIGNAL(textEdited(const QString&)),
- this, SLOT(converter_changed()));
+ this, SLOT(switchConverter()));
+ connect(converterFromCO, SIGNAL(activated(QString)),
+ this, SLOT(changeConverter()));
+ connect(converterToCO, SIGNAL(activated(QString)),
+ this, SLOT(changeConverter()));
+ connect(converterED, SIGNAL(textEdited(QString)),
+ this, SLOT(changeConverter()));
+ connect(converterFlagED, SIGNAL(textEdited(QString)),
+ this, SLOT(changeConverter()));
connect(converterNewPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(converterRemovePB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(converterModifyPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(maxAgeLE, SIGNAL(textEdited(const QString&)),
+ connect(maxAgeLE, SIGNAL(textEdited(QString)),
this, SIGNAL(changed()));
maxAgeLE->setValidator(new QDoubleValidator(maxAgeLE));
void PrefConverters::apply(LyXRC & rc) const
{
rc.use_converter_cache = cacheCB->isChecked();
- rc.converter_cache_maxage = int(maxAgeLE->text().toDouble() * 86400.0);
+ rc.converter_cache_maxage = int(widgetToDouble(maxAgeLE) * 86400.0);
}
{
cacheCB->setChecked(rc.use_converter_cache);
QString max_age;
- max_age.setNum(double(rc.converter_cache_maxage) / 86400.0, 'g', 6);
- maxAgeLE->setText(max_age);
+ doubleToWidget(maxAgeLE, (double(rc.converter_cache_maxage) / 86400.0), 'g', 6);
updateGui();
}
Formats::const_iterator cit = form_->formats().begin();
Formats::const_iterator end = form_->formats().end();
for (; cit != end; ++cit) {
- converterFromCO->addItem(toqstr(cit->prettyname()));
- converterToCO->addItem(toqstr(cit->prettyname()));
+ converterFromCO->addItem(qt_(cit->prettyname()));
+ converterToCO->addItem(qt_(cit->prettyname()));
}
// currentRowChanged(int) is also triggered when updating the listwidget
- // block signals to avoid unnecessary calls to switch_converter()
+ // block signals to avoid unnecessary calls to switchConverter()
convertersLW->blockSignals(true);
convertersLW->clear();
Converters::const_iterator ccit = form_->converters().begin();
Converters::const_iterator cend = form_->converters().end();
for (; ccit != cend; ++ccit) {
- std::string const name =
- ccit->From->prettyname() + " -> " + ccit->To->prettyname();
+ QString const name =
+ qt_(ccit->From->prettyname()) + " -> " + qt_(ccit->To->prettyname());
int type = form_->converters().getNumber(ccit->From->name(), ccit->To->name());
- new QListWidgetItem(toqstr(name), convertersLW, type);
+ new QListWidgetItem(name, convertersLW, type);
}
convertersLW->sortItems(Qt::AscendingOrder);
convertersLW->blockSignals(false);
}
-void PrefConverters::switch_converter()
+void PrefConverters::switchConverter()
{
int const cnr = convertersLW->currentItem()->type();
Converter const & c(form_->converters().get(cnr));
}
-void PrefConverters::converter_changed()
+void PrefConverters::changeConverter()
{
updateButtons();
}
Format const & from = form_->formats().get(converterFromCO->currentIndex());
Format const & to = form_->formats().get(converterToCO->currentIndex());
int const sel = form_->converters().getNumber(from.name(), to.name());
- bool const known = !(sel < 0);
+ bool const known = sel >= 0;
bool const valid = !(converterED->text().isEmpty()
|| from.name() == to.name());
int const cnr = convertersLW->currentItem()->type();
- Converter const & c(form_->converters().get(cnr));
+ Converter const & c = form_->converters().get(cnr);
string const old_command = c.command;
string const old_flag = c.flags;
- string const new_command(fromqstr(converterED->text()));
- string const new_flag(fromqstr(converterFlagED->text()));
+ string const new_command = fromqstr(converterED->text());
+ string const new_flag = fromqstr(converterFlagED->text());
- bool modified = ((old_command != new_command) || (old_flag != new_flag));
+ bool modified = (old_command != new_command || old_flag != new_flag);
converterModifyPB->setEnabled(valid && known && modified);
converterNewPB->setEnabled(valid && !known);
// FIXME: user must
// specify unique from/to or it doesn't appear. This is really bad UI
// this is why we can use the same function for both new and modify
-void PrefConverters::update_converter()
+void PrefConverters::updateConverter()
{
Format const & from = form_->formats().get(converterFromCO->currentIndex());
Format const & to = form_->formats().get(converterToCO->currentIndex());
}
-void PrefConverters::remove_converter()
+void PrefConverters::removeConverter()
{
Format const & from = form_->formats().get(converterFromCO->currentIndex());
Format const & to = form_->formats().get(converterToCO->currentIndex());
/////////////////////////////////////////////////////////////////////
//
-// PrefFileformats
+// FormatValidator
//
/////////////////////////////////////////////////////////////////////
-FormatValidator::FormatValidator(QWidget * parent, Formats const & f)
+
+class FormatValidator : public QValidator
+{
+public:
+ FormatValidator(QWidget *, Formats const & f);
+ void fixup(QString & input) const;
+ QValidator::State validate(QString & input, int & pos) const;
+private:
+ virtual QString toString(Format const & format) const = 0;
+ int nr() const;
+ Formats const & formats_;
+};
+
+
+FormatValidator::FormatValidator(QWidget * parent, Formats const & f)
: QValidator(parent), formats_(f)
{
}
Formats::const_iterator cit = formats_.begin();
Formats::const_iterator end = formats_.end();
for (; cit != end; ++cit) {
- string const name = str(cit);
+ QString const name = toString(*cit);
if (distance(formats_.begin(), cit) == nr()) {
- input = toqstr(name);
+ input = name;
return;
-
}
}
}
Formats::const_iterator end = formats_.end();
bool unknown = true;
for (; unknown && cit != end; ++cit) {
- string const name = str(cit);
+ QString const name = toString(*cit);
if (distance(formats_.begin(), cit) != nr())
- unknown = toqstr(name) != input;
+ unknown = name != input;
}
- if (unknown && !input.isEmpty())
+ if (unknown && !input.isEmpty())
return QValidator::Acceptable;
else
return QValidator::Intermediate;
}
-FormatNameValidator::FormatNameValidator(QWidget * parent, Formats const & f)
- : FormatValidator(parent, f)
-{
-}
+/////////////////////////////////////////////////////////////////////
+//
+// FormatNameValidator
+//
+/////////////////////////////////////////////////////////////////////
-std::string FormatNameValidator::str(Formats::const_iterator it) const
+class FormatNameValidator : public FormatValidator
{
- return it->name();
-}
-
+public:
+ FormatNameValidator(QWidget * parent, Formats const & f)
+ : FormatValidator(parent, f)
+ {}
+private:
+ QString toString(Format const & format) const
+ {
+ return toqstr(format.name());
+ }
+};
-FormatPrettynameValidator::FormatPrettynameValidator(QWidget * parent, Formats const & f)
- : FormatValidator(parent, f)
-{
-}
+/////////////////////////////////////////////////////////////////////
+//
+// FormatPrettynameValidator
+//
+/////////////////////////////////////////////////////////////////////
-std::string FormatPrettynameValidator::str(Formats::const_iterator it) const
+class FormatPrettynameValidator : public FormatValidator
{
- return it->prettyname();
-}
+public:
+ FormatPrettynameValidator(QWidget * parent, Formats const & f)
+ : FormatValidator(parent, f)
+ {}
+private:
+ QString toString(Format const & format) const
+ {
+ return qt_(format.prettyname());
+ }
+};
+
+/////////////////////////////////////////////////////////////////////
+//
+// PrefFileformats
+//
+/////////////////////////////////////////////////////////////////////
-PrefFileformats::PrefFileformats(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("File formats"), form, parent)
+PrefFileformats::PrefFileformats(GuiPreferences * form)
+ : PrefModule(qt_(catFiles), qt_("File formats"), form)
{
setupUi(this);
formatED->setValidator(new FormatNameValidator(formatsCB, form_->formats()));
this, SLOT(setFlags()));
connect(formatsCB->lineEdit(), SIGNAL(editingFinished()),
this, SLOT(updatePrettyname()));
- connect(formatsCB->lineEdit(), SIGNAL(textEdited(const QString &)),
+ connect(formatsCB->lineEdit(), SIGNAL(textEdited(QString)),
+ this, SIGNAL(changed()));
+ connect(defaultFormatCB, SIGNAL(activated(QString)),
+ this, SIGNAL(changed()));
+ connect(viewerCO, SIGNAL(activated(int)),
+ this, SIGNAL(changed()));
+ connect(editorCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
}
-void PrefFileformats::apply(LyXRC & /*rc*/) const
+namespace {
+
+string const l10n_shortcut(string const prettyname, string const shortcut)
+{
+ if (shortcut.empty())
+ return string();
+
+ string l10n_format =
+ to_utf8(_(prettyname + '|' + shortcut));
+ return split(l10n_format, '|');
+}
+
+}; // namespace anon
+
+
+void PrefFileformats::apply(LyXRC & rc) const
{
+ QString const default_format = defaultFormatCB->itemData(
+ defaultFormatCB->currentIndex()).toString();
+ rc.default_view_format = fromqstr(default_format);
}
-void PrefFileformats::update(LyXRC const & /*rc*/)
+void PrefFileformats::update(LyXRC const & rc)
{
+ viewer_alternatives = rc.viewer_alternatives;
+ editor_alternatives = rc.editor_alternatives;
+ bool const init = defaultFormatCB->currentText().isEmpty();
updateView();
+ if (init) {
+ int const pos =
+ defaultFormatCB->findData(toqstr(rc.default_view_format));
+ defaultFormatCB->setCurrentIndex(pos);
+ }
}
void PrefFileformats::updateView()
{
QString const current = formatsCB->currentText();
+ QString const current_def = defaultFormatCB->currentText();
- // update combobox with formats
+ // update comboboxes with formats
formatsCB->blockSignals(true);
+ defaultFormatCB->blockSignals(true);
formatsCB->clear();
+ defaultFormatCB->clear();
form_->formats().sort();
Formats::const_iterator cit = form_->formats().begin();
Formats::const_iterator end = form_->formats().end();
- for (; cit != end; ++cit)
- formatsCB->addItem(toqstr(cit->prettyname()),
- QVariant(form_->formats().getNumber(cit->name())) );
+ for (; cit != end; ++cit) {
+ formatsCB->addItem(qt_(cit->prettyname()),
+ QVariant(form_->formats().getNumber(cit->name())));
+ if (form_->converters().isReachable("latex", cit->name())
+ || form_->converters().isReachable("pdflatex", cit->name()))
+ defaultFormatCB->addItem(qt_(cit->prettyname()),
+ QVariant(toqstr(cit->name())));
+ }
// restore selection
- int const item = formatsCB->findText(current, Qt::MatchExactly);
+ int item = formatsCB->findText(current, Qt::MatchExactly);
formatsCB->setCurrentIndex(item < 0 ? 0 : item);
on_formatsCB_currentIndexChanged(item < 0 ? 0 : item);
+ item = defaultFormatCB->findText(current_def, Qt::MatchExactly);
+ defaultFormatCB->setCurrentIndex(item < 0 ? 0 : item);
formatsCB->blockSignals(false);
+ defaultFormatCB->blockSignals(false);
}
formatED->setText(toqstr(f.name()));
copierED->setText(toqstr(form_->movers().command(f.name())));
extensionED->setText(toqstr(f.extension()));
- shortcutED->setText(toqstr(f.shortcut()));
- viewerED->setText(toqstr(f.viewer()));
- editorED->setText(toqstr(f.editor()));
+ shortcutED->setText(
+ toqstr(l10n_shortcut(f.prettyname(), f.shortcut())));
documentCB->setChecked((f.documentFormat()));
vectorCB->setChecked((f.vectorFormat()));
+ updateViewers();
+ updateEditors();
}
void PrefFileformats::on_shortcutED_textEdited(const QString & s)
{
- currentFormat().setShortcut(fromqstr(s));
+ string const new_shortcut = fromqstr(s);
+ if (new_shortcut == l10n_shortcut(currentFormat().prettyname(),
+ currentFormat().shortcut()))
+ return;
+ currentFormat().setShortcut(new_shortcut);
changed();
}
void PrefFileformats::updatePrettyname()
{
- string const newname = fromqstr(formatsCB->currentText());
- if (newname == currentFormat().prettyname())
+ QString const newname = formatsCB->currentText();
+ if (newname == qt_(currentFormat().prettyname()))
return;
- currentFormat().setPrettyname(newname);
+ currentFormat().setPrettyname(fromqstr(newname));
formatsChanged();
updateView();
changed();
}
+namespace {
+ void updateComboBox(LyXRC::Alternatives const & alts,
+ string const & fmt, QComboBox * combo)
+ {
+ LyXRC::Alternatives::const_iterator it =
+ alts.find(fmt);
+ if (it != alts.end()) {
+ LyXRC::CommandSet const & cmds = it->second;
+ LyXRC::CommandSet::const_iterator sit =
+ cmds.begin();
+ LyXRC::CommandSet::const_iterator const sen =
+ cmds.end();
+ for (; sit != sen; ++sit) {
+ QString const qcmd = toqstr(*sit);
+ combo->addItem(qcmd, qcmd);
+ }
+ }
+ }
+}
+
+
+void PrefFileformats::updateViewers()
+{
+ Format const f = currentFormat();
+ viewerCO->blockSignals(true);
+ viewerCO->clear();
+ viewerCO->addItem(qt_("None"), QString());
+ updateComboBox(viewer_alternatives, f.name(), viewerCO);
+ viewerCO->addItem(qt_("Custom"), QString("custom viewer"));
+ viewerCO->blockSignals(false);
+
+ int pos = viewerCO->findData(toqstr(f.viewer()));
+ if (pos != -1) {
+ viewerED->clear();
+ viewerED->setEnabled(false);
+ viewerCO->setCurrentIndex(pos);
+ } else {
+ viewerED->setEnabled(true);
+ viewerED->setText(toqstr(f.viewer()));
+ viewerCO->setCurrentIndex(viewerCO->findData(toqstr("custom viewer")));
+ }
+}
+
+
+void PrefFileformats::updateEditors()
+{
+ Format const f = currentFormat();
+ editorCO->blockSignals(true);
+ editorCO->clear();
+ editorCO->addItem(qt_("None"), QString());
+ updateComboBox(editor_alternatives, f.name(), editorCO);
+ editorCO->addItem(qt_("Custom"), QString("custom editor"));
+ editorCO->blockSignals(false);
+
+ int pos = editorCO->findData(toqstr(f.editor()));
+ if (pos != -1) {
+ editorED->clear();
+ editorED->setEnabled(false);
+ editorCO->setCurrentIndex(pos);
+ } else {
+ editorED->setEnabled(true);
+ editorED->setText(toqstr(f.editor()));
+ editorCO->setCurrentIndex(editorCO->findData(toqstr("custom editor")));
+ }
+}
+
+
+void PrefFileformats::on_viewerCO_currentIndexChanged(int i)
+{
+ bool const custom = viewerCO->itemData(i).toString() == "custom viewer";
+ viewerED->setEnabled(custom);
+ if (!custom)
+ currentFormat().setViewer(fromqstr(viewerCO->itemData(i).toString()));
+}
+
+
+void PrefFileformats::on_editorCO_currentIndexChanged(int i)
+{
+ bool const custom = editorCO->itemData(i).toString() == "custom editor";
+ editorED->setEnabled(custom);
+ if (!custom)
+ currentFormat().setEditor(fromqstr(editorCO->itemData(i).toString()));
+}
+
+
Format & PrefFileformats::currentFormat()
{
int const i = formatsCB->currentIndex();
//
/////////////////////////////////////////////////////////////////////
-PrefLanguage::PrefLanguage(QWidget * parent)
- : PrefModule(_("Language"), 0, parent)
+PrefLanguage::PrefLanguage(GuiPreferences * form)
+ : PrefModule(qt_(catLanguage), qt_("Language"), form)
{
setupUi(this);
- connect(rtlCB, SIGNAL(clicked()),
+ connect(rtlGB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(visualCursorRB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(logicalCursorRB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(markForeignCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
this, SIGNAL(changed()));
connect(globalCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(languagePackageED, SIGNAL(textChanged(const QString&)),
+ connect(languagePackageED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(startCommandED, SIGNAL(textChanged(const QString&)),
+ connect(startCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(endCommandED, SIGNAL(textChanged(const QString&)),
+ connect(endCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(defaultLanguageCO, SIGNAL(activated(int)),
+ 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);
- // store the lang identifiers for later
- std::vector<LanguagePair> const langs = frontend::getLanguageData(false);
- std::vector<LanguagePair>::const_iterator lit = langs.begin();
- std::vector<LanguagePair>::const_iterator lend = langs.end();
- lang_.clear();
- for (; lit != lend; ++lit) {
- defaultLanguageCO->addItem(toqstr(lit->first));
- lang_.push_back(lit->second);
+ // FIXME: This is wrong, we need filter this list based on the available
+ // translation.
+ uiLanguageCO->blockSignals(true);
+ uiLanguageCO->addItem(qt_("Default"), toqstr("auto"));
+ for (int i = 0; i != language_model->rowCount(); ++i) {
+ QModelIndex index = language_model->index(i, 0);
+ uiLanguageCO->addItem(index.data(Qt::DisplayRole).toString(),
+ index.data(Qt::UserRole).toString());
}
+ uiLanguageCO->blockSignals(false);
+}
+
+
+void PrefLanguage::on_uiLanguageCO_currentIndexChanged(int)
+{
+ QMessageBox::information(this, qt_("LyX needs to be restarted!"),
+ qt_("The change of user interface language will be fully "
+ "effective only after a restart."));
}
void PrefLanguage::apply(LyXRC & rc) const
{
// FIXME: remove rtl_support bool
- rc.rtl_support = rtlCB->isChecked();
+ rc.rtl_support = rtlGB->isChecked();
+ rc.visual_cursor = rtlGB->isChecked() && visualCursorRB->isChecked();
rc.mark_foreign_language = markForeignCB->isChecked();
rc.language_auto_begin = autoBeginCB->isChecked();
rc.language_auto_end = autoEndCB->isChecked();
rc.language_package = fromqstr(languagePackageED->text());
rc.language_command_begin = fromqstr(startCommandED->text());
rc.language_command_end = fromqstr(endCommandED->text());
- rc.default_language = lang_[defaultLanguageCO->currentIndex()];
+ rc.gui_language = fromqstr(
+ uiLanguageCO->itemData(uiLanguageCO->currentIndex()).toString());
}
void PrefLanguage::update(LyXRC const & rc)
{
// FIXME: remove rtl_support bool
- rtlCB->setChecked(rc.rtl_support);
+ rtlGB->setChecked(rc.rtl_support);
+ if (rc.visual_cursor)
+ visualCursorRB->setChecked(true);
+ else
+ logicalCursorRB->setChecked(true);
markForeignCB->setChecked(rc.mark_foreign_language);
autoBeginCB->setChecked(rc.language_auto_begin);
autoEndCB->setChecked(rc.language_auto_end);
startCommandED->setText(toqstr(rc.language_command_begin));
endCommandED->setText(toqstr(rc.language_command_end));
- int const pos = int(findPos_helper(lang_, rc.default_language));
- defaultLanguageCO->setCurrentIndex(pos);
+ int pos = uiLanguageCO->findData(toqstr(rc.gui_language));
+ uiLanguageCO->blockSignals(true);
+ uiLanguageCO->setCurrentIndex(pos);
+ uiLanguageCO->blockSignals(false);
}
//
/////////////////////////////////////////////////////////////////////
-PrefPrinter::PrefPrinter(QWidget * parent)
- : PrefModule(_("Printer"), 0, parent)
+PrefPrinter::PrefPrinter(GuiPreferences * form)
+ : PrefModule(qt_(catOutput), qt_("Printer"), form)
{
setupUi(this);
connect(printerAdaptCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(printerCommandED, SIGNAL(textChanged(const QString&)),
+ connect(printerCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerNameED, SIGNAL(textChanged(const QString&)),
+ connect(printerNameED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerPageRangeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPageRangeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerCopiesED, SIGNAL(textChanged(const QString&)),
+ connect(printerCopiesED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerReverseED, SIGNAL(textChanged(const QString&)),
+ connect(printerReverseED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerToPrinterED, SIGNAL(textChanged(const QString&)),
+ connect(printerToPrinterED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerExtensionED, SIGNAL(textChanged(const QString&)),
+ connect(printerExtensionED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerSpoolCommandED, SIGNAL(textChanged(const QString&)),
+ connect(printerSpoolCommandED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerPaperTypeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPaperTypeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerEvenED, SIGNAL(textChanged(const QString&)),
+ connect(printerEvenED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerOddED, SIGNAL(textChanged(const QString&)),
+ connect(printerOddED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerCollatedED, SIGNAL(textChanged(const QString&)),
+ connect(printerCollatedED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerLandscapeED, SIGNAL(textChanged(const QString&)),
+ connect(printerLandscapeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerToFileED, SIGNAL(textChanged(const QString&)),
+ connect(printerToFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerExtraED, SIGNAL(textChanged(const QString&)),
+ connect(printerExtraED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerSpoolPrefixED, SIGNAL(textChanged(const QString&)),
+ connect(printerSpoolPrefixED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(printerPaperSizeED, SIGNAL(textChanged(const QString&)),
+ connect(printerPaperSizeED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
//
/////////////////////////////////////////////////////////////////////
-PrefUserInterface::PrefUserInterface(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("User interface"), form, parent)
+PrefUserInterface::PrefUserInterface(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("User interface"), form)
{
setupUi(this);
autoSaveSB, SLOT(setEnabled(bool)));
connect(autoSaveCB, SIGNAL(toggled(bool)),
TextLabel1, SLOT(setEnabled(bool)));
+ connect(openDocumentsInTabsCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+#if QT_VERSION < 0x040500
+ singleCloseTabButtonCB->setEnabled(false);
+#endif
+ connect(singleCloseTabButtonCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
connect(uiFilePB, SIGNAL(clicked()),
- this, SLOT(select_ui()));
- connect(uiFileED, SIGNAL(textChanged(const QString &)),
+ this, SLOT(selectUi()));
+ connect(uiFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(restoreCursorCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(loadSessionCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(loadWindowSizeCB, SIGNAL(clicked()),
- this, SIGNAL(changed()));
- connect(loadWindowLocationCB, SIGNAL(clicked()),
- this, SIGNAL(changed()));
- connect(windowWidthSB, SIGNAL(valueChanged(int)),
- this, SIGNAL(changed()));
- connect(windowHeightSB, SIGNAL(valueChanged(int)),
- this, SIGNAL(changed()));
- connect(cursorFollowsCB, SIGNAL(clicked()),
+ connect(allowGeometrySessionCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(autoSaveSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(autoSaveCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
+ connect(backupCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
connect(lastfilesSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
+ connect(tooltipCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
lastfilesSB->setMaximum(maxlastfiles);
}
rc.ui_file = internal_path(fromqstr(uiFileED->text()));
rc.use_lastfilepos = restoreCursorCB->isChecked();
rc.load_session = loadSessionCB->isChecked();
- if (loadWindowSizeCB->isChecked()) {
- rc.geometry_width = 0;
- rc.geometry_height = 0;
- } else {
- rc.geometry_width = windowWidthSB->value();
- rc.geometry_height = windowHeightSB->value();
- }
- rc.geometry_xysaved = loadWindowLocationCB->isChecked();
- rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
- rc.autosave = autoSaveSB->value() * 60;
- rc.make_backup = autoSaveCB->isChecked();
+ rc.allow_geometry_session = allowGeometrySessionCB->isChecked();
+ rc.autosave = autoSaveCB->isChecked()? autoSaveSB->value() * 60 : 0;
+ rc.make_backup = backupCB->isChecked();
rc.num_lastfiles = lastfilesSB->value();
+ rc.use_tooltip = tooltipCB->isChecked();
+ rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
+ rc.single_close_tab_button = singleCloseTabButtonCB->isChecked();
+#if QT_VERSION < 0x040500
+ rc.single_close_tab_button = true;
+#endif
}
uiFileED->setText(toqstr(external_path(rc.ui_file)));
restoreCursorCB->setChecked(rc.use_lastfilepos);
loadSessionCB->setChecked(rc.load_session);
- bool loadWindowSize = rc.geometry_width == 0 && rc.geometry_height == 0;
- loadWindowSizeCB->setChecked(loadWindowSize);
- if (!loadWindowSize) {
- windowWidthSB->setValue(rc.geometry_width);
- windowHeightSB->setValue(rc.geometry_height);
- }
- loadWindowLocationCB->setChecked(rc.geometry_xysaved);
- cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
+ allowGeometrySessionCB->setChecked(rc.allow_geometry_session);
// convert to minutes
- int mins(rc.autosave / 60);
- if (rc.autosave && !mins)
- mins = 1;
+ bool autosave = rc.autosave > 0;
+ int mins = rc.autosave / 60;
+ if (!mins)
+ mins = 5;
autoSaveSB->setValue(mins);
- autoSaveCB->setChecked(rc.make_backup);
+ autoSaveCB->setChecked(autosave);
+ autoSaveSB->setEnabled(autosave);
+ backupCB->setChecked(rc.make_backup);
lastfilesSB->setValue(rc.num_lastfiles);
+ tooltipCB->setChecked(rc.use_tooltip);
+ openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
+ singleCloseTabButtonCB->setChecked(rc.single_close_tab_button);
}
-void PrefUserInterface::select_ui()
+void PrefUserInterface::selectUi()
{
- docstring const name =
- from_utf8(internal_path(fromqstr(uiFileED->text())));
- docstring file = form_->browseUI(name);
- if (!file.empty())
- uiFileED->setText(toqstr(file));
+ QString file = form_->browseUI(internalPath(uiFileED->text()));
+ if (!file.isEmpty())
+ uiFileED->setText(file);
}
-void PrefUserInterface::on_loadWindowSizeCB_toggled(bool loadwindowsize)
+void PrefUserInterface::on_clearSessionPB_clicked()
{
- windowWidthLA->setDisabled(loadwindowsize);
- windowHeightLA->setDisabled(loadwindowsize);
- windowWidthSB->setDisabled(loadwindowsize);
- windowHeightSB->setDisabled(loadwindowsize);
+ guiApp->clearSession();
+}
+
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// PrefEdit
+//
+/////////////////////////////////////////////////////////////////////
+
+PrefEdit::PrefEdit(GuiPreferences * form)
+ : PrefModule(qt_(catEditing), qt_("Control"), form)
+{
+ setupUi(this);
+
+ connect(cursorFollowsCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(scrollBelowCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(sortEnvironmentsCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(groupEnvironmentsCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(macroEditStyleCO, SIGNAL(activated(int)),
+ this, SIGNAL(changed()));
+ connect(fullscreenLimitGB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(fullscreenWidthSB, SIGNAL(valueChanged(int)),
+ this, SIGNAL(changed()));
+ connect(toggleTabbarCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+ connect(toggleMenubarCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+ connect(toggleScrollbarCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+ connect(toggleToolbarsCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
+}
+
+
+void PrefEdit::apply(LyXRC & rc) const
+{
+ rc.cursor_follows_scrollbar = cursorFollowsCB->isChecked();
+ rc.scroll_below_document = scrollBelowCB->isChecked();
+ rc.sort_layouts = sortEnvironmentsCB->isChecked();
+ rc.group_layouts = groupEnvironmentsCB->isChecked();
+ switch (macroEditStyleCO->currentIndex()) {
+ case 0: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE_BOX; break;
+ case 1: rc.macro_edit_style = LyXRC::MACRO_EDIT_INLINE; break;
+ case 2: rc.macro_edit_style = LyXRC::MACRO_EDIT_LIST; break;
+ }
+ rc.full_screen_toolbars = toggleToolbarsCB->isChecked();
+ rc.full_screen_scrollbar = toggleScrollbarCB->isChecked();
+ rc.full_screen_tabbar = toggleTabbarCB->isChecked();
+ rc.full_screen_menubar = toggleMenubarCB->isChecked();
+ rc.full_screen_width = fullscreenWidthSB->value();
+ rc.full_screen_limit = fullscreenLimitGB->isChecked();
+}
+
+
+void PrefEdit::update(LyXRC const & rc)
+{
+ cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
+ scrollBelowCB->setChecked(rc.scroll_below_document);
+ sortEnvironmentsCB->setChecked(rc.sort_layouts);
+ groupEnvironmentsCB->setChecked(rc.group_layouts);
+ macroEditStyleCO->setCurrentIndex(rc.macro_edit_style);
+ toggleScrollbarCB->setChecked(rc.full_screen_scrollbar);
+ toggleToolbarsCB->setChecked(rc.full_screen_toolbars);
+ toggleTabbarCB->setChecked(rc.full_screen_tabbar);
+ toggleMenubarCB->setChecked(rc.full_screen_menubar);
+ fullscreenWidthSB->setValue(rc.full_screen_width);
+ fullscreenLimitGB->setChecked(rc.full_screen_limit);
}
//
/////////////////////////////////////////////////////////////////////
-PrefShortcuts::PrefShortcuts(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Shortcuts"), form, parent)
+
+GuiShortcutDialog::GuiShortcutDialog(QWidget * parent) : QDialog(parent)
+{
+ Ui::shortcutUi::setupUi(this);
+ QDialog::setModal(true);
+}
+
+
+PrefShortcuts::PrefShortcuts(GuiPreferences * form)
+ : PrefModule(qt_(catEditing), qt_("Shortcuts"), form)
{
setupUi(this);
shortcutsTW->setSortingEnabled(true);
// Multi-selection can be annoying.
// shortcutsTW->setSelectionMode(QAbstractItemView::MultiSelection);
- shortcutsTW->header()->resizeSection(0, 200);
connect(bindFilePB, SIGNAL(clicked()),
- this, SLOT(select_bind()));
- connect(bindFileED, SIGNAL(textChanged(const QString &)),
+ this, SLOT(selectBind()));
+ connect(bindFileED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(removePB, SIGNAL(clicked()),
+ connect(removePB, SIGNAL(clicked()),
this, SIGNAL(changed()));
-
+
shortcut_ = new GuiShortcutDialog(this);
shortcut_bc_.setPolicy(ButtonPolicy::OkCancelPolicy);
shortcut_bc_.setOK(shortcut_->okPB);
connect(shortcut_->okPB, SIGNAL(clicked()),
shortcut_, SLOT(accept()));
- connect(shortcut_->okPB, SIGNAL(clicked()),
+ connect(shortcut_->okPB, SIGNAL(clicked()),
this, SIGNAL(changed()));
- connect(shortcut_->cancelPB, SIGNAL(clicked()),
+ connect(shortcut_->cancelPB, SIGNAL(clicked()),
shortcut_, SLOT(reject()));
- connect(shortcut_->okPB, SIGNAL(clicked()),
- this, SLOT(shortcut_okPB_pressed()));
+ connect(shortcut_->clearPB, SIGNAL(clicked()),
+ this, SLOT(shortcutClearPressed()));
+ connect(shortcut_->removePB, SIGNAL(clicked()),
+ this, SLOT(shortcutRemovePressed()));
+ connect(shortcut_->okPB, SIGNAL(clicked()),
+ this, SLOT(shortcutOkPressed()));
+ connect(shortcut_->cancelPB, SIGNAL(clicked()),
+ this, SLOT(shortcutCancelPressed()));
}
{
rc.bind_file = internal_path(fromqstr(bindFileED->text()));
// write user_bind and user_unbind to .lyx/bind/user.bind
- string bind_dir = addPath(package().user_support().absFilename(), "bind");
- if (!FileName(bind_dir).exists() && mkdir(FileName(bind_dir), 0777)) {
+ FileName bind_dir(addPath(package().user_support().absFilename(), "bind"));
+ if (!bind_dir.exists() && !bind_dir.createDirectory(0777)) {
lyxerr << "LyX could not create the user bind directory '"
<< bind_dir << "'. All user-defined key bindings will be lost." << endl;
return;
}
- if (!FileName(bind_dir).isDirWritable()) {
+ if (!bind_dir.isDirWritable()) {
lyxerr << "LyX could not write to the user bind directory '"
<< bind_dir << "'. All user-defined key bindings will be lost." << endl;
return;
}
- FileName user_bind_file = FileName(addName(bind_dir, "user.bind"));
- user_bind_.write(user_bind_file.toFilesystemEncoding(), false, false);
- user_unbind_.write(user_bind_file.toFilesystemEncoding(), true, true);
+ FileName user_bind_file(bind_dir.absFilename() + "/user.bind");
+ user_unbind_.write(user_bind_file.toFilesystemEncoding(), false, true);
+ user_bind_.write(user_bind_file.toFilesystemEncoding(), true, false);
// immediately apply the keybindings. Why this is not done before?
// The good thing is that the menus are updated automatically.
theTopLevelKeymap().clear();
- theTopLevelKeymap().read(rc.bind_file);
- theTopLevelKeymap().read("user");
+ theTopLevelKeymap().read("site");
+ theTopLevelKeymap().read(rc.bind_file, 0, KeyMap::Fallback);
+ theTopLevelKeymap().read("user", 0, KeyMap::MissingOK);
}
system_bind_.clear();
user_bind_.clear();
user_unbind_.clear();
+ system_bind_.read("site");
system_bind_.read(rc.bind_file);
// \unbind in user.bind is added to user_unbind_
- user_bind_.read("user", &user_unbind_);
+ user_bind_.read("user", &user_unbind_, KeyMap::MissingOK);
updateShortcutsTW();
}
shortcutsTW->clear();
editItem_ = new QTreeWidgetItem(shortcutsTW);
- editItem_->setText(0, toqstr("Cursor, Mouse and Editing functions"));
+ editItem_->setText(0, qt_("Cursor, Mouse and Editing functions"));
editItem_->setFlags(editItem_->flags() & ~Qt::ItemIsSelectable);
mathItem_ = new QTreeWidgetItem(shortcutsTW);
- mathItem_->setText(0, toqstr("Mathematical Symbols"));
+ mathItem_->setText(0, qt_("Mathematical Symbols"));
mathItem_->setFlags(mathItem_->flags() & ~Qt::ItemIsSelectable);
-
+
bufferItem_ = new QTreeWidgetItem(shortcutsTW);
- bufferItem_->setText(0, toqstr("Buffer and Window"));
+ bufferItem_->setText(0, qt_("Document and Window"));
bufferItem_->setFlags(bufferItem_->flags() & ~Qt::ItemIsSelectable);
-
+
layoutItem_ = new QTreeWidgetItem(shortcutsTW);
- layoutItem_->setText(0, toqstr("Font, Layouts and Textclasses"));
+ layoutItem_->setText(0, qt_("Font, Layouts and Textclasses"));
layoutItem_->setFlags(layoutItem_->flags() & ~Qt::ItemIsSelectable);
systemItem_ = new QTreeWidgetItem(shortcutsTW);
- systemItem_->setText(0, toqstr("System and Miscellaneous"));
+ systemItem_->setText(0, qt_("System and Miscellaneous"));
systemItem_->setFlags(systemItem_->flags() & ~Qt::ItemIsSelectable);
// listBindings(unbound=true) lists all bound and unbound lfuns
// Items in this list is tagged by its source.
- KeyMap::BindingList bindinglist = system_bind_.listBindings(true,
- static_cast<int>(System));
+ KeyMap::BindingList bindinglist = system_bind_.listBindings(true,
+ KeyMap::System);
KeyMap::BindingList user_bindinglist = user_bind_.listBindings(false,
- static_cast<int>(UserBind));
+ KeyMap::UserBind);
KeyMap::BindingList user_unbindinglist = user_unbind_.listBindings(false,
- static_cast<int>(UserUnbind));
+ KeyMap::UserUnbind);
bindinglist.insert(bindinglist.end(), user_bindinglist.begin(),
user_bindinglist.end());
bindinglist.insert(bindinglist.end(), user_unbindinglist.begin(),
KeyMap::BindingList::const_iterator it = bindinglist.begin();
KeyMap::BindingList::const_iterator it_end = bindinglist.end();
for (; it != it_end; ++it)
- insertShortcutItem(it->get<0>(), it->get<1>(),
- static_cast<item_type>(it->get<2>()));
+ insertShortcutItem(it->request, it->sequence, KeyMap::ItemType(it->tag));
shortcutsTW->sortItems(0, Qt::AscendingOrder);
QList<QTreeWidgetItem*> items = shortcutsTW->selectedItems();
removePB->setEnabled(!items.isEmpty() && !items[0]->text(1).isEmpty());
- searchPB->setEnabled(!searchLE->text().isEmpty());
+ modifyPB->setEnabled(!items.isEmpty());
+
+ shortcutsTW->resizeColumnToContents(0);
}
-void PrefShortcuts::setItemType(QTreeWidgetItem * item, item_type tag)
+void PrefShortcuts::setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag)
{
item->setData(0, Qt::UserRole, QVariant(tag));
+ QFont font;
switch (tag) {
- case System:
-#if QT_VERSION >= 0x040200
- item->setForeground(0, QBrush("black"));
- item->setForeground(1, QBrush("black"));
-#else
- item->setTextColor(QColor("black"));
-#endif
+ case KeyMap::System:
break;
- case UserBind:
-#if QT_VERSION >= 0x040200
- item->setForeground(0, QBrush("green"));
- item->setForeground(1, QBrush("green"));
-#else
- item->setTextColor(QColor("green"));
-#endif
+ case KeyMap::UserBind:
+ font.setBold(true);
break;
- case UserUnbind:
-#if QT_VERSION >= 0x040200
- item->setForeground(0, QBrush("red"));
- item->setForeground(1, QBrush("red"));
-#else
- item->setTextColor(QColor("red"));
-#endif
+ case KeyMap::UserUnbind:
+ font.setStrikeOut(true);
break;
- case UserExtraUnbind:
-#if QT_VERSION >= 0x040200
- item->setForeground(0, QBrush("purple"));
- item->setForeground(1, QBrush("purple"));
-#else
- item->setTextColor(QColor("purple"));
-#endif
+ // this item is not displayed now.
+ case KeyMap::UserExtraUnbind:
+ font.setStrikeOut(true);
break;
}
+
+ item->setFont(1, font);
}
QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
- KeySequence const & seq, item_type tag)
+ KeySequence const & seq, KeyMap::ItemType tag)
{
- kb_action action = lfun.action;
+ FuncCode action = lfun.action;
string const action_name = lyxaction.getActionName(action);
- QString const lfun_name = toqstr(from_utf8(action_name)
- + " " + lfun.argument());
- // use BindFile format instead of a more verbose form Portable
- // if the Shortcut dialog can hide all the bind file stuff,
- // Portable format can be used.
- QString const shortcut = toqstr(seq.print(KeySequence::BindFile));
- item_type item_tag = tag;
-
- QTreeWidgetItem * newItem = NULL;
+ QString const lfun_name = toqstr(from_utf8(action_name)
+ + ' ' + lfun.argument());
+ QString const shortcut = toqstr(seq.print(KeySequence::ForGui));
+ KeyMap::ItemType item_tag = tag;
+
+ QTreeWidgetItem * newItem = 0;
// for unbind items, try to find an existing item in the system bind list
- if (tag == UserUnbind) {
- QList<QTreeWidgetItem*> const items = shortcutsTW->findItems(lfun_name,
+ if (tag == KeyMap::UserUnbind) {
+ QList<QTreeWidgetItem*> const items = shortcutsTW->findItems(lfun_name,
Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive), 0);
for (int i = 0; i < items.size(); ++i) {
if (items[i]->text(1) == shortcut)
newItem = items[i];
break;
}
- // if not found, this unbind item is UserExtraUnbind
- if (!newItem)
- item_tag = UserExtraUnbind;
+ // if not found, this unbind item is KeyMap::UserExtraUnbind
+ // Such an item is not displayed to avoid confusion (what is
+ // unmatched removed?).
+ if (!newItem) {
+ item_tag = KeyMap::UserExtraUnbind;
+ return 0;
+ }
}
if (!newItem) {
switch(lyxaction.getActionType(action)) {
case LyXAction::Hidden:
- return NULL;
+ return 0;
case LyXAction::Edit:
newItem = new QTreeWidgetItem(editItem_);
break;
newItem->setText(0, lfun_name);
newItem->setText(1, shortcut);
+ // record BindFile representation to recover KeySequence when needed.
+ newItem->setData(1, Qt::UserRole, toqstr(seq.print(KeySequence::BindFile)));
setItemType(newItem, item_tag);
return newItem;
}
{
QList<QTreeWidgetItem*> items = shortcutsTW->selectedItems();
removePB->setEnabled(!items.isEmpty() && !items[0]->text(1).isEmpty());
+ modifyPB->setEnabled(!items.isEmpty());
if (items.isEmpty())
return;
-
- item_type tag = static_cast<item_type>(items[0]->data(0, Qt::UserRole).toInt());
- if (tag == UserUnbind)
- removePB->setText(toqstr("Restore"));
+
+ KeyMap::ItemType tag =
+ static_cast<KeyMap::ItemType>(items[0]->data(0, Qt::UserRole).toInt());
+ if (tag == KeyMap::UserUnbind)
+ removePB->setText(qt_("Res&tore"));
else
- removePB->setText(toqstr("Remove"));
+ removePB->setText(qt_("Remo&ve"));
}
void PrefShortcuts::on_shortcutsTW_itemDoubleClicked()
{
- QTreeWidgetItem * item = shortcutsTW->currentItem();
- if (item->flags() & Qt::ItemIsSelectable) {
- shortcut_->lfunLE->setText(item->text(0));
- shortcut_->shortcutLE->setText(item->text(1));
- shortcut_->exec();
- }
+ modifyShortcut();
}
-void PrefShortcuts::select_bind()
+void PrefShortcuts::modifyShortcut()
{
- docstring const name =
- from_utf8(internal_path(fromqstr(bindFileED->text())));
- docstring file = form_->browsebind(name);
- if (!file.empty()) {
- bindFileED->setText(toqstr(file));
- system_bind_ = KeyMap();
- system_bind_.read(to_utf8(file));
- updateShortcutsTW();
+ QTreeWidgetItem * item = shortcutsTW->currentItem();
+ if (item->flags() & Qt::ItemIsSelectable) {
+ shortcut_->lfunLE->setText(item->text(0));
+ save_lfun_ = item->text(0);
+ shortcut_->shortcutWG->setText(item->text(1));
+ KeySequence seq;
+ seq.parse(fromqstr(item->data(1, Qt::UserRole).toString()));
+ shortcut_->shortcutWG->setKeySequence(seq);
+ shortcut_->shortcutWG->setFocus();
+ shortcut_->exec();
}
}
-void PrefShortcuts::on_newPB_pressed()
-{
- shortcut_->lfunLE->clear();
- shortcut_->shortcutLE->clear();
- shortcut_->exec();
-}
-
-
-void PrefShortcuts::on_removePB_pressed()
+void PrefShortcuts::removeShortcut()
{
// it seems that only one item can be selected, but I am
// removing all selected items anyway.
QList<QTreeWidgetItem*> items = shortcutsTW->selectedItems();
for (int i = 0; i < items.size(); ++i) {
- string shortcut = fromqstr(items[i]->text(1));
+ string shortcut = fromqstr(items[i]->data(1, Qt::UserRole).toString());
string lfun = fromqstr(items[i]->text(0));
FuncRequest func = lyxaction.lookupFunc(lfun);
- item_type tag = static_cast<item_type>(items[i]->data(0, Qt::UserRole).toInt());
-
+ KeyMap::ItemType tag =
+ static_cast<KeyMap::ItemType>(items[i]->data(0, Qt::UserRole).toInt());
+
switch (tag) {
- case System: {
+ case KeyMap::System: {
// for system bind, we do not touch the item
// but add an user unbind item
user_unbind_.bind(shortcut, func);
- setItemType(items[i], UserUnbind);
+ setItemType(items[i], KeyMap::UserUnbind);
+ removePB->setText(qt_("Res&tore"));
break;
}
- case UserBind: {
+ case KeyMap::UserBind: {
// for user_bind, we remove this bind
QTreeWidgetItem * parent = items[i]->parent();
- parent->takeChild(parent->indexOfChild(items[i]));
+ int itemIdx = parent->indexOfChild(items[i]);
+ parent->takeChild(itemIdx);
+ if (itemIdx > 0)
+ shortcutsTW->scrollToItem(parent->child(itemIdx - 1));
+ else
+ shortcutsTW->scrollToItem(parent);
user_bind_.unbind(shortcut, func);
break;
}
- case UserUnbind: {
+ case KeyMap::UserUnbind: {
// for user_unbind, we remove the unbind, and the item
- // become System again.
+ // become KeyMap::System again.
user_unbind_.unbind(shortcut, func);
- setItemType(items[i], System);
+ setItemType(items[i], KeyMap::System);
+ removePB->setText(qt_("Remo&ve"));
break;
}
- case UserExtraUnbind: {
+ case KeyMap::UserExtraUnbind: {
// for user unbind that is not in system bind file,
// remove this unbind file
QTreeWidgetItem * parent = items[i]->parent();
}
-void PrefShortcuts::on_searchPB_pressed()
+void PrefShortcuts::selectBind()
+{
+ QString file = form_->browsebind(internalPath(bindFileED->text()));
+ if (!file.isEmpty()) {
+ bindFileED->setText(file);
+ system_bind_ = KeyMap();
+ system_bind_.read(fromqstr(file));
+ updateShortcutsTW();
+ }
+}
+
+
+void PrefShortcuts::on_modifyPB_pressed()
+{
+ modifyShortcut();
+}
+
+
+void PrefShortcuts::on_newPB_pressed()
+{
+ shortcut_->lfunLE->clear();
+ shortcut_->shortcutWG->reset();
+ save_lfun_ = QString();
+ shortcut_->exec();
+}
+
+
+void PrefShortcuts::on_removePB_pressed()
+{
+ removeShortcut();
+}
+
+
+void PrefShortcuts::on_searchLE_textEdited()
{
+ if (searchLE->text().isEmpty()) {
+ // show all hidden items
+ QTreeWidgetItemIterator it(shortcutsTW, QTreeWidgetItemIterator::Hidden);
+ while (*it)
+ shortcutsTW->setItemHidden(*it++, false);
+ return;
+ }
// search both columns
QList<QTreeWidgetItem *> matched = shortcutsTW->findItems(searchLE->text(),
Qt::MatchFlags(Qt::MatchContains | Qt::MatchRecursive), 0);
matched += shortcutsTW->findItems(searchLE->text(),
Qt::MatchFlags(Qt::MatchContains | Qt::MatchRecursive), 1);
-
+
// hide everyone (to avoid searching in matched QList repeatedly
QTreeWidgetItemIterator it(shortcutsTW, QTreeWidgetItemIterator::Selectable);
while (*it)
}
-void PrefShortcuts::on_searchLE_textChanged()
+docstring makeCmdString(FuncRequest const & f)
{
- searchPB->setEnabled(!searchLE->text().isEmpty());
- if (searchLE->text().isEmpty()) {
- // show all hidden items
- QTreeWidgetItemIterator it(shortcutsTW, QTreeWidgetItemIterator::Hidden);
- while (*it)
- shortcutsTW->setItemHidden(*it++, false);
- }
+ docstring actionStr = from_ascii(lyxaction.getActionName(f.action));
+ if (!f.argument().empty())
+ actionStr += " " + f.argument();
+ return actionStr;
}
-
-void PrefShortcuts::shortcut_okPB_pressed()
+
+void PrefShortcuts::shortcutOkPressed()
{
- string shortcut = fromqstr(shortcut_->shortcutLE->text());
- string lfun = fromqstr(shortcut_->lfunLE->text());
- FuncRequest func = lyxaction.lookupFunc(lfun);
+ QString const new_lfun = shortcut_->lfunLE->text();
+ FuncRequest func = lyxaction.lookupFunc(fromqstr(new_lfun));
if (func.action == LFUN_UNKNOWN_ACTION) {
Alert::error(_("Failed to create shortcut"),
- _("Unknown or invalid lyx function"));
+ _("Unknown or invalid LyX function"));
return;
}
- KeySequence k(0, 0);
- string::size_type const res = k.parse(shortcut);
- if (res != string::npos) {
+ KeySequence k = shortcut_->shortcutWG->getKeySequence();
+ if (k.length() == 0) {
Alert::error(_("Failed to create shortcut"),
- _("Invalid key sequence"));
+ _("Invalid or empty key sequence"));
return;
}
- // if both lfun and shortcut is valid
- if (user_bind_.hasBinding(k, func) || system_bind_.hasBinding(k, func)) {
+ // check to see if there's been any change
+ FuncRequest oldBinding = system_bind_.getBinding(k);
+ if (oldBinding.action == LFUN_UNKNOWN_ACTION)
+ oldBinding = user_bind_.getBinding(k);
+ if (oldBinding == func) {
+ docstring const actionStr = makeCmdString(func);
Alert::error(_("Failed to create shortcut"),
- _("Shortcut is alreay defined"));
+ bformat(_("Shortcut `%1$s' is already bound to:\n%2$s"),
+ k.print(KeySequence::ForGui), actionStr));
return;
}
-
- QTreeWidgetItem * item = insertShortcutItem(func, k, UserBind);
+
+ // make sure this key isn't already bound---and, if so, not unbound
+ FuncCode const unbind = user_unbind_.getBinding(k).action;
+ if (oldBinding.action != LFUN_UNKNOWN_ACTION && unbind == LFUN_UNKNOWN_ACTION)
+ {
+ // FIXME Perhaps we should offer to over-write the old shortcut?
+ // If so, we'll need to remove it from our list, etc.
+ docstring const actionStr = makeCmdString(oldBinding);
+ Alert::error(_("Failed to create shortcut"),
+ bformat(_("Shortcut `%1$s' is already bound to:\n%2$s\n"
+ "You need to remove that binding before creating a new one."),
+ k.print(KeySequence::ForGui), actionStr));
+ return;
+ }
+
+ if (!save_lfun_.isEmpty() && new_lfun == save_lfun_)
+ // real modification of the lfun's shortcut,
+ // so remove the previous one
+ removeShortcut();
+
+ QTreeWidgetItem * item = insertShortcutItem(func, k, KeyMap::UserBind);
if (item) {
- user_bind_.bind(shortcut, func);
+ user_bind_.bind(&k, func);
shortcutsTW->sortItems(0, Qt::AscendingOrder);
shortcutsTW->setItemExpanded(item->parent(), true);
shortcutsTW->scrollToItem(item);
}
+void PrefShortcuts::shortcutCancelPressed()
+{
+ shortcut_->shortcutWG->reset();
+}
+
+
+void PrefShortcuts::shortcutClearPressed()
+{
+ shortcut_->shortcutWG->reset();
+}
+
+
+void PrefShortcuts::shortcutRemovePressed()
+{
+ shortcut_->shortcutWG->removeFromSequence();
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// PrefIdentity
//
/////////////////////////////////////////////////////////////////////
-PrefIdentity::PrefIdentity(QWidget * parent)
- : PrefModule(_("Identity"), 0, parent)
+PrefIdentity::PrefIdentity(GuiPreferences * form)
+ : PrefModule(QString(), qt_("Identity"), form)
{
setupUi(this);
- connect(nameED, SIGNAL(textChanged(const QString&)),
+ connect(nameED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
- connect(emailED, SIGNAL(textChanged(const QString&)),
+ connect(emailED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
}
//
/////////////////////////////////////////////////////////////////////
-GuiPreferences::GuiPreferences(LyXView & lv)
- : GuiDialog(lv, "prefs"), update_screen_font_(false)
+GuiPreferences::GuiPreferences(GuiView & lv)
+ : GuiDialog(lv, "prefs", qt_("Preferences")), update_screen_font_(false)
{
setupUi(this);
- setViewTitle(_("Preferences"));
QDialog::setModal(false);
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
- add(new PrefUserInterface(this));
- add(new PrefShortcuts(this));
- add(new PrefScreenFonts(this));
- add(new PrefColors(this));
- add(new PrefDisplay);
- add(new PrefKeyboard(this));
+ addModule(new PrefUserInterface(this));
+ addModule(new PrefEdit(this));
+ addModule(new PrefShortcuts(this));
+ addModule(new PrefScreenFonts(this));
+ addModule(new PrefColors(this));
+ addModule(new PrefDisplay(this));
+ addModule(new PrefInput(this));
+ addModule(new PrefCompletion(this));
- add(new PrefPaths(this));
+ addModule(new PrefPaths(this));
- add(new PrefIdentity);
+ addModule(new PrefIdentity(this));
- add(new PrefLanguage);
- add(new PrefSpellchecker(this));
+ addModule(new PrefLanguage(this));
+ addModule(new PrefSpellchecker(this));
- add(new PrefPrinter);
- add(new PrefDate);
- add(new PrefPlaintext);
- add(new PrefLatex(this));
+ addModule(new PrefPrinter(this));
+ PrefDate * dateFormat = new PrefDate(this);
+ addModule(dateFormat);
+ addModule(new PrefPlaintext(this));
+ addModule(new PrefLatex(this));
PrefConverters * converters = new PrefConverters(this);
PrefFileformats * formats = new PrefFileformats(this);
connect(formats, SIGNAL(formatsChanged()),
converters, SLOT(updateGui()));
- add(converters);
- add(formats);
+ addModule(converters);
+ addModule(formats);
- prefsPS->setCurrentPanel(_("User interface"));
+ prefsPS->setCurrentPanel(qt_("User interface"));
// FIXME: hack to work around resizing bug in Qt >= 4.2
// bug verified with Qt 4.2.{0-3} (JSpitzm)
#if QT_VERSION >= 0x040200
bc().setApply(applyPB);
bc().setCancel(closePB);
bc().setRestore(restorePB);
+
+ // initialize the strftime validator
+ bc().addCheckedLineEdit(dateFormat->DateED);
}
-void GuiPreferences::add(PrefModule * module)
+void GuiPreferences::addModule(PrefModule * module)
{
- BOOST_ASSERT(module);
- prefsPS->addPanel(module, module->title());
+ LASSERT(module, return);
+ if (module->category().isEmpty())
+ prefsPS->addPanel(module, module->title());
+ else
+ prefsPS->addPanel(module, module->title(), module->category());
connect(module, SIGNAL(changed()), this, SLOT(change_adaptor()));
modules_.push_back(module);
}
-void GuiPreferences::closeEvent(QCloseEvent * e)
-{
- slotClose();
- e->accept();
-}
-
-
void GuiPreferences::change_adaptor()
{
changed();
apply(rc());
}
-
-void GuiPreferences::updateContents()
-{
- updateRc(rc());
-}
-
-
-bool GuiPreferences::initialiseParams(std::string const &)
+bool GuiPreferences::initialiseParams(string const &)
{
rc_ = lyxrc;
formats_ = lyx::formats;
movers_ = theMovers();
colors_.clear();
update_screen_font_ = false;
+
+ updateRc(rc_);
+ // Make sure that the bc is in the INITIAL state
+ if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
+ bc().restore();
return true;
}
{
ostringstream ss;
rc_.write(ss, true);
- dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
+ dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
// FIXME: these need lfuns
// FIXME UNICODE
theBufferList().setCurrentAuthor(from_utf8(rc_.user_name), from_utf8(rc_.user_email));
}
-void GuiPreferences::setColor(Color_color col, string const & hex)
+void GuiPreferences::setColor(ColorCode col, QString const & hex)
{
- colors_.push_back(lcolor.getLyXName(col) + ' ' + hex);
+ colors_.push_back(lcolor.getLyXName(col) + ' ' + fromqstr(hex));
}
}
-docstring const GuiPreferences::browsebind(docstring const & file) const
+QString GuiPreferences::browsebind(QString const & file) const
{
- return browseLibFile(from_ascii("bind"), file, from_ascii("bind"),
- _("Choose bind file"),
- FileFilterList(_("LyX bind files (*.bind)")));
+ return browseLibFile("bind", file, "bind", qt_("Choose bind file"),
+ QStringList(qt_("LyX bind files (*.bind)")));
}
-docstring const GuiPreferences::browseUI(docstring const & file) const
+QString GuiPreferences::browseUI(QString const & file) const
{
- return browseLibFile(from_ascii("ui"), file, from_ascii("ui"),
- _("Choose UI file"),
- FileFilterList(_("LyX UI files (*.ui)")));
-}
-
-
-docstring const GuiPreferences::browsekbmap(docstring const & file) const
-{
- return browseLibFile(from_ascii("kbd"), file, from_ascii("kmap"),
- _("Choose keyboard map"),
- FileFilterList(_("LyX keyboard maps (*.kmap)")));
-}
-
-
-docstring const GuiPreferences::browsedict(docstring const & file) const
-{
- if (lyxrc.use_spell_lib)
- return browseFile(file,
- _("Choose personal dictionary"),
- FileFilterList(_("*.pws")));
- else
- return browseFile(file,
- _("Choose personal dictionary"),
- FileFilterList(_("*.ispell")));
+ return browseLibFile("ui", file, "ui", qt_("Choose UI file"),
+ QStringList(qt_("LyX UI files (*.ui)")));
}
-docstring const GuiPreferences::browse(docstring const & file,
- docstring const & title) const
+QString GuiPreferences::browsekbmap(QString const & file) const
{
- return browseFile(file, title, FileFilterList(), true);
+ return browseLibFile("kbd", file, "kmap", qt_("Choose keyboard map"),
+ QStringList(qt_("LyX keyboard maps (*.kmap)")));
}
-docstring const GuiPreferences::browsedir(docstring const & path,
- docstring const & title) const
+QString GuiPreferences::browse(QString const & file,
+ QString const & title) const
{
- return browseDir(path, title);
+ return browseFile(file, title, QStringList(), true);
}
}
-Dialog * createGuiPreferences(LyXView & lv) { return new GuiPreferences(lv); }
+Dialog * createGuiPreferences(GuiView & lv) { return new GuiPreferences(lv); }
} // namespace frontend
} // namespace lyx
-#include "GuiPrefs_moc.cpp"
+#include "moc_GuiPrefs.cpp"
projects / lyx.git / blobdiff