1.1 --- a/mainwindow.cpp Fri Jun 16 08:27:10 2006 +0000
1.2 +++ b/mainwindow.cpp Fri Jun 16 08:27:11 2006 +0000
1.3 @@ -439,6 +439,71 @@
1.4 a->addTo( menu );
1.5 actionEditPaste=a;
1.6
1.7 + // Shortcuts to modify heading:
1.8 + a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
1.9 + connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.10 + actionListBranches.append(a);
1.11 + a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
1.12 + connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.13 + actionListBranches.append(a);
1.14 + actionEditHeading=a;
1.15 + a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
1.16 + connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.17 + a->setEnabled (false);
1.18 + actionEditHeading=a;
1.19 + actionListBranches.append(a);
1.20 +
1.21 + // Shortcut to delete selection
1.22 + a = new QAction( tr( "Delete Selection" ),tr( "Delete Selection" ), Key_Delete, this, "deleteBranch" );
1.23 + connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
1.24 + a->setEnabled (false);
1.25 + actionEditDelete=a;
1.26 +
1.27 + // Shortcut to add branch
1.28 + alt = new QAction( tr( "Add a branch as child of selection" ),QPixmap(iconPath+"newbranch.png"),tr( "Add branch as child" ), Key_A, this, "newBranch" );
1.29 + connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.30 + a = new QAction( tr( "Add a branch as child of selection" ),QPixmap(iconPath+"newbranch.png"),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
1.31 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.32 + a->setEnabled (false);
1.33 + actionListBranches.append(a);
1.34 + #if defined (Q_OS_MACX)
1.35 + // In OSX show different shortcut in menues, the keys work independtly always
1.36 + actionEditAddBranch=alt;
1.37 + #else
1.38 + actionEditAddBranch=a;
1.39 + #endif
1.40 + actionEditAddBranch->addTo( tb );
1.41 +
1.42 + // Add branch by inserting it at selection
1.43 + a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );
1.44 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.45 + a->setEnabled (false);
1.46 + actionListBranches.append(a);
1.47 + actionEditAddBranchHere=a;
1.48 + a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_A, this, "newBranchHere" );
1.49 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.50 + actionListBranches.append(a);
1.51 +
1.52 + // Add branch above
1.53 + a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_Insert, this, "newBranch" );
1.54 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.55 + a->setEnabled (false);
1.56 + actionListBranches.append(a);
1.57 + actionEditAddBranchAbove=a;
1.58 + a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_A, this, "newBranch" );
1.59 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.60 + actionListBranches.append(a);
1.61 +
1.62 + // Add branch below
1.63 + a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_Insert, this, "newBranch" );
1.64 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.65 + a->setEnabled (false);
1.66 + actionListBranches.append(a);
1.67 + actionEditAddBranchBelow=a;
1.68 + a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_A, this, "newBranch" );
1.69 + connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.70 + actionListBranches.append(a);
1.71 +
1.72 a = new QAction( tr( "Move branch up" ), QPixmap(iconPath+"up.png" ), tr( "Move up" ), Key_PageUp, this, "editMoveUp" );
1.73 connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
1.74 a->setEnabled (false);
1.75 @@ -547,70 +612,6 @@
1.76
1.77 menu->insertSeparator();
1.78
1.79 - // Shortcuts to modify heading:
1.80 - a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
1.81 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.82 - actionListBranches.append(a);
1.83 - a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
1.84 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.85 - actionListBranches.append(a);
1.86 - actionEditHeading=a;
1.87 - a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
1.88 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.89 - a->setEnabled (false);
1.90 - actionEditHeading=a;
1.91 - actionListBranches.append(a);
1.92 -
1.93 - // Shortcut to delete selection
1.94 - a = new QAction( tr( "Delete Selection" ),tr( "Delete Selection" ), Key_Delete, this, "deleteBranch" );
1.95 - connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
1.96 - a->setEnabled (false);
1.97 - actionEditDelete=a;
1.98 -
1.99 - // Shortcut to add branch
1.100 - alt = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_A, this, "newBranch" );
1.101 - connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.102 - a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
1.103 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.104 - a->setEnabled (false);
1.105 - actionListBranches.append(a);
1.106 - #if defined (Q_OS_MACX)
1.107 - // In OSX show different shortcut in menues, the keys work independtly always
1.108 - actionEditAddBranch=alt;
1.109 - #else
1.110 - actionEditAddBranch=a;
1.111 - #endif
1.112 -
1.113 - // Add branch by inserting it at selection
1.114 - a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );
1.115 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.116 - a->setEnabled (false);
1.117 - actionListBranches.append(a);
1.118 - actionEditAddBranchHere=a;
1.119 - a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_A, this, "newBranchHere" );
1.120 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.121 - actionListBranches.append(a);
1.122 -
1.123 - // Add branch above
1.124 - a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_Insert, this, "newBranch" );
1.125 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.126 - a->setEnabled (false);
1.127 - actionListBranches.append(a);
1.128 - actionEditAddBranchAbove=a;
1.129 - a = new QAction( tr( "Add a branch above selection" ),tr( "Add branch above" ), SHIFT+Key_A, this, "newBranch" );
1.130 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.131 - actionListBranches.append(a);
1.132 -
1.133 - // Add branch below
1.134 - a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_Insert, this, "newBranch" );
1.135 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.136 - a->setEnabled (false);
1.137 - actionListBranches.append(a);
1.138 - actionEditAddBranchBelow=a;
1.139 - a = new QAction( tr( "Add a branch below selection" ),tr( "Add branch below" ), CTRL +Key_A, this, "newBranch" );
1.140 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.141 - actionListBranches.append(a);
1.142 -
1.143 // Import at selection (adding to selection)
1.144 a = new QAction( tr( "Add map at selection" ),tr( "Add map (insert)" ), 0, this, "importAdd" );
1.145 connect( a, SIGNAL( activated() ), this, SLOT( editImportAdd() ) );
2.1 --- a/tex/vym.changelog Fri Jun 16 08:27:10 2006 +0000
2.2 +++ b/tex/vym.changelog Fri Jun 16 08:27:11 2006 +0000
2.3 @@ -1,5 +1,11 @@
2.4 -------------------------------------------------------------------
2.5 -Thu June 1i 16:53:29 CEST 2006 - uwedr
2.6 +Fri Jun 16 10:26:01 CEST 2006 - uwedr
2.7 +
2.8 +- Version 1.8.0
2.9 +- Feature: Added icon for creating a new branch to toolbar
2.10 +
2.11 +-------------------------------------------------------------------
2.12 +Thu June 1 16:53:29 CEST 2006 - uwedr
2.13
2.14 - Version: 1.7.18
2.15 - Feature: Opening of tabs in Firefox or Mozilla
3.1 --- a/version.h Fri Jun 16 08:27:10 2006 +0000
3.2 +++ b/version.h Fri Jun 16 08:27:11 2006 +0000
3.3 @@ -2,7 +2,7 @@
3.4 #define VERSION_H
3.5
3.6 #define __VYM "VYM"
3.7 -#define __VYM_VERSION "1.7.18"
3.8 -#define __BUILD_DATE "June 1, 2006"
3.9 +#define __VYM_VERSION "1.8.00"
3.10 +#define __BUILD_DATE "June 16, 2006"
3.11
3.12 #endif