#include "TocModel.h"
#include "qt_helpers.h"
+#include "support/filetools.h"
#include "frontends/alert.h"
+#include "frontends/KeySymbol.h"
#include "buffer_funcs.h"
#include "Buffer.h"
#include "LyXVC.h"
#include "Paragraph.h"
#include "SpellChecker.h"
+#include "Session.h"
#include "TexRow.h"
#include "TextClass.h"
#include "Text.h"
#include "support/lstrings.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include "support/Timeout.h"
#include "support/ProgressInterface.h"
#include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QDropEvent>
+#include <QFuture>
+#include <QFutureWatcher>
#include <QLabel>
#include <QList>
#include <QMenu>
#include <QMenuBar>
+#include <QMimeData>
#include <QMovie>
#include <QPainter>
#include <QPixmap>
#include <QPixmapCache>
#include <QPoint>
#include <QPushButton>
+#include <QScrollBar>
#include <QSettings>
#include <QShowEvent>
#include <QSplitter>
#include <QStackedWidget>
#include <QStatusBar>
+#if QT_VERSION >= 0x050000
+#include <QSvgRenderer>
+#endif
+#include <QtConcurrentRun>
#include <QTime>
#include <QTimer>
#include <QToolBar>
#include <QUrl>
-#include <QScrollBar>
+// sync with GuiAlert.cpp
#define EXPORT_in_THREAD 1
-// QtConcurrent was introduced in Qt 4.4
-#if (QT_VERSION >= 0x040400)
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentRun>
-#endif
#include "support/bind.h"
class BackgroundWidget : public QWidget
{
public:
- BackgroundWidget()
+ BackgroundWidget(int width, int height)
+ : width_(width), height_(height)
{
LYXERR(Debug::GUI, "show banner: " << lyxrc.show_banner);
if (!lyxrc.show_banner)
/// The text to be written on top of the pixmap
QString const text = lyx_version ?
qt_("version ") + lyx_version : qt_("unknown version");
- splash_ = getPixmap("images/", "banner", "png");
+#if QT_VERSION >= 0x050000
+ QString imagedir = "images/";
+ FileName fname = imageLibFileSearch(imagedir, "banner", "svgz");
+ QSvgRenderer svgRenderer(toqstr(fname.absFileName()));
+ if (svgRenderer.isValid()) {
+ splash_ = QPixmap(splashSize());
+ QPainter painter(&splash_);
+ svgRenderer.render(&painter);
+ splash_.setDevicePixelRatio(pixelRatio());
+ } else {
+ splash_ = getPixmap("images/", "banner", "png");
+ }
+#else
+ splash_ = getPixmap("images/", "banner", "svgz,png");
+#endif
QPainter pain(&splash_);
pain.setPen(QColor(0, 0, 0));
+ qreal const fsize = fontSize();
+ QPointF const position = textPosition();
+ LYXERR(Debug::GUI,
+ "widget pixel ratio: " << pixelRatio() <<
+ " splash pixel ratio: " << splashPixelRatio() <<
+ " version text size,position: " << fsize << "@" << position.x() << "+" << position.y());
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()));
+ font.setPointSizeF(fsize);
pain.setFont(font);
- pain.drawText(190, 225, text);
+ pain.drawText(position, text);
setFocusPolicy(Qt::StrongFocus);
}
void paintEvent(QPaintEvent *)
{
- int x = (width() - splash_.width()) / 2;
- int y = (height() - splash_.height()) / 2;
+ int const w = width_;
+ int const h = height_;
+ int const x = (width() - w) / 2;
+ int const y = (height() - h) / 2;
+ LYXERR(Debug::GUI,
+ "widget pixel ratio: " << pixelRatio() <<
+ " splash pixel ratio: " << splashPixelRatio() <<
+ " paint pixmap: " << w << "x" << h << "@" << x << "+" << y);
QPainter pain(this);
- pain.drawPixmap(x, y, splash_);
+ pain.drawPixmap(x, y, w, h, splash_);
}
void keyPressEvent(QKeyEvent * ev)
private:
QPixmap splash_;
+ int const width_;
+ int const height_;
+
+ /// Current ratio between physical pixels and device-independent pixels
+ double pixelRatio() const {
+#if QT_VERSION >= 0x050000
+ return devicePixelRatio();
+#else
+ return 1.0;
+#endif
+ }
+
+ qreal fontSize() const {
+ return toqstr(lyxrc.font_sizes[FONT_SIZE_NORMAL]).toDouble();
+ }
+
+ QPointF textPosition() const {
+ return QPointF(width_/2 - 18, height_/2 + 45);
+ }
+
+ QSize splashSize() const {
+ return QSize(
+ static_cast<unsigned int>(width_ * pixelRatio()),
+ static_cast<unsigned int>(height_ * pixelRatio()));
+ }
+
+ /// Ratio between physical pixels and device-independent pixels of splash image
+ double splashPixelRatio() const {
+#if QT_VERSION >= 0x050000
+ return splash_.devicePixelRatio();
+#else
+ return 1.0;
+#endif
+ }
};
smallIconSize = 16; // scaling problems
normalIconSize = 20; // ok, default if iconsize.png is missing
bigIconSize = 26; // better for some math icons
+ hugeIconSize = 32; // better for hires displays
+ giantIconSize = 48;
// if it exists, use width of iconsize.png as normal size
QString const dir = toqstr(addPath("images", lyxrc.icon_set));
QImage image(toqstr(fn.absFileName()));
if (image.width() < int(smallIconSize))
normalIconSize = smallIconSize;
- else if (image.width() > int(bigIconSize))
- normalIconSize = bigIconSize;
+ else if (image.width() > int(giantIconSize))
+ normalIconSize = giantIconSize;
else
normalIconSize = image.width();
}
splitter_ = new QSplitter;
- bg_widget_ = new BackgroundWidget;
+ bg_widget_ = new BackgroundWidget(400, 250);
stack_widget_ = new QStackedWidget;
stack_widget_->addWidget(bg_widget_);
stack_widget_->addWidget(splitter_);
// TODO cleanup, remove the singleton, handle multiple Windows?
progress_ = ProgressInterface::instance();
if (!dynamic_cast<GuiProgress*>(progress_)) {
- progress_ = new GuiProgress(); // TODO who deletes it
+ progress_ = new GuiProgress; // TODO who deletes it
ProgressInterface::setInstance(progress_);
}
QObject::connect(
parent, SLOT(bigSizedIcons()));
menu->addAction(bigIcons);
+ QAction * hugeIcons = new QAction(iconSizeGroup);
+ hugeIcons->setText(qt_("Huge-sized icons"));
+ hugeIcons->setCheckable(true);
+ QObject::connect(hugeIcons, SIGNAL(triggered()),
+ parent, SLOT(hugeSizedIcons()));
+ menu->addAction(hugeIcons);
+
+ QAction * giantIcons = new QAction(iconSizeGroup);
+ giantIcons->setText(qt_("Giant-sized icons"));
+ giantIcons->setCheckable(true);
+ QObject::connect(giantIcons, SIGNAL(triggered()),
+ parent, SLOT(giantSizedIcons()));
+ menu->addAction(giantIcons);
+
unsigned int cur = parent->iconSize().width();
if ( cur == parent->d.smallIconSize)
smallIcons->setChecked(true);
normalIcons->setChecked(true);
else if (cur == parent->d.bigIconSize)
bigIcons->setChecked(true);
+ else if (cur == parent->d.hugeIconSize)
+ hugeIcons->setChecked(true);
+ else if (cur == parent->d.giantIconSize)
+ giantIcons->setChecked(true);
return menu;
}
return count;
}
-#if (QT_VERSION >= 0x040400)
void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{
if (processing_thread_watcher_.isRunning()) {
}
processing_thread_watcher_.setFuture(f);
}
-#endif
public:
GuiView * gv_;
unsigned int smallIconSize;
unsigned int normalIconSize;
unsigned int bigIconSize;
+ unsigned int hugeIconSize;
+ unsigned int giantIconSize;
///
QTimer statusbar_timer_;
/// auto-saving of buffers
///
TocModels toc_models_;
-#if (QT_VERSION >= 0x040400)
///
QFutureWatcher<docstring> autosave_watcher_;
QFutureWatcher<Buffer::ExportStatus> processing_thread_watcher_;
///
string last_export_format;
string processing_format;
-#else
- struct DummyWatcher { bool isRunning(){return false;} };
- DummyWatcher processing_thread_watcher_;
-#endif
static QSet<Buffer const *> busyBuffers;
static Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
GuiView::GuiView(int id)
- : d(*new GuiViewPrivate(this)), id_(id), closing_(false), busy_(0)
+ : d(*new GuiViewPrivate(this)), id_(id), closing_(false), busy_(0),
+ command_execute_(false)
{
// GuiToolbars *must* be initialised before the menu bar.
normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
// We don't want to keep the window in memory if it is closed.
setAttribute(Qt::WA_DeleteOnClose, true);
-#if (!defined(Q_WS_WIN) && !defined(Q_WS_MACX))
+#if !(defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && !defined(Q_OS_MAC)
// QIcon::fromTheme was introduced in Qt 4.6
#if (QT_VERSION >= 0x040600)
// 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. We use a themed
// version when available and use the bundled one as fallback.
- setWindowIcon(QIcon::fromTheme("lyx", getPixmap("images/", "lyx", "png")));
+ setWindowIcon(QIcon::fromTheme("lyx", getPixmap("images/", "lyx", "svg,png")));
#else
- setWindowIcon(getPixmap("images/", "lyx", "png"));
+ setWindowIcon(getPixmap("images/", "lyx", "svg,png"));
#endif
#endif
+ resetWindowTitleAndIconText();
-#if (QT_VERSION >= 0x040300)
// use tabbed dock area for multiple docks
// (such as "source" and "messages")
setDockOptions(QMainWindow::ForceTabbedDocks);
-#endif
// For Drag&Drop.
setAcceptDrops(true);
-#if (QT_VERSION >= 0x040400)
-
// add busy indicator to statusbar
QLabel * busylabel = new QLabel(statusBar());
statusBar()->addPermanentWidget(busylabel);
- QString fn = toqstr(lyx::libFileSearch("images", "busy.gif").absFileName());
+ search_mode mode = theGuiApp()->imageSearchMode();
+ QString fn = toqstr(lyx::libFileSearch("images", "busy", "gif", mode).absFileName());
QMovie * busyanim = new QMovie(fn, QByteArray(), busylabel);
busylabel->setMovie(busyanim);
busyanim->start();
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished()));
-#endif
-
connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)),
SLOT(doShowDialog(QString const &, QString const &, Inset *)));
}
-#if QT_VERSION >= 0x040400
-
void GuiView::processingThreadStarted()
{
}
updateToolbars();
}
-#else
-
-void GuiView::processingThreadStarted()
-{
-}
-
-
-void GuiView::processingThreadFinished()
-{
-}
-
-
-void GuiView::autoSaveThreadFinished()
-{
-}
-#endif
-
void GuiView::saveLayout() const
{
QSettings settings;
settings.beginGroup("views");
settings.beginGroup(QString::number(id_));
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) || defined(QPA_XCB)
settings.setValue("pos", pos());
settings.setValue("size", size());
#else
// Check whether session size changed.
if (icon_size.width() != int(d.smallIconSize) &&
icon_size.width() != int(d.normalIconSize) &&
- icon_size.width() != int(d.bigIconSize)) {
+ icon_size.width() != int(d.bigIconSize) &&
+ icon_size.width() != int(d.hugeIconSize) &&
+ icon_size.width() != int(d.giantIconSize)) {
icon_size.setWidth(d.normalIconSize);
icon_size.setHeight(d.normalIconSize);
}
setIconSize(icon_size);
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11) || defined(QPA_XCB)
QPoint pos = settings.value("pos", QPoint(50, 50)).toPoint();
QSize size = settings.value("size", QSize(690, 510)).toSize();
resize(size);
dialog->prepareView();
if ((dialog = findOrBuild("progress", true)))
dialog->prepareView();
- if ((dialog = findOrBuild("findreplaceadv", true)))
- dialog->prepareView();
if (!restoreState(settings.value("layout").toByteArray(), 0))
initToolbars();
+
+ // init the toolbars that have not been restored
+ Toolbars::Infos::iterator cit = guiApp->toolbars().begin();
+ Toolbars::Infos::iterator end = guiApp->toolbars().end();
+ for (; cit != end; ++cit) {
+ GuiToolbar * tb = toolbar(cit->name);
+ if (tb && !tb->isRestored())
+ initToolbar(cit->name);
+ }
+
updateDialogs();
return true;
}
// extracts the toolbars from the backend
Toolbars::Infos::iterator cit = guiApp->toolbars().begin();
Toolbars::Infos::iterator end = guiApp->toolbars().end();
- for (; cit != end; ++cit) {
- GuiToolbar * tb = toolbar(cit->name);
- if (!tb)
- continue;
- int const visibility = guiApp->toolbars().defaultVisibility(cit->name);
- bool newline = !(visibility & Toolbars::SAMEROW);
- tb->setVisible(false);
- tb->setVisibility(visibility);
-
- if (visibility & Toolbars::TOP) {
- if (newline)
- addToolBarBreak(Qt::TopToolBarArea);
- addToolBar(Qt::TopToolBarArea, tb);
- }
+ for (; cit != end; ++cit)
+ initToolbar(cit->name);
+}
- if (visibility & Toolbars::BOTTOM) {
- // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
-#if (QT_VERSION >= 0x040202)
- if (newline)
- addToolBarBreak(Qt::BottomToolBarArea);
-#endif
- addToolBar(Qt::BottomToolBarArea, tb);
- }
- if (visibility & Toolbars::LEFT) {
- // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
-#if (QT_VERSION >= 0x040202)
- if (newline)
- addToolBarBreak(Qt::LeftToolBarArea);
-#endif
- addToolBar(Qt::LeftToolBarArea, tb);
- }
+void GuiView::initToolbar(string const & name)
+{
+ GuiToolbar * tb = toolbar(name);
+ if (!tb)
+ return;
+ int const visibility = guiApp->toolbars().defaultVisibility(name);
+ bool newline = !(visibility & Toolbars::SAMEROW);
+ tb->setVisible(false);
+ tb->setVisibility(visibility);
+
+ if (visibility & Toolbars::TOP) {
+ if (newline)
+ addToolBarBreak(Qt::TopToolBarArea);
+ addToolBar(Qt::TopToolBarArea, tb);
+ }
- if (visibility & Toolbars::RIGHT) {
- // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
-#if (QT_VERSION >= 0x040202)
- if (newline)
- addToolBarBreak(Qt::RightToolBarArea);
-#endif
- addToolBar(Qt::RightToolBarArea, tb);
- }
+ if (visibility & Toolbars::BOTTOM) {
+ if (newline)
+ addToolBarBreak(Qt::BottomToolBarArea);
+ addToolBar(Qt::BottomToolBarArea, tb);
+ }
+
+ if (visibility & Toolbars::LEFT) {
+ if (newline)
+ addToolBarBreak(Qt::LeftToolBarArea);
+ addToolBar(Qt::LeftToolBarArea, tb);
+ }
- if (visibility & Toolbars::ON)
- tb->setVisible(true);
+ if (visibility & Toolbars::RIGHT) {
+ if (newline)
+ addToolBarBreak(Qt::RightToolBarArea);
+ addToolBar(Qt::RightToolBarArea, tb);
}
+
+ if (visibility & Toolbars::ON)
+ tb->setVisible(true);
}
}
+bool GuiView::hasFocus() const
+{
+ if (currentWorkArea())
+ return currentWorkArea()->hasFocus();
+ if (currentMainWorkArea())
+ return currentMainWorkArea()->hasFocus();
+ return d.bg_widget_->hasFocus();
+}
+
+
void GuiView::focusInEvent(QFocusEvent * e)
{
LYXERR(Debug::DEBUG, "GuiView::focusInEvent()" << this);
}
+bool GuiView::prepareAllBuffersForLogout()
+{
+ Buffer * first = theBufferList().first();
+ if (!first)
+ return true;
+
+ // First, iterate over all buffers and ask the users if unsaved
+ // changes should be saved.
+ // We cannot use a for loop as the buffer list cycles.
+ Buffer * b = first;
+ do {
+ if (!saveBufferIfNeeded(const_cast<Buffer &>(*b), false))
+ return false;
+ b = theBufferList().next(b);
+ } while (b != first);
+
+ // Next, save session state
+ // When a view/window was closed before without quitting LyX, there
+ // are already entries in the lastOpened list.
+ theSession().lastOpened().clear();
+ writeSession();
+
+ return true;
+}
+
+
/** Destroy only all tabbed WorkAreas. Destruction of other WorkAreas
** is responsibility of the container (e.g., dialog)
**/
}
+void GuiView::hugeSizedIcons()
+{
+ setIconSize(QSize(d.hugeIconSize, d.hugeIconSize));
+}
+
+
+void GuiView::giantSizedIcons()
+{
+ setIconSize(QSize(d.giantIconSize, d.giantIconSize));
+}
+
+
void GuiView::clearMessage()
{
// FIXME: This code was introduced in r19643 to fix bug #4123. However,
return;
setWindowTitle(qt_("LyX: ") + wa->windowTitle());
setWindowIconText(wa->windowIconText());
+#if (QT_VERSION >= 0x040400)
+ // Sets the path for the window: this is used by OSX to
+ // allow a context click on the title bar showing a menu
+ // with the path up to the file
+ setWindowFilePath(toqstr(wa->bufferView().buffer().absFileName()));
+#endif
}
return;
}
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
// On Mac we also close the last window because the application stay
// resident in memory. On other platforms we don't close the last
// window because this would quit the application.
void GuiView::showMessage()
{
+ if (busy_)
+ return;
QString msg = toqstr(theGuiApp()->viewStatusMessage());
if (msg.isEmpty()) {
BufferView const * bv = currentBufferView();
}
case QEvent::ShortcutOverride: {
-
-// See bug 4888
-#if (!defined Q_WS_X11) || (QT_VERSION >= 0x040500)
+ // See bug 4888
if (isFullScreen() && menuBar()->isHidden()) {
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
// FIXME: we should also try to detect special LyX shortcut such as
return QMainWindow::event(e);
}
}
-#endif
return QMainWindow::event(e);
}
}
+void GuiView::resetCommandExecute()
+{
+ command_execute_ = false;
+ updateToolbars();
+}
+
+
+double GuiView::pixelRatio() const
+{
+#if QT_VERSION >= 0x050000
+ return devicePixelRatio();
+#else
+ return 1.0;
+#endif
+}
+
+
GuiWorkArea * GuiView::workArea(int index)
{
if (TabWorkArea * twa = d.currentTabWorkArea())
// It is not a tabbed work area (i.e., the search work area), so it
// should be deleted by other means.
- LASSERT(found_twa, /* */);
+ LASSERT(found_twa, return);
if (d.current_work_area_ == 0) {
if (d.splitter_->count() != 0) {
{
ToolbarMap::iterator end = d.toolbars_.end();
if (d.current_work_area_) {
- bool const math =
- d.current_work_area_->bufferView().cursor().inMathed()
- && !d.current_work_area_->bufferView().cursor().inRegexped();
- bool const table =
- lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
- bool const review =
- lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled() &&
- lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onOff(true);
- bool const mathmacrotemplate =
- lyx::getStatus(FuncRequest(LFUN_IN_MATHMACROTEMPLATE)).enabled();
- bool const ipa =
- lyx::getStatus(FuncRequest(LFUN_IN_IPA)).enabled();
+ int context = 0;
+ if (d.current_work_area_->bufferView().cursor().inMathed()
+ && !d.current_work_area_->bufferView().cursor().inRegexped())
+ context |= Toolbars::MATH;
+ if (lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled())
+ context |= Toolbars::TABLE;
+ if (lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled()
+ && lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onOff(true))
+ context |= Toolbars::REVIEW;
+ if (lyx::getStatus(FuncRequest(LFUN_IN_MATHMACROTEMPLATE)).enabled())
+ context |= Toolbars::MATHMACROTEMPLATE;
+ if (lyx::getStatus(FuncRequest(LFUN_IN_IPA)).enabled())
+ context |= Toolbars::IPA;
+ if (command_execute_)
+ context |= Toolbars::MINIBUFFER;
for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
- it->second->update(math, table, review, mathmacrotemplate, ipa);
+ it->second->update(context);
} else
for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
- it->second->update(false, false, false, false, false);
+ it->second->update();
}
if (!bv)
return;
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+#if EXPORT_in_THREAD
// We are called with from_master == false by default, so we
// have to figure out whether that is the case or not.
ErrorList & el = bv->buffer().errorList(error_type);
}
-#if (QT_VERSION >= 0x040400)
docstring GuiView::GuiViewPrivate::autosaveAndDestroy(
Buffer const * orig, Buffer * clone)
{
? _("Automatic save done.")
: _("Automatic save failed!");
}
-#endif
void GuiView::autoSave()
return;
}
-#if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer);
QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy,
buffer, buffer->cloneBufferOnly());
d.autosave_watcher_.setFuture(f);
-#else
- buffer->autoSave();
-#endif
resetAutosaveTimers();
}
Buffer * doc_buffer = documentBufferView()
? &(documentBufferView()->buffer()) : 0;
+#ifdef Q_OS_MAC
+ /* In LyX/Mac, when a dialog is open, the menus of the
+ application can still be accessed without giving focus to
+ the main window. In this case, we want to disable the menu
+ entries that are buffer-related.
+ This code must not be used on Linux and Windows, since it
+ would disable buffer-related entries when hovering over the
+ menu (see bug #9574).
+ */
+ if (cmd.origin() == FuncRequest::MENU && !hasFocus()) {
+ buf = 0;
+ doc_buffer = 0;
+ }
+#endif
+
// Check whether we need a buffer
if (!lyxaction.funcHasFlag(cmd.action(), LyXAction::NoBuffer) && !buf) {
// no, exit directly
case LFUN_MASTER_BUFFER_UPDATE:
case LFUN_MASTER_BUFFER_VIEW:
- enable = doc_buffer && doc_buffer->parent() != 0
+ enable = doc_buffer
+ && (doc_buffer->parent() != 0
+ || doc_buffer->hasChildren())
&& !d.processing_thread_watcher_.isRunning();
break;
|| name == "texinfo"
|| name == "progress"
|| name == "compare";
- else if (name == "print")
- enable = doc_buffer->params().isExportable("dvi")
- && lyxrc.print_command != "none";
- else if (name == "character" || name == "symbols") {
+ else if (name == "character" || name == "symbols"
+ || name == "mathdelimiter" || name == "mathmatrix") {
if (!buf || buf->isReadonly())
enable = false;
else {
enable = false;
break;
- case LFUN_COMPLETION_COMPLETE:
+ case LFUN_COMPLETE:
if (!d.current_work_area_
|| !d.current_work_area_->completer().inlinePossible(
currentBufferView()->cursor()))
enable = doc_buffer;
break;
+ case LFUN_BUFFER_MOVE_NEXT:
+ case LFUN_BUFFER_MOVE_PREVIOUS:
+ // we do not cycle when moving
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
- // FIXME: should we check is there is an previous or next buffer?
+ // because we cycle, it doesn't matter whether on first or last
+ enable = (d.currentTabWorkArea()->count() > 1);
break;
case LFUN_BUFFER_SWITCH:
// toggle on the current buffer, but do not toggle off
case LFUN_VC_REGISTER:
enable = doc_buffer && !doc_buffer->lyxvc().inUse();
break;
+ case LFUN_VC_RENAME:
+ enable = doc_buffer && doc_buffer->lyxvc().renameEnabled();
+ break;
+ case LFUN_VC_COPY:
+ enable = doc_buffer && doc_buffer->lyxvc().copyEnabled();
+ break;
case LFUN_VC_CHECK_IN:
enable = doc_buffer && doc_buffer->lyxvc().checkInEnabled();
break;
enable = documentBufferView() && documentBufferView()->cursor().inTexted();
break;
+ case LFUN_SPELLING_CONTINUOUSLY:
+ flag.setOnOff(lyxrc.spellcheck_continuously);
+ break;
+
default:
return false;
}
string filename;
if (fname.empty()) {
- FileDialog dlg(qt_("Select document to open"), LFUN_FILE_OPEN);
+ FileDialog dlg(qt_("Select document to open"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(), "examples")));
- QStringList filter(qt_("LyX Documents (*.lyx)"));
- filter << qt_("LyX-1.3.x Documents (*.lyx13)")
- << qt_("LyX-1.4.x Documents (*.lyx14)")
- << qt_("LyX-1.5.x Documents (*.lyx15)")
- << qt_("LyX-1.6.x Documents (*.lyx16)");
+ QStringList const filter(qt_("LyX Documents (*.lyx)"));
FileDialog::Result result =
dlg.open(toqstr(initpath), filter);
// if the file doesn't exist and isn't already open (bug 6645),
// let the user create one
- if (!fullname.exists() && !theBufferList().exists(fullname)) {
+ if (!fullname.exists() && !theBufferList().exists(fullname) &&
+ !LyXVC::file_not_found_hook(fullname)) {
// the user specifically chose this name. Believe him.
Buffer * const b = newFile(filename, string(), true);
if (b)
docstring const text = bformat(_("Select %1$s file to import"),
formats.prettyName(format));
- FileDialog dlg(toqstr(text), LFUN_BUFFER_IMPORT);
+ FileDialog dlg(toqstr(text));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(), "examples")));
// get absolute path of file
FileName const fullname(support::makeAbsPath(filename));
+ // Can happen if the user entered a path into the dialog
+ // (see bug #7437)
+ if (fullname.onlyFileName().empty()) {
+ docstring msg = bformat(_("The file name '%1$s' is invalid!\n"
+ "Aborting import."),
+ from_utf8(fullname.absFileName()));
+ frontend::Alert::error(_("File name error"), msg);
+ message(_("Canceled."));
+ return;
+ }
+
+
FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx"));
// Check if the document already is open
initpath = trypath;
// FIXME UNICODE
- FileDialog dlg(qt_("Select LyX document to insert"), LFUN_FILE_INSERT);
+ FileDialog dlg(qt_("Select LyX document to insert"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(),
}
-bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
+bool GuiView::renameBuffer(Buffer & b, docstring const & newname, RenameKind kind)
{
FileName fname = b.fileName();
FileName const oldname = fname;
// No argument? Ask user through dialog.
// FIXME UNICODE
- FileDialog dlg(qt_("Choose a filename to save document as"),
- LFUN_BUFFER_WRITE_AS);
+ FileDialog dlg(qt_("Choose a filename to save document as"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
// trying to overwrite ourselves, which is fine.)
if (theBufferList().exists(fname) && fname != oldname
&& theBufferList().getBuffer(fname) != &b) {
- docstring const text =
+ docstring const text =
bformat(_("The file\n%1$s\nis already open in your current session.\n"
"Please close it before attempting to overwrite it.\n"
"Do you want to choose a new filename?"),
int const ret = Alert::prompt(_("Chosen File Already Open"),
text, 0, 1, _("&Rename"), _("&Cancel"));
switch (ret) {
- case 0: return renameBuffer(b, docstring());
+ case 0: return renameBuffer(b, docstring(), kind);
case 1: return false;
}
//return false;
}
-
- if (FileName(fname).exists()) {
+
+ bool const existsLocal = fname.exists();
+ bool const existsInVC = LyXVC::fileInVC(fname);
+ if (existsLocal || existsInVC) {
docstring const file = makeDisplayPath(fname.absFileName(), 30);
- docstring const text = bformat(_("The document %1$s already "
- "exists.\n\nDo you want to "
- "overwrite that document?"),
- file);
- int const ret = Alert::prompt(_("Overwrite document?"),
- text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
- switch (ret) {
- case 0: break;
- case 1: return renameBuffer(b, docstring());
- case 2: return false;
+ if (kind != LV_WRITE_AS && existsInVC) {
+ // renaming to a name that is already in VC
+ // would not work
+ docstring text = bformat(_("The document %1$s "
+ "is already registered.\n\n"
+ "Do you want to choose a new name?"),
+ file);
+ docstring const title = (kind == LV_VC_RENAME) ?
+ _("Rename document?") : _("Copy document?");
+ docstring const button = (kind == LV_VC_RENAME) ?
+ _("&Rename") : _("&Copy");
+ int const ret = Alert::prompt(title, text, 0, 1,
+ button, _("&Cancel"));
+ switch (ret) {
+ case 0: return renameBuffer(b, docstring(), kind);
+ case 1: return false;
+ }
}
+
+ if (existsLocal) {
+ docstring text = bformat(_("The document %1$s "
+ "already exists.\n\n"
+ "Do you want to overwrite that document?"),
+ file);
+ int const ret = Alert::prompt(_("Overwrite document?"),
+ text, 0, 2, _("&Overwrite"),
+ _("&Rename"), _("&Cancel"));
+ switch (ret) {
+ case 0: break;
+ case 1: return renameBuffer(b, docstring(), kind);
+ case 2: return false;
+ }
+ }
+ }
+
+ switch (kind) {
+ case LV_VC_RENAME: {
+ string msg = b.lyxvc().rename(fname);
+ if (msg.empty())
+ return false;
+ message(from_utf8(msg));
+ break;
+ }
+ case LV_VC_COPY: {
+ string msg = b.lyxvc().copy(fname);
+ if (msg.empty())
+ return false;
+ message(from_utf8(msg));
+ break;
+ }
+ case LV_WRITE_AS:
+ break;
}
+ // LyXVC created the file already in case of LV_VC_RENAME or
+ // LV_VC_COPY, but call saveBuffer() nevertheless to get
+ // relative paths of included stuff right if we moved e.g. from
+ // /a/b.lyx to /a/c/b.lyx.
bool const saved = saveBuffer(b, fname);
if (saved)
- b.reload(false);
+ b.reload();
return saved;
}
struct PrettyNameComparator
{
bool operator()(Format const *first, Format const *second) const {
- return compare_ascii_no_case(first->prettyname(), second->prettyname()) <= 0;
+ return compare_no_case(translateIfPossible(from_ascii(first->prettyname())),
+ translateIfPossible(from_ascii(second->prettyname()))) <= 0;
}
};
-bool GuiView::exportBufferAs(Buffer & b)
+bool GuiView::exportBufferAs(Buffer & b, docstring const & iformat)
{
FileName fname = b.fileName();
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
QStringList types;
- types << "Any supported format (*.*)";
+ QString const anyformat = qt_("Guess from extension (*.*)");
+ types << anyformat;
Formats::const_iterator it = formats.begin();
vector<Format const *> export_formats;
for (; it != formats.end(); ++it)
- if (it->documentFormat() && it->inExportMenu())
+ if (it->documentFormat())
export_formats.push_back(&(*it));
PrettyNameComparator cmp;
sort(export_formats.begin(), export_formats.end(), cmp);
vector<Format const *>::const_iterator fit = export_formats.begin();
- for (; fit != export_formats.end(); ++fit)
- types << toqstr((*fit)->prettyname() + " (*." + (*fit)->extension() + ")");
+ map<QString, string> fmap;
QString filter;
+ string ext;
+ for (; fit != export_formats.end(); ++fit) {
+ docstring const loc_prettyname =
+ translateIfPossible(from_utf8((*fit)->prettyname()));
+ QString const loc_filter = toqstr(bformat(from_ascii("%1$s (*.%2$s)"),
+ loc_prettyname,
+ from_ascii((*fit)->extension())));
+ types << loc_filter;
+ fmap[loc_filter] = (*fit)->name();
+ if (from_ascii((*fit)->name()) == iformat) {
+ filter = loc_filter;
+ ext = (*fit)->extension();
+ }
+ }
+ string ofname = fname.onlyFileName();
+ if (!ext.empty())
+ ofname = support::changeExtension(ofname, ext);
FileDialog::Result result =
dlg.save(toqstr(fname.onlyPath().absFileName()),
types,
- toqstr(fname.onlyFileName()),
+ toqstr(ofname),
&filter);
if (result.first != FileDialog::Chosen)
return false;
- string s = fromqstr(filter);
- size_t pos = s.find(" (*.");
- LASSERT(pos != string::npos, /**/);
- string fmt_prettyname = s.substr(0, pos);
string fmt_name;
fname.set(fromqstr(result.second));
- if (fmt_prettyname == "Any supported format")
+ if (filter == anyformat)
fmt_name = formats.getFormatFromExtension(fname.extension());
else
- fmt_name = formats.getFormatFromPrettyName(fmt_prettyname);
- LYXERR(Debug::FILES, "fmt_prettyname=" << fmt_prettyname
+ fmt_name = fmap[filter];
+ LYXERR(Debug::FILES, "filter=" << fromqstr(filter)
<< ", fmt_name=" << fmt_name << ", fname=" << fname.absFileName());
if (fmt_name.empty() || fname.empty())
text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
switch (ret) {
case 0: break;
- case 1: return exportBufferAs(b);
+ case 1: return exportBufferAs(b, from_ascii(fmt_name));
case 2: return false;
}
}
}
-bool GuiView::saveBuffer(Buffer & b) {
+bool GuiView::saveBuffer(Buffer & b)
+{
return saveBuffer(b, FileName());
}
return true;
if (fn.empty() && b.isUnnamed())
- return renameBuffer(b, docstring());
+ return renameBuffer(b, docstring());
- bool success;
- if (fn.empty())
- success = b.save();
- else
- success = b.saveAs(fn);
-
+ bool const success = (fn.empty() ? b.save() : b.saveAs(fn));
if (success) {
theSession().lastFiles().add(b.fileName());
return true;
return false;
}
- return saveBuffer(b);
+ return saveBuffer(b, fn);
}
}
-void GuiView::gotoNextOrPreviousBuffer(NextOrPrevious np)
+void GuiView::gotoNextOrPreviousBuffer(NextOrPrevious np, bool const move)
{
if (!documentBufferView())
return;
next_index = (i == nwa - 1 ? 0 : i + 1);
else
next_index = (i == 0 ? nwa - 1 : i - 1);
- setBuffer(&workArea(next_index)->bufferView().buffer());
+ if (move)
+ twa->moveTab(i, next_index);
+ else
+ setBuffer(&workArea(next_index)->bufferView().buffer());
break;
}
}
if (!buffer->lyxvc().inUse()) {
if (buffer->lyxvc().registrer()) {
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
+ }
+ }
+ break;
+
+ case LFUN_VC_RENAME:
+ case LFUN_VC_COPY: {
+ if (!buffer || !ensureBufferClean(buffer))
+ break;
+ if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
+ if (buffer->lyxvc().isCheckInWithConfirmation()) {
+ // Some changes are not yet committed.
+ // We test here and not in getStatus(), since
+ // this test is expensive.
+ string log;
+ LyXVC::CommandResult ret =
+ buffer->lyxvc().checkIn(log);
+ dr.setMessage(log);
+ if (ret == LyXVC::ErrorCommand ||
+ ret == LyXVC::VCSuccess)
+ reloadBuffer(*buffer);
+ if (buffer->lyxvc().isCheckInWithConfirmation()) {
+ frontend::Alert::error(
+ _("Revision control error."),
+ _("Document could not be checked in."));
+ break;
+ }
}
+ RenameKind const kind = (cmd.action() == LFUN_VC_RENAME) ?
+ LV_VC_RENAME : LV_VC_COPY;
+ renameBuffer(*buffer, cmd.argument(), kind);
}
break;
+ }
case LFUN_VC_CHECK_IN:
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
- dr.setMessage(buffer->lyxvc().checkIn());
- if (!dr.message().empty())
+ string log;
+ LyXVC::CommandResult ret = buffer->lyxvc().checkIn(log);
+ dr.setMessage(log);
+ // Only skip reloading if the checkin was cancelled or
+ // an error occurred before the real checkin VCS command
+ // was executed, since the VCS might have changed the
+ // file even if it could not checkin successfully.
+ if (ret == LyXVC::ErrorCommand || ret == LyXVC::VCSuccess)
reloadBuffer(*buffer);
}
break;
LASSERT(buffer, return);
if (buffer->lyxvc().revert()) {
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
}
break;
LASSERT(buffer, return);
buffer->lyxvc().undoLast();
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
break;
case LFUN_VC_REPO_UPDATE:
}
-#if (QT_VERSION >= 0x040400)
template<class T>
Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * clone, string const & format)
{
return runAndDestroy(lyx::bind(mem_func, clone, _1), orig, clone, format);
}
-#else
-
-// not used, but the linker needs them
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
-}
-
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
-}
-
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
-}
-
-#endif
-
bool GuiView::GuiViewPrivate::asyncBufferProcessing(
string const & argument,
if (format.empty())
format = used_buffer->params().getDefaultOutputFormat();
processing_format = format;
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
if (!msg.empty()) {
progress_->clearMessages();
gv_->message(msg);
}
+#if EXPORT_in_THREAD
GuiViewPrivate::busyBuffers.insert(used_buffer);
Buffer * cloned_buffer = used_buffer->cloneFromMaster();
if (!cloned_buffer) {
void GuiView::dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr)
{
BufferView * bv = currentBufferView();
- LASSERT(bv, /**/);
+ LASSERT(bv, return);
// Let the current BufferView dispatch its own actions.
bv->dispatch(cmd, dr);
case LFUN_BUFFER_EXPORT: {
if (!doc_buffer)
break;
+ FileName target_dir = doc_buffer->fileName().onlyPath();
+ string const dest = cmd.getArg(1);
+ if (!dest.empty() && FileName::isAbsolute(dest))
+ target_dir = FileName(support::onlyPath(dest));
// GCC only sees strfwd.h when building merged
if (::lyx::operator==(cmd.argument(), "custom")) {
dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), dr);
break;
}
-#if QT_VERSION < 0x040400
- if (!doc_buffer->doExport(argument, false)) {
- dr.setError(true);
- dr.setMessage(bformat(_("Error exporting to format: %1$s"),
- cmd.argument()));
+ if (!target_dir.isDirWritable()) {
+ exportBufferAs(*doc_buffer, cmd.argument());
+ break;
}
-#else
/* TODO/Review: Is it a problem to also export the children?
See the update_unincluded flag */
d.asyncBufferProcessing(argument,
&Buffer::doExport,
0);
// TODO Inform user about success
-#endif
break;
}
- case LFUN_BUFFER_EXPORT_AS:
+ case LFUN_BUFFER_EXPORT_AS: {
LASSERT(doc_buffer, break);
- exportBufferAs(*doc_buffer);
+ docstring f = cmd.argument();
+ if (f.empty())
+ f = from_ascii(doc_buffer->params().getDefaultOutputFormat());
+ exportBufferAs(*doc_buffer, f);
break;
+ }
case LFUN_BUFFER_UPDATE: {
d.asyncBufferProcessing(argument,
}
case LFUN_BUFFER_NEXT:
- gotoNextOrPreviousBuffer(NEXTBUFFER);
+ gotoNextOrPreviousBuffer(NEXTBUFFER, false);
+ break;
+
+ case LFUN_BUFFER_MOVE_NEXT:
+ gotoNextOrPreviousBuffer(NEXTBUFFER, true);
break;
case LFUN_BUFFER_PREVIOUS:
- gotoNextOrPreviousBuffer(PREVBUFFER);
+ gotoNextOrPreviousBuffer(PREVBUFFER, false);
+ break;
+
+ case LFUN_BUFFER_MOVE_PREVIOUS:
+ gotoNextOrPreviousBuffer(PREVBUFFER, true);
break;
case LFUN_COMMAND_EXECUTE: {
- bool const show_it = cmd.argument() != "off";
- // FIXME: this is a hack, "minibuffer" should not be
- // hardcoded.
- if (GuiToolbar * t = toolbar("minibuffer")) {
- t->setVisible(show_it);
- if (show_it && t->commandBuffer())
- t->commandBuffer()->setFocus();
- }
+ command_execute_ = true;
break;
}
case LFUN_DROP_LAYOUTS_CHOICE:
case LFUN_FILE_INSERT_PLAINTEXT:
case LFUN_FILE_INSERT_PLAINTEXT_PARA: {
- bool const as_paragraph = (cmd.action() == LFUN_FILE_INSERT_PLAINTEXT_PARA);
string const fname = to_utf8(cmd.argument());
if (!fname.empty() && !FileName::isAbsolute(fname)) {
dr.setMessage(_("Absolute filename expected."));
FileName filename(fname);
if (fname.empty()) {
- FileDialog dlg(qt_("Select file to insert"), (as_paragraph ?
- LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT));
+ FileDialog dlg(qt_("Select file to insert"));
FileDialog::Result result = dlg.open(toqstr(bv->buffer().filePath()),
QStringList(qt_("All Files (*)")));
break;
- case LFUN_COMPLETION_COMPLETE:
+ case LFUN_COMPLETE:
if (d.current_work_area_)
d.current_work_area_->completer().tab();
break;
break;
case LFUN_VC_REGISTER:
+ case LFUN_VC_RENAME:
+ case LFUN_VC_COPY:
case LFUN_VC_CHECK_IN:
case LFUN_VC_CHECK_OUT:
case LFUN_VC_REPO_UPDATE:
one.startscript(Systemcall::DontWait, command);
break;
}
+
+ case LFUN_SPELLING_CONTINUOUSLY:
+ lyxrc.spellcheck_continuously = !lyxrc.spellcheck_continuously;
+ dr.screenUpdate(Update::Force | Update::FitCursor);
+ break;
+
default:
// The LFUN must be for one of BufferView, Buffer or Cursor;
// let's try that:
if (isFullScreen()) {
if (menuBar()->isVisible() && lyxrc.full_screen_menubar)
menuBar()->hide();
- if (statusBar()->isVisible())
- statusBar()->hide();
+ }
+
+ // Need to update bv because many LFUNs here might have destroyed it
+ bv = currentBufferView();
+
+ // Clear non-empty selections
+ // (e.g. from a "char-forward-select" followed by "char-backward-select")
+ if (bv) {
+ Cursor & cur = bv->cursor();
+ if ((cur.selection() && cur.selBegin() == cur.selEnd())) {
+ cur.clearSelection();
+ }
}
}
} else if (ui_component == "menubar") {
menuBar()->setVisible(!menuBar()->isVisible());
} else
-#if QT_VERSION >= 0x040300
if (ui_component == "frame") {
int l, t, r, b;
getContentsMargins(&l, &t, &r, &b);
setContentsMargins(0, 0, 0, 0);
}
} else
-#endif
if (ui_component == "fullscreen") {
toggleFullScreen();
} else
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);
restoreLayout();
menuBar()->show();
hideDialogs("prefs", 0);
for (int i = 0; i != d.splitter_->count(); ++i)
d.tabWorkArea(i)->setFullScreen(true);
-#if QT_VERSION >= 0x040300
setContentsMargins(-2, -2, -2, -2);
-#endif
saveLayout();
setWindowState(windowState() ^ Qt::WindowFullScreen);
- statusBar()->hide();
+ if (lyxrc.full_screen_statusbar)
+ statusBar()->hide();
if (lyxrc.full_screen_menubar)
menuBar()->hide();
if (lyxrc.full_screen_toolbars) {
return createGuiPhantom(*this);
if (name == "prefs")
return createGuiPreferences(*this);
- if (name == "print")
- return createGuiPrint(*this);
if (name == "ref")
return createGuiRef(*this);
if (name == "sendto")
projects / lyx.git / blobdiff