#include "Dialog.h"
#include "FileDialog.h"
#include "GuiApplication.h"
+#include "GuiCompleter.h"
#include "GuiWorkArea.h"
#include "GuiKeySymbol.h"
#include "GuiToolbar.h"
#include "BufferView.h"
#include "Converter.h"
#include "Cursor.h"
+#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
+#include "FuncStatus.h"
#include "FuncRequest.h"
-#include "support/gettext.h"
#include "Intl.h"
#include "Layout.h"
#include "Lexer.h"
#include "ToolbarBackend.h"
#include "version.h"
+#include "support/assert.h"
#include "support/debug.h"
-#include "support/FileFilterList.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/ForkedCalls.h"
#include "support/lstrings.h"
#include "support/os.h"
#include <QTimer>
#include <QToolBar>
#include <QUrl>
+#include <QScrollBar>
-#include <boost/assert.hpp>
#include <boost/bind.hpp>
#ifdef HAVE_SYS_TIME_H
using namespace lyx::support;
namespace lyx {
-
-extern bool quitting;
-
namespace frontend {
namespace {
{
LYXERR(Debug::GUI, "show banner: " << lyxrc.show_banner);
/// The text to be written on top of the pixmap
- QString const text = lyx_version ? lyx_version : qt_("unknown version");
+ QString const text = lyx_version ?
+ qt_("version ") + lyx_version : qt_("unknown version");
splash_ = QPixmap(":/images/banner.png");
QPainter pain(&splash_);
- pain.setPen(QColor(255, 255, 0));
+ pain.setPen(QColor(0, 0, 0));
QFont font;
// The font used to display the version info
font.setStyleHint(QFont::SansSerif);
font.setWeight(QFont::Bold);
font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble()));
pain.setFont(font);
- pain.drawText(260, 270, text);
+ pain.drawText(190, 225, text);
}
void paintEvent(QPaintEvent *)
struct GuiView::GuiViewPrivate
{
GuiViewPrivate()
- : current_work_area_(0), layout_(0),
- quitting_by_menu_(false), autosave_timeout_(5000), in_show_(false)
+ : current_work_area_(0), layout_(0), autosave_timeout_(5000),
+ in_show_(false)
{
// hardcode here the platform specific icon size
smallIconSize = 14; // scaling problems
// The first TabWorkArea is always the first one, if any.
return tabWorkArea(0);
- TabWorkArea * tab_widget = 0;
for (int i = 0; i != splitter_->count(); ++i) {
- QWidget * w = splitter_->widget(i);
- if (!w->hasFocus())
- continue;
- tab_widget = dynamic_cast<TabWorkArea *>(w);
- if (tab_widget)
- break;
+ TabWorkArea * twa = tabWorkArea(i);
+ if (current_work_area_ == twa->currentWorkArea())
+ return twa;
}
- return tab_widget;
+ // None has the focus so we just take the first one.
+ return tabWorkArea(0);
}
public:
unsigned int bigIconSize;
///
QTimer statusbar_timer_;
- /// are we quitting by the menu?
- bool quitting_by_menu_;
/// auto-saving of buffers
Timeout autosave_timeout_;
/// flag against a race condition due to multiclicks, see bug #1119
// GuiToolbars *must* be initialised before the menu bar.
d.toolbars_ = new GuiToolbars(*this);
+ // set ourself as the current view. This is needed for the menu bar
+ // filling, at least for the static special menu item on Mac. Otherwise
+ // they are greyed out.
+ theLyXFunc().setLyXView(this);
+
// Fill up the menu bar.
- guiApp->menus().fillMenuBar(this);
+ guiApp->menus().fillMenuBar(menuBar(), this, true);
setCentralWidget(d.stack_widget_);
connect(&d.statusbar_timer_, SIGNAL(timeout()),
this, SLOT(clearMessage()));
- // Qt bug? signal lastWindowClosed does not work
- setAttribute(Qt::WA_QuitOnClose, false);
+ // We don't want to keep the window in memory if it is closed.
setAttribute(Qt::WA_DeleteOnClose, true);
-#ifndef Q_WS_MACX
- // assign an icon to main form. We do not do it under Qt/Mac,
+
+#if (!defined(Q_WS_WIN) && !defined(Q_WS_MACX))
+ // assign an icon to main form. We do not do it under Qt/Win or Qt/Mac,
// since the icon is provided in the application bundle.
setWindowIcon(QPixmap(":/images/lyx.png"));
#endif
GuiView::~GuiView()
{
+ if (guiApp->currentView() == this)
+ guiApp->setCurrentView(0);
+ theLyXFunc().setLyXView(0);
+
delete &d;
}
-void GuiView::close()
-{
- d.quitting_by_menu_ = true;
- d.current_work_area_ = 0;
- for (int i = 0; i != d.splitter_->count(); ++i) {
- TabWorkArea * twa = d.tabWorkArea(i);
- if (twa)
- twa->closeAll();
- }
- QMainWindow::close();
- d.quitting_by_menu_ = false;
-}
-
-
void GuiView::setFocus()
{
if (d.current_work_area_)
void GuiView::closeEvent(QCloseEvent * close_event)
{
- // we may have been called through the close window button
- // which bypasses the LFUN machinery.
- if (!d.quitting_by_menu_ && guiApp->viewCount() == 1) {
- if (!quitWriteAll()) {
+ // it can happen that this event arrives without selecting the view,
+ // e.g. when clicking the close button on a background window.
+ theLyXFunc().setLyXView(this);
+
+ while (Buffer * b = buffer()) {
+ if (b->parent()) {
+ // This is a child document, just close the tab after saving
+ // but keep the file loaded.
+ if (!saveBuffer(*b)) {
+ close_event->ignore();
+ return;
+ }
+ removeWorkArea(d.current_work_area_);
+ continue;
+ }
+
+ std::vector<int> const & ids = guiApp->viewIds();
+ for (size_type i = 0; i != ids.size(); ++i) {
+ if (id_ == ids[i])
+ continue;
+ if (guiApp->view(ids[i]).workArea(*b)) {
+ // FIXME 1: should we put an alert box here that the buffer
+ // is viewed elsewhere?
+ // FIXME 2: should we try to save this buffer in any case?
+ //saveBuffer(b);
+
+ // This buffer is also opened in another view, so
+ // but close the associated work area nevertheless.
+ removeWorkArea(d.current_work_area_);
+ // but don't close it.
+ b = 0;
+ break;
+ }
+ }
+ if (b && !closeBuffer(*b, true)) {
close_event->ignore();
return;
}
// Make sure that no LFUN use this close to be closed View.
theLyXFunc().setLyXView(0);
+
+ // Save toolbars configuration
+ if (isFullScreen()) {
+ d.toolbars_->toggleFullScreen(!isFullScreen());
+ updateToolbars();
+ }
+
// Make sure the timer time out will not trigger a statusbar update.
d.statusbar_timer_.stop();
- if (lyxrc.allow_geometry_session) {
+ // Saving fullscreen requires additional tweaks in the toolbar code.
+ // It wouldn't also work under linux natively.
+ if (lyxrc.allow_geometry_session && !isFullScreen()) {
QSettings settings;
QString const key = "view-" + QString::number(id_);
#ifdef Q_WS_X11
}
guiApp->unregisterView(id_);
- if (guiApp->viewCount() > 0) {
- // Just close the window and do nothing else if this is not the
- // last window.
- close_event->accept();
- return;
- }
-
- quitting = true;
-
- // this is the place where we leave the frontend.
- // it is the only point at which we start quitting.
close_event->accept();
- // quit the event loop
- qApp->quit();
}
}
+void GuiView::on_lastWorkAreaRemoved()
+{
+#ifdef Q_WS_MACX
+ // On Mac close the view if there is no Tab open anymore,
+ // but only if no splitter is visible
+ 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
+ QTimer::singleShot(0, this, SLOT(close()));
+ }
+ }
+#endif
+}
+
+
void GuiView::updateStatusBar()
{
// let the user see the explicit message
if (d.statusbar_timer_.isActive())
return;
+ theLyXFunc().setLyXView(this);
statusBar()->showMessage(toqstr(theLyXFunc().viewStatusMessage()));
}
// break;
case QEvent::WindowActivate: {
- guiApp->setCurrentView(*this);
+ if (this == guiApp->currentView()) {
+ setFocus();
+ return QMainWindow::event(e);
+ }
+ guiApp->setCurrentView(this);
if (d.current_work_area_) {
BufferView & bv = d.current_work_area_->bufferView();
connectBufferView(bv);
setWindowTitle(qt_("LyX"));
setWindowIconText(qt_("LyX"));
}
+ setFocus();
return QMainWindow::event(e);
}
GuiWorkArea * GuiView::workArea(Buffer & buffer)
{
- for (int i = 0; i != d.splitter_->count(); ++i) {
- GuiWorkArea * wa = d.tabWorkArea(i)->workArea(buffer);
- if (wa)
- return wa;
- }
+ if (TabWorkArea * twa = d.currentTabWorkArea())
+ return twa->workArea(buffer);
return 0;
}
GuiWorkArea * GuiView::addWorkArea(Buffer & buffer)
{
-
// Automatically create a TabWorkArea if there are none yet.
- if (!d.splitter_->count())
- addTabWorkArea();
-
- TabWorkArea * tab_widget = d.currentTabWorkArea();
+ TabWorkArea * tab_widget = d.splitter_->count()
+ ? d.currentTabWorkArea() : addTabWorkArea();
return tab_widget->addWorkArea(buffer, *this);
}
-void GuiView::addTabWorkArea()
+TabWorkArea * GuiView::addTabWorkArea()
{
TabWorkArea * twa = new TabWorkArea;
QObject::connect(twa, SIGNAL(currentWorkAreaChanged(GuiWorkArea *)),
this, SLOT(on_currentWorkAreaChanged(GuiWorkArea *)));
+ QObject::connect(twa, SIGNAL(lastWorkAreaRemoved()),
+ this, SLOT(on_lastWorkAreaRemoved()));
+
d.splitter_->addWidget(twa);
d.stack_widget_->setCurrentWidget(d.splitter_);
+ return twa;
}
void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
{
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
// Changing work area can result from opening a file so
// update the toc in any case.
void GuiView::removeWorkArea(GuiWorkArea * wa)
{
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
if (wa == d.current_work_area_) {
disconnectBuffer();
disconnectBufferView();
- hideBufferDependent();
d.current_work_area_ = 0;
}
void GuiView::setBuffer(Buffer * newBuffer)
{
- BOOST_ASSERT(newBuffer);
+ LASSERT(newBuffer, /**/);
setBusy(true);
GuiWorkArea * wa = workArea(*newBuffer);
}
-void GuiView::updateEmbeddedFiles()
-{
- updateDialog("embedding", "");
-}
-
-
void GuiView::autoSave()
{
LYXERR(Debug::INFO, "Running autoSave()");
enable = buf;
break;
+ case LFUN_SPLIT_VIEW:
+ enable = buf;
+ break;
+
+ case LFUN_CLOSE_TAB_GROUP:
+ enable = d.currentTabWorkArea();
+ break;
+
case LFUN_TOOLBAR_TOGGLE:
flag.setOnOff(d.toolbars_->visible(cmd.getArg(0)));
break;
+ case LFUN_UI_TOGGLE:
+ flag.setOnOff(isFullScreen());
+ break;
+
case LFUN_DIALOG_TOGGLE:
flag.setOnOff(isDialogVisible(cmd.getArg(0)));
// fall through to set "enable"
FuncStatus fs;
if (!inset->getStatus(view()->cursor(), fr, fs)) {
// Every inset is supposed to handle this
- BOOST_ASSERT(false);
+ LASSERT(false, /**/);
}
flag |= fs;
} else {
break;
}
+ case LFUN_COMPLETION_INLINE:
+ if (!d.current_work_area_
+ || !d.current_work_area_->completer().inlinePossible(view()->cursor()))
+ enable = false;
+ break;
+
+ case LFUN_COMPLETION_POPUP:
+ if (!d.current_work_area_
+ || !d.current_work_area_->completer().popupPossible(view()->cursor()))
+ enable = false;
+ break;
+
+ case LFUN_COMPLETION_COMPLETE:
+ if (!d.current_work_area_
+ || !d.current_work_area_->completer().inlinePossible(view()->cursor()))
+ enable = false;
+ break;
+
default:
if (!view()) {
enable = false;
static FileName selectTemplateFile()
{
- FileDialog dlg(_("Select template file"));
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton1(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
+ FileDialog dlg(qt_("Select template file"));
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton1(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
- FileDialog::Result result =
- dlg.open(from_utf8(lyxrc.template_path),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
+ FileDialog::Result result = dlg.open(toqstr(lyxrc.template_path),
+ QStringList(qt_("LyX Documents (*.lyx)")));
if (result.first == FileDialog::Later)
return FileName();
- if (result.second.empty())
+ if (result.second.isEmpty())
return FileName();
- return FileName(to_utf8(result.second));
+ return FileName(fromqstr(result.second));
}
setBusy(false);
return 0;
}
-
+
setBuffer(newBuffer);
// scroll to the position when the file was last closed
string filename;
if (fname.empty()) {
- FileDialog dlg(_("Select document to open"), LFUN_FILE_OPEN);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(), "examples")));
+ FileDialog dlg(qt_("Select document to open"), LFUN_FILE_OPEN);
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton2(qt_("Examples|#E#e"),
+ toqstr(addPath(package().system_support().absFilename(), "examples")));
FileDialog::Result result =
- dlg.open(from_utf8(initpath),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
+ dlg.open(toqstr(initpath), QStringList(qt_("LyX Documents (*.lyx)")));
if (result.first == FileDialog::Later)
return;
- filename = to_utf8(result.second);
+ filename = fromqstr(result.second);
// check selected filename
if (filename.empty()) {
Buffer * buf = loadDocument(fullname);
if (buf) {
updateLabels(*buf);
+
setBuffer(buf);
buf->errors("Parse");
str2 = bformat(_("Document %1$s opened."), disp_fn);
static bool import(GuiView * lv, FileName const & filename,
string const & format, ErrorList & errorList)
{
- FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
+ FileName const lyxfile(support::changeExtension(filename.absFilename(), ".lyx"));
string loader_format;
vector<string> loaders = theConverters().loaders();
continue;
string const tofile =
- changeExtension(filename.absFilename(),
+ support::changeExtension(filename.absFilename(),
formats.extension(*it));
if (!theConverters().convert(0, filename, FileName(tofile),
filename, format, *it, errorList))
lv->setBuffer(b);
bool as_paragraphs = loader_format == "textparagraph";
string filename2 = (loader_format == format) ? filename.absFilename()
- : changeExtension(filename.absFilename(),
+ : support::changeExtension(filename.absFilename(),
formats.extension(loader_format));
lv->view()->insertPlaintextFile(FileName(filename2), as_paragraphs);
theLyXFunc().setLyXView(lv);
docstring const text = bformat(_("Select %1$s file to import"),
formats.prettyName(format));
- FileDialog dlg(text, LFUN_BUFFER_IMPORT);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(), "examples")));
+ FileDialog dlg(toqstr(text), LFUN_BUFFER_IMPORT);
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton2(qt_("Examples|#E#e"),
+ toqstr(addPath(package().system_support().absFilename(), "examples")));
docstring filter = formats.prettyName(format);
filter += " (*.";
filter += ')';
FileDialog::Result result =
- dlg.open(from_utf8(initpath),
- FileFilterList(filter),
- docstring());
+ dlg.open(toqstr(initpath), fileFilters(toqstr(filter)));
if (result.first == FileDialog::Later)
return;
- filename = to_utf8(result.second);
+ filename = fromqstr(result.second);
// check selected filename
if (filename.empty())
return;
// get absolute path of file
- FileName const fullname(makeAbsPath(filename));
+ FileName const fullname(support::makeAbsPath(filename));
- FileName const lyxfile(changeExtension(fullname.absFilename(), ".lyx"));
+ FileName const lyxfile(support::changeExtension(fullname.absFilename(), ".lyx"));
// Check if the document already is open
Buffer * buf = theBufferList().getBuffer(lyxfile.absFilename());
initpath = trypath;
// FIXME UNICODE
- FileDialog dlg(_("Select LyX document to insert"), LFUN_FILE_INSERT);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(),
+ FileDialog dlg(qt_("Select LyX document to insert"), LFUN_FILE_INSERT);
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton2(qt_("Examples|#E#e"),
+ toqstr(addPath(package().system_support().absFilename(),
"examples")));
- FileDialog::Result result =
- dlg.open(from_utf8(initpath),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
+ FileDialog::Result result = dlg.open(toqstr(initpath),
+ QStringList(qt_("LyX Documents (*.lyx)")));
if (result.first == FileDialog::Later)
return;
// FIXME UNICODE
- filename.set(to_utf8(result.second));
+ filename.set(fromqstr(result.second));
// check selected filename
if (filename.empty()) {
return;
}
- FileDialog dlg(_("Select file to insert"), (asParagraph ?
+ FileDialog dlg(qt_("Select file to insert"), (asParagraph ?
LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT));
- FileDialog::Result result = dlg.open(from_utf8(bv->buffer().filePath()),
- FileFilterList(), docstring());
+ FileDialog::Result result = dlg.open(toqstr(bv->buffer().filePath()),
+ QStringList());
if (result.first == FileDialog::Later)
return;
// FIXME UNICODE
- filename.set(to_utf8(result.second));
+ filename.set(fromqstr(result.second));
// check selected filename
if (filename.empty()) {
if (!newname.empty()) {
// FIXME UNICODE
- fname = makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
+ fname = support::makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
} else {
// Switch to this Buffer.
setBuffer(&b);
/// No argument? Ask user through dialog.
// FIXME UNICODE
- FileDialog dlg(_("Choose a filename to save document as"),
+ FileDialog dlg(qt_("Choose a filename to save document as"),
LFUN_BUFFER_WRITE_AS);
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton2(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+ dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
if (!isLyXFilename(fname.absFilename()))
fname.changeExtension(".lyx");
- FileFilterList const filter(_("LyX Documents (*.lyx)"));
-
FileDialog::Result result =
- dlg.save(from_utf8(fname.onlyPath().absFilename()),
- filter,
- from_utf8(fname.onlyFileName()));
+ dlg.save(toqstr(fname.onlyPath().absFilename()),
+ QStringList(qt_("LyX Documents (*.lyx)")),
+ toqstr(fname.onlyFileName()));
if (result.first == FileDialog::Later)
return false;
- fname.set(to_utf8(result.second));
+ fname.set(fromqstr(result.second));
if (fname.empty())
return false;
}
-bool GuiView::closeBuffer(Buffer & buf)
+bool GuiView::closeBuffer(Buffer & buf, bool tolastopened)
{
+ // goto bookmark to update bookmark pit.
+ //FIXME: we should update only the bookmarks related to this buffer!
+ for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+ theLyXFunc().gotoBookmark(i+1, false, false);
+
if (buf.isClean() || buf.paragraphs().empty()) {
+ if (buf.masterBuffer() == &buf && tolastopened)
+ LyX::ref().session().lastOpened().add(buf.fileName());
theBufferList().release(&buf);
return true;
}
else
file = buf.fileName().displayName(30);
+ // Bring this window to top before asking questions.
+ raise();
+ activateWindow();
+
docstring const text = bformat(_("The document %1$s has unsaved changes."
"\n\nDo you want to save the document or discard the changes?"), file);
int const ret = Alert::prompt(_("Save changed document?"),
// save file names to .lyx/session
// if master/slave are both open, do not save slave since it
// will be automatically loaded when the master is loaded
- if (buf.masterBuffer() == &buf)
+ if (buf.masterBuffer() == &buf && tolastopened)
LyX::ref().session().lastOpened().add(buf.fileName());
theBufferList().release(&buf);
}
-bool GuiView::quitWriteAll()
-{
- while (!theBufferList().empty()) {
- Buffer * b = theBufferList().first();
- if (!closeBuffer(*b))
- return false;
- }
- return true;
-}
-
-
bool GuiView::dispatch(FuncRequest const & cmd)
{
BufferView * bv = view();
bv->cursor().updateFlags(Update::None);
switch(cmd.action) {
- case LFUN_FILE_OPEN:
- openDocument(to_utf8(cmd.argument()));
- break;
-
case LFUN_BUFFER_IMPORT:
importDocument(to_utf8(cmd.argument()));
break;
break;
case LFUN_MENU_OPEN:
- if (QMenu * menu = guiApp->menus().menu(toqstr(cmd.argument())))
+ if (QMenu * menu = guiApp->menus().menu(toqstr(cmd.argument()), *this))
menu->exec(QCursor::pos());
break;
// We cannot use a for loop as the buffer list cycles.
Buffer * b = first;
do {
- if (b->isClean())
- continue;
- saveBuffer(*b);
- LYXERR(Debug::ACTION, "Saved " << b->absFileName());
+ if (!b->isClean()) {
+ saveBuffer(*b);
+ LYXERR(Debug::ACTION, "Saved " << b->absFileName());
+ }
b = theBufferList().next(b);
} while (b != first);
message(_("All documents saved."));
break;
case LFUN_DIALOG_HIDE: {
- if (quitting)
- break;
guiApp->hideDialogs(to_utf8(cmd.argument()), 0);
break;
}
break;
}
- case LFUN_UI_TOGGLE: {
- string const arg = cmd.getArg(0);
- if (arg == "statusbar")
- statusBar()->setVisible(!statusBar()->isVisible());
- else if (arg == "menubar")
- menuBar()->setVisible(!menuBar()->isVisible());
-#if QT_VERSION >= 0x040300
- else if (arg == "frame") {
- int l, t, r, b;
- getContentsMargins(&l, &t, &r, &b);
- //are the frames in default state?
- if (l == 0) {
- d.current_work_area_->setFrameStyle(QFrame::NoFrame);
- setContentsMargins(-2, -2, -2, -2);
- } else {
- d.current_work_area_->setFrameStyle(QFrame::NoFrame);
- setContentsMargins(0, 0, 0, 0);
- }
+ case LFUN_UI_TOGGLE:
+ lfunUiToggle(cmd);
+ // Make sure the keyboard focus stays in the work area.
+ setFocus();
+ break;
+
+ case LFUN_COMPLETION_INLINE:
+ if (d.current_work_area_)
+ d.current_work_area_->completer().showInline();
+ break;
+
+ case LFUN_SPLIT_VIEW:
+ if (Buffer * buf = buffer()) {
+ string const orientation = cmd.getArg(0);
+ d.splitter_->setOrientation(orientation == "vertical"
+ ? Qt::Vertical : Qt::Horizontal);
+ TabWorkArea * twa = addTabWorkArea();
+ GuiWorkArea * wa = twa->addWorkArea(*buf, *this);
+ setCurrentWorkArea(wa);
}
-#endif
- else if (arg == "fullscreen") {
- if (isFullScreen()) {
- showNormal();
-#if QT_VERSION >= 0x040300
- setContentsMargins(0, 0, 0, 0);
-#endif
- d.current_work_area_->setFrameStyle(QFrame::NoFrame);
- d.current_work_area_->bufferView().setFullScreen(false);
- menuBar()->show();
- statusBar()->show();
- } else {
- statusBar()->hide();
- menuBar()->hide();
- d.current_work_area_->setFrameStyle(QFrame::NoFrame);
- d.current_work_area_->bufferView().setFullScreen(true);
-#if QT_VERSION >= 0x040300
- setContentsMargins(-2, -2, -2, -2);
-#endif
- showFullScreen();
- }
+ break;
+
+ case LFUN_CLOSE_TAB_GROUP:
+ if (TabWorkArea * twa = d.currentTabWorkArea()) {
+ delete twa;
+ twa = d.currentTabWorkArea();
+ // Switch to the next GuiWorkArea in the found TabWorkArea.
+ d.current_work_area_ = twa? twa->currentWorkArea() : 0;
+ if (d.splitter_->count() == 0)
+ // No more work area, switch to the background widget.
+ d.setBackground();
}
+ break;
+
+ case LFUN_COMPLETION_POPUP:
+ if (d.current_work_area_)
+ d.current_work_area_->completer().showPopup();
+ break;
+
+ case LFUN_COMPLETION_COMPLETE:
+ if (d.current_work_area_)
+ d.current_work_area_->completer().tab();
break;
- }
default:
return false;
}
+void GuiView::lfunUiToggle(FuncRequest const & cmd)
+{
+ string const arg = cmd.getArg(0);
+ if (arg == "scrollbar") {
+ // hide() is of no help
+ if (d.current_work_area_->verticalScrollBarPolicy() ==
+ Qt::ScrollBarAlwaysOff)
+
+ d.current_work_area_->setVerticalScrollBarPolicy(
+ Qt::ScrollBarAsNeeded);
+ else
+ d.current_work_area_->setVerticalScrollBarPolicy(
+ Qt::ScrollBarAlwaysOff);
+ return;
+ }
+ if (arg == "statusbar") {
+ statusBar()->setVisible(!statusBar()->isVisible());
+ return;
+ }
+ if (arg == "menubar") {
+ menuBar()->setVisible(!menuBar()->isVisible());
+ return;
+ }
+#if QT_VERSION >= 0x040300
+ if (arg == "frame") {
+ int l, t, r, b;
+ getContentsMargins(&l, &t, &r, &b);
+ //are the frames in default state?
+ d.current_work_area_->setFrameStyle(QFrame::NoFrame);
+ if (l == 0) {
+ setContentsMargins(-2, -2, -2, -2);
+ } else {
+ setContentsMargins(0, 0, 0, 0);
+ }
+ return;
+ }
+#endif
+ if (arg != "fullscreen") {
+ message(bformat("LFUN_UI_TOGGLE " + _("%1$s unknown command!"), from_utf8(arg)));
+ return;
+ }
+
+ if (lyxrc.full_screen_toolbars)
+ d.toolbars_->toggleFullScreen(!isFullScreen());
+
+ if (isFullScreen()) {
+ for (int i = 0; i != d.splitter_->count(); ++i)
+ d.tabWorkArea(i)->setFullScreen(false);
+#if QT_VERSION >= 0x040300
+ setContentsMargins(0, 0, 0, 0);
+#endif
+ setWindowState(windowState() ^ Qt::WindowFullScreen);
+ menuBar()->show();
+ statusBar()->show();
+ } else {
+ for (int i = 0; i != d.splitter_->count(); ++i)
+ d.tabWorkArea(i)->setFullScreen(true);
+#if QT_VERSION >= 0x040300
+ setContentsMargins(-2, -2, -2, -2);
+#endif
+ setWindowState(windowState() ^ Qt::WindowFullScreen);
+ statusBar()->hide();
+ menuBar()->hide();
+ }
+}
+
+
Buffer const * GuiView::updateInset(Inset const * inset)
{
if (!d.current_work_area_)
if (d.current_work_area_)
d.current_work_area_->startBlinkingCursor();
- // Take this occasion to update the toobars and layout list.
+ // Take this occasion to update the other GUI elements.
updateLayoutList();
updateToolbars();
+ updateStatusBar();
+}
+
+
+void GuiView::updateCompletion(Cursor & cur, bool start, bool keep)
+{
+ if (d.current_work_area_)
+ d.current_work_area_->completer().updateVisibility(cur, start, keep);
}
namespace {
char const * const dialognames[] = {
"aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "embedding", "errorlist", "ert", "external", "file",
+"citation", "document", "errorlist", "ert", "external", "file",
"findreplace", "float", "graphics", "include", "index", "nomenclature", "label", "log",
"mathdelimiter", "mathmatrix", "note", "paragraph", "prefs", "print",
-"ref", "sendto", "spellchecker", "symbols", "tabular", "tabularcreate",
+"ref", "sendto", "space", "spellchecker", "symbols", "tabular", "tabularcreate",
#ifdef HAVE_LIBAIKSAURUS
"thesaurus",
// FIXME: the "math panels" toolbar takes an awful lot of time to
// initialise so we don't do that for the time being.
//d.toolbars_->init();
- guiApp->menus().fillMenuBar(this);
+ guiApp->menus().fillMenuBar(menuBar(), this);
if (d.layout_)
d.layout_->updateContents(true);
// Now update controls with current buffer.
void GuiView::hideDialog(string const & name, Inset * inset)
{
- // Don't send the signal if we are quitting, because on MSVC it is
- // destructed before the cut stack in CutAndPaste.cpp, and this method
- // is called from some inset destructor if the cut stack is not empty
- // on exit.
- if (quitting)
- return;
-
map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
if (it == d.dialogs_.end())
return;
}
-void GuiView::hideBufferDependent() const
-{
- map<string, DialogPtr>::const_iterator it = d.dialogs_.begin();
- map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
-
- for(; it != end; ++it) {
- Dialog * dialog = it->second.get();
- if (dialog->isBufferDependent())
- dialog->hideView();
- }
-}
-
-
void GuiView::updateBufferDependent(bool switched) const
{
map<string, DialogPtr>::const_iterator it = d.dialogs_.begin();
Dialog * createGuiExternal(GuiView & lv);
Dialog * createGuiFloat(GuiView & lv);
Dialog * createGuiGraphics(GuiView & lv);
+Dialog * createGuiHSpace(GuiView & lv);
Dialog * createGuiInclude(GuiView & lv);
-Dialog * createGuiIndex(GuiView & lv);
Dialog * createGuiLabel(GuiView & lv);
Dialog * createGuiListings(GuiView & lv);
Dialog * createGuiLog(GuiView & lv);
Dialog * GuiView::build(string const & name)
{
- BOOST_ASSERT(isValidName(name));
+ LASSERT(isValidName(name), /**/);
if (name == "aboutlyx")
return createGuiAbout(*this);
return createGuiGraphics(*this);
if (name == "include")
return createGuiInclude(*this);
- if (name == "index")
- return createGuiIndex(*this);
if (name == "nomenclature")
return createGuiNomenclature(*this);
if (name == "label")
return createGuiRef(*this);
if (name == "sendto")
return createGuiSendTo(*this);
+ if (name == "space")
+ return createGuiHSpace(*this);
if (name == "spellchecker")
return createGuiSpellchecker(*this);
if (name == "symbols")