anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 05:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Use open_buffers_in_tabs instead of single_window. The latter even confused me.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23737 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-03-14 23:27:31 +00:00
parent 5496ff053f
commit 25e0113c9c
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LyXFunc.cpp
View File

@ -1976,7 +1976,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_SERVERPIPE: case LyXRC::RC_SERVERPIPE:
case LyXRC::RC_SET_COLOR: case LyXRC::RC_SET_COLOR:
case LyXRC::RC_SHOW_BANNER: case LyXRC::RC_SHOW_BANNER:
case LyXRC::RC_SINGLE_WINDOW: case LyXRC::RC_OPEN_BUFFERS_IN_TABS:
case LyXRC::RC_SPELL_COMMAND: case LyXRC::RC_SPELL_COMMAND:
case LyXRC::RC_TEMPDIRPATH: case LyXRC::RC_TEMPDIRPATH:
case LyXRC::RC_TEMPLATEPATH: case LyXRC::RC_TEMPLATEPATH:

18
src/LyXRC.cpp
View File

@ -153,7 +153,7 @@ keyword_item lyxrcTags[] = {
{ "\\serverpipe", LyXRC::RC_SERVERPIPE }, { "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR }, { "\\set_color", LyXRC::RC_SET_COLOR },
{ "\\show_banner", LyXRC::RC_SHOW_BANNER }, { "\\show_banner", LyXRC::RC_SHOW_BANNER },
{ "\\single_window", LyXRC::RC_SINGLE_WINDOW }, { "\\open_buffers_in_tabs", LyXRC::RC_OPEN_BUFFERS_IN_TABS },
{ "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS }, { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND }, { "\\spell_command", LyXRC::RC_SPELL_COMMAND },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH }, { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
@ -294,9 +294,9 @@ void LyXRC::setDefaults() {
user_name = to_utf8(support::user_name()); user_name = to_utf8(support::user_name());
user_email = to_utf8(support::user_email()); user_email = to_utf8(support::user_email());
#ifdef __APPLE_CC__ #ifdef __APPLE_CC__
single_window = false; open_buffers_in_tabs = false;
#else #else
single_window = true; open_buffers_in_tabs = true;
#endif #endif
// Fullscreen settings // Fullscreen settings
@ -1302,9 +1302,9 @@ int LyXRC::read(Lexer & lexrc)
if (lexrc.next()) if (lexrc.next())
full_screen_width = lexrc.getInteger(); full_screen_width = lexrc.getInteger();
break; break;
case RC_SINGLE_WINDOW: case RC_OPEN_BUFFERS_IN_TABS:
if (lexrc.next()) if (lexrc.next())
single_window = lexrc.getBool(); open_buffers_in_tabs = lexrc.getBool();
break; break;
case RC_LAST: break; // this is just a dummy case RC_LAST: break; // this is just a dummy
@ -1884,11 +1884,11 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
case RC_SINGLE_WINDOW: case RC_OPEN_BUFFERS_IN_TABS:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
single_window != system_lyxrc.single_window) { open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
os << "\\single_window " os << "\\open_buffers_in_tabs "
<< convert<string>(single_window) << convert<string>(open_buffers_in_tabs)
<< '\n'; << '\n';
} }
if (tag != RC_LAST) if (tag != RC_LAST)

6
src/LyXRC.h
View File

@ -138,7 +138,7 @@ public:
RC_SERVERPIPE, RC_SERVERPIPE,
RC_SET_COLOR, RC_SET_COLOR,
RC_SHOW_BANNER, RC_SHOW_BANNER,
RC_SINGLE_WINDOW, RC_OPEN_BUFFERS_IN_TABS,
RC_SORT_LAYOUTS, RC_SORT_LAYOUTS,
RC_SPELL_COMMAND, RC_SPELL_COMMAND,
RC_TEMPDIRPATH, RC_TEMPDIRPATH,
@ -437,8 +437,8 @@ public:
bool completion_popup_text; bool completion_popup_text;
/// ///
bool completion_popup_after_complete; bool completion_popup_after_complete;
/// Open new buffers in the current window as tab. ///
bool single_window; bool open_buffers_in_tabs;
}; };

6
src/frontends/qt4/GuiApplication.cpp
View File

@ -318,14 +318,14 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
case LFUN_BUFFER_NEW: case LFUN_BUFFER_NEW:
if (viewCount() == 0 if (viewCount() == 0
|| (!lyxrc.single_window && current_view_->buffer() != 0)) || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0))
createView(); createView();
current_view_->newDocument(to_utf8(cmd.argument()), false); current_view_->newDocument(to_utf8(cmd.argument()), false);
break; break;
case LFUN_BUFFER_NEW_TEMPLATE: case LFUN_BUFFER_NEW_TEMPLATE:
if (viewCount() == 0 if (viewCount() == 0
|| (!lyxrc.single_window && current_view_->buffer() != 0)) { || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView(); createView();
current_view_->newDocument(to_utf8(cmd.argument()), true); current_view_->newDocument(to_utf8(cmd.argument()), true);
if (!current_view_->buffer()) if (!current_view_->buffer())
@ -336,7 +336,7 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
case LFUN_FILE_OPEN: case LFUN_FILE_OPEN:
if (viewCount() == 0 if (viewCount() == 0
|| (!lyxrc.single_window && current_view_->buffer() != 0)) { || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView(); createView();
current_view_->openDocument(to_utf8(cmd.argument())); current_view_->openDocument(to_utf8(cmd.argument()));
if (!current_view_->buffer()) if (!current_view_->buffer())

4
src/frontends/qt4/GuiPrefs.cpp
View File

@ -1848,7 +1848,7 @@ void PrefUserInterface::apply(LyXRC & rc) const
rc.full_screen_tabbar = toggleTabbarCB->isChecked(); rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_width = fullscreenWidthSB->value(); rc.full_screen_width = fullscreenWidthSB->value();
rc.full_screen_limit = fullscreenLimitGB->isChecked(); rc.full_screen_limit = fullscreenLimitGB->isChecked();
rc.single_window = openDocumentsInTabsCB->isChecked(); rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
} }
@ -1875,7 +1875,7 @@ void PrefUserInterface::update(LyXRC const & rc)
toggleTabbarCB->setChecked(rc.full_screen_tabbar); toggleTabbarCB->setChecked(rc.full_screen_tabbar);
fullscreenWidthSB->setValue(rc.full_screen_width); fullscreenWidthSB->setValue(rc.full_screen_width);
fullscreenLimitGB->setChecked(rc.full_screen_limit); fullscreenLimitGB->setChecked(rc.full_screen_limit);
openDocumentsInTabsCB->setChecked(rc.single_window); openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
} }

2
src/frontends/qt4/GuiView.cpp
View File

@ -543,7 +543,7 @@ void GuiView::on_lastWorkAreaRemoved()
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
// On Mac close the view if there is no Tab open anymore, // On Mac close the view if there is no Tab open anymore,
// but only if no splitter is visible // but only if no splitter is visible
if (!lyxrc.single_window && d.splitter_->count() == 1) { if (!lyxrc.open_buffers_in_tabs && d.splitter_->count() == 1) {
TabWorkArea * twa = qobject_cast<TabWorkArea *>(d.splitter_->widget(0)); TabWorkArea * twa = qobject_cast<TabWorkArea *>(d.splitter_->widget(0));
if (twa && twa->count() == 0) { if (twa && twa->count() == 0) {
// close the view, as no tab is open anymore // close the view, as no tab is open anymore