1.1 --- a/aboutdialog.cpp Tue Aug 15 11:43:21 2006 +0000
1.2 +++ b/aboutdialog.cpp Tue Aug 15 12:01:14 2006 +0000
1.3 @@ -190,6 +190,6 @@
1.4 void AboutTextBrowser::setSource(const QUrl &url )
1.5 {
1.6 QProcess *proc= new QProcess ();
1.7 - proc->start( settings.value("/vym/mainwindow/readerURL"),QStringList ()<<url.toString());
1.8 + proc->start( settings.value("/vym/mainwindow/readerURL").toString(),QStringList ()<<url.toString());
1.9 if (!proc->waitForStarted() &&mainWindow->settingsURL() ) setSource(url);
1.10 }
2.1 --- a/mainwindow.cpp Tue Aug 15 11:43:21 2006 +0000
2.2 +++ b/mainwindow.cpp Tue Aug 15 12:01:14 2006 +0000
2.3 @@ -1109,7 +1109,6 @@
2.4 standardFlagsDefault->setVisibility (false);
2.5 standardFlagsDefault->setName ("standardFlagsDef");
2.6 standardFlagsDefault->setToolBar (tb);
2.7 - TB_standardFlags=tb;
2.8 tb->setObjectName ("standardFlagTB");
2.9
2.10 fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
2.11 @@ -3055,10 +3054,7 @@
2.12
2.13 void Main::testFunction()
2.14 {
2.15 - cout <<TB_standardFlags->isMovable()<<endl;
2.16 - cout <<TB_standardFlags->pos()<<endl;
2.17 - TB_standardFlags->move(QPoint (0,66));
2.18 - //currentMapEditor()->testFunction();
2.19 + currentMapEditor()->testFunction();
2.20 }
2.21
2.22 void Main::helpDoc()
3.1 --- a/mainwindow.h Tue Aug 15 11:43:21 2006 +0000
3.2 +++ b/mainwindow.h Tue Aug 15 12:01:14 2006 +0000
3.3 @@ -21,7 +21,6 @@
3.4 #include "findwindow.h"
3.5 #include "mapeditor.h"
3.6 #include "texteditor.h"
3.7 -#include "toolbars.h"
3.8 #include "xml.h"
3.9
3.10 class Main : public QMainWindow
3.11 @@ -185,8 +184,6 @@
3.12 void helpAboutQT();
3.13
3.14 private:
3.15 - ToolBarSet toolbars;
3.16 - QToolBar *TB_standardFlags;
3.17 QTabWidget *tabWidget;
3.18 FindWindow *findWindow;
3.19 QStringList lastMaps;