1.1 --- a/mainwindow.h Sun Jan 30 12:58:47 2005 +0000
1.2 +++ b/mainwindow.h Tue Jun 06 14:58:11 2006 +0000
1.3 @@ -1,28 +1,33 @@
1.4 #ifndef MAINWINDOW_H
1.5 #define MAINWINDOW_H
1.6
1.7 -#include <qpopupmenu.h>
1.8 -#include <qmainwindow.h>
1.9 -#include <qtextedit.h>
1.10 -#include <qintdict.h>
1.11 -#include <qcanvas.h>
1.12 +#include <q3popupmenu.h>
1.13 +#include <q3mainwindow.h>
1.14 +#include <q3textedit.h>
1.15 +#include <q3intdict.h>
1.16 +#include <q3canvas.h>
1.17 #include <qlineedit.h>
1.18 #include <qaction.h>
1.19 #include <qcursor.h>
1.20 #include <qtabwidget.h>
1.21 #include <qmap.h>
1.22 +//Added by qt3to4:
1.23 +#include <QCloseEvent>
1.24 +#include <QShowEvent>
1.25 +#include <QHideEvent>
1.26
1.27 +#include "file.h"
1.28 +#include "findwindow.h"
1.29 +#include "mapeditor.h"
1.30 +#include "texteditor.h"
1.31 #include "xml.h"
1.32 -#include "texteditor.h"
1.33 -#include "mapeditor.h"
1.34 -#include "findwindow.h"
1.35
1.36 -class Main : public QMainWindow
1.37 +class Main : public Q3MainWindow
1.38 {
1.39 Q_OBJECT
1.40
1.41 public:
1.42 - Main(QWidget* parent=0, const char* name=0, WFlags f=0);
1.43 + Main(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
1.44 ~Main();
1.45 void loadCmdLine();
1.46 void statusMessage (const QString &);
1.47 @@ -38,6 +43,7 @@
1.48 void setupEditActions();
1.49 void setupFormatActions();
1.50 void setupViewActions();
1.51 + void setupModeActions();
1.52 void setupWindowActions();
1.53 void setupFlagActions();
1.54 void setupSettingsActions();
1.55 @@ -55,7 +61,7 @@
1.56 void newView();
1.57 void editorChanged(QWidget*);
1.58
1.59 - void fileLoad(QString ,const LoadMode &);
1.60 + ErrorCode fileLoad(QString ,const LoadMode &);
1.61 void fileLoad(const LoadMode &);
1.62 void fileLoad();
1.63 void fileLoadLast(int);
1.64 @@ -63,12 +69,18 @@
1.65 void fileSave();
1.66 void fileSaveAs(const SaveMode &);
1.67 void fileSaveAs();
1.68 + void fileImportKDEBookmarks();
1.69 + void fileImportFirefoxBookmarks();
1.70 + void fileImportMM();
1.71 void fileImportDir();
1.72 void fileExportXML();
1.73 - void fileExportHTML();
1.74 void fileExportXHTML();
1.75 void fileExportImage(int);
1.76 void fileExportASCII();
1.77 + void fileExportLaTeX();
1.78 + void fileExportKDEBookmarks();
1.79 + void fileExportTaskjuggler();
1.80 + void fileExportOOPresentation();
1.81 void fileCloseMap();
1.82 void filePrint();
1.83 void fileExitVYM();
1.84 @@ -83,15 +95,18 @@
1.85 void editFindChanged();
1.86 public slots:
1.87 void editOpenURL();
1.88 + void editOpenURLTab();
1.89 private slots:
1.90 void editURL();
1.91 void editHeading2URL();
1.92 void editBugzilla2URL();
1.93 + void editFATE2URL();
1.94 void editVymLink();
1.95 public slots:
1.96 void editOpenVymLink();
1.97 private slots:
1.98 void editDeleteVymLink();
1.99 + void editToggleHideExport();
1.100 void editMapInfo();
1.101 void editMoveUp();
1.102 void editMoveDown();
1.103 @@ -99,11 +114,14 @@
1.104 void editUnScrollAll();
1.105 void editHeading();
1.106 void editNewBranch();
1.107 + void editNewBranchHere();
1.108 void editNewBranchAbove();
1.109 void editNewBranchBelow();
1.110 void editImportAdd();
1.111 void editImportReplace();
1.112 void editSaveBranch();
1.113 + void editRemoveBranchKeepChilds();
1.114 + void editRemoveChilds();
1.115 void editDeleteSelection();
1.116 void editUpperBranch();
1.117 void editLowerBranch();
1.118 @@ -113,7 +131,8 @@
1.119 void editLastBranch();
1.120 void editLoadImage();
1.121 void editSaveImage(int);
1.122 - void editToggleFloatExport();
1.123 + void editFollowXLink (int);
1.124 + void editEditXLink (int);
1.125
1.126 void formatSelectColor();
1.127 void formatPickColor();
1.128 @@ -129,16 +148,26 @@
1.129 void formatToggleLinkColorHint();
1.130 void formatFrameNone();
1.131 void formatFrameRectangle();
1.132 + void formatIncludeImagesVer();
1.133 + void formatIncludeImagesHor();
1.134 + void formatHideLinkUnselected();
1.135
1.136 void viewZoomReset();
1.137 void viewZoomIn();
1.138 void viewZoomOut();
1.139
1.140 + void modModeColor();
1.141 + void modModeLink();
1.142 +
1.143 public slots:
1.144 bool settingsPDF();
1.145 bool settingsURL();
1.146 + void settingsToggleDelKey();
1.147
1.148 void windowToggleNoteEditor();
1.149 + void windowToggleHistory();
1.150 + void updateNoteFlag();
1.151 +
1.152 private slots:
1.153 void windowNextEditor();
1.154 void windowPreviousEditor();
1.155 @@ -148,19 +177,19 @@
1.156 void standardFlagChanged();
1.157
1.158 void testFunction();
1.159 - void testShowClipboard();
1.160
1.161 void helpDoc();
1.162 void helpAbout();
1.163 void helpAboutQT();
1.164
1.165 private:
1.166 - QCanvas* canvas;
1.167 +// not needed? QCanvas* canvas;
1.168 QTabWidget *tabWidget;
1.169 FindWindow *findWindow;
1.170 QStringList lastMaps;
1.171 int maxLastMaps;
1.172 QString lastFileDir;
1.173 + Q3Process *procBrowser;
1.174 };
1.175
1.176