diff -r 192e1392ba6a -r 12958f987bcf mainwindow.h --- a/mainwindow.h Wed Jul 16 10:44:44 2008 +0000 +++ b/mainwindow.h Wed Jul 16 10:46:14 2008 +0000 @@ -4,6 +4,7 @@ #include #include "branchpropwindow.h" +#include "extrainfodialog.h" #include "file.h" #include "findwindow.h" #include "historywindow.h" @@ -56,6 +57,7 @@ void hideEvent (QHideEvent * ); void showEvent (QShowEvent * ); MapEditor* currentMapEditor() const; + VymModel* currentModel() const; private slots: void editorChanged(QWidget*); @@ -65,10 +67,10 @@ void fileLoad(); void fileLoadRecent(); void addRecentMap (const QString &); - void fileSave(MapEditor*, const SaveMode & ); + void fileSave(VymModel*, const SaveMode & ); void fileSave(); public slots: - void fileSave(MapEditor *); // autosave from MapEditor + void fileSave(VymModel*); // autosave from MapEditor private slots: void fileSaveAs(const SaveMode &); void fileSaveAs(); @@ -116,10 +118,10 @@ void openVymLinks(const QStringList &); void editVymLink(); void editOpenMultipleVymLinks(); - void editHeadingFinished(); void editAttributeFinished(); public slots: - void editHeading(); + void editHeadingFinished(VymModel *m); +// void editHeading(); void editAttribute(); void editOpenVymLink(); private slots: @@ -130,7 +132,7 @@ void editMoveDown(); void editSortChildren(); void editToggleScroll(); - void editUnscrollChilds(); + void editUnscrollChildren(); void editAddMapCenter(); void editNewBranch(); void editNewBranchBefore(); @@ -139,8 +141,8 @@ void editImportAdd(); void editImportReplace(); void editSaveBranch(); - void editDeleteKeepChilds(); - void editDeleteChilds(); + void editDeleteKeepChildren(); + void editDeleteChildren(); void editDeleteSelection(); void editUpperBranch(); void editLowerBranch(); @@ -230,6 +232,8 @@ QStringList imageTypes; + QList models; + QLineEdit *lineedit; // to enter headings of branches QString prevSelection; @@ -284,8 +288,8 @@ QAction *actionEditAddBranchBefore; QAction *actionEditAddBranchAbove; QAction *actionEditAddBranchBelow; - QAction *actionEditDeleteKeepChilds; - QAction *actionEditDeleteChilds; + QAction *actionEditDeleteKeepChildren; + QAction *actionEditDeleteChildren; QAction *actionEditImportAdd; QAction *actionEditImportReplace; QAction *actionEditSaveBranch;