#include <QLocale>
#include <QLibraryInfo>
#include <QPixmapCache>
+#include <QRegExp>
#include <QSessionManager>
#include <QSocketNotifier>
#include <QTextCodec>
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(unsigned int width,
- unsigned int height,
- int posx, int posy,
- int maximized,
- unsigned int iconSizeXY,
- const std::string & geometryArg)
+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.setGeometry(width, height, posx, posy, GuiView::Maximized(maximized),
- iconSizeXY, geometryArg);
-
+ 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);
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();