1.1 --- a/mainwindow.h	Wed Jul 16 10:44:44 2008 +0000
     1.2 +++ b/mainwindow.h	Wed Jul 16 10:46:14 2008 +0000
     1.3 @@ -4,6 +4,7 @@
     1.4  #include <QMainWindow>
     1.5  
     1.6  #include "branchpropwindow.h"
     1.7 +#include "extrainfodialog.h"
     1.8  #include "file.h"
     1.9  #include "findwindow.h"
    1.10  #include "historywindow.h"
    1.11 @@ -56,6 +57,7 @@
    1.12  	void hideEvent (QHideEvent * );
    1.13  	void showEvent (QShowEvent * );
    1.14  	MapEditor* currentMapEditor() const;
    1.15 +	VymModel* currentModel() const;
    1.16      
    1.17  private slots:
    1.18  	void editorChanged(QWidget*);
    1.19 @@ -65,10 +67,10 @@
    1.20      void fileLoad();
    1.21  	void fileLoadRecent();
    1.22  	void addRecentMap (const QString &);
    1.23 -    void fileSave(MapEditor*, const SaveMode & );
    1.24 +    void fileSave(VymModel*, const SaveMode & );
    1.25      void fileSave();
    1.26  public slots:	
    1.27 -    void fileSave(MapEditor *);	// autosave from MapEditor
    1.28 +    void fileSave(VymModel*);	// autosave from MapEditor
    1.29  private slots:	
    1.30      void fileSaveAs(const SaveMode &);
    1.31      void fileSaveAs();
    1.32 @@ -116,10 +118,10 @@
    1.33  	void openVymLinks(const QStringList &);
    1.34  	void editVymLink();
    1.35  	void editOpenMultipleVymLinks();
    1.36 -    void editHeadingFinished();
    1.37      void editAttributeFinished();
    1.38  public slots:
    1.39 -    void editHeading();
    1.40 +    void editHeadingFinished(VymModel *m);
    1.41 +//    void editHeading();
    1.42      void editAttribute();
    1.43  	void editOpenVymLink();
    1.44  private slots:
    1.45 @@ -130,7 +132,7 @@
    1.46      void editMoveDown();	
    1.47  	void editSortChildren();
    1.48      void editToggleScroll();
    1.49 -    void editUnscrollChilds();
    1.50 +    void editUnscrollChildren();
    1.51      void editAddMapCenter();
    1.52      void editNewBranch();
    1.53      void editNewBranchBefore();
    1.54 @@ -139,8 +141,8 @@
    1.55      void editImportAdd();
    1.56      void editImportReplace();
    1.57      void editSaveBranch();
    1.58 -    void editDeleteKeepChilds();
    1.59 -    void editDeleteChilds();
    1.60 +    void editDeleteKeepChildren();
    1.61 +    void editDeleteChildren();
    1.62      void editDeleteSelection();
    1.63      void editUpperBranch();
    1.64      void editLowerBranch();
    1.65 @@ -230,6 +232,8 @@
    1.66  
    1.67  	QStringList imageTypes;
    1.68  
    1.69 +	QList <VymModel*> models;
    1.70 +
    1.71  	QLineEdit *lineedit;	// to enter headings of branches
    1.72  	QString prevSelection;
    1.73  
    1.74 @@ -284,8 +288,8 @@
    1.75  	QAction *actionEditAddBranchBefore;
    1.76  	QAction *actionEditAddBranchAbove;
    1.77  	QAction *actionEditAddBranchBelow;
    1.78 -	QAction *actionEditDeleteKeepChilds;
    1.79 -	QAction *actionEditDeleteChilds;
    1.80 +	QAction *actionEditDeleteKeepChildren;
    1.81 +	QAction *actionEditDeleteChildren;
    1.82  	QAction *actionEditImportAdd;
    1.83  	QAction *actionEditImportReplace;
    1.84  	QAction *actionEditSaveBranch;