1.1 --- a/mainwindow.cpp Fri Feb 19 13:47:03 2010 +0000
1.2 +++ b/mainwindow.cpp Thu Feb 25 11:03:52 2010 +0000
1.3 @@ -205,6 +205,8 @@
1.4 setupSettingsActions();
1.5 setupContextMenus();
1.6 setupMacros();
1.7 + if (debug) switchboard.print();
1.8 +
1.9 if (settings.value( "/mainwindow/showTestMenu",false).toBool()) setupTestActions();
1.10 setupHelpActions();
1.11
1.12 @@ -341,6 +343,7 @@
1.13 a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New map","File menu" ),this);
1.14 a->setStatusTip ( tr( "New map","Status tip File menu" ) );
1.15 a->setShortcut ( Qt::CTRL + Qt::Key_N ); //New map
1.16 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.17 a->addTo( tb );
1.18 fileMenu->addAction (a);
1.19 connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
1.20 @@ -348,6 +351,7 @@
1.21 a = new QAction(QPixmap( iconPath+"filenewcopy.png"), tr( "&Copy to new map","File menu" ),this);
1.22 a->setStatusTip ( tr( "Copy selection to mapcenter of a new map","Status tip File menu" ) );
1.23 a->setShortcut ( Qt::CTRL +Qt::SHIFT + Qt::Key_N ); //New map
1.24 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.25 fileMenu->addAction (a);
1.26 connect( a, SIGNAL( triggered() ), this, SLOT( fileNewCopy() ) );
1.27 actionFileNewCopy=a;
1.28 @@ -355,6 +359,7 @@
1.29 a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ,"File menu"),this);
1.30 a->setStatusTip (tr( "Open","Status tip File menu" ) );
1.31 a->setShortcut ( Qt::CTRL + Qt::Key_O ); //Open map
1.32 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.33 a->addTo( tb );
1.34 fileMenu->addAction (a);
1.35 connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) );
1.36 @@ -365,6 +370,7 @@
1.37 a = new QAction( QPixmap( iconPath+"filesave.png"), tr( "&Save...","File menu" ), this);
1.38 a->setStatusTip ( tr( "Save","Status tip file menu" ));
1.39 a->setShortcut (Qt::CTRL + Qt::Key_S ); //Save map
1.40 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.41 a->addTo( tb );
1.42 fileMenu->addAction (a);
1.43 connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
1.44 @@ -372,6 +378,7 @@
1.45
1.46 a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As...","File menu" ), this);
1.47 a->setStatusTip (tr( "Save &As","Status tip file menu" ) );
1.48 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.49 fileMenu->addAction (a);
1.50 connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) );
1.51
1.52 @@ -381,12 +388,14 @@
1.53
1.54 a = new QAction(tr("KDE 3 Bookmarks"), this);
1.55 a->setStatusTip ( tr( "Import %1","Status tip file menu" ).arg(tr("KDE 3 bookmarks")));
1.56 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.57 a->addTo (fileImportMenu);
1.58 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDE3Bookmarks() ) );
1.59
1.60 a = new QAction(tr("KDE 4 Bookmarks"), this);
1.61 a->setStatusTip ( tr( "Import %1","Status tip file menu" ).arg(tr("KDE 4 bookmarks")));
1.62 a->addTo (fileImportMenu);
1.63 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.64 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDE4Bookmarks() ) );
1.65
1.66 if (settings.value( "/mainwindow/showTestMenu",false).toBool())
1.67 @@ -394,21 +403,25 @@
1.68 a = new QAction( QPixmap(), tr("Firefox Bookmarks","File menu"),this);
1.69 a->setStatusTip (tr( "Import %1","Status tip file menu").arg(tr("Firefox Bookmarks" ) ));
1.70 a->addTo (fileImportMenu);
1.71 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.72 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) );
1.73 }
1.74
1.75 a = new QAction("Freemind...",this);
1.76 a->setStatusTip ( tr( "Import %1","status tip file menu").arg(" Freemind") );
1.77 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.78 fileImportMenu->addAction (a);
1.79 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFreemind() ) );
1.80
1.81 a = new QAction("Mind Manager...",this);
1.82 a->setStatusTip ( tr( "Import %1","status tip file menu").arg(" Mind Manager") );
1.83 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.84 fileImportMenu->addAction (a);
1.85 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) );
1.86
1.87 a = new QAction( tr( "Import Dir%1","File menu").arg("..."), this);
1.88 a->setStatusTip (tr( "Import directory structure (experimental)","status tip file menu" ) );
1.89 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.90 fileImportMenu->addAction (a);
1.91 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) );
1.92
1.93 @@ -416,17 +429,20 @@
1.94
1.95 a = new QAction( tr("Image%1","File export menu").arg("..."), this);
1.96 a->setStatusTip( tr( "Export map as image","status tip file menu" ));
1.97 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.98 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) );
1.99 fileExportMenu->addAction (a);
1.100
1.101 a = new QAction( "Open Office...", this);
1.102 a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office ","status tip file menu" ));
1.103 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.104 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
1.105 fileExportMenu->addAction (a);
1.106
1.107 a = new QAction( "Webpage (HTML)...",this );
1.108 a->setShortcut (Qt::ALT + Qt::Key_X); //Export HTML
1.109 a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu")));
1.110 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.111 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportHTML() ) );
1.112 fileExportMenu->addAction (a);
1.113
1.114 @@ -438,41 +454,49 @@
1.115
1.116 a = new QAction( "Text (A&O report)...", this);
1.117 a->setStatusTip ( tr( "Export as %1").arg("A&O report "+tr("(still experimental)" )));
1.118 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.119 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportAO() ) );
1.120 fileExportMenu->addAction (a);
1.121
1.122 a = new QAction( "Text (ASCII)...", this);
1.123 a->setStatusTip ( tr( "Export as %1").arg("ASCII "+tr("(still experimental)" )));
1.124 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.125 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) );
1.126 fileExportMenu->addAction (a);
1.127
1.128 a = new QAction( "Spreadsheet (CSV)...", this);
1.129 a->setStatusTip ( tr( "Export as %1").arg("CSV "+tr("(still experimental)" )));
1.130 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.131 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportCSV() ) );
1.132 fileExportMenu->addAction (a);
1.133
1.134 a = new QAction( tr("KDE 3 Bookmarks","File menu"), this);
1.135 a->setStatusTip( tr( "Export as %1").arg(tr("KDE 3 Bookmarks" )));
1.136 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.137 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDE3Bookmarks() ) );
1.138 fileExportMenu->addAction (a);
1.139
1.140 a = new QAction( tr("KDE 4 Bookmarks","File menu"), this);
1.141 a->setStatusTip( tr( "Export as %1").arg(tr("KDE 4 Bookmarks" )));
1.142 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.143 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDE4Bookmarks() ) );
1.144 fileExportMenu->addAction (a);
1.145
1.146 a = new QAction( "Taskjuggler...", this );
1.147 a->setStatusTip( tr( "Export as %1").arg("Taskjuggler "+tr("(still experimental)" )));
1.148 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.149 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) );
1.150 fileExportMenu->addAction (a);
1.151
1.152 a = new QAction( "LaTeX...", this);
1.153 a->setStatusTip( tr( "Export as %1").arg("LaTeX "+tr("(still experimental)" )));
1.154 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.155 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) );
1.156 fileExportMenu->addAction (a);
1.157
1.158 a = new QAction( "XML..." , this );
1.159 a->setStatusTip (tr( "Export as %1").arg("XML"));
1.160 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.161 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) );
1.162 fileExportMenu->addAction (a);
1.163
1.164 @@ -482,6 +506,7 @@
1.165 a->setStatusTip ( tr( "Print" ,"File menu") );
1.166 a->setShortcut (Qt::CTRL + Qt::Key_P ); //Print map
1.167 a->addTo( tb );
1.168 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.169 fileMenu->addAction (a);
1.170 connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
1.171 actionFilePrint=a;
1.172 @@ -489,12 +514,14 @@
1.173 a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map","File menu" ), this);
1.174 a->setStatusTip (tr( "Close Map" ) );
1.175 a->setShortcut (Qt::CTRL + Qt::Key_W ); //Close map
1.176 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.177 fileMenu->addAction (a);
1.178 connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) );
1.179
1.180 a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit","File menu")+" "+vymName, this);
1.181 a->setStatusTip ( tr( "Exit")+" "+vymName );
1.182 a->setShortcut (Qt::CTRL + Qt::Key_Q ); //Quit vym
1.183 + switchboard.addConnection(a,tr("File","Shortcut group"));
1.184 fileMenu->addAction (a);
1.185 connect( a, SIGNAL( triggered() ), this, SLOT( fileExitVYM() ) );
1.186 }
1.187 @@ -515,6 +542,7 @@
1.188 a->setStatusTip (tr( "Undo" ) );
1.189 a->setShortcut ( Qt::CTRL + Qt::Key_Z ); //Undo last action
1.190 a->setEnabled (false);
1.191 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.192 tb->addAction (a);
1.193 editMenu->addAction (a);
1.194 actionUndo=a;
1.195 @@ -522,6 +550,7 @@
1.196 a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo","Edit menu" ), this);
1.197 a->setStatusTip (tr( "Redo" ));
1.198 a->setShortcut (Qt::CTRL + Qt::Key_Y ); //Redo last action
1.199 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.200 tb->addAction (a);
1.201 editMenu->addAction (a);
1.202 connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
1.203 @@ -532,6 +561,7 @@
1.204 a->setStatusTip ( tr( "Copy" ) );
1.205 a->setShortcut (Qt::CTRL + Qt::Key_C ); //Copy
1.206 a->setEnabled (false);
1.207 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.208 tb->addAction (a);
1.209 editMenu->addAction (a);
1.210 connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
1.211 @@ -542,6 +572,7 @@
1.212 a->setShortcut (Qt::CTRL + Qt::Key_X ); //Cut
1.213 a->setEnabled (false);
1.214 tb->addAction (a);
1.215 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.216 editMenu->addAction (a);
1.217 actionCut=a;
1.218 connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
1.219 @@ -552,6 +583,7 @@
1.220 a->setShortcut ( Qt::CTRL + Qt::Key_V ); //Paste
1.221 a->setEnabled (false);
1.222 tb->addAction (a);
1.223 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.224 editMenu->addAction (a);
1.225 actionPaste=a;
1.226
1.227 @@ -560,6 +592,7 @@
1.228 a->setStatusTip (tr( "Delete Selection" ));
1.229 a->setShortcut ( Qt::Key_Delete); //Delete selection
1.230 a->setShortcutContext (Qt::WindowShortcut);
1.231 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.232 addAction (a);
1.233 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteSelection() ) );
1.234 actionDelete=a;
1.235 @@ -568,6 +601,7 @@
1.236 a= new QAction(tr( "Add attribute" ), this);
1.237 a->setShortcut ( Qt::Key_Q);
1.238 a->setShortcutContext (Qt::WindowShortcut);
1.239 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.240 addAction (a);
1.241 connect( a, SIGNAL( triggered() ), this, SLOT( editAddAttribute() ) );
1.242 actionAddAttribute= a;
1.243 @@ -577,6 +611,7 @@
1.244 a= new QAction(QPixmap(iconPath+"newmapcenter.png"),tr( "Add mapcenter","Canvas context menu" ), this);
1.245 a->setShortcut ( Qt::Key_M);
1.246 a->setShortcutContext (Qt::WindowShortcut);
1.247 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.248 connect( a, SIGNAL( triggered() ), this, SLOT( editAddMapCenter() ) );
1.249 //actionListBranches.append(a);
1.250 tb->addAction (a);
1.251 @@ -588,11 +623,13 @@
1.252 alt->setStatusTip ( tr( "Add a branch as child of selection" ));
1.253 alt->setShortcut (Qt::Key_A); //Add branch
1.254 alt->setShortcutContext (Qt::WindowShortcut);
1.255 + switchboard.addConnection(alt,tr("Edit","Shortcut group"));
1.256 addAction (alt);
1.257 connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.258 a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
1.259 a->setStatusTip ( tr( "Add a branch as child of selection" ));
1.260 a->setShortcut (Qt::Key_Insert); //Add branch
1.261 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.262 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.263 actionListBranches.append(a);
1.264 #if defined (Q_OS_MACX)
1.265 @@ -610,6 +647,7 @@
1.266 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
1.267 a->setShortcut (Qt::ALT + Qt::Key_Insert ); //Insert branch
1.268 a->setShortcutContext (Qt::WindowShortcut);
1.269 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.270 addAction (a);
1.271 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBefore() ) );
1.272 a->setEnabled (false);
1.273 @@ -619,6 +657,7 @@
1.274 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
1.275 a->setShortcut ( Qt::ALT + Qt::Key_A ); //Insert branch
1.276 a->setShortcutContext (Qt::WindowShortcut);
1.277 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.278 addAction (a);
1.279 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBefore() ) );
1.280 actionListBranches.append(a);
1.281 @@ -628,6 +667,7 @@
1.282 a->setStatusTip ( tr( "Add a branch above selection" ));
1.283 a->setShortcut (Qt::SHIFT+Qt::Key_Insert ); //Add branch above
1.284 a->setShortcutContext (Qt::WindowShortcut);
1.285 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.286 addAction (a);
1.287 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
1.288 a->setEnabled (false);
1.289 @@ -637,6 +677,7 @@
1.290 a->setStatusTip ( tr( "Add a branch above selection" ));
1.291 a->setShortcut (Qt::SHIFT+Qt::Key_A ); //Add branch above
1.292 a->setShortcutContext (Qt::WindowShortcut);
1.293 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.294 addAction (a);
1.295 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
1.296 actionListBranches.append(a);
1.297 @@ -646,6 +687,7 @@
1.298 a->setStatusTip ( tr( "Add a branch below selection" ));
1.299 a->setShortcut (Qt::CTRL +Qt::Key_Insert ); //Add branch below
1.300 a->setShortcutContext (Qt::WindowShortcut);
1.301 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.302 addAction (a);
1.303 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.304 a->setEnabled (false);
1.305 @@ -655,6 +697,7 @@
1.306 a->setStatusTip ( tr( "Add a branch below selection" ));
1.307 a->setShortcut (Qt::CTRL +Qt::Key_A ); // Add branch below
1.308 a->setShortcutContext (Qt::WindowShortcut);
1.309 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.310 addAction (a);
1.311 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.312 actionListBranches.append(a);
1.313 @@ -663,6 +706,7 @@
1.314 a->setStatusTip ( tr( "Move branch up" ) );
1.315 a->setShortcut (Qt::Key_PageUp ); // Move branch up
1.316 a->setEnabled (false);
1.317 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.318 tb->addAction (a);
1.319 editMenu->addAction (a);
1.320 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
1.321 @@ -673,6 +717,7 @@
1.322 a->setStatusTip (tr( "Move branch down" ) );
1.323 a->setShortcut ( Qt::Key_PageDown ); // Move branch down
1.324 a->setEnabled (false);
1.325 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.326 tb->addAction (a);
1.327 editMenu->addAction (a);
1.328 actionMoveDown=a;
1.329 @@ -680,6 +725,7 @@
1.330 a = new QAction(QPixmap(), tr( "&Detach","Context menu" ),this);
1.331 a->setStatusTip ( tr( "Detach branch and use as mapcenter","Context menu" ) );
1.332 a->setShortcut ( Qt::Key_D ); // Detach branch
1.333 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.334 editMenu->addAction (a);
1.335 connect( a, SIGNAL( triggered() ), this, SLOT( editDetach() ) );
1.336 actionDetach=a;
1.337 @@ -688,6 +734,7 @@
1.338 connect( a, SIGNAL( activated() ), this, SLOT( editSortChildren() ) );
1.339 a->setEnabled (true);
1.340 a->addTo( tb );
1.341 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.342 editMenu->addAction (a);
1.343 actionSortChildren=a;
1.344
1.345 @@ -695,12 +742,14 @@
1.346 connect( a, SIGNAL( activated() ), this, SLOT( editSortBackChildren() ) );
1.347 a->setEnabled (true);
1.348 a->addTo( tb );
1.349 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.350 editMenu->addAction (a);
1.351 actionSortBackChildren=a;
1.352
1.353 alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
1.354 alt->setShortcut ( Qt::Key_S ); // Scroll branch
1.355 alt->setStatusTip (tr( "Scroll branch" ));
1.356 + switchboard.addConnection(alt,tr("Edit","Shortcut group"));
1.357 connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.358 #if defined(Q_OS_MACX)
1.359 actionToggleScroll=alt;
1.360 @@ -719,6 +768,7 @@
1.361 a = new QAction( QPixmap(), tr( "Expand all branches","Edit menu" ), this);
1.362 a->setShortcut ( Qt::SHIFT + Qt::Key_X ); // Expand all branches
1.363 a->setStatusTip (tr( "Expand all branches" ));
1.364 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.365 connect( a, SIGNAL( triggered() ), this, SLOT( editExpandAll() ) );
1.366 actionExpandAll=a;
1.367 actionExpandAll->setEnabled (false);
1.368 @@ -730,6 +780,7 @@
1.369
1.370 a = new QAction( QPixmap(), tr( "Expand one level","Edit menu" ), this);
1.371 a->setShortcut ( Qt::Key_Greater ); // Expand one level in tree editor
1.372 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.373 a->setStatusTip (tr( "Expand one level in tree editor" ));
1.374 connect( a, SIGNAL( triggered() ), this, SLOT( editExpandOneLevel() ) );
1.375 a->setEnabled (false);
1.376 @@ -742,6 +793,7 @@
1.377
1.378 a = new QAction( QPixmap(), tr( "Collapse one level","Edit menu" ), this);
1.379 a->setShortcut ( Qt::Key_Less); // Collapse one level in tree editor
1.380 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.381 a->setStatusTip (tr( "Collapse one level in tree editor" ));
1.382 connect( a, SIGNAL( triggered() ), this, SLOT( editCollapseOneLevel() ) );
1.383 a->setEnabled (false);
1.384 @@ -754,6 +806,7 @@
1.385
1.386 a = new QAction( tr( "Unscroll children","Edit menu" ), this);
1.387 a->setStatusTip (tr( "Unscroll all scrolled branches in selected subtree" ));
1.388 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.389 editMenu->addAction (a);
1.390 connect( a, SIGNAL( triggered() ), this, SLOT( editUnscrollChildren() ) );
1.391
1.392 @@ -762,12 +815,14 @@
1.393 a = new QAction( QPixmap(iconPath+"find.png"), tr( "Find...","Edit menu"), this);
1.394 a->setStatusTip (tr( "Find" ) );
1.395 a->setShortcut (Qt::CTRL + Qt::Key_F ); //Find
1.396 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.397 editMenu->addAction (a);
1.398 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenFindWidget() ) );
1.399
1.400 a = new QAction( tr( "Find duplicate URLs","Edit menu"), this);
1.401 //a->setStatusTip (tr( "Find" ) );
1.402 a->setShortcut (Qt::SHIFT + Qt::Key_F); //Find duplicate URLs
1.403 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.404 if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
1.405 editMenu->addAction (a);
1.406 connect( a, SIGNAL( triggered() ), this, SLOT( editFindDuplicateURLs() ) );
1.407 @@ -776,7 +831,7 @@
1.408
1.409 a = new QAction( QPixmap(flagsPath+"flag-url.png"), tr( "Open URL","Edit menu" ), this);
1.410 a->setShortcut (Qt::SHIFT + Qt::Key_U );
1.411 - a->setShortcut (tr( "Open URL" ));
1.412 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.413 tb->addAction (a);
1.414 addAction(a);
1.415 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
1.416 @@ -785,6 +840,7 @@
1.417 a = new QAction( tr( "Open URL in new tab","Edit menu" ), this);
1.418 a->setStatusTip (tr( "Open URL in new tab" ));
1.419 //a->setShortcut (Qt::CTRL+Qt::Key_U );
1.420 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.421 addAction(a);
1.422 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
1.423 actionOpenURLTab=a;
1.424 @@ -792,6 +848,7 @@
1.425 a = new QAction( tr( "Open all URLs in subtree (including scrolled branches)","Edit menu" ), this);
1.426 a->setStatusTip (tr( "Open all URLs in subtree (including scrolled branches)" ));
1.427 a->setShortcut ( Qt::CTRL + Qt::Key_U );
1.428 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.429 addAction(a);
1.430 actionListBranches.append(a);
1.431 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleVisURLTabs() ) );
1.432 @@ -799,6 +856,7 @@
1.433
1.434 a = new QAction( tr( "Open all URLs in subtree","Edit menu" ), this);
1.435 a->setStatusTip (tr( "Open all URLs in subtree" ));
1.436 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.437 addAction(a);
1.438 actionListBranches.append(a);
1.439 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleURLTabs() ) );
1.440 @@ -808,6 +866,7 @@
1.441 a->setStatusTip ( tr( "Edit URL" ) );
1.442 a->setShortcut ( Qt::Key_U );
1.443 a->setShortcutContext (Qt::WindowShortcut);
1.444 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.445 actionListBranches.append(a);
1.446 addAction(a);
1.447 connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
1.448 @@ -817,6 +876,7 @@
1.449 a->setStatusTip ( tr( "Edit local URL" ) );
1.450 //a->setShortcut (Qt::SHIFT + Qt::Key_U );
1.451 a->setShortcutContext (Qt::WindowShortcut);
1.452 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.453 actionListBranches.append(a);
1.454 addAction(a);
1.455 connect( a, SIGNAL( triggered() ), this, SLOT( editLocalURL() ) );
1.456 @@ -825,6 +885,7 @@
1.457 a = new QAction( tr( "Use heading for URL","Edit menu" ), this);
1.458 a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
1.459 a->setEnabled (false);
1.460 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.461 actionListBranches.append(a);
1.462 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
1.463 actionHeading2URL=a;
1.464 @@ -835,6 +896,7 @@
1.465 actionListBranches.append(a);
1.466 a->setShortcut ( Qt::Key_B );
1.467 a->setShortcutContext (Qt::WindowShortcut);
1.468 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.469 addAction(a);
1.470 connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
1.471 actionBugzilla2URL=a;
1.472 @@ -845,6 +907,7 @@
1.473 actionListBranches.append(a);
1.474 a->setShortcut ( Qt::Key_B + Qt::SHIFT);
1.475 a->setShortcutContext (Qt::WindowShortcut);
1.476 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.477 addAction(a);
1.478 connect( a, SIGNAL( triggered() ), this, SLOT( getBugzillaData() ) );
1.479 actionGetBugzillaData=a;
1.480 @@ -852,6 +915,7 @@
1.481 a = new QAction(tr( "Create URL to Novell FATE","Edit menu" ), this);
1.482 a->setStatusTip ( tr( "Create URL to Novell FATE" ));
1.483 a->setEnabled (false);
1.484 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.485 actionListBranches.append(a);
1.486 connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
1.487 actionFATE2URL=a;
1.488 @@ -860,12 +924,14 @@
1.489 a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
1.490 tb->addAction (a);
1.491 a->setEnabled (false);
1.492 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.493 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
1.494 actionOpenVymLink=a;
1.495
1.496 a = new QAction(QPixmap(), tr( "Open all vym links in subtree","Edit menu" ), this);
1.497 a->setStatusTip ( tr( "Open all vym links in subtree" ));
1.498 a->setEnabled (false);
1.499 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.500 actionListBranches.append(a);
1.501 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleVymLinks() ) );
1.502 actionOpenMultipleVymLinks=a;
1.503 @@ -874,6 +940,7 @@
1.504 a = new QAction(tr( "Edit vym link...","Edit menu" ), this);
1.505 a->setEnabled (false);
1.506 a->setStatusTip ( tr( "Edit link to another vym map" ));
1.507 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.508 connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
1.509 actionListBranches.append(a);
1.510 actionVymLink=a;
1.511 @@ -881,6 +948,7 @@
1.512 a = new QAction(tr( "Delete vym link","Edit menu" ),this);
1.513 a->setStatusTip ( tr( "Delete link to another vym map" ));
1.514 a->setEnabled (false);
1.515 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.516 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
1.517 actionDeleteVymLink=a;
1.518
1.519 @@ -890,6 +958,7 @@
1.520 a->setToggleAction(true);
1.521 tb->addAction (a);
1.522 a->setEnabled (false);
1.523 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.524 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
1.525 actionToggleHideExport=a;
1.526
1.527 @@ -899,6 +968,7 @@
1.528 actionListBranches.append(a);
1.529 a->setShortcut ( Qt::Key_T ); // Add timestamp
1.530 a->setShortcutContext (Qt::WindowShortcut);
1.531 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.532 addAction(a);
1.533 connect( a, SIGNAL( triggered() ), this, SLOT( editAddTimestamp() ) );
1.534 actionAddTimestamp=a;
1.535 @@ -906,6 +976,7 @@
1.536 a = new QAction(tr( "Edit Map Info...","Edit menu" ),this);
1.537 a->setStatusTip ( tr( "Edit Map Info" ));
1.538 a->setEnabled (true);
1.539 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.540 connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
1.541 actionMapInfo=a;
1.542
1.543 @@ -914,12 +985,14 @@
1.544 a->setStatusTip (tr( "Add map at selection" ));
1.545 connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
1.546 a->setEnabled (false);
1.547 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.548 actionListBranches.append(a);
1.549 actionImportAdd=a;
1.550
1.551 // Import at selection (replacing selection)
1.552 a = new QAction( tr( "Add map (replace)","Edit menu" ), this);
1.553 a->setStatusTip (tr( "Replace selection with map" ));
1.554 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.555 connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
1.556 a->setEnabled (false);
1.557 actionListBranches.append(a);
1.558 @@ -930,6 +1003,7 @@
1.559 a->setStatusTip (tr( "Save selection" ));
1.560 connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
1.561 a->setEnabled (false);
1.562 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.563 actionListBranches.append(a);
1.564 actionSaveBranch=a;
1.565
1.566 @@ -939,6 +1013,7 @@
1.567 a->setShortcut (Qt::ALT + Qt::Key_Delete );
1.568 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteKeepChildren() ) );
1.569 a->setEnabled (false);
1.570 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.571 addAction (a);
1.572 actionListBranches.append(a);
1.573 actionDeleteKeepChildren=a;
1.574 @@ -947,6 +1022,7 @@
1.575 a = new QAction( tr( "Remove children","Edit menu" ), this);
1.576 a->setStatusTip (tr( "Remove children of branch" ));
1.577 a->setShortcut (Qt::SHIFT + Qt::Key_Delete );
1.578 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.579 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteChildren() ) );
1.580 a->setEnabled (false);
1.581 actionListBranches.append(a);
1.582 @@ -954,6 +1030,7 @@
1.583
1.584 a = new QAction( tr( "Add Image...","Edit menu" ), this);
1.585 a->setStatusTip (tr( "Add Image" ));
1.586 + switchboard.addConnection(a,tr("Edit","Shortcut group"));
1.587 connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
1.588 actionLoadImage=a;
1.589
1.590 @@ -962,6 +1039,7 @@
1.591 a->setShortcut ( Qt::CTRL + Qt::Key_I ); //Property window
1.592 a->setShortcutContext (Qt::WindowShortcut);
1.593 a->setToggleAction (true);
1.594 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.595 addAction (a);
1.596 connect( a, SIGNAL( triggered() ), this, SLOT( windowToggleProperty() ) );
1.597 actionViewTogglePropertyWindow=a;
1.598 @@ -1090,34 +1168,36 @@
1.599 tb->setObjectName ("viewTB");
1.600 QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
1.601
1.602 - Switchboard switchboard; //FIXME-2 testing...
1.603
1.604 QAction *a;
1.605 a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this);
1.606 a->setStatusTip ( tr( "Zoom reset" ) );
1.607 a->setShortcut (Qt::CTRL + Qt::Key_0); // Reset zoom
1.608 - switchboard.addConnection(a,"CTRL+0");
1.609 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.610 a->addTo( tb );
1.611 viewMenu->addAction (a);
1.612 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) );
1.613
1.614 a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in","View action" ), this);
1.615 a->setStatusTip (tr( "Zoom in" ));
1.616 - switchboard.addConnection(a,"CTRL++");
1.617 + a->setShortcut(Qt::CTRL + Qt::Key_Plus);
1.618 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.619 a->addTo( tb );
1.620 viewMenu->addAction (a);
1.621 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) );
1.622
1.623 a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out","View action" ), this);
1.624 a->setStatusTip (tr( "Zoom out" ));
1.625 - switchboard.addConnection(a,"CTRL+-");
1.626 + a->setShortcut(Qt::CTRL + Qt::Key_Minus);
1.627 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.628 a->addTo( tb );
1.629 viewMenu->addAction (a);
1.630 connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
1.631
1.632 a = new QAction( QPixmap(iconPath+"viewshowsel.png"), tr( "Show selection","View action" ), this);
1.633 a->setStatusTip (tr( "Show selection" ));
1.634 - switchboard.addConnection(a,".");
1.635 + a->setShortcut(Qt::CTRL + Qt::Key_Period);
1.636 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.637 a->addTo( tb );
1.638 viewMenu->addAction (a);
1.639 connect( a, SIGNAL( triggered() ), this, SLOT( viewCenter() ) );
1.640 @@ -1127,6 +1207,7 @@
1.641 a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor","View action" ),this);
1.642 a->setStatusTip ( tr( "Show Note Editor" ));
1.643 a->setShortcut ( Qt::CTRL + Qt::Key_E ); // Toggle Note Editor
1.644 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.645 a->setToggleAction(true);
1.646 a->addTo( tb );
1.647 viewMenu->addAction (a);
1.648 @@ -1135,7 +1216,8 @@
1.649
1.650 a = new QAction(QPixmap(), tr( "Show tree editor","View action" ),this);
1.651 a->setStatusTip ( tr( "Show tree editor" ));
1.652 - a->setShortcut ( Qt::CTRL + Qt::Key_T ); // Toggle Note Editor // FIXME-3 originally: color subtree
1.653 + a->setShortcut ( Qt::CTRL + Qt::Key_T ); // Toggle Tree Editor // FIXME-3 originally: color subtree
1.654 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.655 a->setToggleAction(true);
1.656 a->addTo( tb );
1.657 viewMenu->addAction (a);
1.658 @@ -1145,6 +1227,7 @@
1.659 a = new QAction(QPixmap(iconPath+"history.png"), tr( "History Window","View action" ),this );
1.660 a->setStatusTip ( tr( "Show History Window" ));
1.661 a->setShortcut ( Qt::CTRL + Qt::Key_H ); // Toggle history window
1.662 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.663 a->setToggleAction(true);
1.664 a->addTo( tb );
1.665 viewMenu->addAction (a);
1.666 @@ -1159,6 +1242,7 @@
1.667 a->setStatusTip ( tr( "Antialiasing" ));
1.668 a->setToggleAction(true);
1.669 a->setChecked (settings.value("/mainwindow/view/AntiAlias",true).toBool());
1.670 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.671 viewMenu->addAction (a);
1.672 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleAntiAlias() ) );
1.673 actionViewToggleAntiAlias=a;
1.674 @@ -1167,6 +1251,7 @@
1.675 a->setStatusTip (a->text());
1.676 a->setToggleAction(true);
1.677 a->setChecked (settings.value("/mainwindow/view/SmoothPixmapTransformation",true).toBool());
1.678 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.679 viewMenu->addAction (a);
1.680 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleSmoothPixmap() ) );
1.681 actionViewToggleSmoothPixmapTransform=a;
1.682 @@ -1174,16 +1259,16 @@
1.683 a = new QAction(tr( "Next Map","View action" ), this);
1.684 a->setStatusTip (a->text());
1.685 a->setShortcut (Qt::ALT + Qt::Key_N );
1.686 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.687 viewMenu->addAction (a);
1.688 connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
1.689
1.690 a = new QAction (tr( "Previous Map","View action" ), this );
1.691 a->setStatusTip (a->text());
1.692 a->setShortcut (Qt::ALT + Qt::Key_P );
1.693 + switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
1.694 viewMenu->addAction (a);
1.695 connect( a, SIGNAL( triggered() ), this, SLOT(windowPreviousEditor() ) );
1.696 -
1.697 - if (debug) switchboard.print();
1.698 }
1.699
1.700 // Mode Actions
1.701 @@ -1199,6 +1284,7 @@
1.702 actionGroupModModes->setExclusive (true);
1.703 a= new QAction( QPixmap(iconPath+"modecolor.png"), tr( "Use modifier to color branches","Mode modifier" ), actionGroupModModes);
1.704 a->setShortcut (Qt::Key_J);
1.705 + switchboard.addConnection(a,tr("Modes","Shortcut group"));
1.706 a->setStatusTip ( tr( "Use modifier to color branches" ));
1.707 a->setToggleAction(true);
1.708 a->addTo (tb);
1.709 @@ -1207,6 +1293,7 @@
1.710
1.711 a= new QAction( QPixmap(iconPath+"modecopy.png"), tr( "Use modifier to copy","Mode modifier" ), actionGroupModModes );
1.712 a->setShortcut( Qt::Key_K);
1.713 + switchboard.addConnection(a,tr("Modes","Shortcut group"));
1.714 a->setStatusTip( tr( "Use modifier to copy" ));
1.715 a->setToggleAction(true);
1.716 a->addTo (tb);
1.717 @@ -1214,6 +1301,7 @@
1.718
1.719 a= new QAction(QPixmap(iconPath+"modelink.png"), tr( "Use modifier to draw xLinks","Mode modifier" ), actionGroupModModes );
1.720 a->setShortcut (Qt::Key_L);
1.721 + switchboard.addConnection(a,tr("Modes","Shortcut group"));
1.722 a->setStatusTip( tr( "Use modifier to draw xLinks" ));
1.723 a->setToggleAction(true);
1.724 a->addTo (tb);
1.725 @@ -1458,12 +1546,14 @@
1.726 a = new QAction( "Start TCPserver for MapEditor",this);
1.727 //a->setStatusTip ( "Set application to open pdf files"));
1.728 //a->setShortcut ( Qt::ALT + Qt::Key_T ); //New TCP server
1.729 + switchboard.addConnection(a,tr("Network shortcuts","Shortcut group"));
1.730 connect( a, SIGNAL( triggered() ), this, SLOT( networkStartServer() ) );
1.731 netMenu->addAction (a);
1.732
1.733 a = new QAction( "Connect MapEditor to server",this);
1.734 //a->setStatusTip ( "Set application to open pdf files"));
1.735 a->setShortcut ( Qt::ALT + Qt::Key_C ); // Connect to server
1.736 + switchboard.addConnection(a,tr("Network shortcuts","Shortcut group"));
1.737 connect( a, SIGNAL( triggered() ), this, SLOT( networkConnect() ) );
1.738 netMenu->addAction (a);
1.739 }
1.740 @@ -1582,17 +1672,20 @@
1.741 a = new QAction( "Test function 1" , this);
1.742 a->setStatusTip( "Call test function 1" );
1.743 a->setShortcut (Qt::SHIFT + Qt::Key_T); // Test function 1
1.744 + switchboard.addConnection(a,tr("Test shortcuts","Shortcut group"));
1.745 testMenu->addAction (a);
1.746 connect( a, SIGNAL( triggered() ), this, SLOT( testFunction1() ) );
1.747
1.748 a = new QAction( "Test function 2" , this);
1.749 a->setStatusTip( "Call test function 2" );
1.750 a->setShortcut (Qt::ALT + Qt::Key_T); // Test function 2
1.751 + switchboard.addConnection(a,tr("Test shortcuts","Shortcut group"));
1.752 testMenu->addAction (a);
1.753 connect( a, SIGNAL( triggered() ), this, SLOT( testFunction2() ) );
1.754
1.755 a = new QAction( "Command" , this);
1.756 a->setStatusTip( "Enter command to call in editor" );
1.757 + switchboard.addConnection(a,tr("Test shortcuts","Shortcut group"));
1.758 connect( a, SIGNAL( triggered() ), this, SLOT( testCommand() ) );
1.759 testMenu->addAction (a);
1.760 }
1.761 @@ -1605,11 +1698,13 @@
1.762 QAction *a;
1.763 a = new QAction( tr( "Open VYM Documentation (pdf) ","Help action" ), this );
1.764 a->setStatusTip( tr( "Open VYM Documentation (pdf)" ));
1.765 + switchboard.addConnection(a,tr("Help shortcuts","Shortcut group"));
1.766 connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) );
1.767 helpMenu->addAction (a);
1.768
1.769 a = new QAction( tr( "Open VYM example maps ","Help action" ), this );
1.770 a->setStatusTip( tr( "Open VYM example maps " ));
1.771 + switchboard.addConnection(a,tr("Help shortcuts","Shortcut group"));
1.772 connect( a, SIGNAL( triggered() ), this, SLOT( helpDemo() ) );
1.773 helpMenu->addAction (a);
1.774
1.775 @@ -1758,6 +1853,7 @@
1.776 macroActions[i] = new QAction(this);
1.777 macroActions[i]->setData(i);
1.778 addAction (macroActions[i]);
1.779 + //switchboard.addConnection(macroActions[i],tr("Macro shortcuts","Shortcut group"));
1.780 connect(macroActions[i], SIGNAL(triggered()),
1.781 this, SLOT(callMacro()));
1.782 }