1.1 --- a/mainwindow.cpp Tue Oct 24 15:36:38 2006 +0000
1.2 +++ b/mainwindow.cpp Mon Oct 30 12:39:37 2006 +0000
1.3 @@ -73,6 +73,9 @@
1.4 // Sometimes we may need to remember old selections
1.5 prevSelection="";
1.6
1.7 + // Default color
1.8 + currentColor=Qt::black;
1.9 +
1.10 // Create unique temporary directory
1.11 bool ok;
1.12 tmpVymDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
1.13 @@ -242,123 +245,123 @@
1.14 tb->setObjectName ("mapTB");
1.15
1.16 QAction *a;
1.17 - a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
1.18 - a->setStatusTip ( tr( "New map","File menu" ) );
1.19 + a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New...","File menu" ),this);
1.20 + a->setStatusTip ( tr( "New map","Status tip File menu" ) );
1.21 a->setShortcut ( Qt::CTRL + Qt::Key_N );
1.22 a->addTo( tb );
1.23 fileMenu->addAction (a);
1.24 connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
1.25
1.26 - a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ),this);
1.27 - a->setStatusTip (tr( "Open","File menu" ) );
1.28 + a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ,"File menu"),this);
1.29 + a->setStatusTip (tr( "Open","Status tip File menu" ) );
1.30 a->setShortcut ( Qt::CTRL + Qt::Key_O );
1.31 a->addTo( tb );
1.32 fileMenu->addAction (a);
1.33 connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) );
1.34
1.35 - fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent"));
1.36 + fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent","File menu"));
1.37 fileMenu->addSeparator();
1.38
1.39 - a = new QAction( QPixmap( iconPath+"filesave.png"), tr( "&Save..." ), this);
1.40 - a->setStatusTip ( tr( "Save" ));
1.41 + a = new QAction( QPixmap( iconPath+"filesave.png"), tr( "&Save...","File menu" ), this);
1.42 + a->setStatusTip ( tr( "Save","Status tip file menu" ));
1.43 a->setShortcut (Qt::CTRL + Qt::Key_S );
1.44 a->addTo( tb );
1.45 fileMenu->addAction (a);
1.46 connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
1.47 actionFileSave=a;
1.48
1.49 - a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), this);
1.50 - a->setStatusTip (tr( "Save &As" ) );
1.51 + a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As...","File menu" ), this);
1.52 + a->setStatusTip (tr( "Save &As","Status tip file menu" ) );
1.53 fileMenu->addAction (a);
1.54 connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) );
1.55
1.56 fileMenu->addSeparator();
1.57
1.58 - fileImportMenu = fileMenu->addMenu (tr("Import"));
1.59 + fileImportMenu = fileMenu->addMenu (tr("Import","File menu"));
1.60
1.61 a = new QAction(tr("KDE Bookmarks"), this);
1.62 - a->setStatusTip ( tr( "Import")+" "+tr("KDE Bookmarks" ));
1.63 + a->setStatusTip ( tr( "Import %1","Status tip file menu" ).arg(tr("KDE bookmarks")));
1.64 a->addTo (fileImportMenu);
1.65 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDEBookmarks() ) );
1.66
1.67 if (settings.value( "/mainwindow/showTestMenu",false).toBool())
1.68 {
1.69 - a = new QAction( QPixmap(), tr("Firefox Bookmarks"),this);
1.70 - a->setStatusTip (tr( "Import")+" "+tr("Firefox Bookmarks" ) );
1.71 + a = new QAction( QPixmap(), tr("Firefox Bookmarks","File menu"),this);
1.72 + a->setStatusTip (tr( "Import %1","Status tip file menu").arg(tr("Firefox Bookmarks" ) ));
1.73 a->addTo (fileImportMenu);
1.74 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) );
1.75 }
1.76
1.77 a = new QAction("Mind Manager...",this);
1.78 - a->setStatusTip ( tr( "Import")+" Mind Manager" );
1.79 + a->setStatusTip ( tr( "Import %1","status tip file menu").arg(" Mind Manager") );
1.80 fileImportMenu->addAction (a);
1.81 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) );
1.82
1.83 - a = new QAction( tr( "Import Dir"+QString("...") ), this);
1.84 - a->setStatusTip (tr( "Import directory structure (experimental)" ) );
1.85 + a = new QAction( tr( "Import Dir%1","File menu").arg("..."), this);
1.86 + a->setStatusTip (tr( "Import directory structure (experimental)","status tip file menu" ) );
1.87 fileImportMenu->addAction (a);
1.88 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) );
1.89
1.90 - fileExportMenu = fileMenu->addMenu (tr("Export"));
1.91 -
1.92 - a = new QAction( tr("Image")+QString("..."), this);
1.93 - a->setStatusTip( tr( "Export map as image" ));
1.94 + fileExportMenu = fileMenu->addMenu (tr("Export","File menu"));
1.95 +
1.96 + a = new QAction( tr("Image%1","File export menu").arg("..."), this);
1.97 + a->setStatusTip( tr( "Export map as image","status tip file menu" ));
1.98 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) );
1.99 fileExportMenu->addAction (a);
1.100
1.101 - a = new QAction( "Open Office"+QString("..."), this);
1.102 - a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office " ));
1.103 + a = new QAction( "Open Office...", this);
1.104 + a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office ","status tip file menu" ));
1.105 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
1.106 fileExportMenu->addAction (a);
1.107
1.108 a = new QAction( "Webpage (XHTML)...",this );
1.109 a->setShortcut (Qt::ALT + Qt::Key_X);
1.110 - a->setStatusTip ( tr( "Export as")+" webpage (XHTML)");
1.111 + a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu")));
1.112 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) );
1.113 fileExportMenu->addAction (a);
1.114
1.115 a = new QAction( "Text (ASCII)...", this);
1.116 - a->setStatusTip ( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" ));
1.117 + a->setStatusTip ( tr( "Export as %1").arg("ASCII "+tr("(still experimental)" )));
1.118 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) );
1.119 fileExportMenu->addAction (a);
1.120
1.121 - a = new QAction( tr("KDE Bookmarks"), this);
1.122 - a->setStatusTip( tr( "Export as")+" "+tr("KDE Bookmarks" ));
1.123 + a = new QAction( tr("KDE Bookmarks","File menu"), this);
1.124 + a->setStatusTip( tr( "Export as %1").arg(tr("KDE Bookmarks" )));
1.125 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDEBookmarks() ) );
1.126 fileExportMenu->addAction (a);
1.127
1.128 a = new QAction( "Taskjuggler...", this );
1.129 - a->setStatusTip( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ));
1.130 + a->setStatusTip( tr( "Export as %1").arg("Taskjuggler "+tr("(still experimental)" )));
1.131 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) );
1.132 fileExportMenu->addAction (a);
1.133
1.134 a = new QAction( "LaTeX...", this);
1.135 - a->setStatusTip( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" ));
1.136 + a->setStatusTip( tr( "Export as %1").arg("LaTeX "+tr("(still experimental)" )));
1.137 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) );
1.138 fileExportMenu->addAction (a);
1.139
1.140 a = new QAction( "XML..." , this );
1.141 - a->setStatusTip (tr( "Export as")+" XML");
1.142 + a->setStatusTip (tr( "Export as %1").arg("XML"));
1.143 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) );
1.144 fileExportMenu->addAction (a);
1.145
1.146 fileMenu->addSeparator();
1.147
1.148 a = new QAction(QPixmap( iconPath+"fileprint.png"), tr( "&Print")+QString("..."), this);
1.149 - a->setStatusTip ( tr( "Print" ) );
1.150 + a->setStatusTip ( tr( "Print" ,"File menu") );
1.151 a->setShortcut (Qt::CTRL + Qt::Key_P );
1.152 a->addTo( tb );
1.153 fileMenu->addAction (a);
1.154 connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
1.155 actionFilePrint=a;
1.156
1.157 - a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), this);
1.158 + a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map","File menu" ), this);
1.159 a->setStatusTip (tr( "Close Map" ) );
1.160 a->setShortcut (Qt::ALT + Qt::Key_C );
1.161 fileMenu->addAction (a);
1.162 connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) );
1.163
1.164 - a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, this);
1.165 + a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit","File menu")+" "+__VYM, this);
1.166 a->setStatusTip ( tr( "Exit")+" "+__VYM );
1.167 a->setShortcut (Qt::CTRL + Qt::Key_Q );
1.168 fileMenu->addAction (a);
1.169 @@ -369,14 +372,14 @@
1.170 //Edit Actions
1.171 void Main::setupEditActions()
1.172 {
1.173 - QToolBar *tb = addToolBar( tr ("&Actions") );
1.174 + QToolBar *tb = addToolBar( tr ("&Actions toolbar","Toolbar name") );
1.175 tb->setLabel( "Edit Actions" );
1.176 tb->setObjectName ("actionsTB");
1.177 - QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
1.178 + QMenu *editMenu = menuBar()->addMenu( tr("&Edit","Edit menu") );
1.179
1.180 QAction *a;
1.181 QAction *alt;
1.182 - a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo" ),this);
1.183 + a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo","Edit menu" ),this);
1.184 connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
1.185 a->setStatusTip (tr( "Undo" ) );
1.186 a->setShortcut ( Qt::CTRL + Qt::Key_Z );
1.187 @@ -385,7 +388,7 @@
1.188 editMenu->addAction (a);
1.189 actionEditUndo=a;
1.190
1.191 - a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo" ), this);
1.192 + a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo","Edit menu" ), this);
1.193 a->setStatusTip (tr( "Redo" ));
1.194 a->setShortcut (Qt::CTRL + Qt::Key_Y );
1.195 tb->addAction (a);
1.196 @@ -394,7 +397,7 @@
1.197 actionEditRedo=a;
1.198
1.199 editMenu->addSeparator();
1.200 - a = new QAction(QPixmap( iconPath+"editcopy.png"), tr( "&Copy" ), this);
1.201 + a = new QAction(QPixmap( iconPath+"editcopy.png"), tr( "&Copy","Edit menu" ), this);
1.202 a->setStatusTip ( tr( "Copy" ) );
1.203 a->setShortcut (Qt::CTRL + Qt::Key_C );
1.204 a->setEnabled (false);
1.205 @@ -403,7 +406,7 @@
1.206 connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
1.207 actionEditCopy=a;
1.208
1.209 - a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), this);
1.210 + a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t","Edit menu" ), this);
1.211 a->setStatusTip ( tr( "Cut" ) );
1.212 a->setShortcut (Qt::CTRL + Qt::Key_X );
1.213 a->setEnabled (false);
1.214 @@ -412,7 +415,7 @@
1.215 actionEditCut=a;
1.216 connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
1.217
1.218 - a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ),this);
1.219 + a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste","Edit menu" ),this);
1.220 connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
1.221 a->setStatusTip ( tr( "Paste" ) );
1.222 a->setShortcut ( Qt::CTRL + Qt::Key_V );
1.223 @@ -422,14 +425,14 @@
1.224 actionEditPaste=a;
1.225
1.226 // Shortcuts to modify heading:
1.227 - a = new QAction(tr( "Edit heading" ),this);
1.228 + a = new QAction(tr( "Edit heading","Edit menu" ),this);
1.229 a->setStatusTip ( tr( "edit Heading" ));
1.230 a->setShortcut ( Qt::Key_Enter);
1.231 // a->setShortcutContext (Qt::WindowShortcut);
1.232 addAction (a);
1.233 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
1.234 actionListBranches.append(a);
1.235 - a = new QAction( tr( "Edit heading" ), this);
1.236 + a = new QAction( tr( "Edit heading","Edit menu" ), this);
1.237 a->setStatusTip (tr( "edit Heading" ));
1.238 a->setShortcut (Qt::Key_Return );
1.239 //a->setShortcutContext (Qt::WindowShortcut);
1.240 @@ -438,7 +441,7 @@
1.241 actionListBranches.append(a);
1.242 editMenu->addAction (a);
1.243 actionEditHeading=a;
1.244 - a = new QAction( tr( "Edit heading" ), this);
1.245 + a = new QAction( tr( "Edit heading","Edit menu" ), this);
1.246 a->setStatusTip (tr( "edit Heading" ));
1.247 a->setShortcut ( Qt::Key_F2 );
1.248 a->setShortcutContext (Qt::WindowShortcut);
1.249 @@ -447,7 +450,7 @@
1.250 actionListBranches.append(a);
1.251
1.252 // Shortcut to delete selection
1.253 - a = new QAction( tr( "Delete Selection" ),this);
1.254 + a = new QAction( tr( "Delete Selection","Edit menu" ),this);
1.255 a->setStatusTip (tr( "Delete Selection" ));
1.256 a->setShortcut ( Qt::Key_Delete);
1.257 a->setShortcutContext (Qt::WindowShortcut);
1.258 @@ -456,13 +459,13 @@
1.259 actionEditDelete=a;
1.260
1.261 // Shortcut to add branch
1.262 - alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
1.263 + alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
1.264 alt->setStatusTip ( tr( "Add a branch as child of selection" ));
1.265 alt->setShortcut (Qt::Key_A);
1.266 alt->setShortcutContext (Qt::WindowShortcut);
1.267 addAction (alt);
1.268 connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.269 - a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
1.270 + a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
1.271 a->setStatusTip ( tr( "Add a branch as child of selection" ));
1.272 a->setShortcut (Qt::Key_Insert);
1.273 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.274 @@ -478,7 +481,7 @@
1.275
1.276
1.277 // Add branch by inserting it at selection
1.278 - a = new QAction(tr( "Add branch (insert)" ), this);
1.279 + a = new QAction(tr( "Add branch (insert)","Edit menu" ), this);
1.280 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
1.281 a->setShortcut (Qt::ALT + Qt::Key_Insert );
1.282 a->setShortcutContext (Qt::WindowShortcut);
1.283 @@ -487,7 +490,7 @@
1.284 a->setEnabled (false);
1.285 actionListBranches.append(a);
1.286 actionEditAddBranchBefore=a;
1.287 - a = new QAction(tr( "Add branch (insert)" ),this);
1.288 + a = new QAction(tr( "Add branch (insert)","Edit menu" ),this);
1.289 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
1.290 a->setShortcut ( Qt::ALT + Qt::Key_A );
1.291 a->setShortcutContext (Qt::WindowShortcut);
1.292 @@ -496,7 +499,7 @@
1.293 actionListBranches.append(a);
1.294
1.295 // Add branch above
1.296 - a = new QAction(tr( "Add branch above" ), this);
1.297 + a = new QAction(tr( "Add branch above","Edit menu" ), this);
1.298 a->setStatusTip ( tr( "Add a branch above selection" ));
1.299 a->setShortcut (Qt::SHIFT+Qt::Key_Insert );
1.300 a->setShortcutContext (Qt::WindowShortcut);
1.301 @@ -505,7 +508,7 @@
1.302 a->setEnabled (false);
1.303 actionListBranches.append(a);
1.304 actionEditAddBranchAbove=a;
1.305 - a = new QAction(tr( "Add branch above" ), this);
1.306 + a = new QAction(tr( "Add branch above","Edit menu" ), this);
1.307 a->setStatusTip ( tr( "Add a branch above selection" ));
1.308 a->setShortcut (Qt::SHIFT+Qt::Key_A );
1.309 a->setShortcutContext (Qt::WindowShortcut);
1.310 @@ -514,7 +517,7 @@
1.311 actionListBranches.append(a);
1.312
1.313 // Add branch below
1.314 - a = new QAction(tr( "Add branch below" ), this);
1.315 + a = new QAction(tr( "Add branch below","Edit menu" ), this);
1.316 a->setStatusTip ( tr( "Add a branch below selection" ));
1.317 a->setShortcut (Qt::CTRL +Qt::Key_Insert );
1.318 a->setShortcutContext (Qt::WindowShortcut);
1.319 @@ -523,7 +526,7 @@
1.320 a->setEnabled (false);
1.321 actionListBranches.append(a);
1.322 actionEditAddBranchBelow=a;
1.323 - a = new QAction(tr( "Add branch below" ), this);
1.324 + a = new QAction(tr( "Add branch below","Edit menu" ), this);
1.325 a->setStatusTip ( tr( "Add a branch below selection" ));
1.326 a->setShortcut (Qt::CTRL +Qt::Key_A );
1.327 a->setShortcutContext (Qt::WindowShortcut);
1.328 @@ -531,7 +534,7 @@
1.329 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.330 actionListBranches.append(a);
1.331
1.332 - a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up" ), this);
1.333 + a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up","Edit menu" ), this);
1.334 a->setStatusTip ( tr( "Move branch up" ) );
1.335 a->setShortcut (Qt::Key_PageUp );
1.336 a->setEnabled (false);
1.337 @@ -540,7 +543,7 @@
1.338 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
1.339 actionEditMoveUp=a;
1.340
1.341 - a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down" ),this);
1.342 + a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down","Edit menu" ),this);
1.343 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) );
1.344 a->setStatusTip (tr( "Move branch down" ) );
1.345 a->setShortcut ( Qt::Key_PageDown );
1.346 @@ -550,12 +553,12 @@
1.347 actionEditMoveDown=a;
1.348
1.349
1.350 - a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ),this);
1.351 + a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ),this);
1.352 a->setShortcut ( Qt::Key_ScrollLock );
1.353 a->setStatusTip (tr( "Scroll branch" ) );
1.354 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.355
1.356 - alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
1.357 + alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
1.358 alt->setShortcut ( Qt::Key_S );
1.359 alt->setStatusTip (tr( "Scroll branch" ));
1.360 connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.361 @@ -573,14 +576,14 @@
1.362 addAction (alt);
1.363 actionListBranches.append(actionEditToggleScroll);
1.364
1.365 - a = new QAction( tr( "Unscroll all scrolled branches" ), this);
1.366 + a = new QAction( tr( "Unscroll all scrolled branches","Edit menu" ), this);
1.367 a->setStatusTip (tr( "Unscroll all" ));
1.368 editMenu->addAction (a);
1.369 connect( a, SIGNAL( triggered() ), this, SLOT( editUnScrollAll() ) );
1.370
1.371 editMenu->addSeparator();
1.372
1.373 - a = new QAction( QPixmap(iconPath+"find.png"), tr( "Find"+QString("...") ), this);
1.374 + a = new QAction( QPixmap(iconPath+"find.png"), tr( "Find...","Edit menu"), this);
1.375 a->setStatusTip (tr( "Find" ) );
1.376 a->setShortcut (Qt::CTRL + Qt::Key_F );
1.377 editMenu->addAction (a);
1.378 @@ -588,7 +591,7 @@
1.379
1.380 editMenu->addSeparator();
1.381
1.382 - a = new QAction( QPixmap(flagsPath+"flag-url.png"), tr( "Open URL" ), this);
1.383 + a = new QAction( QPixmap(flagsPath+"flag-url.png"), tr( "Open URL","Edit menu" ), this);
1.384 a->setShortcut (Qt::CTRL + Qt::Key_U );
1.385 a->setShortcut (tr( "Open URL" ));
1.386 tb->addAction (a);
1.387 @@ -596,21 +599,21 @@
1.388 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
1.389 actionEditOpenURL=a;
1.390
1.391 - a = new QAction( tr( "Open URL in new tab" ), this);
1.392 + a = new QAction( tr( "Open URL in new tab","Edit menu" ), this);
1.393 a->setStatusTip (tr( "Open URL in new tab" ));
1.394 a->setShortcut (Qt::CTRL+Qt::Key_U );
1.395 addAction(a);
1.396 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
1.397 actionEditOpenURLTab=a;
1.398
1.399 - a = new QAction( tr( "Open all URLs in subtree" ), this);
1.400 + a = new QAction( tr( "Open all URLs in subtree","Edit menu" ), this);
1.401 a->setStatusTip (tr( "Open all URLs in subtree" ));
1.402 addAction(a);
1.403 actionListBranches.append(a);
1.404 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleURLTabs() ) );
1.405 actionEditOpenMultipleURLTabs=a;
1.406
1.407 - a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
1.408 + a = new QAction(QPixmap(), tr( "Edit URL...","Edit menu"), this);
1.409 a->setStatusTip ( tr( "Edit URL" ) );
1.410 a->setShortcut (Qt::SHIFT + Qt::CTRL + Qt::Key_U );
1.411 //a->setShortcut ( Qt::Key_U );
1.412 @@ -620,35 +623,35 @@
1.413 connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
1.414 actionEditURL=a;
1.415
1.416 - a = new QAction( tr( "Use heading for URL" ), this);
1.417 + a = new QAction( tr( "Use heading for URL","Edit menu" ), this);
1.418 a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
1.419 a->setEnabled (false);
1.420 actionListBranches.append(a);
1.421 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
1.422 actionEditHeading2URL=a;
1.423
1.424 - a = new QAction(tr( "Create URL to Bugzilla" ), this);
1.425 + a = new QAction(tr( "Create URL to Bugzilla","Edit menu" ), this);
1.426 a->setStatusTip ( tr( "Create URL to Bugzilla" ));
1.427 a->setEnabled (false);
1.428 actionListBranches.append(a);
1.429 connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
1.430 actionEditBugzilla2URL=a;
1.431
1.432 - a = new QAction(tr( "Create URL to FATE" ), this);
1.433 + a = new QAction(tr( "Create URL to FATE","Edit menu" ), this);
1.434 a->setStatusTip ( tr( "Create URL to FATE" ));
1.435 a->setEnabled (false);
1.436 actionListBranches.append(a);
1.437 connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
1.438 actionEditFATE2URL=a;
1.439
1.440 - a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Open xlinked map" ), this);
1.441 + a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Open linked map","Edit menu" ), this);
1.442 a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
1.443 tb->addAction (a);
1.444 a->setEnabled (false);
1.445 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
1.446 actionEditOpenVymLink=a;
1.447
1.448 - a = new QAction(QPixmap(), tr( "Open all vym links in subtree" ), this);
1.449 + a = new QAction(QPixmap(), tr( "Open all vym links in subtree","Edit menu" ), this);
1.450 a->setStatusTip ( tr( "Open all vym links in subtree" ));
1.451 a->setEnabled (false);
1.452 actionListBranches.append(a);
1.453 @@ -656,20 +659,20 @@
1.454 actionEditOpenMultipleVymLinks=a;
1.455
1.456
1.457 - a = new QAction(tr( "Edit vym link"+QString("...") ), this);
1.458 + a = new QAction(tr( "Edit vym link...","Edit menu" ), this);
1.459 a->setEnabled (false);
1.460 a->setStatusTip ( tr( "Edit link to another vym map" ));
1.461 connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
1.462 actionListBranches.append(a);
1.463 actionEditVymLink=a;
1.464
1.465 - a = new QAction(tr( "Delete vym link" ),this);
1.466 + a = new QAction(tr( "Delete vym link","Edit menu" ),this);
1.467 a->setStatusTip ( tr( "Delete link to another vym map" ));
1.468 a->setEnabled (false);
1.469 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
1.470 actionEditDeleteVymLink=a;
1.471
1.472 - a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), this);
1.473 + a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports","Edit menu" ), this);
1.474 a->setStatusTip ( tr( "Hide object in exports" ) );
1.475 a->setShortcut (Qt::Key_H );
1.476 a->setToggleAction(true);
1.477 @@ -678,14 +681,14 @@
1.478 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
1.479 actionEditToggleHideExport=a;
1.480
1.481 - a = new QAction(tr( "Edit Map Info"+QString("...") ),this);
1.482 + a = new QAction(tr( "Edit Map Info...","Edit menu" ),this);
1.483 a->setStatusTip ( tr( "Edit Map Info" ));
1.484 a->setEnabled (true);
1.485 connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
1.486 actionEditMapInfo=a;
1.487
1.488 // Import at selection (adding to selection)
1.489 - a = new QAction( tr( "Add map (insert)" ),this);
1.490 + a = new QAction( tr( "Add map (insert)","Edit menu" ),this);
1.491 a->setStatusTip (tr( "Add map at selection" ));
1.492 connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
1.493 a->setEnabled (false);
1.494 @@ -693,7 +696,7 @@
1.495 actionEditImportAdd=a;
1.496
1.497 // Import at selection (replacing selection)
1.498 - a = new QAction( tr( "Add map (replace)" ), this);
1.499 + a = new QAction( tr( "Add map (replace)","Edit menu" ), this);
1.500 a->setStatusTip (tr( "Replace selection with map" ));
1.501 connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
1.502 a->setEnabled (false);
1.503 @@ -701,7 +704,7 @@
1.504 actionEditImportReplace=a;
1.505
1.506 // Save selection
1.507 - a = new QAction( tr( "Save selection" ), this);
1.508 + a = new QAction( tr( "Save selection","Edit menu" ), this);
1.509 a->setStatusTip (tr( "Save selection" ));
1.510 connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
1.511 a->setEnabled (false);
1.512 @@ -709,50 +712,50 @@
1.513 actionEditSaveBranch=a;
1.514
1.515 // Only remove branch, not its childs
1.516 - a = new QAction(tr( "Remove only branch " ), this);
1.517 + a = new QAction(tr( "Remove only branch ","Edit menu" ), this);
1.518 a->setStatusTip ( tr( "Remove only branch and keep its childs" ));
1.519 a->setShortcut (Qt::ALT + Qt::Key_Delete );
1.520 - connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
1.521 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteKeepChilds() ) );
1.522 a->setEnabled (false);
1.523 addAction (a);
1.524 actionListBranches.append(a);
1.525 - actionEditRemoveBranchKeepChilds=a;
1.526 + actionEditDeleteKeepChilds=a;
1.527
1.528 // Only remove childs of a branch
1.529 - a = new QAction( tr( "Remove childs" ), this);
1.530 + a = new QAction( tr( "Remove childs","Edit menu" ), this);
1.531 a->setStatusTip (tr( "Remove childs of branch" ));
1.532 a->setShortcut (Qt::SHIFT + Qt::Key_Delete );
1.533 - connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveChilds() ) );
1.534 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteChilds() ) );
1.535 a->setEnabled (false);
1.536 actionListBranches.append(a);
1.537 - actionEditRemoveChilds=a;
1.538 + actionEditDeleteChilds=a;
1.539
1.540 // Shortcuts for navigating with cursor:
1.541 - a = new QAction(tr( "Select upper branch" ), this);
1.542 + a = new QAction(tr( "Select upper branch","Edit menu" ), this);
1.543 a->setStatusTip ( tr( "Select upper branch" ));
1.544 a->setShortcut (Qt::Key_Up );
1.545 a->setShortcutContext (Qt::WindowShortcut);
1.546 addAction (a);
1.547 connect( a, SIGNAL( triggered() ), this, SLOT( editUpperBranch() ) );
1.548 - a = new QAction( tr( "Select lower branch" ),this);
1.549 + a = new QAction( tr( "Select lower branch","Edit menu" ),this);
1.550 a->setStatusTip (tr( "Select lower branch" ));
1.551 a->setShortcut ( Qt::Key_Down );
1.552 a->setShortcutContext (Qt::WindowShortcut);
1.553 addAction (a);
1.554 connect( a, SIGNAL( triggered() ), this, SLOT( editLowerBranch() ) );
1.555 - a = new QAction(tr( "Select left branch" ), this);
1.556 + a = new QAction(tr( "Select left branch","Edit menu" ), this);
1.557 a->setStatusTip ( tr( "Select left branch" ));
1.558 a->setShortcut (Qt::Key_Left );
1.559 a->setShortcutContext (Qt::WindowShortcut);
1.560 addAction (a);
1.561 connect( a, SIGNAL( triggered() ), this, SLOT( editLeftBranch() ) );
1.562 - a = new QAction( tr( "Select child branch" ), this);
1.563 + a = new QAction( tr( "Select child branch","Edit menu" ), this);
1.564 a->setStatusTip (tr( "Select right branch" ));
1.565 a->setShortcut (Qt::Key_Right);
1.566 a->setShortcutContext (Qt::WindowShortcut);
1.567 addAction (a);
1.568 connect( a, SIGNAL( triggered() ), this, SLOT( editRightBranch() ) );
1.569 - a = new QAction( tr( "Select first branch" ), this);
1.570 + a = new QAction( tr( "Select first branch","Edit menu" ), this);
1.571 a->setStatusTip (tr( "Select first branch" ));
1.572 a->setShortcut (Qt::Key_Home );
1.573 a->setShortcutContext (Qt::WindowShortcut);
1.574 @@ -762,7 +765,7 @@
1.575 actionListBranches.append(a);
1.576 actionEditSelectFirst=a;
1.577 connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) );
1.578 - a = new QAction( tr( "Select last branch" ),this);
1.579 + a = new QAction( tr( "Select last branch","Edit menu" ),this);
1.580 a->setStatusTip (tr( "Select last branch" ));
1.581 a->setShortcut ( Qt::Key_End );
1.582 a->setShortcutContext (Qt::WindowShortcut);
1.583 @@ -773,7 +776,7 @@
1.584 actionListBranches.append(a);
1.585 actionEditSelectLast=a;
1.586
1.587 - a = new QAction( tr( "Add Image" )+QString("..."), this);
1.588 + a = new QAction( tr( "Add Image...","Edit menu" ), this);
1.589 a->setStatusTip (tr( "Add Image" ));
1.590 connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
1.591 actionEditLoadImage=a;
1.592 @@ -783,9 +786,9 @@
1.593 // Format Actions
1.594 void Main::setupFormatActions()
1.595 {
1.596 - QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat"));
1.597 -
1.598 - QToolBar *tb = addToolBar( tr("Format Actions","Toolbars"));
1.599 + QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat","Format menu"));
1.600 +
1.601 + QToolBar *tb = addToolBar( tr("Format Actions","Format Toolbar name"));
1.602 tb->setObjectName ("formatTB");
1.603 QAction *a;
1.604 QPixmap pix( 16,16);
1.605 @@ -796,7 +799,7 @@
1.606 a->addTo( tb );
1.607 formatMenu->addAction (a);
1.608 actionFormatColor=a;
1.609 - a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), this);
1.610 + a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color","Edit menu" ), this);
1.611 a->setStatusTip (tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ) );
1.612 a->setShortcut (Qt::CTRL + Qt::Key_K );
1.613 connect( a, SIGNAL( triggered() ), this, SLOT( formatPickColor() ) );
1.614 @@ -806,7 +809,7 @@
1.615 actionListBranches.append(a);
1.616 actionFormatPickColor=a;
1.617
1.618 - a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), this);
1.619 + a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch","Edit menu" ), this);
1.620 a->setStatusTip ( tr( "Color branch" ) );
1.621 a->setShortcut (Qt::CTRL + Qt::Key_I);
1.622 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) );
1.623 @@ -816,7 +819,7 @@
1.624 actionListBranches.append(a);
1.625 actionFormatColorBranch=a;
1.626
1.627 - a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), this);
1.628 + a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree","Edit menu" ), this);
1.629 a->setStatusTip ( tr( "Color Subtree" ));
1.630 a->setShortcut (Qt::CTRL + Qt::Key_T);
1.631 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
1.632 @@ -857,37 +860,37 @@
1.633
1.634 actionGroupFormatFrameTypes=new QActionGroup ( this);
1.635 actionGroupFormatFrameTypes->setExclusive (true);
1.636 - a = new QAction( tr( "No Frame" ), actionGroupFormatFrameTypes );
1.637 + a = new QAction( tr( "No Frame","Branch attribute" ), actionGroupFormatFrameTypes );
1.638 a->setStatusTip (tr("No Frame"));
1.639 a->setToggleAction(true);
1.640 connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameNone() ) );
1.641 actionFormatFrameNone=a;
1.642 - a = new QAction( tr( "Rectangle" ), actionGroupFormatFrameTypes);
1.643 + a = new QAction( tr( "Rectangle""Branch attribute" ), actionGroupFormatFrameTypes);
1.644 a->setStatusTip (tr( "Rectangle" ));
1.645 a->setToggleAction(true);
1.646 connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameRectangle() ) );
1.647 actionFormatFrameRectangle=a;
1.648
1.649 - a = new QAction( tr( "Include images vertically" ), this);
1.650 + a = new QAction( tr( "Include images vertically","Branch attribute" ), this);
1.651 a->setStatusTip ( tr ("Include top and bottom position of images into branch"));
1.652 a->setToggleAction(true);
1.653 connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesVer() ) );
1.654 actionFormatIncludeImagesVer=a;
1.655
1.656 - a = new QAction( tr( "Include images horizontally" ), this);
1.657 + a = new QAction( tr( "Include images horizontally","Branch attribute" ), this);
1.658 a->setStatusTip ( tr ("Include left and right position of images into branch"));
1.659 a->setToggleAction(true);
1.660 connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesHor() ) );
1.661 actionFormatIncludeImagesHor=a;
1.662
1.663 - a = new QAction( tr( "Hide link if object is not selected" ), this);
1.664 + a = new QAction( tr( "Hide link if object is not selected","Branch attribute" ), this);
1.665 a->setStatusTip (tr( "Hide link" ));
1.666 a->setToggleAction(true);
1.667 connect( a, SIGNAL( triggered() ), this, SLOT( formatHideLinkUnselected() ) );
1.668 actionFormatHideLinkUnselected=a;
1.669
1.670 formatMenu->addSeparator();
1.671 - a= new QAction( tr( "&Use color of heading for link" ), this);
1.672 + a= new QAction( tr( "&Use color of heading for link","Branch attribute" ), this);
1.673 a->setStatusTip (tr( "Use same color for links and headings" ));
1.674 a->setToggleAction(true);
1.675 connect( a, SIGNAL( triggered() ), this, SLOT( formatToggleLinkColorHint() ) );
1.676 @@ -911,27 +914,27 @@
1.677 // View Actions
1.678 void Main::setupViewActions()
1.679 {
1.680 - QToolBar *tb = addToolBar( tr("View Actions","Toolbars") );
1.681 + QToolBar *tb = addToolBar( tr("View Actions","View Toolbar name") );
1.682 tb->setLabel( "View Actions" );
1.683 tb->setObjectName ("viewTB");
1.684 QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
1.685
1.686 QAction *a;
1.687 - a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom" ), this);
1.688 + a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this);
1.689 a->setStatusTip ( tr( "Zoom reset" ) );
1.690 a->setShortcut (Qt::CTRL + Qt::Key_0 );
1.691 a->addTo( tb );
1.692 viewMenu->addAction (a);
1.693 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) );
1.694
1.695 - a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), this);
1.696 + a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in","View action" ), this);
1.697 a->setStatusTip (tr( "Zoom in" ));
1.698 a->setShortcut (Qt::CTRL + Qt::Key_Plus);
1.699 a->addTo( tb );
1.700 viewMenu->addAction (a);
1.701 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) );
1.702
1.703 - a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), this);
1.704 + a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out","View action" ), this);
1.705 a->setStatusTip (tr( "Zoom out" ));
1.706 a->setShortcut (Qt::CTRL + Qt::Key_Minus );
1.707 a->addTo( tb );
1.708 @@ -939,7 +942,7 @@
1.709 connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
1.710
1.711
1.712 - a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ),this);
1.713 + a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor","View action" ),this);
1.714 a->setStatusTip ( tr( "Show Note Editor" ));
1.715 a->setShortcut ( Qt::CTRL + Qt::Key_E );
1.716 a->setToggleAction(true);
1.717 @@ -952,7 +955,7 @@
1.718 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) );
1.719 actionViewToggleNoteEditor=a;
1.720
1.721 - a = new QAction( tr( "Show history window" ),this );
1.722 + a = new QAction( tr( "Show history window","View action" ),this );
1.723 a->setStatusTip ( tr( "Show history window" ));
1.724 a->setShortcut ( Qt::CTRL + Qt::Key_H );
1.725 a->setToggleAction(false);
1.726 @@ -960,13 +963,13 @@
1.727 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
1.728 actionViewToggleHistoryWindow=a;
1.729
1.730 - a = new QAction(tr( "Next Window" ), this);
1.731 + a = new QAction(tr( "Next Window","View action" ), this);
1.732 a->setStatusTip ( tr( "&Next Window" ) );
1.733 a->setShortcut (Qt::ALT + Qt::Key_N );
1.734 viewMenu->addAction (a);
1.735 connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
1.736
1.737 - a = new QAction (tr( "Previous Window" ), this );
1.738 + a = new QAction (tr( "Previous Window","View action" ), this );
1.739 a->setStatusTip (tr( "&Previous Window" ));
1.740 a->setShortcut (Qt::ALT + Qt::Key_P );
1.741 viewMenu->addAction (a);
1.742 @@ -979,12 +982,12 @@
1.743 //QPopupMenu *menu = new QPopupMenu( this );
1.744 //menuBar()->insertItem( tr( "&Mode (using modifiers)" ), menu );
1.745
1.746 - QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Toolbars") );
1.747 + QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Modifier Toolbar name") );
1.748 tb->setObjectName ("modesTB");
1.749 QAction *a;
1.750 actionGroupModModes=new QActionGroup ( this);
1.751 actionGroupModModes->setExclusive (true);
1.752 - a= new QAction( QPixmap(iconPath+"modecolor.png"), tr( "Use modifier to color branches" ), actionGroupModModes);
1.753 + a= new QAction( QPixmap(iconPath+"modecolor.png"), tr( "Use modifier to color branches","Mode modifier" ), actionGroupModModes);
1.754 a->setShortcut (Qt::Key_J);
1.755 a->setStatusTip ( tr( "Use modifier to color branches" ));
1.756 a->setToggleAction(true);
1.757 @@ -992,14 +995,14 @@
1.758 a->setOn(true);
1.759 actionModModeColor=a;
1.760
1.761 - a= new QAction( QPixmap(iconPath+"modecopy.png"), tr( "Use modifier to copy" ), actionGroupModModes );
1.762 + a= new QAction( QPixmap(iconPath+"modecopy.png"), tr( "Use modifier to copy","Mode modifier" ), actionGroupModModes );
1.763 a->setShortcut( Qt::Key_K);
1.764 a->setStatusTip( tr( "Use modifier to copy" ));
1.765 a->setToggleAction(true);
1.766 a->addTo (tb);
1.767 actionModModeCopy=a;
1.768
1.769 - a= new QAction(QPixmap(iconPath+"modelink.png"), tr( "Use modifier to draw xLinks" ), actionGroupModModes );
1.770 + a= new QAction(QPixmap(iconPath+"modelink.png"), tr( "Use modifier to draw xLinks","Mode modifier" ), actionGroupModModes );
1.771 a->setShortcut (Qt::Key_L);
1.772 a->setStatusTip( tr( "Use modifier to draw xLinks" ));
1.773 a->setToggleAction(true);
1.774 @@ -1333,39 +1336,39 @@
1.775
1.776 QAction *a;
1.777
1.778 - a = new QAction( tr( "Set application to open pdf files"), this);
1.779 + a = new QAction( tr( "Set application to open pdf files","Settings action"), this);
1.780 a->setStatusTip ( tr( "Set application to open pdf files"));
1.781 connect( a, SIGNAL( triggered() ), this, SLOT( settingsPDF() ) );
1.782 settingsMenu->addAction (a);
1.783
1.784 - a = new QAction( tr( "Set application to open external links"), this);
1.785 + a = new QAction( tr( "Set application to open external links","Settings action"), this);
1.786 a->setStatusTip( tr( "Set application to open external links"));
1.787 connect( a, SIGNAL( triggered() ), this, SLOT( settingsURL() ) );
1.788 settingsMenu->addAction (a);
1.789
1.790 settingsMenu->addSeparator();
1.791 - a = new QAction( tr( "Edit branch after adding it" ), this );
1.792 + a = new QAction( tr( "Edit branch after adding it","Settings action" ), this );
1.793 a->setStatusTip( tr( "Edit branch after adding it" ));
1.794 a->setToggleAction(true);
1.795 a->setOn ( settings.value ("/mapeditor/editmode/autoEdit",true).toBool());
1.796 settingsMenu->addAction (a);
1.797 actionSettingsAutoEdit=a;
1.798
1.799 - a= new QAction( tr( "Select branch after adding it" ), this );
1.800 + a= new QAction( tr( "Select branch after adding it","Settings action" ), this );
1.801 a->setStatusTip( tr( "Select branch after adding it" ));
1.802 a->setToggleAction(true);
1.803 a->setOn ( settings.value ("/mapeditor/editmode/autoSelectHeading",false).toBool() );
1.804 settingsMenu->addAction (a);
1.805 actionSettingsAutoSelectHeading=a;
1.806
1.807 - a= new QAction(tr( "Select existing heading" ), this);
1.808 + a= new QAction(tr( "Select existing heading","Settings action" ), this);
1.809 a->setStatusTip( tr( "Select heading before editing" ));
1.810 a->setToggleAction(true);
1.811 a->setOn ( settings.value ("/mapeditor/editmode/autoSelectText",true).toBool() );
1.812 settingsMenu->addAction (a);
1.813 actionSettingsAutoSelectText=a;
1.814
1.815 - a= new QAction( tr( "Delete key" ), this);
1.816 + a= new QAction( tr( "Delete key","Settings action" ), this);
1.817 a->setStatusTip( tr( "Delete key for deleting branches" ));
1.818 a->setToggleAction(true);
1.819 a->setOn ( settings.value ("/mapeditor/editmode/useDelKey",false).toBool() );
1.820 @@ -1373,14 +1376,14 @@
1.821 connect( a, SIGNAL( triggered() ), this, SLOT( settingsToggleDelKey() ) );
1.822 actionSettingsUseDelKey=a;
1.823
1.824 - a= new QAction( tr( "Exclusive flags" ), this);
1.825 + a= new QAction( tr( "Exclusive flags","Settings action" ), this);
1.826 a->setStatusTip( tr( "Use exclusive flags in flag toolbars" ));
1.827 a->setToggleAction(true);
1.828 a->setOn ( settings.value ("/mapeditor/editmode/useFlagGroups",true).toBool() );
1.829 settingsMenu->addAction (a);
1.830 actionSettingsUseFlagGroups=a;
1.831
1.832 - a= new QAction( tr( "Use hide flags" ), this);
1.833 + a= new QAction( tr( "Use hide flags","Settings action" ), this);
1.834 a->setStatusTip( tr( "Use hide flag during exports " ));
1.835 a->setToggleAction(true);
1.836 a->setOn ( settings.value ("/export/useHideExport",true).toBool() );
1.837 @@ -1394,13 +1397,13 @@
1.838 QMenu *testMenu = menuBar()->addMenu( tr( "&Test" ));
1.839
1.840 QAction *a;
1.841 - a = new QAction( tr( "Test function" ), this);
1.842 - a->setStatusTip( tr( "Call test function" ));
1.843 + a = new QAction( "Test function" , this);
1.844 + a->setStatusTip( "Call test function" );
1.845 a->setShortcut (Qt::Key_F4 );
1.846 connect( a, SIGNAL( triggered() ), this, SLOT( testFunction() ) );
1.847 testMenu->addAction (a);
1.848 - a = new QAction( tr( "Command" ), this);
1.849 - a->setStatusTip( tr( "Enter command to call in editor" ));
1.850 + a = new QAction( "Command" , this);
1.851 + a->setStatusTip( "Enter command to call in editor" );
1.852 a->setShortcut (Qt::Key_F5 );
1.853 connect( a, SIGNAL( triggered() ), this, SLOT( testCommand() ) );
1.854 testMenu->addAction (a);
1.855 @@ -1409,20 +1412,20 @@
1.856 // Help Actions
1.857 void Main::setupHelpActions()
1.858 {
1.859 - QMenu *helpMenu = menuBar()->addMenu ( tr( "&Help" ));
1.860 + QMenu *helpMenu = menuBar()->addMenu ( tr( "&Help","Help menubar entry" ));
1.861
1.862 QAction *a;
1.863 - a = new QAction( tr( "Open VYM Documentation (pdf) " ), this );
1.864 + a = new QAction( tr( "Open VYM Documentation (pdf) ","Help action" ), this );
1.865 a->setStatusTip( tr( "Open VYM Documentation (pdf)" ));
1.866 connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) );
1.867 helpMenu->addAction (a);
1.868
1.869 - a = new QAction( tr( "About VYM" ), this);
1.870 + a = new QAction( tr( "About VYM","Help action" ), this);
1.871 a->setStatusTip( tr( "About VYM")+" "__VYM);
1.872 connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ) );
1.873 helpMenu->addAction (a);
1.874
1.875 - a = new QAction( tr( "About QT" ), this);
1.876 + a = new QAction( tr( "About QT","Help action" ), this);
1.877 a->setStatusTip( tr( "Information about QT toolkit" ));
1.878 connect( a, SIGNAL( triggered() ), this, SLOT( helpAboutQT() ) );
1.879 helpMenu->addAction (a);
1.880 @@ -1450,11 +1453,11 @@
1.881 branchAddContextMenu->addAction ( actionEditImportReplace );
1.882
1.883 // Submenu "Remove"
1.884 - branchRemoveContextMenu =branchContextMenu->addMenu (tr ("Remove"));
1.885 + branchRemoveContextMenu =branchContextMenu->addMenu (tr ("Remove","Context menu name"));
1.886 branchRemoveContextMenu->addAction (actionEditCut);
1.887 branchRemoveContextMenu->addAction ( actionEditDelete );
1.888 - branchRemoveContextMenu->addAction ( actionEditRemoveBranchKeepChilds );
1.889 - branchRemoveContextMenu->addAction ( actionEditRemoveChilds );
1.890 + branchRemoveContextMenu->addAction ( actionEditDeleteKeepChilds );
1.891 + branchRemoveContextMenu->addAction ( actionEditDeleteChilds );
1.892
1.893
1.894 actionEditSaveBranch->addTo( branchContextMenu );
1.895 @@ -1472,7 +1475,7 @@
1.896 branchLinksContextMenu =new QMenu (this);
1.897
1.898 branchContextMenu->addSeparator();
1.899 - branchLinksContextMenu=branchContextMenu->addMenu(tr("URLs and vymLinks"));
1.900 + branchLinksContextMenu=branchContextMenu->addMenu(tr("URLs and vymLinks","Context menu name"));
1.901 branchLinksContextMenu->addAction ( actionEditOpenURL );
1.902 branchLinksContextMenu->addAction ( actionEditOpenURLTab );
1.903 branchLinksContextMenu->addAction ( actionEditOpenMultipleURLTabs );
1.904 @@ -1493,15 +1496,15 @@
1.905 // Context Menu for XLinks in a branch menu
1.906 // This will be populated "on demand" in MapEditor::updateActions
1.907 branchContextMenu->addSeparator();
1.908 - branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink"));
1.909 - branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink"));
1.910 + branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
1.911 + branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
1.912 connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
1.913 connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
1.914
1.915
1.916 // Context menu for floatimage
1.917 floatimageContextMenu =new QMenu (this);
1.918 - a= new QAction (tr ("Save image"),this);
1.919 + a= new QAction (tr ("Save image","Context action"),this);
1.920 connect (a, SIGNAL (triggered()), this, SLOT (editSaveImage()));
1.921 floatimageContextMenu->addAction (a);
1.922
1.923 @@ -1583,7 +1586,7 @@
1.924 if (!eList.isEmpty())
1.925 {
1.926 QMessageBox mb( __VYM,
1.927 - tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?").arg(dir),
1.928 + tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?","write directory").arg(dir),
1.929 QMessageBox::Warning,
1.930 QMessageBox::Yes ,
1.931 QMessageBox::Cancel | QMessageBox::Default,
1.932 @@ -2882,16 +2885,16 @@
1.933 fileSaveAs (PartOfMap);
1.934 }
1.935
1.936 -void Main::editRemoveBranchKeepChilds()
1.937 +void Main::editDeleteKeepChilds()
1.938 {
1.939 if (currentMapEditor())
1.940 - currentMapEditor()->removeBranchKeepChilds();
1.941 + currentMapEditor()->deleteKeepChilds();
1.942 }
1.943
1.944 -void Main::editRemoveChilds()
1.945 +void Main::editDeleteChilds()
1.946 {
1.947 if (currentMapEditor())
1.948 - currentMapEditor()->removeChilds();
1.949 + currentMapEditor()->deleteChilds();
1.950 }
1.951
1.952 void Main::editDeleteSelection()
1.953 @@ -2965,9 +2968,8 @@
1.954 {
1.955 if (currentMapEditor())
1.956 {
1.957 - QColor col = QColorDialog::getColor( currentMapEditor()->getColor(), this );
1.958 + QColor col = QColorDialog::getColor((currentColor ), this );
1.959 if ( !col.isValid() ) return;
1.960 - currentMapEditor()->setColor( col );
1.961 colorChanged( col );
1.962 }
1.963 }
1.964 @@ -2975,7 +2977,7 @@
1.965 void Main::formatPickColor()
1.966 {
1.967 if (currentMapEditor())
1.968 - colorChanged( currentMapEditor()->pickColor() );
1.969 + colorChanged( currentMapEditor()->getCurrentHeadingColor() );
1.970 }
1.971
1.972 void Main::colorChanged(QColor c)
1.973 @@ -2983,18 +2985,19 @@
1.974 QPixmap pix( 16, 16 );
1.975 pix.fill( c );
1.976 actionFormatColor->setIconSet( pix );
1.977 + currentColor=c;
1.978 }
1.979
1.980 void Main::formatColorItem()
1.981 {
1.982 if (currentMapEditor())
1.983 - currentMapEditor()->colorItem();
1.984 + currentMapEditor()->colorItem(currentColor);
1.985 }
1.986
1.987 void Main::formatColorBranch()
1.988 {
1.989 if (currentMapEditor())
1.990 - currentMapEditor()->colorBranch();
1.991 + currentMapEditor()->colorBranch(currentColor);
1.992 }
1.993
1.994 void Main::formatLinkStyleLine()
1.995 @@ -3412,6 +3415,7 @@
1.996 {
1.997 if (!currentMapEditor()) return;
1.998 currentMapEditor()->testFunction();
1.999 +
1.1000 }
1.1001
1.1002 void Main::testCommand()
1.1003 @@ -3425,38 +3429,45 @@
1.1004
1.1005 void Main::helpDoc()
1.1006 {
1.1007 - QString docpath;
1.1008 + QString locale = QLocale::system().name();
1.1009 + QString docname;
1.1010 + if (locale.left(2)=="es")
1.1011 + docname="vym_es.pdf";
1.1012 + else
1.1013 + docname="vym.pdf";
1.1014 + QDir docdir;
1.1015 #if defined(Q_OS_MACX)
1.1016 - docpath="./vym.app/Contents/vym.pdf";
1.1017 + docdir.setPath("./vym.app/Contents");
1.1018 #else
1.1019 // default path in SUSE LINUX
1.1020 - docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
1.1021 + docdir.setPath("/usr/share/doc/packages/vym/doc");
1.1022 #endif
1.1023
1.1024 - if (!QFile (docpath).exists() )
1.1025 + if (!docdir.exists() )
1.1026 {
1.1027 // relative path for easy testing in tarball
1.1028 - docpath="doc/vym.pdf";
1.1029 - if (!QFile (docpath).exists() )
1.1030 + docdir.setPath("doc");
1.1031 + if (!docdir.exists() )
1.1032 {
1.1033 // relative path for testing while still writing vym.tex
1.1034 - docpath="doc/tex/vym.pdf";
1.1035 - if (!QFile (docpath).exists() )
1.1036 + docdir.setPath("doc/tex/vym.pdf");
1.1037 + if (!docdir.exists() )
1.1038 {
1.1039 // Try yet another one for Knoppix
1.1040 - docpath="/usr/share/doc/packages/vym/vym.pdf";
1.1041 - if (!QFile (docpath).exists() )
1.1042 + docdir.setPath("/usr/share/doc/packages/vym");
1.1043 + if (!docdir.exists() )
1.1044 {
1.1045 QMessageBox::critical(0,
1.1046 tr("Critcal error"),
1.1047 tr("Couldn't find the documentation\n"
1.1048 - "vym.pdf in various places."));
1.1049 + "vym.pdf in various directories."));
1.1050 return;
1.1051 }
1.1052 }
1.1053 }
1.1054 }
1.1055
1.1056 + QString docpath=docdir.path()+"/"+docname;
1.1057 Process *pdfProc = new Process();
1.1058 pdfProc->clearArguments();
1.1059 pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString());
1.1060 @@ -3467,7 +3478,7 @@
1.1061 // error handling
1.1062 QMessageBox::warning(0,
1.1063 tr("Warning"),
1.1064 - tr("Couldn't find a viewer to open %1.\n").arg("vym.pdf")+
1.1065 + tr("Couldn't find a viewer to open %1.\n").arg(docpath)+
1.1066 tr("Please use Settings->")+tr("Set application to open PDF files"));
1.1067 settingsPDF();
1.1068 return;