1.1 --- a/mainwindow.cpp Wed Jul 16 11:56:44 2008 +0000
1.2 +++ b/mainwindow.cpp Mon Aug 04 10:43:06 2008 +0000
1.3 @@ -456,7 +456,7 @@
1.4 a->setEnabled (false);
1.5 tb->addAction (a);
1.6 editMenu->addAction (a);
1.7 - actionEditUndo=a;
1.8 + actionUndo=a;
1.9
1.10 a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo","Edit menu" ), this);
1.11 a->setStatusTip (tr( "Redo" ));
1.12 @@ -464,7 +464,7 @@
1.13 tb->addAction (a);
1.14 editMenu->addAction (a);
1.15 connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
1.16 - actionEditRedo=a;
1.17 + actionRedo=a;
1.18
1.19 editMenu->addSeparator();
1.20 a = new QAction(QPixmap( iconPath+"editcopy.png"), tr( "&Copy","Edit menu" ), this);
1.21 @@ -474,7 +474,7 @@
1.22 tb->addAction (a);
1.23 editMenu->addAction (a);
1.24 connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
1.25 - actionEditCopy=a;
1.26 + actionCopy=a;
1.27
1.28 a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t","Edit menu" ), this);
1.29 a->setStatusTip ( tr( "Cut" ) );
1.30 @@ -482,7 +482,7 @@
1.31 a->setEnabled (false);
1.32 tb->addAction (a);
1.33 editMenu->addAction (a);
1.34 - actionEditCut=a;
1.35 + actionCut=a;
1.36 connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
1.37
1.38 a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste","Edit menu" ),this);
1.39 @@ -492,7 +492,7 @@
1.40 a->setEnabled (false);
1.41 tb->addAction (a);
1.42 editMenu->addAction (a);
1.43 - actionEditPaste=a;
1.44 + actionPaste=a;
1.45
1.46 /*
1.47 // Shortcuts to modify heading:
1.48 @@ -511,9 +511,8 @@
1.49 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
1.50 actionListBranches.append(a);
1.51 editMenu->addAction (a);
1.52 - actionEditHeading=a;
1.53 -
1.54 -*/
1.55 + actionHeading=a;
1.56 +
1.57 a = new QAction( tr( "Edit heading","Edit menu" ), this);
1.58 a->setStatusTip (tr( "edit Heading" ));
1.59 //a->setShortcut ( Qt::Key_F2 ); //Edit heading
1.60 @@ -521,6 +520,7 @@
1.61 addAction (a);
1.62 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
1.63 actionListBranches.append(a);
1.64 +*/
1.65
1.66 // Shortcut to delete selection
1.67 a = new QAction( tr( "Delete Selection","Edit menu" ),this);
1.68 @@ -529,12 +529,12 @@
1.69 a->setShortcutContext (Qt::WindowShortcut);
1.70 addAction (a);
1.71 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteSelection() ) );
1.72 - actionEditDelete=a;
1.73 + actionDelete=a;
1.74
1.75 // Shortcut to add mapcenter
1.76 a= new QAction(tr( "Add mapcenter","Canvas context menu" ), this);
1.77 connect( a, SIGNAL( triggered() ), this, SLOT( editAddMapCenter() ) );
1.78 - actionEditAddMapCenter = a;
1.79 + actionAddMapCenter = a;
1.80
1.81
1.82 // Shortcut to add branch
1.83 @@ -551,12 +551,12 @@
1.84 actionListBranches.append(a);
1.85 #if defined (Q_OS_MACX)
1.86 // In OSX show different shortcut in menues, the keys work indepently always
1.87 - actionEditAddBranch=alt;
1.88 + actionAddBranch=alt;
1.89 #else
1.90 - actionEditAddBranch=a;
1.91 + actionAddBranch=a;
1.92 #endif
1.93 - editMenu->addAction (actionEditAddBranch);
1.94 - tb->addAction (actionEditAddBranch);
1.95 + editMenu->addAction (actionAddBranch);
1.96 + tb->addAction (actionAddBranch);
1.97
1.98
1.99 // Add branch by inserting it at selection
1.100 @@ -568,7 +568,7 @@
1.101 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBefore() ) );
1.102 a->setEnabled (false);
1.103 actionListBranches.append(a);
1.104 - actionEditAddBranchBefore=a;
1.105 + actionAddBranchBefore=a;
1.106 a = new QAction(tr( "Add branch (insert)","Edit menu" ),this);
1.107 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
1.108 a->setShortcut ( Qt::ALT + Qt::Key_A ); //Insert branch
1.109 @@ -586,7 +586,7 @@
1.110 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
1.111 a->setEnabled (false);
1.112 actionListBranches.append(a);
1.113 - actionEditAddBranchAbove=a;
1.114 + actionAddBranchAbove=a;
1.115 a = new QAction(tr( "Add branch above","Edit menu" ), this);
1.116 a->setStatusTip ( tr( "Add a branch above selection" ));
1.117 a->setShortcut (Qt::SHIFT+Qt::Key_A ); //Add branch above
1.118 @@ -604,7 +604,7 @@
1.119 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.120 a->setEnabled (false);
1.121 actionListBranches.append(a);
1.122 - actionEditAddBranchBelow=a;
1.123 + actionAddBranchBelow=a;
1.124 a = new QAction(tr( "Add branch below","Edit menu" ), this);
1.125 a->setStatusTip ( tr( "Add a branch below selection" ));
1.126 a->setShortcut (Qt::CTRL +Qt::Key_A ); // Add branch below
1.127 @@ -620,7 +620,7 @@
1.128 tb->addAction (a);
1.129 editMenu->addAction (a);
1.130 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
1.131 - actionEditMoveUp=a;
1.132 + actionMoveUp=a;
1.133
1.134 a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down","Edit menu" ),this);
1.135 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) );
1.136 @@ -629,14 +629,14 @@
1.137 a->setEnabled (false);
1.138 tb->addAction (a);
1.139 editMenu->addAction (a);
1.140 - actionEditMoveDown=a;
1.141 + actionMoveDown=a;
1.142
1.143 a = new QAction( QPixmap(iconPath+"editsort.png" ), tr( "Sort children","Edit menu" ), this );
1.144 connect( a, SIGNAL( activated() ), this, SLOT( editSortChildren() ) );
1.145 a->setEnabled (true);
1.146 a->addTo( tb );
1.147 editMenu->addAction (a);
1.148 - actionEditSortChildren=a;
1.149 + actionSortChildren=a;
1.150
1.151 a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ),this);
1.152 a->setShortcut ( Qt::Key_ScrollLock );
1.153 @@ -648,18 +648,18 @@
1.154 alt->setStatusTip (tr( "Scroll branch" ));
1.155 connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.156 #if defined(Q_OS_MACX)
1.157 - actionEditToggleScroll=alt;
1.158 + actionToggleScroll=alt;
1.159 #else
1.160 - actionEditToggleScroll=a;
1.161 + actionToggleScroll=a;
1.162 #endif
1.163 - actionEditToggleScroll->setEnabled (false);
1.164 - actionEditToggleScroll->setToggleAction(true);
1.165 - tb->addAction (actionEditToggleScroll);
1.166 - editMenu->addAction ( actionEditToggleScroll);
1.167 - editMenu->addAction (actionEditToggleScroll);
1.168 + actionToggleScroll->setEnabled (false);
1.169 + actionToggleScroll->setToggleAction(true);
1.170 + tb->addAction (actionToggleScroll);
1.171 + editMenu->addAction ( actionToggleScroll);
1.172 + editMenu->addAction (actionToggleScroll);
1.173 addAction (a);
1.174 addAction (alt);
1.175 - actionListBranches.append(actionEditToggleScroll);
1.176 + actionListBranches.append(actionToggleScroll);
1.177
1.178 a = new QAction( tr( "Unscroll children","Edit menu" ), this);
1.179 a->setStatusTip (tr( "Unscroll all scrolled branches in selected subtree" ));
1.180 @@ -682,21 +682,21 @@
1.181 tb->addAction (a);
1.182 addAction(a);
1.183 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
1.184 - actionEditOpenURL=a;
1.185 + actionOpenURL=a;
1.186
1.187 a = new QAction( tr( "Open URL in new tab","Edit menu" ), this);
1.188 a->setStatusTip (tr( "Open URL in new tab" ));
1.189 //a->setShortcut (Qt::CTRL+Qt::Key_U );
1.190 addAction(a);
1.191 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
1.192 - actionEditOpenURLTab=a;
1.193 + actionOpenURLTab=a;
1.194
1.195 a = new QAction( tr( "Open all URLs in subtree","Edit menu" ), this);
1.196 a->setStatusTip (tr( "Open all URLs in subtree" ));
1.197 addAction(a);
1.198 actionListBranches.append(a);
1.199 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleURLTabs() ) );
1.200 - actionEditOpenMultipleURLTabs=a;
1.201 + actionOpenMultipleURLTabs=a;
1.202
1.203 a = new QAction(QPixmap(), tr( "Edit URL...","Edit menu"), this);
1.204 a->setStatusTip ( tr( "Edit URL" ) );
1.205 @@ -705,7 +705,7 @@
1.206 actionListBranches.append(a);
1.207 addAction(a);
1.208 connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
1.209 - actionEditURL=a;
1.210 + actionURL=a;
1.211
1.212 a = new QAction(QPixmap(), tr( "Edit local URL...","Edit menu"), this);
1.213 a->setStatusTip ( tr( "Edit local URL" ) );
1.214 @@ -714,42 +714,42 @@
1.215 actionListBranches.append(a);
1.216 addAction(a);
1.217 connect( a, SIGNAL( triggered() ), this, SLOT( editLocalURL() ) );
1.218 - actionEditLocalURL=a;
1.219 + actionLocalURL=a;
1.220
1.221 a = new QAction( tr( "Use heading for URL","Edit menu" ), this);
1.222 a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
1.223 a->setEnabled (false);
1.224 actionListBranches.append(a);
1.225 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
1.226 - actionEditHeading2URL=a;
1.227 + actionHeading2URL=a;
1.228
1.229 a = new QAction(tr( "Create URL to Novell Bugzilla","Edit menu" ), this);
1.230 a->setStatusTip ( tr( "Create URL to Novell Bugzilla" ));
1.231 a->setEnabled (false);
1.232 actionListBranches.append(a);
1.233 connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
1.234 - actionEditBugzilla2URL=a;
1.235 + actionBugzilla2URL=a;
1.236
1.237 a = new QAction(tr( "Create URL to Novell FATE","Edit menu" ), this);
1.238 a->setStatusTip ( tr( "Create URL to Novell FATE" ));
1.239 a->setEnabled (false);
1.240 actionListBranches.append(a);
1.241 connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
1.242 - actionEditFATE2URL=a;
1.243 + actionFATE2URL=a;
1.244
1.245 a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Open linked map","Edit menu" ), this);
1.246 a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
1.247 tb->addAction (a);
1.248 a->setEnabled (false);
1.249 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
1.250 - actionEditOpenVymLink=a;
1.251 + actionOpenVymLink=a;
1.252
1.253 a = new QAction(QPixmap(), tr( "Open all vym links in subtree","Edit menu" ), this);
1.254 a->setStatusTip ( tr( "Open all vym links in subtree" ));
1.255 a->setEnabled (false);
1.256 actionListBranches.append(a);
1.257 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleVymLinks() ) );
1.258 - actionEditOpenMultipleVymLinks=a;
1.259 + actionOpenMultipleVymLinks=a;
1.260
1.261
1.262 a = new QAction(tr( "Edit vym link...","Edit menu" ), this);
1.263 @@ -757,13 +757,13 @@
1.264 a->setStatusTip ( tr( "Edit link to another vym map" ));
1.265 connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
1.266 actionListBranches.append(a);
1.267 - actionEditVymLink=a;
1.268 + actionVymLink=a;
1.269
1.270 a = new QAction(tr( "Delete vym link","Edit menu" ),this);
1.271 a->setStatusTip ( tr( "Delete link to another vym map" ));
1.272 a->setEnabled (false);
1.273 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
1.274 - actionEditDeleteVymLink=a;
1.275 + actionDeleteVymLink=a;
1.276
1.277 a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports","Edit menu" ), this);
1.278 a->setStatusTip ( tr( "Hide object in exports" ) );
1.279 @@ -772,13 +772,13 @@
1.280 tb->addAction (a);
1.281 a->setEnabled (false);
1.282 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
1.283 - actionEditToggleHideExport=a;
1.284 + actionToggleHideExport=a;
1.285
1.286 a = new QAction(tr( "Edit Map Info...","Edit menu" ),this);
1.287 a->setStatusTip ( tr( "Edit Map Info" ));
1.288 a->setEnabled (true);
1.289 connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
1.290 - actionEditMapInfo=a;
1.291 + actionMapInfo=a;
1.292
1.293 // Import at selection (adding to selection)
1.294 a = new QAction( tr( "Add map (insert)","Edit menu" ),this);
1.295 @@ -786,7 +786,7 @@
1.296 connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
1.297 a->setEnabled (false);
1.298 actionListBranches.append(a);
1.299 - actionEditImportAdd=a;
1.300 + actionImportAdd=a;
1.301
1.302 // Import at selection (replacing selection)
1.303 a = new QAction( tr( "Add map (replace)","Edit menu" ), this);
1.304 @@ -794,7 +794,7 @@
1.305 connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
1.306 a->setEnabled (false);
1.307 actionListBranches.append(a);
1.308 - actionEditImportReplace=a;
1.309 + actionImportReplace=a;
1.310
1.311 // Save selection
1.312 a = new QAction( tr( "Save selection","Edit menu" ), this);
1.313 @@ -802,7 +802,7 @@
1.314 connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
1.315 a->setEnabled (false);
1.316 actionListBranches.append(a);
1.317 - actionEditSaveBranch=a;
1.318 + actionSaveBranch=a;
1.319
1.320 // Only remove branch, not its children
1.321 a = new QAction(tr( "Remove only branch ","Edit menu" ), this);
1.322 @@ -812,7 +812,7 @@
1.323 a->setEnabled (false);
1.324 addAction (a);
1.325 actionListBranches.append(a);
1.326 - actionEditDeleteKeepChildren=a;
1.327 + actionDeleteKeepChildren=a;
1.328
1.329 // Only remove children of a branch
1.330 a = new QAction( tr( "Remove children","Edit menu" ), this);
1.331 @@ -821,7 +821,7 @@
1.332 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteChildren() ) );
1.333 a->setEnabled (false);
1.334 actionListBranches.append(a);
1.335 - actionEditDeleteChildren=a;
1.336 + actionDeleteChildren=a;
1.337
1.338 // Shortcuts for navigating with cursor:
1.339 a = new QAction(tr( "Select upper branch","Edit menu" ), this);
1.340 @@ -856,7 +856,7 @@
1.341 a->setEnabled (false);
1.342 editMenu->addAction (a);
1.343 actionListBranches.append(a);
1.344 - actionEditSelectFirst=a;
1.345 + actionSelectFirst=a;
1.346 connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) );
1.347 a = new QAction( tr( "Select last branch","Edit menu" ),this);
1.348 a->setStatusTip (tr( "Select last branch" ));
1.349 @@ -867,12 +867,12 @@
1.350 a->setEnabled (false);
1.351 editMenu->addAction (a);
1.352 actionListBranches.append(a);
1.353 - actionEditSelectLast=a;
1.354 + actionSelectLast=a;
1.355
1.356 a = new QAction( tr( "Add Image...","Edit menu" ), this);
1.357 a->setStatusTip (tr( "Add Image" ));
1.358 connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
1.359 - actionEditLoadImage=a;
1.360 + actionLoadImage=a;
1.361
1.362 a = new QAction( tr( "Property window","Dialog to edit properties of selection" )+QString ("..."), this);
1.363 a->setStatusTip (tr( "Set properties for selection" ));
1.364 @@ -1542,50 +1542,50 @@
1.365
1.366 // Submenu "Add"
1.367 branchAddContextMenu =branchContextMenu->addMenu (tr("Add"));
1.368 - branchAddContextMenu->addAction (actionEditPaste );
1.369 - branchAddContextMenu->addAction ( actionEditAddBranch );
1.370 - branchAddContextMenu->addAction ( actionEditAddBranchBefore );
1.371 - branchAddContextMenu->addAction ( actionEditAddBranchAbove);
1.372 - branchAddContextMenu->addAction ( actionEditAddBranchBelow );
1.373 + branchAddContextMenu->addAction (actionPaste );
1.374 + branchAddContextMenu->addAction ( actionAddBranch );
1.375 + branchAddContextMenu->addAction ( actionAddBranchBefore );
1.376 + branchAddContextMenu->addAction ( actionAddBranchAbove);
1.377 + branchAddContextMenu->addAction ( actionAddBranchBelow );
1.378 branchAddContextMenu->addSeparator();
1.379 - branchAddContextMenu->addAction ( actionEditImportAdd );
1.380 - branchAddContextMenu->addAction ( actionEditImportReplace );
1.381 + branchAddContextMenu->addAction ( actionImportAdd );
1.382 + branchAddContextMenu->addAction ( actionImportReplace );
1.383
1.384 // Submenu "Remove"
1.385 branchRemoveContextMenu =branchContextMenu->addMenu (tr ("Remove","Context menu name"));
1.386 - branchRemoveContextMenu->addAction (actionEditCut);
1.387 - branchRemoveContextMenu->addAction ( actionEditDelete );
1.388 - branchRemoveContextMenu->addAction ( actionEditDeleteKeepChildren );
1.389 - branchRemoveContextMenu->addAction ( actionEditDeleteChildren );
1.390 + branchRemoveContextMenu->addAction (actionCut);
1.391 + branchRemoveContextMenu->addAction ( actionDelete );
1.392 + branchRemoveContextMenu->addAction ( actionDeleteKeepChildren );
1.393 + branchRemoveContextMenu->addAction ( actionDeleteChildren );
1.394
1.395
1.396 - actionEditSaveBranch->addTo( branchContextMenu );
1.397 + actionSaveBranch->addTo( branchContextMenu );
1.398 actionFileNewCopy->addTo (branchContextMenu );
1.399
1.400 branchContextMenu->addSeparator();
1.401 - branchContextMenu->addAction ( actionEditLoadImage);
1.402 + branchContextMenu->addAction ( actionLoadImage);
1.403
1.404 // Submenu for Links (URLs, vymLinks)
1.405 branchLinksContextMenu =new QMenu (this);
1.406
1.407 branchContextMenu->addSeparator();
1.408 branchLinksContextMenu=branchContextMenu->addMenu(tr("References (URLs, vymLinks, ...)","Context menu name"));
1.409 - branchLinksContextMenu->addAction ( actionEditOpenURL );
1.410 - branchLinksContextMenu->addAction ( actionEditOpenURLTab );
1.411 - branchLinksContextMenu->addAction ( actionEditOpenMultipleURLTabs );
1.412 - branchLinksContextMenu->addAction ( actionEditURL );
1.413 - branchLinksContextMenu->addAction ( actionEditLocalURL );
1.414 - branchLinksContextMenu->addAction ( actionEditHeading2URL );
1.415 - branchLinksContextMenu->addAction ( actionEditBugzilla2URL );
1.416 + branchLinksContextMenu->addAction ( actionOpenURL );
1.417 + branchLinksContextMenu->addAction ( actionOpenURLTab );
1.418 + branchLinksContextMenu->addAction ( actionOpenMultipleURLTabs );
1.419 + branchLinksContextMenu->addAction ( actionURL );
1.420 + branchLinksContextMenu->addAction ( actionLocalURL );
1.421 + branchLinksContextMenu->addAction ( actionHeading2URL );
1.422 + branchLinksContextMenu->addAction ( actionBugzilla2URL );
1.423 if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
1.424 {
1.425 - branchLinksContextMenu->addAction ( actionEditFATE2URL );
1.426 + branchLinksContextMenu->addAction ( actionFATE2URL );
1.427 }
1.428 branchLinksContextMenu->addSeparator();
1.429 - branchLinksContextMenu->addAction ( actionEditOpenVymLink );
1.430 - branchLinksContextMenu->addAction ( actionEditOpenMultipleVymLinks );
1.431 - branchLinksContextMenu->addAction ( actionEditVymLink );
1.432 - branchLinksContextMenu->addAction ( actionEditDeleteVymLink );
1.433 + branchLinksContextMenu->addAction ( actionOpenVymLink );
1.434 + branchLinksContextMenu->addAction ( actionOpenMultipleVymLinks );
1.435 + branchLinksContextMenu->addAction ( actionVymLink );
1.436 + branchLinksContextMenu->addAction ( actionDeleteVymLink );
1.437
1.438
1.439 // Context Menu for XLinks in a branch menu
1.440 @@ -1604,8 +1604,8 @@
1.441 floatimageContextMenu->addAction (a);
1.442
1.443 floatimageContextMenu->addSeparator();
1.444 - actionEditCopy->addTo( floatimageContextMenu );
1.445 - actionEditCut->addTo( floatimageContextMenu );
1.446 + actionCopy->addTo( floatimageContextMenu );
1.447 + actionCut->addTo( floatimageContextMenu );
1.448
1.449 floatimageContextMenu->addSeparator();
1.450 floatimageContextMenu->addAction ( actionFormatHideLinkUnselected );
1.451 @@ -1613,9 +1613,9 @@
1.452
1.453 // Context menu for canvas
1.454 canvasContextMenu =new QMenu (this);
1.455 - actionEditMapInfo->addTo( canvasContextMenu );
1.456 if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
1.457 - actionEditAddMapCenter->addTo( canvasContextMenu );
1.458 + actionAddMapCenter->addTo( canvasContextMenu );
1.459 + actionMapInfo->addTo( canvasContextMenu );
1.460 canvasContextMenu->insertSeparator();
1.461 actionGroupFormatLinkStyles->addTo( canvasContextMenu );
1.462 canvasContextMenu->insertSeparator();
1.463 @@ -3412,10 +3412,10 @@
1.464 {
1.465 if (actionSettingsUseDelKey->isOn())
1.466 {
1.467 - actionEditDelete->setAccel (QKeySequence (Qt::Key_Delete));
1.468 + actionDelete->setAccel (QKeySequence (Qt::Key_Delete));
1.469 } else
1.470 {
1.471 - actionEditDelete->setAccel (QKeySequence (""));
1.472 + actionDelete->setAccel (QKeySequence (""));
1.473 }
1.474 }
1.475
1.476 @@ -3482,9 +3482,9 @@
1.477 if (m) m->updateNoteFlag();
1.478 }
1.479
1.480 -void Main::updateSatellites(MapEditor *me)
1.481 +void Main::updateSatellites(VymModel* model)
1.482 {
1.483 - branchPropertyWindow->setModel (me->getModel() );
1.484 + branchPropertyWindow->setModel (model );
1.485 }
1.486
1.487 void Main::updateActions()
1.488 @@ -3534,14 +3534,14 @@
1.489
1.490 actionFileSave->setEnabled( m->hasChanged() );
1.491 if (m->isUndoAvailable())
1.492 - actionEditUndo->setEnabled( true);
1.493 + actionUndo->setEnabled( true);
1.494 else
1.495 - actionEditUndo->setEnabled( false);
1.496 + actionUndo->setEnabled( false);
1.497
1.498 if (m->isRedoAvailable())
1.499 - actionEditRedo->setEnabled( true);
1.500 + actionRedo->setEnabled( true);
1.501 else
1.502 - actionEditRedo->setEnabled( false);
1.503 + actionRedo->setEnabled( false);
1.504
1.505 LinkableMapObj *selection=m->getSelection();
1.506 if (selection)
1.507 @@ -3577,54 +3577,54 @@
1.508
1.509 standardFlagsDefault->setEnabled (true);
1.510
1.511 - actionEditToggleScroll->setEnabled (true);
1.512 + actionToggleScroll->setEnabled (true);
1.513 if ( bo->isScrolled() )
1.514 - actionEditToggleScroll->setOn(true);
1.515 + actionToggleScroll->setOn(true);
1.516 else
1.517 - actionEditToggleScroll->setOn(false);
1.518 + actionToggleScroll->setOn(false);
1.519
1.520 if ( bo->getURL().isEmpty() )
1.521 {
1.522 - actionEditOpenURL->setEnabled (false);
1.523 - actionEditOpenURLTab->setEnabled (false);
1.524 + actionOpenURL->setEnabled (false);
1.525 + actionOpenURLTab->setEnabled (false);
1.526 }
1.527 else
1.528 {
1.529 - actionEditOpenURL->setEnabled (true);
1.530 - actionEditOpenURLTab->setEnabled (true);
1.531 + actionOpenURL->setEnabled (true);
1.532 + actionOpenURLTab->setEnabled (true);
1.533 }
1.534 if ( bo->getVymLink().isEmpty() )
1.535 {
1.536 - actionEditOpenVymLink->setEnabled (false);
1.537 - actionEditDeleteVymLink->setEnabled (false);
1.538 + actionOpenVymLink->setEnabled (false);
1.539 + actionDeleteVymLink->setEnabled (false);
1.540 } else
1.541 {
1.542 - actionEditOpenVymLink->setEnabled (true);
1.543 - actionEditDeleteVymLink->setEnabled (true);
1.544 + actionOpenVymLink->setEnabled (true);
1.545 + actionDeleteVymLink->setEnabled (true);
1.546 }
1.547
1.548 if (bo->canMoveBranchUp())
1.549 - actionEditMoveUp->setEnabled (true);
1.550 + actionMoveUp->setEnabled (true);
1.551 else
1.552 - actionEditMoveUp->setEnabled (false);
1.553 + actionMoveUp->setEnabled (false);
1.554 if (bo->canMoveBranchDown())
1.555 - actionEditMoveDown->setEnabled (true);
1.556 + actionMoveDown->setEnabled (true);
1.557 else
1.558 - actionEditMoveDown->setEnabled (false);
1.559 -
1.560 -
1.561 - actionEditToggleHideExport->setEnabled (true);
1.562 - actionEditToggleHideExport->setOn (bo->hideInExport() );
1.563 -
1.564 - actionEditCopy->setEnabled (true);
1.565 - actionEditCut->setEnabled (true);
1.566 + actionMoveDown->setEnabled (false);
1.567 +
1.568 +
1.569 + actionToggleHideExport->setEnabled (true);
1.570 + actionToggleHideExport->setOn (bo->hideInExport() );
1.571 +
1.572 + actionCopy->setEnabled (true);
1.573 + actionCut->setEnabled (true);
1.574 if (!clipboardEmpty)
1.575 - actionEditPaste->setEnabled (true);
1.576 + actionPaste->setEnabled (true);
1.577 else
1.578 - actionEditPaste->setEnabled (false);
1.579 + actionPaste->setEnabled (false);
1.580 for (int i=0; i<actionListBranches.size(); ++i)
1.581 actionListBranches.at(i)->setEnabled(true);
1.582 - actionEditDelete->setEnabled (true);
1.583 + actionDelete->setEnabled (true);
1.584 actionFormatHideLinkUnselected->setOn
1.585 (selection->getHideLinkUnselected());
1.586 }
1.587 @@ -3632,42 +3632,42 @@
1.588 {
1.589 FloatObj *fo=(FloatImageObj*)selection;
1.590
1.591 - actionEditOpenURL->setEnabled (false);
1.592 - actionEditOpenVymLink->setEnabled (false);
1.593 - actionEditDeleteVymLink->setEnabled (false);
1.594 - actionEditToggleHideExport->setEnabled (true);
1.595 - actionEditToggleHideExport->setOn (fo->hideInExport() );
1.596 -
1.597 -
1.598 - actionEditCopy->setEnabled (true);
1.599 - actionEditCut->setEnabled (true);
1.600 - actionEditPaste->setEnabled (false);
1.601 + actionOpenURL->setEnabled (false);
1.602 + actionOpenVymLink->setEnabled (false);
1.603 + actionDeleteVymLink->setEnabled (false);
1.604 + actionToggleHideExport->setEnabled (true);
1.605 + actionToggleHideExport->setOn (fo->hideInExport() );
1.606 +
1.607 +
1.608 + actionCopy->setEnabled (true);
1.609 + actionCut->setEnabled (true);
1.610 + actionPaste->setEnabled (false);
1.611 for (int i=0; i<actionListBranches.size(); ++i)
1.612 actionListBranches.at(i)->setEnabled(false);
1.613 - actionEditDelete->setEnabled (true);
1.614 + actionDelete->setEnabled (true);
1.615 actionFormatHideLinkUnselected->setOn
1.616 ( selection->getHideLinkUnselected());
1.617 - actionEditMoveUp->setEnabled (false);
1.618 - actionEditMoveDown->setEnabled (false);
1.619 + actionMoveUp->setEnabled (false);
1.620 + actionMoveDown->setEnabled (false);
1.621 }
1.622
1.623 } else
1.624 {
1.625 - actionEditCopy->setEnabled (false);
1.626 - actionEditCut->setEnabled (false);
1.627 - actionEditPaste->setEnabled (false);
1.628 + actionCopy->setEnabled (false);
1.629 + actionCut->setEnabled (false);
1.630 + actionPaste->setEnabled (false);
1.631 for (int i=0; i<actionListBranches.size(); ++i)
1.632 actionListBranches.at(i)->setEnabled(false);
1.633
1.634 - actionEditToggleScroll->setEnabled (false);
1.635 - actionEditOpenURL->setEnabled (false);
1.636 - actionEditOpenVymLink->setEnabled (false);
1.637 - actionEditDeleteVymLink->setEnabled (false);
1.638 - actionEditHeading2URL->setEnabled (false);
1.639 - actionEditDelete->setEnabled (false);
1.640 - actionEditMoveUp->setEnabled (false);
1.641 - actionEditMoveDown->setEnabled (false);
1.642 - actionEditToggleHideExport->setEnabled (false);
1.643 + actionToggleScroll->setEnabled (false);
1.644 + actionOpenURL->setEnabled (false);
1.645 + actionOpenVymLink->setEnabled (false);
1.646 + actionDeleteVymLink->setEnabled (false);
1.647 + actionHeading2URL->setEnabled (false);
1.648 + actionDelete->setEnabled (false);
1.649 + actionMoveUp->setEnabled (false);
1.650 + actionMoveDown->setEnabled (false);
1.651 + actionToggleHideExport->setEnabled (false);
1.652 }
1.653 }
1.654