X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt%2FGuiPrefs.cpp;h=a5f4014874772d747b61ddaa73e0c1b974705b66;hb=5cb80b867f4a59c3253487652ba74a29ad5b3f0f;hp=beb424f38758bbfdce09925e9ef9b081f8e483b6;hpb=78f457796c87bd86a10c7b24bf70f9bf60894f4f;p=lyx.git diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp index beb424f387..a5f4014874 100644 --- a/src/frontends/qt/GuiPrefs.cpp +++ b/src/frontends/qt/GuiPrefs.cpp @@ -33,6 +33,7 @@ #include "FuncRequest.h" #include "KeySequence.h" #include "Language.h" +#include "LengthCombo.h" #include "LyXAction.h" #include "LyX.h" #include "PanelStack.h" @@ -188,7 +189,7 @@ QString browseRelToSub(QString const & filename, QString const & relpath, toqstr(makeRelPath(qstring_to_ucs4(outname), qstring_to_ucs4(relpath))); QString testname = reloutname; - testname.remove(QRegExp("^(\\.\\./)+")); + testname.remove(QRegularExpression("^(\\.\\./)+")); if (testname.contains("/")) return outname; @@ -433,13 +434,11 @@ PrefInput::PrefInput(GuiPreferences * form) this, SIGNAL(changed())); // reveal checkbox for switching Ctrl and Meta on Mac: - bool swapcb = false; #ifdef Q_OS_MAC -#if QT_VERSION > 0x040600 - swapcb = true; -#endif + dontswapCB->setVisible(true); +#else + dontswapCB->setVisible(false); #endif - dontswapCB->setVisible(swapcb); } @@ -911,26 +910,48 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form) { setupUi(this); +#if QT_VERSION < 0x050e00 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))); +#else + connect(screenRomanCO, SIGNAL(textActivated(QString)), + this, SLOT(selectRoman(QString))); + connect(screenSansCO, SIGNAL(textActivated(QString)), + this, SLOT(selectSans(QString))); + connect(screenTypewriterCO, SIGNAL(textActivated(QString)), + this, SLOT(selectTypewriter(QString))); +#endif +#if QT_VERSION >= 0x060000 + const QStringList families(QFontDatabase::families()); +#else QFontDatabase fontdb; - QStringList families(fontdb.families()); + const QStringList families(fontdb.families()); +#endif for (auto const & family : families) { screenRomanCO->addItem(family); screenSansCO->addItem(family); screenTypewriterCO->addItem(family); } +#if QT_VERSION < 0x050e00 connect(screenRomanCO, SIGNAL(activated(QString)), this, SIGNAL(changed())); connect(screenSansCO, SIGNAL(activated(QString)), this, SIGNAL(changed())); connect(screenTypewriterCO, SIGNAL(activated(QString)), this, SIGNAL(changed())); +#else + connect(screenRomanCO, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); + connect(screenSansCO, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); + connect(screenTypewriterCO, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); +#endif connect(screenZoomSB, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); connect(screenTinyED, SIGNAL(textChanged(QString)), @@ -1131,7 +1152,7 @@ void PrefColors::applyRC(LyXRC & rc) const void PrefColors::updateRC(LyXRC const & rc) { for (size_type i = 0; i < lcolors_.size(); ++i) { - QColor color = QColor(guiApp->colorCache().get(lcolors_[i], false)); + QColor color = guiApp->colorCache().get(lcolors_[i], false); QPixmap coloritem(32, 32); coloritem.fill(color); lyxObjectsLW->item(int(i))->setIcon(QIcon(coloritem)); @@ -1251,7 +1272,8 @@ bool PrefColors::isDefaultColor(int const row, QString const & color) QColor PrefColors::getDefaultColorByRow(int const row) { ColorSet const defaultcolor; - return defaultcolor.getX11HexName(lcolors_[size_t(row)]).c_str(); + return defaultcolor.getX11HexName(lcolors_[size_t(row)], + guiApp->colorCache().isDarkMode()).c_str(); } @@ -1636,10 +1658,17 @@ PrefConverters::PrefConverters(GuiPreferences * form) this, SLOT(updateConverter())); connect(convertersLW, SIGNAL(currentRowChanged(int)), this, SLOT(switchConverter())); +#if QT_VERSION < 0x050e00 connect(converterFromCO, SIGNAL(activated(QString)), this, SLOT(changeConverter())); connect(converterToCO, SIGNAL(activated(QString)), this, SLOT(changeConverter())); +#else + connect(converterFromCO, SIGNAL(textActivated(QString)), + this, SLOT(changeConverter())); + connect(converterToCO, SIGNAL(textActivated(QString)), + this, SLOT(changeConverter())); +#endif connect(converterED, SIGNAL(textEdited(QString)), this, SLOT(changeConverter())); connect(converterFlagED, SIGNAL(textEdited(QString)), @@ -1857,7 +1886,7 @@ void PrefConverters::on_needauthCB_toggled(bool checked) } int ret = frontend::Alert::prompt( - _("SECURITY WARNING!"), _("Unchecking this option has the effect that potentially harmful converters would be run without asking your permission first. This is UNSAFE and NOT recommended, unless you know what you are doing. Are you sure you would like to proceed ? The recommended and safe answer is NO!"), + _("SECURITY WARNING!"), _("Unchecking this option has the effect that potentially harmful converters would be run without asking your permission first. This is UNSAFE and NOT recommended, unless you know what you are doing. Are you sure you would like to proceed? The recommended and safe answer is NO!"), 0, 0, _("&No"), _("&Yes")); if (ret == 1) changed(); @@ -1999,12 +2028,21 @@ PrefFileformats::PrefFileformats(GuiPreferences * form) this, SLOT(updatePrettyname())); connect(formatsCB->lineEdit(), SIGNAL(textEdited(QString)), this, SIGNAL(changed())); +#if QT_VERSION < 0x050e00 connect(defaultFormatCB, SIGNAL(activated(QString)), this, SIGNAL(changed())); connect(defaultOTFFormatCB, SIGNAL(activated(QString)), this, SIGNAL(changed())); connect(defaultPlatexFormatCB, SIGNAL(activated(QString)), this, SIGNAL(changed())); +#else + connect(defaultFormatCB, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); + connect(defaultOTFFormatCB, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); + connect(defaultPlatexFormatCB, SIGNAL(textActivated(QString)), + this, SIGNAL(changed())); +#endif connect(viewerCO, SIGNAL(activated(int)), this, SIGNAL(changed())); connect(editorCO, SIGNAL(activated(int)), @@ -2282,6 +2320,8 @@ void PrefFileformats::updateViewers() viewerCO->blockSignals(true); viewerCO->clear(); viewerCO->addItem(qt_("None"), QString()); + if (os::canAutoOpenFile(f.extension(), os::VIEW)) + viewerCO->addItem(qt_("System Default"), QString("auto")); updateComboBox(viewer_alternatives, f.name(), viewerCO); viewerCO->addItem(qt_("Custom"), QString("custom viewer")); viewerCO->blockSignals(false); @@ -2305,6 +2345,8 @@ void PrefFileformats::updateEditors() editorCO->blockSignals(true); editorCO->clear(); editorCO->addItem(qt_("None"), QString()); + if (os::canAutoOpenFile(f.extension(), os::EDIT)) + editorCO->addItem(qt_("System Default"), QString("auto")); updateComboBox(editor_alternatives, f.name(), editorCO); editorCO->addItem(qt_("Custom"), QString("custom editor")); editorCO->blockSignals(false); @@ -2423,7 +2465,7 @@ PrefLanguage::PrefLanguage(GuiPreferences * form) startCommandED->setValidator(new NoNewLineValidator(startCommandED)); endCommandED->setValidator(new NoNewLineValidator(endCommandED)); - defaultDecimalSepED->setValidator(new QRegExpValidator(QRegExp("\\S"), this)); + defaultDecimalSepED->setValidator(new QRegularExpressionValidator(QRegularExpression("\\S"), this)); defaultDecimalSepED->setMaxLength(1); defaultLengthUnitCO->addItem(lyx::qt_(unit_name_gui[Length::CM]), Length::CM); @@ -2452,6 +2494,9 @@ PrefLanguage::PrefLanguage(GuiPreferences * form) index.data(Qt::UserRole).toString()); } uiLanguageCO->blockSignals(false); + + // FIXME: restore this when it works (see discussion in #6450). + respectOSkbdCB->hide(); } @@ -2574,15 +2619,25 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) this, SIGNAL(changed())); connect(tooltipCB, SIGNAL(toggled(bool)), 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(toggleStatusbarCB, SIGNAL(toggled(bool)), + this, SIGNAL(changed())); + connect(toggleToolbarsCB, SIGNAL(toggled(bool)), + this, SIGNAL(changed())); lastfilesSB->setMaximum(maxlastfiles); iconSetCO->addItem(qt_("Default"), QString()); iconSetCO->addItem(qt_("Classic"), "classic"); iconSetCO->addItem(qt_("Oxygen"), "oxygen"); -#if (!(defined Q_WS_X11 || defined(QPA_XCB)) || QT_VERSION < 0x040600) - useSystemThemeIconsCB->hide(); -#endif + if (guiApp->platformName() != "xcb" + && !guiApp->platformName().contains("wayland")) + useSystemThemeIconsCB->hide(); } @@ -2595,6 +2650,11 @@ void PrefUserInterface::applyRC(LyXRC & rc) const rc.use_system_theme_icons = useSystemThemeIconsCB->isChecked(); rc.num_lastfiles = lastfilesSB->value(); rc.use_tooltip = tooltipCB->isChecked(); + rc.full_screen_toolbars = toggleToolbarsCB->isChecked(); + rc.full_screen_scrollbar = toggleScrollbarCB->isChecked(); + rc.full_screen_statusbar = toggleStatusbarCB->isChecked(); + rc.full_screen_tabbar = toggleTabbarCB->isChecked(); + rc.full_screen_menubar = toggleMenubarCB->isChecked(); } @@ -2608,6 +2668,11 @@ void PrefUserInterface::updateRC(LyXRC const & rc) uiFileED->setText(toqstr(external_path(rc.ui_file))); lastfilesSB->setValue(rc.num_lastfiles); tooltipCB->setChecked(rc.use_tooltip); + toggleScrollbarCB->setChecked(rc.full_screen_scrollbar); + toggleStatusbarCB->setChecked(rc.full_screen_statusbar); + toggleToolbarsCB->setChecked(rc.full_screen_toolbars); + toggleTabbarCB->setChecked(rc.full_screen_tabbar); + toggleMenubarCB->setChecked(rc.full_screen_menubar); } @@ -2716,6 +2781,21 @@ void PrefDocHandling::updateRC(LyXRC const & rc) closeLastViewCO->setCurrentIndex(1); else if (rc.close_buffer_with_last_view == "ask") closeLastViewCO->setCurrentIndex(2); + if (rc.backupdir_path.empty()) + backupCB->setToolTip(qt_("If this is checked, a backup of the document is created " + "in the current working directory. " + "The backup file has the same name but the suffix '.lyx~'. " + "Note that these files are hidden by default by some file managers. " + "A dedicated backup directory can be set in the 'Paths' section.")); + else { + docstring const tip = bformat(_("If this is checked, a backup of the document is created " + "in the backup directory (%1$s). " + "The backup file has the full original path and name as file name " + "and the suffix \'.lyx~\' (e.g., !mydir!filename.lyx~). " + "Note that these files are hidden by default by some file managers."), + FileName(rc.backupdir_path).absoluteFilePath()); + backupCB->setToolTip(toqstr(tip)); + } } @@ -2755,25 +2835,17 @@ PrefEdit::PrefEdit(GuiPreferences * form) this, SIGNAL(changed())); connect(citationSearchLE, SIGNAL(textChanged(QString)), 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)), + connect(screenWidthLE, SIGNAL(textChanged(QString)), this, SIGNAL(changed())); - connect(toggleStatusbarCB, SIGNAL(toggled(bool)), - this, SIGNAL(changed())); - connect(toggleToolbarsCB, SIGNAL(toggled(bool)), + connect(screenWidthUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)), this, SIGNAL(changed())); } -void PrefEdit::on_fullscreenLimitCB_toggled(bool const state) +void PrefEdit::on_screenLimitCB_toggled(bool const state) { - fullscreenWidthSB->setEnabled(state); - fullscreenWidthLA->setEnabled(state); + screenWidthLE->setEnabled(state); + screenWidthUnitCO->setEnabled(state); changed(); } @@ -2802,13 +2874,8 @@ void PrefEdit::applyRC(LyXRC & rc) const rc.cursor_width = cursorWidthSB->value(); rc.citation_search = citationSearchCB->isChecked(); rc.citation_search_pattern = fromqstr(citationSearchLE->text()); - rc.full_screen_toolbars = toggleToolbarsCB->isChecked(); - rc.full_screen_scrollbar = toggleScrollbarCB->isChecked(); - rc.full_screen_statusbar = toggleStatusbarCB->isChecked(); - rc.full_screen_tabbar = toggleTabbarCB->isChecked(); - rc.full_screen_menubar = toggleMenubarCB->isChecked(); - rc.full_screen_width = fullscreenWidthSB->value(); - rc.full_screen_limit = fullscreenLimitCB->isChecked(); + rc.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO)); + rc.screen_limit = screenLimitCB->isChecked(); } @@ -2826,15 +2893,10 @@ void PrefEdit::updateRC(LyXRC const & rc) citationSearchLE->setText(toqstr(rc.citation_search_pattern)); citationSearchLE->setEnabled(rc.citation_search); citationSearchLA->setEnabled(rc.citation_search); - toggleScrollbarCB->setChecked(rc.full_screen_scrollbar); - toggleStatusbarCB->setChecked(rc.full_screen_statusbar); - toggleToolbarsCB->setChecked(rc.full_screen_toolbars); - toggleTabbarCB->setChecked(rc.full_screen_tabbar); - toggleMenubarCB->setChecked(rc.full_screen_menubar); - fullscreenWidthSB->setValue(rc.full_screen_width); - fullscreenLimitCB->setChecked(rc.full_screen_limit); - fullscreenWidthSB->setEnabled(rc.full_screen_limit); - fullscreenWidthLA->setEnabled(rc.full_screen_limit); + lengthToWidgets(screenWidthLE, screenWidthUnitCO, rc.screen_width, Length::defaultUnit()); + screenWidthUnitCO->setEnabled(rc.screen_limit); + screenLimitCB->setChecked(rc.screen_limit); + screenWidthLE->setEnabled(rc.screen_limit); } @@ -3034,10 +3096,10 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun, QTreeWidgetItem * newItem = nullptr; // for unbind items, try to find an existing item in the system bind list if (tag == KeyMap::UserUnbind) { - QList const items = shortcutsTW->findItems(lfun_name, - Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive), 0); + QList const items = shortcutsTW->findItems(shortcut, + Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive), 1); for (auto const & item : items) { - if (item->text(1) == shortcut) { + if (item->text(0) == lfun_name || lfun == FuncRequest::unknown) { newItem = item; break; } @@ -3072,10 +3134,10 @@ QTreeWidgetItem * PrefShortcuts::insertShortcutItem(FuncRequest const & lfun, // this should not happen newItem = new QTreeWidgetItem(shortcutsTW); } + newItem->setText(0, lfun_name); + newItem->setText(1, shortcut); } - 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, tag); @@ -3304,9 +3366,10 @@ docstring makeCmdString(FuncRequest const & f) FuncRequest PrefShortcuts::currentBinding(KeySequence const & k) { FuncRequest res = user_bind_.getBinding(k); - if (res.action() != LFUN_UNKNOWN_ACTION) + if (res != FuncRequest::unknown) return res; res = system_bind_.getBinding(k); + // Check if it is unbound. Note: user_unbind_ can only unbind one // FuncRequest per key sequence. if (user_unbind_.getBinding(k) == res) @@ -3345,6 +3408,23 @@ bool PrefShortcuts::validateNewShortcut(FuncRequest const & func, // nothing to change return false; + // Check whether the key sequence is a prefix for other shortcuts. + if (oldBinding == FuncRequest::prefix) { + docstring const new_action_string = makeCmdString(func); + docstring const text = bformat(_("Shortcut `%1$s' is already a prefix for other commands.\n" + "Are you sure you want to unbind these commands and bind it to %2$s?"), + k.print(KeySequence::ForGui), new_action_string); + int ret = Alert::prompt(_("Redefine shortcut?"), + text, 0, 1, _("&Redefine"), _("&Cancel")); + if (ret != 0) + return false; + QString const sequence_text = toqstr(k.print(KeySequence::ForGui)); + QList items = shortcutsTW->findItems(sequence_text, + Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchRecursive), 1); + deactivateShortcuts(items); + return true; + } + // make sure this key isn't already bound---and, if so, prompt user // (exclude the lfun the user already wants to modify) docstring const action_string = makeCmdString(oldBinding); @@ -3394,7 +3474,8 @@ void PrefShortcuts::shortcutOkPressed() if (item) { user_bind_.bind(&k, func); shortcutsTW->sortItems(0, Qt::AscendingOrder); - item->parent()->setExpanded(true); + if (item->parent()) + item->parent()->setExpanded(true); shortcutsTW->setCurrentItem(item); shortcutsTW->scrollToItem(item); } else { @@ -3512,11 +3593,6 @@ GuiPreferences::GuiPreferences(GuiView & lv) addModule(formats); prefsPS->setCurrentPanel("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 - prefsPS->updateGeometry(); -#endif bc().setPolicy(ButtonPolicy::PreferencesPolicy); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));