1.1 --- a/mainwindow.h	Wed Jan 10 13:26:12 2007 +0000
     1.2 +++ b/mainwindow.h	Tue Jan 23 11:50:53 2007 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  
     1.5  #include <QMainWindow>
     1.6  
     1.7 +#include "branchpropwindow.h"
     1.8  #include "file.h"
     1.9  #include "findwindow.h"
    1.10  #include "historywindow.h"
    1.11 @@ -146,8 +147,6 @@
    1.12      void formatSelectBackImage();
    1.13      void formatSelectLinkColor();
    1.14      void formatToggleLinkColorHint();
    1.15 -	void formatFrameNone();
    1.16 -	void formatFrameRectangle();
    1.17  	void formatIncludeImagesVer();
    1.18  	void formatIncludeImagesHor();
    1.19  	void formatHideLinkUnselected();
    1.20 @@ -174,6 +173,7 @@
    1.21  	bool useFlagGroups();
    1.22  
    1.23  private slots:
    1.24 +	void showPropertyDialog();
    1.25  	void windowNextEditor();
    1.26  	void windowPreviousEditor();
    1.27  	void windowShowNoteEditor();
    1.28 @@ -200,6 +200,8 @@
    1.29  
    1.30  	HistoryWindow *historyWindow;
    1.31  
    1.32 +	BranchPropertyWindow *branchPropertyWindow;
    1.33 +
    1.34  	QList <QAction*> actionListBranches;
    1.35  
    1.36  	QColor currentColor;
    1.37 @@ -263,8 +265,8 @@
    1.38  	QAction* actionModModeCopy;
    1.39  
    1.40  	QActionGroup *actionGroupFormatFrameTypes;
    1.41 -	QAction *actionFormatFrameNone;
    1.42 -	QAction *actionFormatFrameRectangle;
    1.43 +
    1.44 +	QAction *actionOpenPropertyDialog;
    1.45  
    1.46  	QActionGroup *actionGroupFormatLinkStyles;
    1.47  	QAction *actionFormatLinkStyleLine;