mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 11:16:55 +00:00
remove show_banner + keyboard_shortcuts as discussed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4455 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
e9681ce03c
commit
13430adc9a
@ -1,3 +1,9 @@
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* lyxrc.h:
|
||||
* lyxrc.C:
|
||||
* lyxfunc.C: remove display_shortcuts, show_banner
|
||||
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* Buffer_pimpl.C: oops, update on resize
|
||||
|
@ -1,3 +1,7 @@
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* QWorkArea.C: remove dead splash code
|
||||
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* QContentPane.C: restore calls to workAreaResize()
|
||||
|
@ -40,14 +40,6 @@ using std::hex;
|
||||
QWorkArea::QWorkArea(int, int, int, int)
|
||||
: WorkArea(), QWidget(qApp->mainWidget()), painter_(*this)
|
||||
{
|
||||
// Add a splash screen to the centre of the work area
|
||||
string const splash_file = (lyxrc.show_banner) ?
|
||||
LibFileSearch("images", "banner", "xpm") : string();
|
||||
|
||||
if (!splash_file.empty()) {
|
||||
// FIXME
|
||||
}
|
||||
|
||||
scrollbar_ = new QScrollBar(QScrollBar::Vertical, this);
|
||||
content_ = new QContentPane(this);
|
||||
|
||||
|
@ -306,8 +306,7 @@ or similar.
|
||||
*/
|
||||
#if 0
|
||||
// Add a splash screen to the centre of the work area
|
||||
string const splash_file = (lyxrc.show_banner) ?
|
||||
LibFileSearch("images", "banner", "xpm") : string();
|
||||
string const splash_file = LibFileSearch("images", "banner", "xpm");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* FormPreferences.h:
|
||||
* FormPreferences.C:
|
||||
* forms/form_preferences.fd: remove show_banner, display_shortcuts
|
||||
|
||||
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* XWorkArea.h:
|
||||
|
@ -1825,12 +1825,9 @@ FD_preferences_lnf_misc const * FormPreferences::LnFmisc::dialog()
|
||||
|
||||
void FormPreferences::LnFmisc::apply() const
|
||||
{
|
||||
lyxrc.show_banner = fl_get_button(dialog_->check_banner);
|
||||
lyxrc.auto_region_delete =
|
||||
fl_get_button(dialog_->check_auto_region_delete);
|
||||
lyxrc.exit_confirmation = fl_get_button(dialog_->check_exit_confirm);
|
||||
lyxrc.display_shortcuts =
|
||||
fl_get_button(dialog_->check_display_shrtcuts);
|
||||
lyxrc.new_ask_filename = fl_get_button(dialog_->check_ask_new_file);
|
||||
lyxrc.cursor_follows_scrollbar =
|
||||
fl_get_button(dialog_->check_cursor_follows_scrollbar);
|
||||
@ -1869,10 +1866,8 @@ void FormPreferences::LnFmisc::build()
|
||||
fl_set_counter_return(dialog_->counter_wm_jump, FL_RETURN_CHANGED);
|
||||
|
||||
// set up the feedback mechanism
|
||||
setPrehandler(dialog_->check_banner);
|
||||
setPrehandler(dialog_->check_auto_region_delete);
|
||||
setPrehandler(dialog_->check_exit_confirm);
|
||||
setPrehandler(dialog_->check_display_shrtcuts);
|
||||
setPrehandler(dialog_->counter_autosave);
|
||||
setPrehandler(dialog_->check_ask_new_file);
|
||||
setPrehandler(dialog_->check_cursor_follows_scrollbar);
|
||||
@ -1890,14 +1885,10 @@ FormPreferences::LnFmisc::feedback(FL_OBJECT const * const ob) const
|
||||
{
|
||||
string str;
|
||||
|
||||
if (ob == dialog_->check_banner)
|
||||
str = lyxrc.getDescription(LyXRC::RC_SHOW_BANNER);
|
||||
else if (ob == dialog_->check_auto_region_delete)
|
||||
if (ob == dialog_->check_auto_region_delete)
|
||||
str = lyxrc.getDescription(LyXRC::RC_AUTOREGIONDELETE);
|
||||
else if (ob == dialog_->check_exit_confirm)
|
||||
str = lyxrc.getDescription(LyXRC::RC_EXIT_CONFIRMATION);
|
||||
else if (ob == dialog_->check_display_shrtcuts)
|
||||
str = lyxrc.getDescription(LyXRC::RC_DISPLAY_SHORTCUTS);
|
||||
else if (ob == dialog_->check_ask_new_file)
|
||||
str = lyxrc.getDescription(LyXRC::RC_NEW_ASK_FILENAME);
|
||||
else if (ob == dialog_->check_cursor_follows_scrollbar)
|
||||
@ -1920,11 +1911,9 @@ FormPreferences::LnFmisc::feedback(FL_OBJECT const * const ob) const
|
||||
|
||||
void FormPreferences::LnFmisc::update()
|
||||
{
|
||||
fl_set_button(dialog_->check_banner, lyxrc.show_banner);
|
||||
fl_set_button(dialog_->check_auto_region_delete,
|
||||
lyxrc.auto_region_delete);
|
||||
fl_set_button(dialog_->check_exit_confirm, lyxrc.exit_confirmation);
|
||||
fl_set_button(dialog_->check_display_shrtcuts, lyxrc.display_shortcuts);
|
||||
fl_set_button(dialog_->check_ask_new_file, lyxrc.new_ask_filename);
|
||||
fl_set_button(dialog_->check_cursor_follows_scrollbar,
|
||||
lyxrc.cursor_follows_scrollbar);
|
||||
|
@ -973,7 +973,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_BEGIN_GROUP
|
||||
type: 0
|
||||
box: 0 0 0 0
|
||||
box: 0 10 10 0
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1101,7 +1101,7 @@ argument: 0
|
||||
Name: form_preferences_lnf_misc
|
||||
Width: 450
|
||||
Height: 350
|
||||
Number of Objects: 19
|
||||
Number of Objects: 17
|
||||
|
||||
--------------------
|
||||
class: FL_BOX
|
||||
@ -1142,26 +1142,7 @@ argument:
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 15 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Show banner|#S
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: check_banner
|
||||
callback: C_FormBaseDeprecatedInputCB
|
||||
argument: 0
|
||||
value: 1
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 45 30 30
|
||||
box: 15 20 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1180,7 +1161,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 75 30 30
|
||||
box: 15 50 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1199,26 +1180,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 105 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
style: FL_NORMAL_STYLE
|
||||
size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Display keyboard shortcuts|#k
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
name: check_display_shrtcuts
|
||||
callback: C_FormBaseDeprecatedInputCB
|
||||
argument: 0
|
||||
value: 1
|
||||
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 135 30 30
|
||||
box: 15 80 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1237,7 +1199,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 165 30 30
|
||||
box: 15 110 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1256,7 +1218,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_CHECKBUTTON
|
||||
type: PUSH_BUTTON
|
||||
box: 15 195 30 30
|
||||
box: 15 140 30 30
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_YELLOW
|
||||
alignment: FL_ALIGN_CENTER
|
||||
@ -1319,7 +1281,7 @@ argument: 0
|
||||
--------------------
|
||||
class: FL_BEGIN_GROUP
|
||||
type: 0
|
||||
box: 0 0 0 0
|
||||
box: 0 10 10 0
|
||||
boxtype: FL_NO_BOX
|
||||
colors: FL_COL1 FL_MCOL
|
||||
alignment: FL_ALIGN_CENTER
|
||||
|
@ -785,8 +785,7 @@ void LyXFunc::verboseDispatch(kb_action action,
|
||||
|
||||
commandshortcut.erase();
|
||||
|
||||
if (lyxrc.display_shortcuts && show_sc) {
|
||||
if (action != LFUN_SELFINSERT) {
|
||||
if (show_sc && action != LFUN_SELFINSERT) {
|
||||
// Put name of command and list of shortcuts
|
||||
// for it in minibuffer
|
||||
string comname = lyxaction.getActionName(action);
|
||||
@ -822,7 +821,6 @@ void LyXFunc::verboseDispatch(kb_action action,
|
||||
commandshortcut = "(" + comname + ')';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (res.empty()) {
|
||||
if (!commandshortcut.empty()) {
|
||||
|
29
src/lyxrc.C
29
src/lyxrc.C
@ -66,7 +66,6 @@ keyword_item lyxrcTags[] = {
|
||||
{ "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE },
|
||||
{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
|
||||
{ "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
|
||||
{ "\\display_shortcuts", LyXRC::RC_DISPLAY_SHORTCUTS },
|
||||
{ "\\document_path", LyXRC::RC_DOCUMENTPATH },
|
||||
{ "\\escape_chars", LyXRC::RC_ESC_CHARS },
|
||||
{ "\\exit_confirmation", LyXRC::RC_EXIT_CONFIRMATION },
|
||||
@ -131,7 +130,6 @@ keyword_item lyxrcTags[] = {
|
||||
{ "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM },
|
||||
{ "\\serverpipe", LyXRC::RC_SERVERPIPE },
|
||||
{ "\\set_color", LyXRC::RC_SET_COLOR },
|
||||
{ "\\show_banner", LyXRC::RC_SHOW_BANNER },
|
||||
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND },
|
||||
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
|
||||
{ "\\template_path", LyXRC::RC_TEMPLATEPATH },
|
||||
@ -225,7 +223,6 @@ void LyXRC::setDefaults() {
|
||||
backupdir_path.erase();
|
||||
exit_confirmation = true;
|
||||
display_graphics = "color";
|
||||
display_shortcuts = true;
|
||||
// Spellchecker settings:
|
||||
#ifdef USE_PSPELL
|
||||
use_pspell = true;
|
||||
@ -253,7 +250,6 @@ void LyXRC::setDefaults() {
|
||||
|
||||
//
|
||||
date_insert_format = "%A, %e %B %Y";
|
||||
show_banner = true;
|
||||
cursor_follows_scrollbar = false;
|
||||
dialogs_iconify_with_main = false;
|
||||
label_init_length = 3;
|
||||
@ -361,11 +357,6 @@ int LyXRC::read(string const & filename)
|
||||
display_graphics = lexrc.getString();
|
||||
break;
|
||||
|
||||
case RC_DISPLAY_SHORTCUTS:
|
||||
if (lexrc.next())
|
||||
display_shortcuts = lexrc.getBool();
|
||||
break;
|
||||
|
||||
case RC_KBMAP:
|
||||
if (lexrc.next())
|
||||
use_kbmap = lexrc.getBool();
|
||||
@ -882,10 +873,6 @@ int LyXRC::read(string const & filename)
|
||||
if (lexrc.next())
|
||||
mark_foreign_language = lexrc.getBool();
|
||||
break;
|
||||
case RC_SHOW_BANNER:
|
||||
if (lexrc.next())
|
||||
show_banner = lexrc.getBool();
|
||||
break;
|
||||
|
||||
case RC_NEW_ASK_FILENAME:
|
||||
if (lexrc.next())
|
||||
@ -1015,11 +1002,6 @@ void LyXRC::output(ostream & os) const
|
||||
<< "# MISC SECTION ######################################\n"
|
||||
<< "#\n\n";
|
||||
|
||||
case RC_SHOW_BANNER:
|
||||
if (show_banner != system_lyxrc.show_banner) {
|
||||
os << "# Set to false to inhibit the startup banner.\n"
|
||||
<< "\\show_banner " << tostr(show_banner) << "\n";
|
||||
}
|
||||
// bind files are not done here.
|
||||
case RC_UIFILE:
|
||||
if (ui_file != system_lyxrc.ui_file) {
|
||||
@ -1059,13 +1041,6 @@ void LyXRC::output(ostream & os) const
|
||||
<< "\n";
|
||||
}
|
||||
|
||||
case RC_DISPLAY_SHORTCUTS:
|
||||
if (display_shortcuts != system_lyxrc.display_shortcuts) {
|
||||
os << "# Display name of the last command executed,\n"
|
||||
<< "# with a list of short-cuts in the minibuffer.\n"
|
||||
<< "\\display_shortcuts " << tostr(display_shortcuts)
|
||||
<< "\n";
|
||||
}
|
||||
case RC_VIEWDVI_PAPEROPTION:
|
||||
if (view_dvi_paper_option
|
||||
!= system_lyxrc.view_dvi_paper_option) {
|
||||
@ -1919,10 +1894,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
|
||||
str = _("Select how LyX will display any graphics.");
|
||||
break;
|
||||
|
||||
case RC_DISPLAY_SHORTCUTS:
|
||||
str = _("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow.");
|
||||
break;
|
||||
|
||||
case RC_MAKE_BACKUP:
|
||||
str = _("De-select if you don't want LyX to create backup files.");
|
||||
break;
|
||||
|
@ -97,7 +97,6 @@ enum LyXRCTags {
|
||||
RC_CURSOR_FOLLOWS_SCROLLBAR,
|
||||
RC_DIALOGS_ICONIFY_WITH_MAIN,
|
||||
RC_EXIT_CONFIRMATION,
|
||||
RC_DISPLAY_SHORTCUTS,
|
||||
RC_MAKE_BACKUP,
|
||||
RC_BACKUPDIR_PATH,
|
||||
RC_RTL_SUPPORT,
|
||||
@ -302,8 +301,6 @@ enum LyXRCTags {
|
||||
bool use_kbmap;
|
||||
/// Ask for confirmation of exit when there are unsaved documents?
|
||||
bool exit_confirmation;
|
||||
/// Should we display short-cut information in the minibuffer?
|
||||
bool display_shortcuts;
|
||||
///
|
||||
string primary_kbmap;
|
||||
///
|
||||
@ -334,8 +331,6 @@ enum LyXRCTags {
|
||||
bool auto_number;
|
||||
///
|
||||
bool mark_foreign_language;
|
||||
///
|
||||
bool show_banner;
|
||||
/// Do we have to use a GUI?
|
||||
bool use_gui;
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user