Am Freitag, 22. September 2006 11:49 schrieb Abdelrazak Younes:
> Abdelrazak Younes wrote:
> >> 2) I just commit and continue my cleanup work. This includes:
> >
> > If there's no objection then I will proceed to 2) at the end of the
day.
This is the qt3 part. I ignored the wa_ptr stuff, I never understood why it
is there. It seems to work for me.
Georg
Index: src/frontends/qt3/lyx_gui.C
===================================================================
--- src/frontends/qt3/lyx_gui.C (Revision 15125)
+++ src/frontends/qt3/lyx_gui.C (Arbeitskopie)
@@ -14,7 +14,6 @@
#include "lyx_gui.h"
// FIXME: move this stuff out again
-#include "bufferlist.h"
#include "BufferView.h"
#include "Color.h"
#include "funcrequest.h"
@@ -26,8 +25,6 @@
#include "lyxserver.h"
#include "lyxsocket.h"
-#include "graphics/LoaderQueue.h"
-
#include "support/lstrings.h"
#include "support/os.h"
#include "support/package.h"
@@ -39,9 +36,10 @@
#include <boost/signal.hpp> // FIXME: Is this needed? (Lgb)
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
+#include "frontends/LyXView.h"
#include "frontends/WorkArea.h"
-#include "GuiImplementation.h"
+#include "GuiApplication.h"
#include "QtView.h"
#include "lcolorcache.h"
#include "qfont_loader.h"
@@ -64,8 +62,7 @@
using lyx::support::ltrim;
using lyx::support::package;
-using lyx::frontend::Gui;
-using lyx::frontend::GuiImplementation;
+using lyx::frontend::GuiApplication;
using lyx::frontend::QtView;
namespace os = lyx::support::os;
@@ -81,92 +78,15 @@ using std::vector;
using std::string;
-extern BufferList bufferlist;
-
-// FIXME: wrong place !
-LyXServer * lyxserver;
-LyXServerSocket * lyxsocket;
-
namespace {
-int getDPI()
-{
- QWidget w;
- QPaintDeviceMetrics pdm(&w);
- return int(0.5 * (pdm.logicalDpiX() + pdm.logicalDpiY()));
-}
-
map<int, shared_ptr<socket_callback> > socket_callbacks;
-void cleanup()
-{
- delete lyxsocket;
- lyxsocket = 0;
- delete lyxserver;
- lyxserver = 0;
-}
-
} // namespace anon
-// in QLyXKeySym.C
-extern void initEncodings();
-
-#ifdef Q_WS_X11
-extern bool lyxX11EventFilter(XEvent * xev);
-#endif
-
-#ifdef Q_WS_MACX
-extern pascal OSErr
-handleOpenDocuments(const AppleEvent* inEvent, AppleEvent* /*reply*/,
- long /*refCon*/);
-#endif
-
-class LQApplication : public QApplication
-{
-public:
- LQApplication(int & argc, char ** argv);
- //
- Gui & gui() { return gui_; }
-
-#ifdef Q_WS_X11
- bool x11EventFilter (XEvent * ev) { return lyxX11EventFilter(ev); }
-#endif
-#ifdef Q_WS_MACX
- bool macEventFilter(EventRef event);
-#endif
-
-private:
- ///
- GuiImplementation gui_;
-};
-
-LQApplication::LQApplication(int & argc, char ** argv)
- : QApplication(argc, argv)
-{
-#ifdef Q_WS_MACX
- AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
- NewAEEventHandlerUPP(handleOpenDocuments),
- 0, false);
-#endif
-}
-
-
-#ifdef Q_WS_MACX
-bool LQApplication::macEventFilter(EventRef event)
-{
- if (GetEventClass(event) == kEventClassAppleEvent) {
- EventRecord eventrec;
- ConvertEventRefToEventRecord(event, &eventrec);
- AEProcessAppleEvent(&eventrec);
-
- return false;
- }
- return false;
-}
-#endif
-
-LQApplication * theApp;
+lyx::frontend::Application * theApp;
+GuiApplication * guiApp;
namespace lyx_gui {
@@ -178,53 +98,10 @@ int exec(int & argc, char * argv[])
// Force adding of font path _before_ QApplication is initialized
FontLoader::initFontPath();
- LQApplication app(argc, argv);
- theApp = &app;
-
-#if QT_VERSION >= 0x030200
- // install translation file for Qt built-in dialogs
- // These are only installed since Qt 3.2.x
- QTranslator qt_trans(0);
- if (qt_trans.load(QString("qt_") + QTextCodec::locale(),
- qInstallPathTranslations())) {
- qApp->installTranslator(&qt_trans);
- // even if the language calls for RtL, don't do that
- qApp->setReverseLayout(false);
- lyxerr[Debug::GUI]
- << "Successfully installed Qt translations for locale "
- << QTextCodec::locale() << std::endl;
- } else
- lyxerr[Debug::GUI]
- << "Could not find Qt translations for locale "
- << QTextCodec::locale() << std::endl;
-#endif
-
-#ifdef Q_WS_MACX
- // These translations are meant to break Qt/Mac menu merging
- // algorithm on some entries. It lists the menu names that
- // should not be moved to the LyX menu
- QTranslator aqua_trans(0);
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0,
- "do_not_merge_me"));
- aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0,
- "do_not_merge_me"));
-
- qApp->installTranslator(&aqua_trans);
-#endif
+ GuiApplication app(argc, argv);
- using namespace lyx::graphics;
-
- Image::newImage = boost::bind(&QLImage::newImage);
- Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
-
- // needs to be done before reading lyxrc
- lyxrc.dpi = getDPI();
-
- LoaderQueue::setPriority(10,100);
+ guiApp = &app;
+ theApp = guiApp;
return LyX::ref().exec2(argc, argv);
}
@@ -237,50 +114,13 @@ void parse_lyxrc()
LyXView* create_view(unsigned int width, unsigned int height, int posx, int posy,
bool maximize)
{
- // this can't be done before because it needs the Languages object
- initEncodings();
-
- int view_id = theApp->gui().newView(width, height);
- QtView & view = static_cast<QtView &> (theApp->gui().view(view_id));
- theApp->gui().newWorkArea(width, height, 0);
-
- LyX::ref().addLyXView(&view);
-
- view.init();
-
- if (width != 0 && height != 0) {
- view.initFloatingGeometry(QRect(posx, posy, width, height));
- view.resize(width, height);
- if (posx != -1 && posy != -1)
- view.move(posx, posy);
- view.show();
- if (maximize)
- view.setWindowState(Qt::WindowMaximized);
- } else
- view.show();
-
- return &view;
+ return &guiApp->createView(width, height, posx, posy, maximize);
}
-int start(LyXView * view, string const & batch)
+int start(LyXView *, string const & batch)
{
- // FIXME: some code below needs moving
-
- lyxserver = new LyXServer(&view->getLyXFunc(), lyxrc.lyxpipes);
- lyxsocket = new LyXServerSocket(&view->getLyXFunc(),
- os::internal_path(package().temp_dir() + "/lyxsocket"));
-
- // handle the batch commands the user asked for
- if (!batch.empty()) {
- view->getLyXFunc().dispatch(lyxaction.lookupFunc(batch));
- }
-
- int const status = qApp->exec();
-
- // FIXME
- cleanup();
- return status;
+ return theApp->start(batch);
}
@@ -298,8 +138,7 @@ void sync_events()
void exit(int status)
{
- cleanup();
- QApplication::exit(status);
+ guiApp->exit(status);
}
Index: src/frontends/qt3/QtView.C
===================================================================
--- src/frontends/qt3/QtView.C (Revision 15125)
+++ src/frontends/qt3/QtView.C (Arbeitskopie)
@@ -55,8 +55,8 @@ int const statusbar_timer_value = 3000;
} // namespace anon
-QtView::QtView(Gui & owner)
- : QMainWindow(), LyXView(owner), commandbuffer_(0)
+QtView::QtView()
+ : QMainWindow(), LyXView(), commandbuffer_(0)
{
qApp->setMainWidget(this);
Index: src/frontends/qt3/GuiSelection.C
===================================================================
--- src/frontends/qt3/GuiSelection.C (Revision 15125)
+++ src/frontends/qt3/GuiSelection.C (Arbeitskopie)
@@ -50,5 +50,17 @@ void GuiSelection::put(docstring const &
QClipboard::Selection);
}
+
+void GuiSelection::haveSelection(bool own)
+{
+ if (!QApplication::clipboard()->supportsSelection())
+ return;
+
+ if (own)
+ QApplication::clipboard()->setText(QString(), QClipboard::Selection);
+ // We don't need to do anything if own = false, as this case is
+ // handled by QT.
+}
+
} // namespace frontend
} // namespace lyx
Index: src/frontends/qt3/GuiImplementation.h
===================================================================
--- src/frontends/qt3/GuiImplementation.h (Revision 15125)
+++ src/frontends/qt3/GuiImplementation.h (Arbeitskopie)
@@ -18,8 +18,6 @@
#include "qscreen.h"
#include "QWorkArea.h"
-#include "GuiClipboard.h"
-#include "GuiSelection.h"
#include "GuiWorkArea.h"
#include "BufferView.h"
@@ -47,19 +45,9 @@ public:
{
}
- lyx::frontend::Clipboard& clipboard()
- {
- return clipboard_;
- }
-
- lyx::frontend::Selection& selection()
- {
- return *selection_;
- }
-
int newView(unsigned int /*w*/, unsigned int /*h*/)
{
- view_.reset(new FView(*this));
+ view_.reset(new FView);
return 0;
}
@@ -80,7 +68,6 @@ public:
old_work_area_.reset(new FWorkArea(*view_.get(), w, h));
old_screen_.reset(new FScreen(*old_work_area_.get()));
work_area_.reset(new GuiWorkArea(old_screen_.get(), old_work_area_.get()));
- selection_.reset(new GuiSelection(old_work_area_.get()));
// FIXME BufferView creation should be independant of WorkArea creation
buffer_views_[0].reset(new BufferView(view_.get()));
@@ -96,7 +83,6 @@ public:
void destroyWorkArea(int /*id*/)
{
- selection_.reset();
work_area_.reset();
old_work_area_.reset();
old_screen_.reset();
@@ -104,10 +90,6 @@ public:
private:
///
- GuiClipboard clipboard_;
- ///
- boost::shared_ptr<GuiSelection> selection_;
- ///
boost::shared_ptr<GuiWorkArea> work_area_;
///
boost::shared_ptr<FView> view_;
Index: src/frontends/qt3/QtView.h
===================================================================
--- src/frontends/qt3/QtView.h (Revision 15125)
+++ src/frontends/qt3/QtView.h (Arbeitskopie)
@@ -36,7 +36,7 @@ class QtView : public QMainWindow, publi
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(Gui & owner);
+ QtView();
~QtView();
Index: src/frontends/qt3/Makefile.am
===================================================================
--- src/frontends/qt3/Makefile.am (Revision 15125)
+++ src/frontends/qt3/Makefile.am (Arbeitskopie)
@@ -34,6 +34,7 @@ libqt3_la_SOURCES = \
Alert_pimpl.C \
Dialogs.C \
FileDialog.C \
+ GuiApplication.C GuiApplication.h \
GuiClipboard.C GuiClipboard.h \
GuiImplementation.h \
GuiSelection.C GuiSelection.h \
Index: src/frontends/qt3/QWorkArea.C
===================================================================
--- src/frontends/qt3/QWorkArea.C (Revision 15125)
+++ src/frontends/qt3/QWorkArea.C (Arbeitskopie)
@@ -45,10 +45,6 @@ using std::string;
namespace os = lyx::support::os;
-namespace {
-lyx::frontend::QWorkArea * wa_ptr = 0;
-}
-
namespace lyx {
namespace frontend {
@@ -72,9 +68,6 @@ QWorkArea::QWorkArea(LyXView & owner, in
vl->addWidget(content_, 5);
vl->addWidget(scrollbar_, 0);
-#ifdef Q_WS_MACX
- wa_ptr = this;
-#endif
show();
}
@@ -102,117 +95,6 @@ void QWorkArea::setScrollbarParams(int h
scrollbar_->setTracking(true);
}
-} // namespace frontend
-} // namespace lyx
-
-
-#ifdef Q_WS_X11
-bool lyxX11EventFilter(XEvent * xev)
-{
- switch (xev->type) {
- case SelectionRequest:
- lyxerr[Debug::GUI] << "X requested selection." << endl;
- if (wa_ptr) {
- lyx::docstring const sel = wa_ptr->view().view()->requestSelection();
- if (!sel.empty())
- wa_ptr->view().gui().selection().put(sel);
- }
- break;
- case SelectionClear:
- lyxerr[Debug::GUI] << "Lost selection." << endl;
- if (wa_ptr)
- wa_ptr->view().view()->clearSelection();
- break;
- }
- return false;
-}
-#endif
-
-#ifdef Q_WS_MACX
-namespace{
-OSErr checkAppleEventForMissingParams(const AppleEvent& theAppleEvent)
- {
- DescType returnedType;
- Size actualSize;
- OSErr err = AEGetAttributePtr(&theAppleEvent, keyMissedKeywordAttr,
- typeWildCard, &returnedType, nil, 0,
- &actualSize);
- switch (err) {
- case errAEDescNotFound:
- return noErr;
- case noErr:
- return errAEEventNotHandled;
- default:
- return err;
- }
- }
-}
-
-pascal OSErr handleOpenDocuments(const AppleEvent* inEvent,
- AppleEvent* /*reply*/, long /*refCon*/)
-{
- QString s_arg;
- AEDescList documentList;
- OSErr err = AEGetParamDesc(inEvent, keyDirectObject, typeAEList,
- &documentList);
- if (err != noErr)
- return err;
-
- err = checkAppleEventForMissingParams(*inEvent);
- if (err == noErr) {
- long documentCount;
- err = AECountItems(&documentList, &documentCount);
- for (long documentIndex = 1;
- err == noErr && documentIndex <= documentCount;
- documentIndex++) {
- DescType returnedType;
- Size actualSize;
- AEKeyword keyword;
- FSRef ref;
- char qstr_buf[1024];
- err = AESizeOfNthItem(&documentList, documentIndex,
- &returnedType, &actualSize);
- if (err == noErr) {
- err = AEGetNthPtr(&documentList, documentIndex,
- typeFSRef, &keyword,
- &returnedType, (Ptr)&ref,
- sizeof(FSRef), &actualSize);
- if (err == noErr) {
- FSRefMakePath(&ref, (UInt8*)qstr_buf,
- 1024);
- s_arg=QString::fromUtf8(qstr_buf);
- wa_ptr->view().view()->workAreaDispatch(
- FuncRequest(LFUN_FILE_OPEN,
- fromqstr(s_arg)));
- break;
- }
- }
- } // for ...
- }
- AEDisposeDesc(&documentList);
- return err;
-}
-#endif // Q_WS_MACX
-
-
-namespace lyx {
-namespace frontend {
-
-void QWorkArea::haveSelection(bool own)
-{
- wa_ptr = const_cast<QWorkArea*>(this);
-
- if (!QApplication::clipboard()->supportsSelection())
- return;
-
- if (own) {
- QApplication::clipboard()->setSelectionMode(true);
- QApplication::clipboard()->setText(QString());
- }
- // We don't need to do anything if own = false, as this case is
- // handled by QT.
-}
-
void QWorkArea::dragEnterEvent(QDragEnterEvent * event)
{
Index: src/frontends/qt3/GuiSelection.h
===================================================================
--- src/frontends/qt3/GuiSelection.h (Revision 15125)
+++ src/frontends/qt3/GuiSelection.h (Arbeitskopie)
@@ -14,8 +14,6 @@
#include "frontends/Selection.h"
-#include "QWorkArea.h"
-
namespace lyx {
namespace frontend {
@@ -25,28 +23,19 @@ namespace frontend {
class GuiSelection: public lyx::frontend::Selection
{
public:
- GuiSelection(QWorkArea * work_area)
- : old_work_area_(work_area)
- {
- }
+ GuiSelection() {}
virtual ~GuiSelection() {}
/** Selection overloaded methods
*/
//@{
- void haveSelection(bool own)
- {
- old_work_area_->haveSelection(own);
- }
+ void haveSelection(bool);
docstring const get() const;
void put(docstring const & str);
//@}
-
-private:
- QWorkArea * old_work_area_;
};
} // namespace frontend
Index: src/frontends/qt3/QWorkArea.h
===================================================================
--- src/frontends/qt3/QWorkArea.h (Revision 15125)
+++ src/frontends/qt3/QWorkArea.h (Arbeitskopie)
@@ -49,8 +49,6 @@ public:
///
virtual void setScrollbarParams(int height, int pos, int line_height);
- /// a selection exists
- virtual void haveSelection(bool);
///
virtual void dragEnterEvent(QDragEnterEvent * event);
///
Index: src/frontends/qt3/GuiApplication.C
===================================================================
--- src/frontends/qt3/GuiApplication.C (Revision 15125)
+++ src/frontends/qt3/GuiApplication.C (Arbeitskopie)
@@ -1,5 +1,5 @@
/**
- * \file qt4/GuiApplication.C
+ * \file qt3/GuiApplication.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@@ -12,9 +12,12 @@
#include <config.h>
+#include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
+
#include "GuiApplication.h"
-#include "GuiView.h"
+#include "QtView.h"
#include "GuiWorkArea.h"
#include "qt_helpers.h"
#include "QLImage.h"
@@ -31,13 +34,13 @@
#include "lyxrc.h"
#include "debug.h"
-#include <QApplication>
-#include <QClipboard>
-#include <QEventLoop>
-#include <QLocale>
-#include <QLibraryInfo>
-#include <QTextCodec>
-#include <QTranslator>
+#include <qapplication.h>
+#include <qclipboard.h>
+#include <qeventloop.h>
+#include <qlocale.h>
+#include <qpaintdevicemetrics.h>
+#include <qtextcodec.h>
+#include <qtranslator.h>
#ifdef Q_WS_X11
#include <X11/Xlib.h>
@@ -63,7 +66,8 @@ namespace {
int getDPI()
{
QWidget w;
- return int(0.5 * (w.logicalDpiX() + w.logicalDpiY()));
+ QPaintDeviceMetrics pdm(&w);
+ return int(0.5 * (pdm.logicalDpiX() + pdm.logicalDpiY()));
}
} // namespace anon
@@ -89,26 +93,25 @@ GuiApplication::GuiApplication(int & arg
0, false);
#endif
+#if QT_VERSION >= 0x030200
// install translation file for Qt built-in dialogs
// These are only installed since Qt 3.2.x
- QTranslator qt_trans;
- QString language_name = QString("qt_") + QLocale::system().name();
- language_name.truncate(5);
- if (qt_trans.load(language_name,
- QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
- {
+ QTranslator qt_trans(0);
+ if (qt_trans.load(QString("qt_") + QTextCodec::locale(),
+ qInstallPathTranslations())) {
qApp->installTranslator(&qt_trans);
// even if the language calls for RtL, don't do that
- qApp->setLayoutDirection(Qt::LeftToRight);
+ qApp->setReverseLayout(false);
lyxerr[Debug::GUI]
<< "Successfully installed Qt translations for locale "
- << fromqstr(language_name) << std::endl;
+ << QTextCodec::locale() << std::endl;
} else
lyxerr[Debug::GUI]
<< "Could not find Qt translations for locale "
- << fromqstr(language_name) << std::endl;
+ << QTextCodec::locale() << std::endl;
+#endif
-/*#ifdef Q_WS_MACX
+#ifdef Q_WS_MACX
// These translations are meant to break Qt/Mac menu merging
// algorithm on some entries. It lists the menu names that
// should not be moved to the LyX menu
@@ -124,7 +127,7 @@ GuiApplication::GuiApplication(int & arg
qApp->installTranslator(&aqua_trans);
#endif
-*/
+
using namespace lyx::graphics;
Image::newImage = boost::bind(&QLImage::newImage);
@@ -171,7 +174,7 @@ LyXView & GuiApplication::createView(uns
initEncodings();
int view_id = gui().newView(width, height);
- GuiView & view = static_cast<GuiView &> (gui().view(view_id));
+ QtView & view = static_cast<QtView &> (gui().view(view_id));
lyxfunc_.reset(new LyXFunc(&view));
@@ -188,24 +191,15 @@ LyXView & GuiApplication::createView(uns
// only true when the -geometry option was NOT used
if (width != 0 && height != 0) {
- if (posx != -1 && posy != -1) {
-#ifdef Q_OS_WIN32
- // FIXME: use only setGeoemtry when Trolltech has
- // fixed the qt4/X11 bug
- view.setGeometry(posx, posy,width, height);
-#else
- view.resize(width, height);
+ view.initFloatingGeometry(QRect(posx, posy, width, height));
+ view.resize(width, height);
+ if (posx != -1 && posy != -1)
view.move(posx, posy);
-#endif
- } else {
- view.resize(width, height);
- }
-
+ view.show();
if (maximize)
view.setWindowState(Qt::WindowMaximized);
- }
-
- view.show();
+ } else
+ view.show();
return view;
}
@@ -222,7 +216,7 @@ bool GuiApplication::x11EventFilter(XEve
if (buffer_view_) {
lyx::docstring const sel = buffer_view_->requestSelection();
if (!sel.empty())
- gui_.selection().put(sel);
+ selection_.put(sel);
}
break;
case SelectionClear:
Index: src/frontends/qt3/GuiApplication.h
===================================================================
--- src/frontends/qt3/GuiApplication.h (Revision 15125)
+++ src/frontends/qt3/GuiApplication.h (Arbeitskopie)
@@ -1,5 +1,5 @@
/**
- * \file qt4/GuiApplication.h
+ * \file qt3/GuiApplication.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
@@ -10,17 +10,17 @@
* Full author contact details are available in file CREDITS.
*/
-#ifndef QT4_APPLICATION_H
-#define QT4_APPLICATION_H
+#ifndef QT3_APPLICATION_H
+#define QT3_APPLICATION_H
-#include "FontLoader.h"
+#include "frontends/Application.h"
+
+#include "qfont_loader.h"
#include "GuiClipboard.h"
#include "GuiImplementation.h"
#include "GuiSelection.h"
-#include "frontends/Application.h"
-
-#include <QApplication>
+#include <qapplication.h>
///////////////////////////////////////////////////////////////
// Specific stuff
@@ -97,4 +97,4 @@ private:
extern lyx::frontend::GuiApplication * guiApp;
-#endif // QT4_APPLICATION_H
+#endif // QT3_APPLICATION_H
Index: development/scons/scons_manifest.py
===================================================================
--- development/scons/scons_manifest.py (Revision 15129)
+++ development/scons/scons_manifest.py (Arbeitskopie)
@@ -732,6 +732,7 @@ src_frontends_qt3_moc_files = Split('''
src_frontends_qt3_header_files = Split('''
BulletsModule.h
FileDialog_private.h
+ GuiApplication.h
GuiClipboard.h
GuiImplementation.h
GuiSelection.h
@@ -852,6 +853,7 @@ src_frontends_qt3_files = Split('''
Dialogs.C
FileDialog.C
FileDialog_private.C
+ GuiApplication.C
GuiClipboard.C
GuiSelection.C
LyXKeySymFactory.C
