#include "Cursor.h"
#include "ErrorList.h"
#include "Format.h"
+#include "FuncStatus.h"
#include "FuncRequest.h"
#include "support/gettext.h"
#include "Intl.h"
// 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);
setCentralWidget(d.stack_widget_);
void GuiView::closeEvent(QCloseEvent * close_event)
{
+ // 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
// Save toolbars configuration
if (isFullScreen()) {
- d.toolbars_->toggleFullScreen(!isFullScreen());
- updateToolbars();
+ d.toolbars_->toggleFullScreen(!isFullScreen());
+ updateToolbars();
}
// Make sure the timer time out will not trigger a statusbar update.
}
+void GuiView::on_lastWorkAreaRemoved()
+{
+#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.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
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;
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());
+ dlg.open(toqstr(lyxrc.template_path),
+ FileFilterList(_("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), FileFilterList(_("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), FileFilterList(filter));
if (result.first == FileDialog::Later)
return;
- filename = to_utf8(result.second);
+ filename = fromqstr(result.second);
// check selected filename
if (filename.empty())
// get absolute path of file
FileName const fullname(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());
+ dlg.open(toqstr(initpath),
+ FileFilterList(_("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()),
+ FileFilterList());
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()) {
/// 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()),
+ dlg.save(toqstr(fname.onlyPath().absFilename()),
filter,
- from_utf8(fname.onlyFileName()));
+ 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;
theLyXFunc().gotoBookmark(i+1, false, false);
if (buf.isClean() || buf.paragraphs().empty()) {
+ if (buf.masterBuffer() == &buf)
+ LyX::ref().session().lastOpened().add(buf.fileName());
theBufferList().release(&buf);
return true;
}
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;
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) {
- 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);
}
return;
// 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.
projects / lyx.git / blobdiff