case LyXRC::RC_SERVERPIPE:
case LyXRC::RC_SET_COLOR:
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_TEMPDIRPATH:
case LyXRC::RC_TEMPLATEPATH:
{ "\\serverpipe", LyXRC::RC_SERVERPIPE },
{ "\\set_color", LyXRC::RC_SET_COLOR },
{ "\\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 },
{ "\\spell_command", LyXRC::RC_SPELL_COMMAND },
{ "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
user_name = to_utf8(support::user_name());
user_email = to_utf8(support::user_email());
#ifdef __APPLE_CC__
- single_window = false;
+ open_buffers_in_tabs = false;
#else
- single_window = true;
+ open_buffers_in_tabs = true;
#endif
// Fullscreen settings
if (lexrc.next())
full_screen_width = lexrc.getInteger();
break;
- case RC_SINGLE_WINDOW:
+ case RC_OPEN_BUFFERS_IN_TABS:
if (lexrc.next())
- single_window = lexrc.getBool();
+ open_buffers_in_tabs = lexrc.getBool();
break;
case RC_LAST: break; // this is just a dummy
}
if (tag != RC_LAST)
break;
- case RC_SINGLE_WINDOW:
+ case RC_OPEN_BUFFERS_IN_TABS:
if (ignore_system_lyxrc ||
- single_window != system_lyxrc.single_window) {
- os << "\\single_window "
- << convert<string>(single_window)
+ open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
+ os << "\\open_buffers_in_tabs "
+ << convert<string>(open_buffers_in_tabs)
<< '\n';
}
if (tag != RC_LAST)
RC_SERVERPIPE,
RC_SET_COLOR,
RC_SHOW_BANNER,
- RC_SINGLE_WINDOW,
+ RC_OPEN_BUFFERS_IN_TABS,
RC_SORT_LAYOUTS,
RC_SPELL_COMMAND,
RC_TEMPDIRPATH,
bool completion_popup_text;
///
bool completion_popup_after_complete;
- /// Open new buffers in the current window as tab.
- bool single_window;
+ ///
+ bool open_buffers_in_tabs;
};
case LFUN_BUFFER_NEW:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0))
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0))
createView();
current_view_->newDocument(to_utf8(cmd.argument()), false);
break;
case LFUN_BUFFER_NEW_TEMPLATE:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView();
current_view_->newDocument(to_utf8(cmd.argument()), true);
if (!current_view_->buffer())
case LFUN_FILE_OPEN:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView();
current_view_->openDocument(to_utf8(cmd.argument()));
if (!current_view_->buffer())
rc.full_screen_tabbar = toggleTabbarCB->isChecked();
rc.full_screen_width = fullscreenWidthSB->value();
rc.full_screen_limit = fullscreenLimitGB->isChecked();
- rc.single_window = openDocumentsInTabsCB->isChecked();
+ rc.open_buffers_in_tabs = openDocumentsInTabsCB->isChecked();
}
toggleTabbarCB->setChecked(rc.full_screen_tabbar);
fullscreenWidthSB->setValue(rc.full_screen_width);
fullscreenLimitGB->setChecked(rc.full_screen_limit);
- openDocumentsInTabsCB->setChecked(rc.single_window);
+ openDocumentsInTabsCB->setChecked(rc.open_buffers_in_tabs);
}
#ifdef Q_WS_MAC
// On Mac close the view if there is no Tab open anymore,
// 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));
if (twa && twa->count() == 0) {
// close the view, as no tab is open anymore