# HG changeset patch
# User insilmaril
# Date 1150446431 0
# Node ID ffe2a43966946677e7407f5003b557b4881d46be
# Parent 13b9befc665ed247e2a04250501a6131d028c5a8
1.8.0
diff -r 13b9befc665e -r ffe2a4396694 mainwindow.cpp
--- a/mainwindow.cpp Fri Jun 16 08:27:10 2006 +0000
+++ b/mainwindow.cpp Fri Jun 16 08:27:11 2006 +0000
@@ -439,6 +439,71 @@
a->addTo( menu );
actionEditPaste=a;
+ // Shortcuts to modify heading:
+ a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
+ actionListBranches.append(a);
+ a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
+ actionListBranches.append(a);
+ actionEditHeading=a;
+ a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
+ a->setEnabled (false);
+ actionEditHeading=a;
+ actionListBranches.append(a);
+
+ // Shortcut to delete selection
+ a = new QAction( tr( "Delete Selection" ),tr( "Delete Selection" ), Key_Delete, this, "deleteBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
+ a->setEnabled (false);
+ actionEditDelete=a;
+
+ // Shortcut to add branch
+ alt = new QAction( tr( "Add a branch as child of selection" ),QPixmap(iconPath+"newbranch.png"),tr( "Add branch as child" ), Key_A, this, "newBranch" );
+ connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
+ a = new QAction( tr( "Add a branch as child of selection" ),QPixmap(iconPath+"newbranch.png"),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
+ a->setEnabled (false);
+ actionListBranches.append(a);
+ #if defined (Q_OS_MACX)
+ // In OSX show different shortcut in menues, the keys work independtly always
+ actionEditAddBranch=alt;
+ #else
+ actionEditAddBranch=a;
+ #endif
+ actionEditAddBranch->addTo( tb );
+
+ // Add branch by inserting it at selection
+ a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
+ a->setEnabled (false);
+ actionListBranches.append(a);
+ actionEditAddBranchHere=a;
+ a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_A, this, "newBranchHere" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
+ actionListBranches.append(a);
+
+ // Add branch above
+ a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_Insert, this, "newBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
+ a->setEnabled (false);
+ actionListBranches.append(a);
+ actionEditAddBranchAbove=a;
+ a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_A, this, "newBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
+ actionListBranches.append(a);
+
+ // Add branch below
+ a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_Insert, this, "newBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
+ a->setEnabled (false);
+ actionListBranches.append(a);
+ actionEditAddBranchBelow=a;
+ a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_A, this, "newBranch" );
+ connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
+ actionListBranches.append(a);
+
a = new QAction( tr( "Move branch up" ), QPixmap(iconPath+"up.png" ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
a->setEnabled (false);
@@ -547,70 +612,6 @@
menu->insertSeparator();
- // Shortcuts to modify heading:
- a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
- connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
- actionListBranches.append(a);
- a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
- connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
- actionListBranches.append(a);
- actionEditHeading=a;
- a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
- connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
- a->setEnabled (false);
- actionEditHeading=a;
- actionListBranches.append(a);
-
- // Shortcut to delete selection
- a = new QAction( tr( "Delete Selection" ),tr( "Delete Selection" ), Key_Delete, this, "deleteBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
- a->setEnabled (false);
- actionEditDelete=a;
-
- // Shortcut to add branch
- alt = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_A, this, "newBranch" );
- connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
- a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
- a->setEnabled (false);
- actionListBranches.append(a);
- #if defined (Q_OS_MACX)
- // In OSX show different shortcut in menues, the keys work independtly always
- actionEditAddBranch=alt;
- #else
- actionEditAddBranch=a;
- #endif
-
- // Add branch by inserting it at selection
- a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
- a->setEnabled (false);
- actionListBranches.append(a);
- actionEditAddBranchHere=a;
- a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_A, this, "newBranchHere" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
- actionListBranches.append(a);
-
- // Add branch above
- a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_Insert, this, "newBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
- a->setEnabled (false);
- actionListBranches.append(a);
- actionEditAddBranchAbove=a;
- a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_A, this, "newBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
- actionListBranches.append(a);
-
- // Add branch below
- a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_Insert, this, "newBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
- a->setEnabled (false);
- actionListBranches.append(a);
- actionEditAddBranchBelow=a;
- a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_A, this, "newBranch" );
- connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
- actionListBranches.append(a);
-
// Import at selection (adding to selection)
a = new QAction( tr( "Add map at selection" ),tr( "Add map (insert)" ), 0, this, "importAdd" );
connect( a, SIGNAL( activated() ), this, SLOT( editImportAdd() ) );
diff -r 13b9befc665e -r ffe2a4396694 tex/vym.changelog
--- a/tex/vym.changelog Fri Jun 16 08:27:10 2006 +0000
+++ b/tex/vym.changelog Fri Jun 16 08:27:11 2006 +0000
@@ -1,5 +1,11 @@
-------------------------------------------------------------------
-Thu June 1i 16:53:29 CEST 2006 - uwedr
+Fri Jun 16 10:26:01 CEST 2006 - uwedr
+
+- Version 1.8.0
+- Feature: Added icon for creating a new branch to toolbar
+
+-------------------------------------------------------------------
+Thu June 1 16:53:29 CEST 2006 - uwedr
- Version: 1.7.18
- Feature: Opening of tabs in Firefox or Mozilla
diff -r 13b9befc665e -r ffe2a4396694 version.h
--- a/version.h Fri Jun 16 08:27:10 2006 +0000
+++ b/version.h Fri Jun 16 08:27:11 2006 +0000
@@ -2,7 +2,7 @@
#define VERSION_H
#define __VYM "VYM"
-#define __VYM_VERSION "1.7.18"
-#define __BUILD_DATE "June 1, 2006"
+#define __VYM_VERSION "1.8.00"
+#define __BUILD_DATE "June 16, 2006"
#endif