#include "GuiApplication.h"
+#include "GuiView.h"
#include "qt_helpers.h"
#include "GuiImage.h"
#include "frontends/alert.h"
-#include "frontends/LyXView.h"
#include "graphics/LoaderQueue.h"
#include <QLocale>
#include <QLibraryInfo>
#include <QPixmapCache>
+#include <QRegExp>
#include <QSessionManager>
#include <QSocketNotifier>
#include <QTextCodec>
#ifdef Q_WS_X11
#include <X11/Xatom.h>
#include <X11/Xlib.h>
+#undef CursorShape
+#undef None
#endif
#include <boost/bind.hpp>
GuiApplication::GuiApplication(int & argc, char ** argv)
- : QApplication(argc, argv), Application(argc, argv)
+ : QApplication(argc, argv), Application()
{
QCoreApplication::setOrganizationName("The LyX Community");
QCoreApplication::setOrganizationDomain("lyx.org");
installTranslator(&qt_trans_);
// even if the language calls for RtL, don't do that
setLayoutDirection(Qt::LeftToRight);
- LYXERR(Debug::GUI)
- << "Successfully installed Qt translations for locale "
- << fromqstr(language_name) << std::endl;
+ LYXERR(Debug::GUI, "Successfully installed Qt translations for locale "
+ << fromqstr(language_name));
} else
- LYXERR(Debug::GUI)
- << "Could not find Qt translations for locale "
- << fromqstr(language_name) << std::endl;
+ LYXERR(Debug::GUI, "Could not find Qt translations for locale "
+ << fromqstr(language_name));
#ifdef Q_WS_MACX
// This allows to translate the strings that appear in the LyX menu.
}
+LyXView & GuiApplication::createView(string const & geometry_arg)
+{
+ int const id = gui_.createRegisteredView();
+ GuiView & view = static_cast<GuiView &>(gui_.view(id));
+ theLyXFunc().setLyXView(&view);
+
+ view.init();
+ view.show();
+ if (!geometry_arg.empty()) {
+#ifdef Q_WS_WIN
+ int x, y;
+ int w, h;
+ QRegExp re( "[=]*(?:([0-9]+)[xX]([0-9]+)){0,1}[ ]*(?:([+-][0-9]*)([+-][0-9]*)){0,1}" );
+ re.indexIn(toqstr(geometry_arg.c_str()));
+ w = re.cap(1).toInt();
+ h = re.cap(2).toInt();
+ x = re.cap(3).toInt();
+ y = re.cap(4).toInt();
+ view.setGeometry(x, y, w, h);
+#endif
+ }
+ view.setFocus();
+
+ setCurrentView(view);
+
+ return view;
+}
+
+
+
+
Clipboard & GuiApplication::clipboard()
{
return clipboard_;
bool GuiApplication::notify(QObject * receiver, QEvent * event)
{
- bool return_value = false;
try {
- return_value = QApplication::notify(receiver, event);
+ return QApplication::notify(receiver, event);
}
- catch (support::ExceptionMessage const & e) {
+ catch (support::ExceptionMessage const & e) {
if (e.type_ == support::ErrorException) {
Alert::error(e.title_, e.details_);
LyX::cref().emergencyCleanup();
QApplication::exit(1);
} else if (e.type_ == support::WarningException) {
Alert::warning(e.title_, e.details_);
- return return_value;
+ return false;
}
}
- catch (std::exception const & e) {
+ catch (std::exception const & e) {
docstring s = _("LyX has caught an exception, it will now "
"attemp to save all unsaved documents and exit."
"\n\nException: ");
QApplication::exit(1);
}
- return return_value;
+ return false;
}
}
-bool GuiApplication::getRgbColor(ColorCode col,
- RGBColor & rgbcol)
+bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol)
{
QColor const & qcol = color_cache_.get(col);
if (!qcol.isValid()) {
case SelectionRequest: {
if (xev->xselectionrequest.selection != XA_PRIMARY)
break;
- LYXERR(Debug::GUI) << "X requested selection." << endl;
+ LYXERR(Debug::GUI, "X requested selection.");
BufferView * bv = currentView()->view();
if (bv) {
docstring const sel = bv->requestSelection();
case SelectionClear: {
if (xev->xselectionclear.selection != XA_PRIMARY)
break;
- LYXERR(Debug::GUI) << "Lost selection." << endl;
+ LYXERR(Debug::GUI, "Lost selection.");
BufferView * bv = currentView()->view();
if (bv)
bv->clearSelection();