#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 "ConverterCache.h"
-#include "debug.h"
+#include "FontEnums.h"
#include "FuncRequest.h"
-#include "gettext.h"
-#include "GuiFontExample.h"
-#include "GuiKeySymbol.h"
#include "KeyMap.h"
#include "KeySequence.h"
+#include "Language.h"
#include "LyXAction.h"
#include "PanelStack.h"
#include "paper.h"
#include "Session.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 "graphics/GraphicsTypes.h"
-#include "frontend_helpers.h"
-
#include "frontends/alert.h"
#include "frontends/Application.h"
+#include "frontends/FontLoader.h"
+#include <QAbstractItemModel>
#include <QCheckBox>
#include <QColorDialog>
#include <QFontDatabase>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QValidator>
-#include <QCloseEvent>
-
-#include <boost/tuple/tuple.hpp>
#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 lastPath = ".";
+ if (!filename.isEmpty())
+ lastPath = onlyPath(filename);
+
+ 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);
+
+ // 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;
}
-static std::pair<string, string> parseFontName(string const & name)
+} // 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)
{
- 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));
+ 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;
+}
+
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// 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 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)),
//
/////////////////////////////////////////////////////////////////////
-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(QString)),
/////////////////////////////////////////////////////////////////////
//
-// 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);
this, SIGNAL(changed()));
connect(secondKeymapED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
+ 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(popupTextCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(popupAfterCompleteCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+ connect(cursorTextCB, SIGNAL(clicked()),
+ this, SIGNAL(changed()));
+}
+
+
+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.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);
+ popupTextCB->setChecked(rc.completion_popup_text);
+ cursorTextCB->setChecked(rc.completion_cursor_text);
+ popupAfterCompleteCB->setChecked(rc.completion_popup_after_complete);
+}
+
+
+
/////////////////////////////////////////////////////////////////////
//
// 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(QString)),
//
/////////////////////////////////////////////////////////////////////
-PrefScreenFonts::PrefScreenFonts(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Screen fonts"), form, parent)
+PrefScreenFonts::PrefScreenFonts(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Screen fonts"), form)
{
setupUi(this);
this, SIGNAL(changed()));
connect(screenHugerED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
+ connect(pixmapCacheCB, SIGNAL(toggled(bool)),
+ this, SIGNAL(changed()));
screenTinyED->setValidator(new QDoubleValidator(screenTinyED));
screenSmallestED->setValidator(new QDoubleValidator(screenSmallestED));
{
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_LARGEST] = fromqstr(screenLargestED->text());
rc.font_sizes[FONT_SIZE_HUGE] = fromqstr(screenHugeED->text());
rc.font_sizes[FONT_SIZE_HUGER] = fromqstr(screenHugerED->text());
+ rc.use_pixmap_cache = pixmapCacheCB->isChecked();
if (rc.font_sizes != oldrc.font_sizes
|| rc.roman_font_name != oldrc.roman_font_name
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]));
+
+ pixmapCacheCB->setChecked(rc.use_pixmap_cache);
+#if defined(Q_WS_X11)
+ pixmapCacheCB->setEnabled(false);
+#endif
+
}
} // namespace anon
-PrefColors::PrefColors(GuiPreferences * form, QWidget * parent)
- : PrefModule( _("Colors"), form, parent)
+PrefColors::PrefColors(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Colors"), form)
{
setupUi(this);
lcolors_.push_back(lc);
}
- std::sort(lcolors_.begin(), lcolors_.end(), ColorSorter());
+ 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) {
{
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]);
}
change_lyxObjects_selection();
}
+
void PrefColors::change_color()
{
int const row = lyxObjectsLW->currentRow();
//
/////////////////////////////////////////////////////////////////////
-PrefDisplay::PrefDisplay(QWidget * parent)
- : PrefModule(_("Graphics"), 0, parent)
+PrefDisplay::PrefDisplay(GuiPreferences * form)
+ : PrefModule(qt_(catLookAndFeel), qt_("Graphics"), form)
{
setupUi(this);
connect(instantPreviewCO, SIGNAL(activated(int)),
case 2: rc.preview = LyXRC::PREVIEW_ON; break;
}
- lyx::graphics::DisplayType dtype;
+ graphics::DisplayType dtype;
switch (displayGraphicsCO->currentIndex()) {
case 3: dtype = graphics::NoDisplay; break;
case 2: dtype = graphics::ColorDisplay; break;
//
/////////////////////////////////////////////////////////////////////
-PrefPaths::PrefPaths(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Paths"), form, parent)
+PrefPaths::PrefPaths(GuiPreferences * form)
+ : PrefModule(QString(), qt_("Paths"), form)
{
setupUi(this);
+ connect(exampleDirPB, SIGNAL(clicked()), this, SLOT(select_exampledir()));
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(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
connect(workingDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
+ connect(exampleDirED, SIGNAL(textChanged(QString)),
+ this, SIGNAL(changed()));
connect(templateDirED, SIGNAL(textChanged(QString)),
this, SIGNAL(changed()));
connect(backupDirED, SIGNAL(textChanged(QString)),
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()));
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)));
}
+void PrefPaths::select_exampledir()
+{
+ QString file = browseDir(internalPath(exampleDirED->text()),
+ qt_("Select directory for example files"));
+ if (!file.isEmpty())
+ exampleDirED->setText(file);
+}
+
+
void PrefPaths::select_templatedir()
{
- 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(templateDirED->text()),
+ qt_("Select a document templates directory"));
+ if (!file.isEmpty())
+ templateDirED->setText(file);
}
void PrefPaths::select_tempdir()
{
- 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(tempDirED->text()),
+ qt_("Select a temporary directory"));
+ if (!file.isEmpty())
+ tempDirED->setText(file);
}
void PrefPaths::select_backupdir()
{
- 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(backupDirED->text()),
+ qt_("Select a backups directory"));
+ if (!file.isEmpty())
+ backupDirED->setText(file);
}
void PrefPaths::select_workingdir()
{
- 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(workingDirED->text()),
+ qt_("Select a document directory"));
+ if (!file.isEmpty())
+ workingDirED->setText(file);
}
void PrefPaths::select_lyxpipe()
{
- 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);
void PrefSpellchecker::select_dict()
{
- docstring file(form_->browsedict(
- from_utf8(internal_path(fromqstr(persDictionaryED->text())))));
- if (!file.empty())
- persDictionaryED->setText(toqstr(file));
+ QString file = form_->browsedict(internalPath(persDictionaryED->text()));
+ if (!file.isEmpty())
+ persDictionaryED->setText(file);
}
/////////////////////////////////////////////////////////////////////
-PrefConverters::PrefConverters(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Converters"), form, parent)
+PrefConverters::PrefConverters(GuiPreferences * form)
+ : PrefModule(qt_(catFiles), qt_("Converters"), form)
{
setupUi(this);
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
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);
|| 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);
/////////////////////////////////////////////////////////////////////
//
-// PrefFileformats
+// FormatValidator
//
/////////////////////////////////////////////////////////////////////
-//
+
+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())
}
-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(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("File formats"), form, parent)
+/////////////////////////////////////////////////////////////////////
+//
+// PrefFileformats
+//
+/////////////////////////////////////////////////////////////////////
+
+PrefFileformats::PrefFileformats(GuiPreferences * form)
+ : PrefModule(qt_(catFiles), qt_("File formats"), form)
{
setupUi(this);
formatED->setValidator(new FormatNameValidator(formatsCB, form_->formats()));
}
+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
{
}
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())) );
+ formatsCB->addItem(qt_(cit->prettyname()),
+ QVariant(form_->formats().getNumber(cit->name())));
// restore selection
int const item = formatsCB->findText(current, Qt::MatchExactly);
formatED->setText(toqstr(f.name()));
copierED->setText(toqstr(form_->movers().command(f.name())));
extensionED->setText(toqstr(f.extension()));
- shortcutED->setText(toqstr(f.shortcut()));
+ shortcutED->setText(
+ toqstr(l10n_shortcut(f.prettyname(), f.shortcut())));
viewerED->setText(toqstr(f.viewer()));
editorED->setText(toqstr(f.editor()));
documentCB->setChecked((f.documentFormat()));
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();
//
/////////////////////////////////////////////////////////////////////
-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()));
defaultLanguageCO->clear();
- // 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);
- }
+ QAbstractItemModel * language_model = guiApp->languageModel();
+ // FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
+ language_model->sort(0);
+ defaultLanguageCO->setModel(language_model);
}
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.default_language = fromqstr(
+ defaultLanguageCO->itemData(defaultLanguageCO->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));
+ int const pos = defaultLanguageCO->findData(toqstr(rc.default_language));
defaultLanguageCO->setCurrentIndex(pos);
}
//
/////////////////////////////////////////////////////////////////////
-PrefPrinter::PrefPrinter(QWidget * parent)
- : PrefModule(_("Printer"), 0, parent)
+PrefPrinter::PrefPrinter(GuiPreferences * form)
+ : PrefModule(qt_(catOutput), qt_("Printer"), form)
{
setupUi(this);
//
/////////////////////////////////////////////////////////////////////
-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()));
connect(uiFilePB, SIGNAL(clicked()),
this, SLOT(select_ui()));
connect(uiFileED, SIGNAL(textChanged(QString)),
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()));
this, SIGNAL(changed()));
connect(lastfilesSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
- connect(pixmapCacheCB, SIGNAL(toggled(bool)),
+ 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.allow_geometry_session = allowGeometrySessionCB->isChecked();
rc.autosave = autoSaveSB->value() * 60;
rc.make_backup = autoSaveCB->isChecked();
rc.num_lastfiles = lastfilesSB->value();
- rc.use_pixmap_cache = pixmapCacheCB->isChecked();
+ rc.use_tooltip = tooltipCB->isChecked();
+ rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
}
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)
autoSaveSB->setValue(mins);
autoSaveCB->setChecked(rc.make_backup);
lastfilesSB->setValue(rc.num_lastfiles);
- pixmapCacheCB->setChecked(rc.use_pixmap_cache);
-#if (QT_VERSION < 0x040200) || defined(Q_WS_X11)
- pixmapCacheGB->setEnabled(false);
-#endif
+ tooltipCB->setChecked(rc.use_tooltip);
+ openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
}
void PrefUserInterface::select_ui()
{
- 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)
+/////////////////////////////////////////////////////////////////////
+//
+// PrefEdit
+//
+/////////////////////////////////////////////////////////////////////
+
+PrefEdit::PrefEdit(GuiPreferences * form)
+ : PrefModule(qt_(catEditing), qt_("Control"), form)
{
- windowWidthLA->setDisabled(loadwindowsize);
- windowHeightLA->setDisabled(loadwindowsize);
- windowWidthSB->setDisabled(loadwindowsize);
- windowHeightSB->setDisabled(loadwindowsize);
+ setupUi(this);
+
+ connect(cursorFollowsCB, 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(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.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_width = fullscreenWidthSB->value();
+ rc.full_screen_limit = fullscreenLimitGB->isChecked();
+}
+
+
+void PrefEdit::update(LyXRC const & rc)
+{
+ cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar);
+ 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);
+ fullscreenWidthSB->setValue(rc.full_screen_width);
+ fullscreenLimitGB->setChecked(rc.full_screen_limit);
}
}
-PrefShortcuts::PrefShortcuts(GuiPreferences * form, QWidget * parent)
- : PrefModule(_("Shortcuts"), form, parent)
+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()));
{
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"));
+ FileName user_bind_file(bind_dir.absFilename() + "/user.bind");
user_bind_.write(user_bind_file.toFilesystemEncoding(), false, false);
user_unbind_.write(user_bind_file.toFilesystemEncoding(), true, true);
// immediately apply the keybindings. Why this is not done before?
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
KeyMap::BindingList::const_iterator it = bindinglist.begin();
KeyMap::BindingList::const_iterator it_end = bindinglist.end();
for (; it != it_end; ++it)
- insertShortcutItem(it->request, it->sequence, item_type(it->tag));
+ insertShortcutItem(it->request, it->sequence, ItemType(it->tag));
shortcutsTW->sortItems(0, Qt::AscendingOrder);
QList<QTreeWidgetItem*> items = shortcutsTW->selectedItems();
removePB->setEnabled(!items.isEmpty() && !items[0]->text(1).isEmpty());
+ modifyPB->setEnabled(!items.isEmpty());
+
+ shortcutsTW->resizeColumnToContents(0);
}
-void PrefShortcuts::setItemType(QTreeWidgetItem * item, item_type tag)
+void PrefShortcuts::setItemType(QTreeWidgetItem * item, ItemType tag)
{
item->setData(0, Qt::UserRole, QVariant(tag));
QFont font;
QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun,
- KeySequence const & seq, item_type tag)
+ KeySequence const & seq, 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());
+ + ' ' + lfun.argument());
QString const shortcut = toqstr(seq.print(KeySequence::ForGui));
- item_type item_tag = tag;
+ ItemType item_tag = tag;
- QTreeWidgetItem * newItem = NULL;
+ 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,
// unmatched removed?).
if (!newItem) {
item_tag = UserExtraUnbind;
- return NULL;
+ return 0;
}
}
if (!newItem) {
switch(lyxaction.getActionType(action)) {
case LyXAction::Hidden:
- return NULL;
+ return 0;
case LyXAction::Edit:
newItem = new QTreeWidgetItem(editItem_);
break;
{
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());
+ ItemType tag = static_cast<ItemType>(items[0]->data(0, Qt::UserRole).toInt());
if (tag == UserUnbind)
- removePB->setText(toqstr("Restore"));
+ removePB->setText(qt_("Res&tore"));
else
- removePB->setText(toqstr("Remove"));
+ removePB->setText(qt_("Remo&ve"));
}
void PrefShortcuts::on_shortcutsTW_itemDoubleClicked()
+{
+ modifyShortcut();
+}
+
+
+void PrefShortcuts::modifyShortcut()
{
QTreeWidgetItem * item = shortcutsTW->currentItem();
if (item->flags() & Qt::ItemIsSelectable) {
shortcut_->lfunLE->setText(item->text(0));
- // clear the shortcut because I assume that a user will enter
- // a new shortcut.
- shortcut_->shortcutLE->reset();
+ shortcut_->shortcutLE->setText(item->text(1));
shortcut_->shortcutLE->setFocus();
shortcut_->exec();
}
void PrefShortcuts::select_bind()
{
- docstring const name =
- from_utf8(internal_path(fromqstr(bindFileED->text())));
- docstring file = form_->browsebind(name);
- if (!file.empty()) {
- bindFileED->setText(toqstr(file));
+ QString file = form_->browsebind(internalPath(bindFileED->text()));
+ if (!file.isEmpty()) {
+ bindFileED->setText(file);
system_bind_ = KeyMap();
- system_bind_.read(to_utf8(file));
+ system_bind_.read(fromqstr(file));
updateShortcutsTW();
}
}
+void PrefShortcuts::on_modifyPB_pressed()
+{
+ modifyShortcut();
+}
+
+
void PrefShortcuts::on_newPB_pressed()
{
shortcut_->lfunLE->clear();
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());
+ ItemType tag = static_cast<ItemType>(items[i]->data(0, Qt::UserRole).toInt());
switch (tag) {
case System: {
// but add an user unbind item
user_unbind_.bind(shortcut, func);
setItemType(items[i], UserUnbind);
- removePB->setText(toqstr("Restore"));
+ removePB->setText(qt_("Res&tore"));
break;
}
case UserBind: {
// become System again.
user_unbind_.unbind(shortcut, func);
setItemType(items[i], System);
- removePB->setText(toqstr("Remove"));
+ removePB->setText(qt_("Remo&ve"));
break;
}
case UserExtraUnbind: {
//
/////////////////////////////////////////////////////////////////////
-PrefIdentity::PrefIdentity(QWidget * parent)
- : PrefModule(_("Identity"), 0, parent)
+PrefIdentity::PrefIdentity(GuiPreferences * form)
+ : PrefModule(QString(), qt_("Identity"), form)
{
setupUi(this);
//
/////////////////////////////////////////////////////////////////////
-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));
+ addModule(new PrefDate(this));
+ 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
}
-void GuiPreferences::add(PrefModule * module)
+void GuiPreferences::addModule(PrefModule * module)
{
- BOOST_ASSERT(module);
- prefsPS->addPanel(module, module->title());
+ LASSERT(module, /**/);
+ 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();
}
-bool GuiPreferences::initialiseParams(std::string const &)
+bool GuiPreferences::initialiseParams(string const &)
{
rc_ = lyxrc;
formats_ = lyx::formats;
}
-void GuiPreferences::setColor(ColorCode 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
-{
- return browseLibFile(from_ascii("bind"), file, from_ascii("bind"),
- _("Choose bind file"),
- FileFilterList(_("LyX bind files (*.bind)")));
-}
-
-
-docstring const GuiPreferences::browseUI(docstring const & file) const
+QString GuiPreferences::browsebind(QString const & file) const
{
- return browseLibFile(from_ascii("ui"), file, from_ascii("ui"),
- _("Choose UI file"),
- FileFilterList(_("LyX UI files (*.ui)")));
+ return browseLibFile("bind", file, "bind", qt_("Choose bind file"),
+ QStringList(qt_("LyX bind files (*.bind)")));
}
-docstring const GuiPreferences::browsekbmap(docstring const & file) const
+QString GuiPreferences::browseUI(QString const & file) const
{
- return browseLibFile(from_ascii("kbd"), file, from_ascii("kmap"),
- _("Choose keyboard map"),
- FileFilterList(_("LyX keyboard maps (*.kmap)")));
+ return browseLibFile("ui", file, "ui", qt_("Choose UI file"),
+ QStringList(qt_("LyX UI files (*.ui)")));
}
-docstring const GuiPreferences::browsedict(docstring const & file) const
+QString GuiPreferences::browsekbmap(QString 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("kbd", file, "kmap", qt_("Choose keyboard map"),
+ QStringList(qt_("LyX keyboard maps (*.kmap)")));
}
-docstring const GuiPreferences::browse(docstring const & file,
- docstring const & title) const
+QString GuiPreferences::browsedict(QString const & file) const
{
- return browseFile(file, title, FileFilterList(), true);
+ return browseFile(file, qt_("Choose personal dictionary"),
+ QStringList(lyxrc.use_spell_lib ? qt_("*.pws") : qt_("*.ispell")));
}
-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
projects / lyx.git / blobdiff