#include "GuiView.h"
#include "Menus.h"
#include "qt_helpers.h"
-#include "ToolbarBackend.h"
+#include "Toolbars.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
using namespace std;
using namespace lyx::support;
-// FIXME: These strings are also used in GuiClipboard.cpp.
-static char const * const lyx_mime_type = "application/x-lyx";
-static char const * const pdf_mime_type = "application/pdf";
-static char const * const emf_mime_type = "image/x-emf";
-static char const * const wmf_mime_type = "image/x-wmf";
namespace lyx {
return new frontend::GuiApplication(argc, argv);
}
-
namespace frontend {
class SocketNotifier : public QSocketNotifier
QString flavorFor(QString const & mime)
{
LYXERR(Debug::ACTION, "flavorFor " << mime);
- if (mime == QLatin1String(pdf_mime_type))
+ if (mime == pdfMimeType())
return QLatin1String("com.adobe.pdf");
return QString();
}
{
LYXERR(Debug::ACTION, "mimeFor " << flav);
if (flav == QLatin1String("com.adobe.pdf"))
- return QLatin1String(pdf_mime_type);
+ return pdfMimeType();
return QString();
}
bool canConvert(QString const & mime, QString flav)
- { return mimeFor(flav) == mime; }
+ {
+ return mimeFor(flav) == mime;
+ }
QVariant convertToMime(QString const & mime, QList<QByteArray> data, QString flav)
{
static FORMATETC cfFromMime(QString const & mimetype)
{
FORMATETC formatetc;
- if (mimetype == emf_mime_type) {
+ if (mimetype == emfMimeType()) {
formatetc.cfFormat = CF_ENHMETAFILE;
formatetc.tymed = TYMED_ENHMF;
- } else if (mimetype == wmf_mime_type) {
+ } else if (mimetype == wmfMimeType()) {
formatetc.cfFormat = CF_METAFILEPICT;
formatetc.tymed = TYMED_MFPICT;
}
bool canConvertToMime(QString const & mimetype,
IDataObject * pDataObj) const
{
- if (mimetype != emf_mime_type && mimetype != wmf_mime_type)
+ if (mimetype != emfMimeType() && mimetype != wmfMimeType())
return false;
FORMATETC formatetc = cfFromMime(mimetype);
return pDataObj->QueryGetData(&formatetc) == S_OK;
{
switch (formatetc.cfFormat) {
case CF_ENHMETAFILE:
- return emf_mime_type;
+ return emfMimeType();
case CF_METAFILEPICT:
- return wmf_mime_type;
+ return wmfMimeType();
}
return QString();
}
QHash<int, SocketNotifier *> socket_notifiers_;
///
Menus menus_;
+ ///
+ /// The global instance
+ Toolbars toolbars_;
+
/// this timer is used for any regular events one wants to
/// perform. at present it is used to check if forked processes
/// are done.
}
if (!enable)
- flag.enabled(false);
+ flag.setEnabled(false);
return true;
}
}
+Toolbars const & GuiApplication::toolbars() const
+{
+ return d->toolbars_;
+}
+
+
+Toolbars & GuiApplication::toolbars()
+{
+ return d->toolbars_;
+}
+
+
Menus const & GuiApplication::menus() const
{
return d->menus_;
case QEvent::FileOpen: {
// Open a file; this happens only on Mac OS X for now
QFileOpenEvent * foe = static_cast<QFileOpenEvent *>(e);
-
- if (!current_view_ || !current_view_->view())
- // The application is not properly initialized yet.
- // So we acknowledge the event and delay the file opening
- // until LyX is ready.
- // FIXME UNICODE: FileName accept an utf8 encoded string.
- LyX::ref().addFileToLoad(fromqstr(foe->file()));
- else
- lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
- qstring_to_ucs4(foe->file())));
-
+ lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
+ qstring_to_ucs4(foe->file())));
e->accept();
return true;
}
bool GuiApplication::searchMenu(FuncRequest const & func,
- vector<docstring> & names) const
+ docstring_list & names) const
{
return d->menus_.searchMenu(func, names);
}
break;
case ui_toolbarset:
- toolbarbackend.readToolbars(lex);
+ d->toolbars_.readToolbars(lex);
break;
case ui_toolbars:
- toolbarbackend.readToolbarSettings(lex);
+ d->toolbars_.readToolbarSettings(lex);
break;
default: