toqstr(makeRelPath(qstring_to_ucs4(outname), qstring_to_ucs4(relpath)));
QString testname = reloutname;
-#if QT_VERSION < 0x060000
- testname.remove(QRegExp("^(\\.\\./)+"));
-#else
testname.remove(QRegularExpression("^(\\.\\./)+"));
-#endif
if (testname.contains("/"))
return outname;
}
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();
startCommandED->setValidator(new NoNewLineValidator(startCommandED));
endCommandED->setValidator(new NoNewLineValidator(endCommandED));
-#if QT_VERSION < 0x060000
- defaultDecimalSepED->setValidator(new QRegExpValidator(QRegExp("\\S"), this));
-#else
defaultDecimalSepED->setValidator(new QRegularExpressionValidator(QRegularExpression("\\S"), this));
-#endif
defaultDecimalSepED->setMaxLength(1);
defaultLengthUnitCO->addItem(lyx::qt_(unit_name_gui[Length::CM]), Length::CM);
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());
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();
}
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);
}
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));
+ }
}
this, SIGNAL(changed()));
connect(screenWidthUnitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)),
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()));
}
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.screen_width = Length(widgetsToLength(screenWidthLE, screenWidthUnitCO));
rc.screen_limit = screenLimitCB->isChecked();
}
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);
lengthToWidgets(screenWidthLE, screenWidthUnitCO, rc.screen_width, Length::defaultUnit());
screenWidthUnitCO->setEnabled(rc.screen_limit);
screenLimitCB->setChecked(rc.screen_limit);
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)
// 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<QTreeWidgetItem*> 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);
projects / lyx.git / blobdiff