diff -r 67cfa6e6b863 -r 7ced3733ba60 mainwindow.h --- a/mainwindow.h Tue Oct 24 15:36:38 2006 +0000 +++ b/mainwindow.h Mon Oct 30 12:39:37 2006 +0000 @@ -115,8 +115,8 @@ void editImportAdd(); void editImportReplace(); void editSaveBranch(); - void editRemoveBranchKeepChilds(); - void editRemoveChilds(); + void editDeleteKeepChilds(); + void editDeleteChilds(); void editDeleteSelection(); void editUpperBranch(); void editLowerBranch(); @@ -194,6 +194,8 @@ Q3PtrList actionListBranches; + QColor currentColor; + QAction* actionFileSave; QAction* actionFilePrint; QAction* actionEditUndo; @@ -223,8 +225,8 @@ QAction *actionEditAddBranchBefore; QAction *actionEditAddBranchAbove; QAction *actionEditAddBranchBelow; - QAction *actionEditRemoveBranchKeepChilds; - QAction *actionEditRemoveChilds; + QAction *actionEditDeleteKeepChilds; + QAction *actionEditDeleteChilds; QAction *actionEditImportAdd; QAction *actionEditImportReplace; QAction *actionEditSaveBranch;