1.1 --- a/mainwindow.cpp Tue Aug 01 09:31:22 2006 +0000
1.2 +++ b/mainwindow.cpp Tue Aug 15 11:42:10 2006 +0000
1.3 @@ -155,10 +155,8 @@
1.4 setCaption ("VYM - View Your Mind");
1.5
1.6 // Load window settings
1.7 - resize (settings.readNumEntry( "/vym/mainwindow/geometry/width", 800),
1.8 - settings.readNumEntry( "/vym/mainwindow/geometry/height",600));
1.9 - move (settings.readNumEntry( "/vym/mainwindow/geometry/posX", 100),
1.10 - settings.readNumEntry( "/vym/mainwindow/geometry/posY", 100));
1.11 + resize (settings.value( "/mainwindow/geometry/size",QSize (800,600)).toSize());
1.12 + move (settings.value( "/mainwindow/geometry/pos", QPoint(300,100)).toPoint());
1.13
1.14
1.15 // Create unique temporary directory
1.16 @@ -183,30 +181,30 @@
1.17 QString p,s;
1.18
1.19 // application to open URLs
1.20 - p="/vym/mainwindow/readerURL";
1.21 + p="/mainwindow/readerURL";
1.22 #if defined(Q_OS_LINUX)
1.23 - s=settings.readEntry (p,"konqueror");
1.24 + s=settings.value (p,"konqueror").toString();
1.25 #else
1.26 #if defined(Q_OS_MACX)
1.27 - s=settings.readEntry (p,"/usr/bin/open");
1.28 + s=settings.value (p,"/usr/bin/open").toString();
1.29 #else
1.30 - s=settings.readEntry (p,"mozilla");
1.31 + s=settings.value (p,"mozilla");
1.32 #endif
1.33 #endif
1.34 - settings.writeEntry( p,s);
1.35 + settings.setValue( p,s);
1.36
1.37 // application to open PDFs
1.38 - p="/vym/mainwindow/readerPDF";
1.39 + p="/mainwindow/readerPDF";
1.40 #if defined(Q_OS_LINUX)
1.41 - s=settings.readEntry (p,"acroread");
1.42 + s=settings.value (p,"acroread").toString();
1.43 #else
1.44 #if defined(Q_OS_MACX)
1.45 - s=settings.readEntry (p,"/usr/bin/open");
1.46 + s=settings.value (p,"/usr/bin/open").toString();
1.47 #else
1.48 - s=settings.readEntry (p,"acroread");
1.49 + s=settings.value (p,"acroread").toString();
1.50 #endif
1.51 #endif
1.52 - settings.writeEntry( p,s);
1.53 + settings.setValue( p,s);
1.54
1.55
1.56 maxLastMaps=9;
1.57 @@ -226,23 +224,12 @@
1.58 setupFlagActions();
1.59 setupSettingsActions();
1.60 setupContextMenus();
1.61 - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) setupTestActions();
1.62 + if (settings.value( "/mainwindow/showTestMenu",false).toBool()) setupTestActions();
1.63 setupHelpActions();
1.64
1.65 - // After menu is created, we can enable some actions
1.66 -//FIXME QT3 testing actionFilePrint->setEnabled (true);
1.67 -
1.68 statusBar();
1.69
1.70 - // Position toolbars
1.71 - settings.beginGroup("/vym/mainwindow/toolbars/standardFlags");
1.72 - TB_standardFlags->move(settings.value("pos").toPoint());
1.73 - cout << "moving TB to pos="<<settings.value("pos").toPoint()<<endl;
1.74 -// FIXME proceed here...
1.75 -// TB_standardFlags->setOrientation(settings.value("orientation").toInt());
1.76 -// TB_standardFlags->setVisible(settings.value<QVariant::Bool>("visible",true));
1.77 - settings.endGroup();
1.78 -
1.79 + restoreState (settings.value("/mainwindow/state",0).toByteArray());
1.80
1.81 // Initialize Find window
1.82 findWindow=new FindWindow(NULL,"findwindow");
1.83 @@ -260,38 +247,30 @@
1.84 Main::~Main()
1.85 {
1.86 // Save Settings
1.87 - settings.writeEntry( "/vym/mainwindow/geometry/width", width() );
1.88 - settings.writeEntry( "/vym/mainwindow/geometry/height", height() );
1.89 - settings.writeEntry( "/vym/mainwindow/geometry/posX", pos().x() );
1.90 - settings.writeEntry( "/vym/mainwindow/geometry/posY", pos().y() );
1.91 -
1.92 - settings.beginGroup ("/vym/mainwindow/toolbar/standardFlags");
1.93 - settings.setValue ("pos",TB_standardFlags->pos());
1.94 - settings.setValue ("visible",TB_standardFlags->isVisible());
1.95 - settings.setValue ("orientation",TB_standardFlags->orientation());
1.96 - settings.endGroup();
1.97 -
1.98 - settings.writeEntry( "/vym/mainwindow/toobar/posY", pos().y() );
1.99 -
1.100 - settings.writeEntry( "/vym/version/version", __VYM_VERSION );
1.101 - settings.writeEntry( "/vym/version/builddate", __BUILD_DATE );
1.102 -
1.103 - settings.writeEntry( "/vym/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() );
1.104 - settings.writeEntry( "/vym/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() );
1.105 - settings.writeEntry( "/vym/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
1.106 - settings.writeEntry( "/vym/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
1.107 - settings.writeEntry( "/vym/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
1.108 - settings.writeEntry( "/vym/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
1.109 - settings.writeEntry( "/vym/export/useHideExport",actionSettingsUseHideExport->isOn() );
1.110 + settings.setValue ( "/mainwindow/geometry/size", size() );
1.111 + settings.setValue ( "/mainwindow/geometry/pos", pos() );
1.112 +
1.113 + settings.setValue ("/mainwindow/state",saveState(0));
1.114 +
1.115 + settings.setValue( "/version/version", __VYM_VERSION );
1.116 + settings.setValue( "/version/builddate", __BUILD_DATE );
1.117 +
1.118 + settings.setValue( "/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() );
1.119 + settings.setValue( "/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() );
1.120 + settings.setValue( "/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
1.121 + settings.setValue( "/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
1.122 + settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
1.123 + settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
1.124 + settings.setValue( "/export/useHideExport",actionSettingsUseHideExport->isOn() );
1.125
1.126 QString s;
1.127 int maps=lastMaps.count();
1.128 - settings.writeEntry( "/vym/lastMaps/number",maps );
1.129 + settings.setValue( "/lastMaps/number",maps );
1.130 for (int i=1;i<=maps;i++)
1.131 {
1.132 - s=QString("/vym/lastMaps/map-%1").arg(i);
1.133 + s=QString("/lastMaps/map-%1").arg(i);
1.134 if (!s.isEmpty() && i<=maxLastMaps)
1.135 - settings.writeEntry (s, lastMaps.at(i-1));
1.136 + settings.setValue (s, lastMaps.at(i-1));
1.137 }
1.138
1.139
1.140 @@ -334,8 +313,8 @@
1.141 // File Actions
1.142 void Main::setupFileActions()
1.143 {
1.144 - QMenu *fileMenu = menuBar()->addMenu ( tr ("&File") );
1.145 - QToolBar *tb = addToolBar( tr ("&File") );
1.146 + QMenu *fileMenu = menuBar()->addMenu ( tr ("&Map") );
1.147 + QToolBar *tb = addToolBar( tr ("&Map") );
1.148
1.149 QAction *a;
1.150 a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
1.151 @@ -343,14 +322,14 @@
1.152 a->setShortcut ( Qt::CTRL + Qt::Key_N );
1.153 a->addTo( tb );
1.154 fileMenu->addAction (a);
1.155 - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
1.156 + connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
1.157
1.158 a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ),this);
1.159 a->setStatusTip (tr( "Open","File menu" ) );
1.160 a->setShortcut ( Qt::CTRL + Qt::Key_O );
1.161 a->addTo( tb );
1.162 fileMenu->addAction (a);
1.163 - connect( a, SIGNAL( activated() ), this, SLOT( fileLoad() ) );
1.164 + connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) );
1.165
1.166 fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent"));
1.167 fileMenu->addSeparator();
1.168 @@ -360,13 +339,13 @@
1.169 a->setShortcut (Qt::CTRL + Qt::Key_S );
1.170 a->addTo( tb );
1.171 fileMenu->addAction (a);
1.172 - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) );
1.173 + connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
1.174 actionFileSave=a;
1.175
1.176 a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), this);
1.177 a->setStatusTip (tr( "Save &As" ) );
1.178 fileMenu->addAction (a);
1.179 - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) );
1.180 + connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) );
1.181
1.182 fileMenu->addSeparator();
1.183
1.184 @@ -375,67 +354,67 @@
1.185 a = new QAction(tr("KDE Bookmarks"), this);
1.186 a->setStatusTip ( tr( "Import")+" "+tr("KDE Bookmarks" ));
1.187 a->addTo (fileImportMenu);
1.188 - connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
1.189 -
1.190 - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
1.191 + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDEBookmarks() ) );
1.192 +
1.193 + if (settings.value( "/mainwindow/showTestMenu",false).toBool())
1.194 {
1.195 a = new QAction( QPixmap(), tr("Firefox Bookmarks"),this);
1.196 a->setStatusTip (tr( "Import")+" "+tr("Firefox Bookmarks" ) );
1.197 a->addTo (fileImportMenu);
1.198 - connect( a, SIGNAL( activated() ), this, SLOT( fileImportFirefoxBookmarks() ) );
1.199 + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) );
1.200 }
1.201
1.202 a = new QAction("Mind Manager...",this);
1.203 a->setStatusTip ( tr( "Import")+" Mind Manager" );
1.204 fileImportMenu->addAction (a);
1.205 - connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
1.206 + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) );
1.207
1.208 a = new QAction( tr( "Import Dir"+QString("...") ), this);
1.209 a->setStatusTip (tr( "Import directory structure (experimental)" ) );
1.210 fileImportMenu->addAction (a);
1.211 - connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) );
1.212 + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) );
1.213
1.214 fileExportMenu = fileMenu->addMenu (tr("Export"));
1.215
1.216 a = new QAction( tr("Image")+QString("..."), this);
1.217 a->setStatusTip( tr( "Export map as image" ));
1.218 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportImage() ) );
1.219 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) );
1.220 fileExportMenu->addAction (a);
1.221
1.222 a = new QAction( "Open Office"+QString("..."), this);
1.223 a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office " ));
1.224 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportOOPresentation() ) );
1.225 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
1.226 fileExportMenu->addAction (a);
1.227
1.228 a = new QAction( "Webpage (XHTML)...",this );
1.229 a->setShortcut (Qt::ALT + Qt::Key_X);
1.230 a->setStatusTip ( tr( "Export as")+" webpage (XHTML)");
1.231 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) );
1.232 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) );
1.233 fileExportMenu->addAction (a);
1.234
1.235 a = new QAction( "Text (ASCII)...", this);
1.236 a->setStatusTip ( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" ));
1.237 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
1.238 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) );
1.239 fileExportMenu->addAction (a);
1.240
1.241 a = new QAction( tr("KDE Bookmarks"), this);
1.242 a->setStatusTip( tr( "Export as")+" "+tr("KDE Bookmarks" ));
1.243 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
1.244 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDEBookmarks() ) );
1.245 fileExportMenu->addAction (a);
1.246
1.247 a = new QAction( "Taskjuggler...", this );
1.248 a->setStatusTip( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ));
1.249 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
1.250 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) );
1.251 fileExportMenu->addAction (a);
1.252
1.253 a = new QAction( "LaTeX...", this);
1.254 a->setStatusTip( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" ));
1.255 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportLaTeX() ) );
1.256 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) );
1.257 fileExportMenu->addAction (a);
1.258
1.259 a = new QAction( "XML..." , this );
1.260 a->setStatusTip (tr( "Export as")+" XML");
1.261 - connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
1.262 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) );
1.263 fileExportMenu->addAction (a);
1.264
1.265 fileMenu->addSeparator();
1.266 @@ -445,34 +424,34 @@
1.267 a->setShortcut (Qt::CTRL + Qt::Key_P );
1.268 a->addTo( tb );
1.269 fileMenu->addAction (a);
1.270 - connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
1.271 + connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
1.272 actionFilePrint=a;
1.273
1.274 a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), this);
1.275 a->setStatusTip (tr( "Close Map" ) );
1.276 a->setShortcut (Qt::ALT + Qt::Key_C );
1.277 fileMenu->addAction (a);
1.278 - connect( a, SIGNAL( activated() ), this, SLOT( fileCloseMap() ) );
1.279 + connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) );
1.280
1.281 a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, this);
1.282 a->setStatusTip ( tr( "Exit")+" "+__VYM );
1.283 a->setShortcut (Qt::CTRL + Qt::Key_Q );
1.284 fileMenu->addAction (a);
1.285 - connect( a, SIGNAL( activated() ), this, SLOT( fileExitVYM() ) );
1.286 + connect( a, SIGNAL( triggered() ), this, SLOT( fileExitVYM() ) );
1.287 }
1.288
1.289
1.290 //Edit Actions
1.291 void Main::setupEditActions()
1.292 {
1.293 - QToolBar *tb = addToolBar( tr ("&Edit") );
1.294 + QToolBar *tb = addToolBar( tr ("&Actions") );
1.295 tb->setLabel( "Edit Actions" );
1.296 QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
1.297
1.298 QAction *a;
1.299 QAction *alt;
1.300 a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo" ),this);
1.301 - connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
1.302 + connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
1.303 a->setStatusTip (tr( "Undo" ) );
1.304 a->setShortcut ( Qt::CTRL + Qt::Key_Z );
1.305 a->setEnabled (false);
1.306 @@ -480,13 +459,13 @@
1.307 editMenu->addAction (a);
1.308 actionEditUndo=a;
1.309
1.310 - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
1.311 + if (settings.value( "/mainwindow/showTestMenu",false).toBool())
1.312 {
1.313 a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo" ), this);
1.314 a->setStatusTip (tr( "Redo" ));
1.315 a->setShortcut (Qt::CTRL + Qt::Key_Y );
1.316 editMenu->addAction (a);
1.317 - connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
1.318 + connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
1.319 }
1.320
1.321 editMenu->addSeparator();
1.322 @@ -496,7 +475,7 @@
1.323 a->setEnabled (false);
1.324 tb->addAction (a);
1.325 editMenu->addAction (a);
1.326 - connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
1.327 + connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
1.328 actionEditCopy=a;
1.329
1.330 a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), this);
1.331 @@ -506,10 +485,10 @@
1.332 tb->addAction (a);
1.333 editMenu->addAction (a);
1.334 actionEditCut=a;
1.335 - connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
1.336 + connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
1.337
1.338 a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ),this);
1.339 - connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
1.340 + connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
1.341 a->setStatusTip ( tr( "Paste" ) );
1.342 a->setShortcut ( Qt::CTRL + Qt::Key_V );
1.343 a->setEnabled (false);
1.344 @@ -530,7 +509,7 @@
1.345 a->setShortcut (Qt::Key_Return );
1.346 a->setShortcutContext (Qt::WindowShortcut);
1.347 addAction (a);
1.348 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.349 + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
1.350 actionListBranches.append(a);
1.351 editMenu->addAction (a);
1.352 actionEditHeading=a;
1.353 @@ -539,7 +518,7 @@
1.354 a->setShortcut ( Qt::Key_F2 );
1.355 a->setShortcutContext (Qt::WindowShortcut);
1.356 addAction (a);
1.357 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
1.358 + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
1.359 actionListBranches.append(a);
1.360
1.361 // Shortcut to delete selection
1.362 @@ -548,7 +527,7 @@
1.363 a->setShortcut ( Qt::Key_Delete);
1.364 a->setShortcutContext (Qt::WindowShortcut);
1.365 addAction (a);
1.366 - connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) );
1.367 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteSelection() ) );
1.368 actionEditDelete=a;
1.369
1.370 // Shortcut to add branch
1.371 @@ -557,11 +536,11 @@
1.372 alt->setShortcut (Qt::Key_A);
1.373 alt->setShortcutContext (Qt::WindowShortcut);
1.374 addAction (alt);
1.375 - connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.376 + connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.377 a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
1.378 a->setStatusTip ( tr( "Add a branch as child of selection" ));
1.379 a->setShortcut (Qt::Key_Insert);
1.380 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
1.381 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
1.382 actionListBranches.append(a);
1.383 #if defined (Q_OS_MACX)
1.384 // In OSX show different shortcut in menues, the keys work indepently always
1.385 @@ -579,7 +558,7 @@
1.386 a->setShortcut (Qt::ALT + Qt::Key_Insert );
1.387 a->setShortcutContext (Qt::WindowShortcut);
1.388 addAction (a);
1.389 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.390 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) );
1.391 a->setEnabled (false);
1.392 actionListBranches.append(a);
1.393 actionEditAddBranchHere=a;
1.394 @@ -588,7 +567,7 @@
1.395 a->setShortcut ( Qt::ALT + Qt::Key_A );
1.396 a->setShortcutContext (Qt::WindowShortcut);
1.397 addAction (a);
1.398 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) );
1.399 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) );
1.400 actionListBranches.append(a);
1.401
1.402 // Add branch above
1.403 @@ -597,7 +576,7 @@
1.404 a->setShortcut (Qt::SHIFT+Qt::Key_Insert );
1.405 a->setShortcutContext (Qt::WindowShortcut);
1.406 addAction (a);
1.407 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.408 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
1.409 a->setEnabled (false);
1.410 actionListBranches.append(a);
1.411 actionEditAddBranchAbove=a;
1.412 @@ -606,7 +585,7 @@
1.413 a->setShortcut (Qt::SHIFT+Qt::Key_A );
1.414 a->setShortcutContext (Qt::WindowShortcut);
1.415 addAction (a);
1.416 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) );
1.417 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) );
1.418 actionListBranches.append(a);
1.419
1.420 // Add branch below
1.421 @@ -615,7 +594,7 @@
1.422 a->setShortcut (Qt::CTRL +Qt::Key_Insert );
1.423 a->setShortcutContext (Qt::WindowShortcut);
1.424 addAction (a);
1.425 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.426 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.427 a->setEnabled (false);
1.428 actionListBranches.append(a);
1.429 actionEditAddBranchBelow=a;
1.430 @@ -624,7 +603,7 @@
1.431 a->setShortcut (Qt::CTRL +Qt::Key_A );
1.432 a->setShortcutContext (Qt::WindowShortcut);
1.433 addAction (a);
1.434 - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) );
1.435 + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
1.436 actionListBranches.append(a);
1.437
1.438 a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up" ), this);
1.439 @@ -633,11 +612,11 @@
1.440 a->setEnabled (false);
1.441 tb->addAction (a);
1.442 editMenu->addAction (a);
1.443 - connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) );
1.444 + connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
1.445 actionEditMoveUp=a;
1.446
1.447 a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down" ),this);
1.448 - connect( a, SIGNAL( activated() ), this, SLOT( editMoveDown() ) );
1.449 + connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) );
1.450 a->setStatusTip (tr( "Move branch down" ) );
1.451 a->setShortcut ( Qt::Key_PageDown );
1.452 a->setEnabled (false);
1.453 @@ -649,11 +628,11 @@
1.454 a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ),this);
1.455 a->setShortcut ( Qt::Key_ScrollLock );
1.456 a->setStatusTip (tr( "Scroll branch" ) );
1.457 - connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
1.458 + connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.459 alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
1.460 alt->setShortcut ( Qt::Key_S );
1.461 alt->setStatusTip (tr( "Scroll branch" ));
1.462 - connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
1.463 + connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
1.464 #if defined(Q_OS_MACX)
1.465 actionEditToggleScroll=alt;
1.466 #else
1.467 @@ -669,7 +648,7 @@
1.468 a = new QAction( tr( "Unscroll all scrolled branches" ), this);
1.469 a->setStatusTip (tr( "Unscroll all" ));
1.470 editMenu->addAction (a);
1.471 - connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) );
1.472 + connect( a, SIGNAL( triggered() ), this, SLOT( editUnScrollAll() ) );
1.473
1.474 editMenu->addSeparator();
1.475
1.476 @@ -677,7 +656,7 @@
1.477 a->setStatusTip (tr( "Find" ) );
1.478 a->setShortcut (Qt::CTRL + Qt::Key_F );
1.479 editMenu->addAction (a);
1.480 - connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) );
1.481 + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenFindWindow() ) );
1.482
1.483 editMenu->addSeparator();
1.484
1.485 @@ -686,14 +665,14 @@
1.486 a->setShortcut (tr( "Open URL" ));
1.487 tb->addAction (a);
1.488 addAction(a);
1.489 - connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) );
1.490 + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
1.491 actionEditOpenURL=a;
1.492
1.493 a = new QAction( tr( "Open URL in new tab" ), this);
1.494 a->setStatusTip (tr( "Open URL in new tab" ));
1.495 a->setShortcut (Qt::CTRL+Qt::Key_U );
1.496 addAction(a);
1.497 - connect( a, SIGNAL( activated() ), this, SLOT( editOpenURLTab() ) );
1.498 + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
1.499 actionEditOpenURLTab=a;
1.500
1.501 a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
1.502 @@ -703,48 +682,48 @@
1.503 a->setShortcutContext (Qt::WindowShortcut);
1.504 actionListBranches.append(a);
1.505 addAction(a);
1.506 - connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) );
1.507 + connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
1.508 actionEditURL=a;
1.509
1.510 a = new QAction( tr( "Use heading for URL" ), this);
1.511 a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
1.512 a->setEnabled (false);
1.513 actionListBranches.append(a);
1.514 - connect( a, SIGNAL( activated() ), this, SLOT( editHeading2URL() ) );
1.515 + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
1.516 actionEditHeading2URL=a;
1.517
1.518 a = new QAction(tr( "Create URL to Bugzilla" ), this);
1.519 a->setStatusTip ( tr( "Create URL to Bugzilla" ));
1.520 a->setEnabled (false);
1.521 actionListBranches.append(a);
1.522 - connect( a, SIGNAL( activated() ), this, SLOT( editBugzilla2URL() ) );
1.523 + connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
1.524 actionEditBugzilla2URL=a;
1.525
1.526 a = new QAction(tr( "Create URL to FATE" ), this);
1.527 a->setStatusTip ( tr( "Create URL to FATE" ));
1.528 a->setEnabled (false);
1.529 actionListBranches.append(a);
1.530 - connect( a, SIGNAL( activated() ), this, SLOT( editFATE2URL() ) );
1.531 + connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
1.532 actionEditFATE2URL=a;
1.533
1.534 a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Jump to map" ), this);
1.535 a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
1.536 tb->addAction (a);
1.537 a->setEnabled (false);
1.538 - connect( a, SIGNAL( activated() ), this, SLOT( editOpenVymLink() ) );
1.539 + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
1.540 actionEditOpenVymLink=a;
1.541
1.542 a = new QAction(tr( "Edit vym link"+QString("...") ), this);
1.543 a->setEnabled (false);
1.544 a->setStatusTip ( tr( "Edit link to another vym map" ));
1.545 - connect( a, SIGNAL( activated() ), this, SLOT( editVymLink() ) );
1.546 + connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
1.547 actionListBranches.append(a);
1.548 actionEditVymLink=a;
1.549
1.550 a = new QAction(tr( "Delete vym link" ),this);
1.551 a->setStatusTip ( tr( "Delete link to another vym map" ));
1.552 a->setEnabled (false);
1.553 - connect( a, SIGNAL( activated() ), this, SLOT( editDeleteVymLink() ) );
1.554 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
1.555 actionEditDeleteVymLink=a;
1.556
1.557 a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), this);
1.558 @@ -753,13 +732,13 @@
1.559 a->setToggleAction(true);
1.560 tb->addAction (a);
1.561 a->setEnabled (false);
1.562 - connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) );
1.563 + connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
1.564 actionEditToggleHideExport=a;
1.565
1.566 a = new QAction(tr( "Edit Map Info"+QString("...") ),this);
1.567 a->setStatusTip ( tr( "Edit Map Info" ));
1.568 a->setEnabled (true);
1.569 - connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) );
1.570 + connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
1.571 actionEditMapInfo=a;
1.572
1.573 editMenu->addSeparator();
1.574 @@ -767,7 +746,7 @@
1.575 // Import at selection (adding to selection)
1.576 a = new QAction( tr( "Add map (insert)" ),this);
1.577 a->setStatusTip (tr( "Add map at selection" ));
1.578 - connect( a, SIGNAL( activated() ), this, SLOT( editImportAdd() ) );
1.579 + connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
1.580 a->setEnabled (false);
1.581 actionListBranches.append(a);
1.582 actionEditImportAdd=a;
1.583 @@ -775,7 +754,7 @@
1.584 // Import at selection (replacing selection)
1.585 a = new QAction( tr( "Add map (replace)" ), this);
1.586 a->setStatusTip (tr( "Replace selection with map" ));
1.587 - connect( a, SIGNAL( activated() ), this, SLOT( editImportReplace() ) );
1.588 + connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
1.589 a->setEnabled (false);
1.590 actionListBranches.append(a);
1.591 actionEditImportReplace=a;
1.592 @@ -783,7 +762,7 @@
1.593 // Save selection
1.594 a = new QAction( tr( "Save selection" ), this);
1.595 a->setStatusTip (tr( "Save selection" ));
1.596 - connect( a, SIGNAL( activated() ), this, SLOT( editSaveBranch() ) );
1.597 + connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
1.598 a->setEnabled (false);
1.599 actionListBranches.append(a);
1.600 actionEditSaveBranch=a;
1.601 @@ -792,7 +771,7 @@
1.602 a = new QAction(tr( "Remove only branch " ), this);
1.603 a->setStatusTip ( tr( "Remove only branch and keep its childs" ));
1.604 a->setShortcut (Qt::ALT + Qt::Key_Delete );
1.605 - connect( a, SIGNAL( activated() ), this, SLOT( editRemoveBranchKeepChilds() ) );
1.606 + connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
1.607 a->setEnabled (false);
1.608 actionListBranches.append(a);
1.609 actionEditRemoveBranchKeepChilds=a;
1.610 @@ -801,7 +780,7 @@
1.611 a = new QAction( tr( "Remove childs" ), this);
1.612 a->setStatusTip (tr( "Remove childs of branch" ));
1.613 a->setShortcut (Qt::SHIFT + Qt::Key_Delete );
1.614 - connect( a, SIGNAL( activated() ), this, SLOT( editRemoveChilds() ) );
1.615 + connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveChilds() ) );
1.616 a->setEnabled (false);
1.617 actionListBranches.append(a);
1.618 actionEditRemoveChilds=a;
1.619 @@ -812,25 +791,25 @@
1.620 a->setShortcut (Qt::Key_Up );
1.621 a->setShortcutContext (Qt::WindowShortcut);
1.622 addAction (a);
1.623 - connect( a, SIGNAL( activated() ), this, SLOT( editUpperBranch() ) );
1.624 + connect( a, SIGNAL( triggered() ), this, SLOT( editUpperBranch() ) );
1.625 a = new QAction( tr( "Select lower branch" ),this);
1.626 a->setStatusTip (tr( "Select lower branch" ));
1.627 a->setShortcut ( Qt::Key_Down );
1.628 a->setShortcutContext (Qt::WindowShortcut);
1.629 addAction (a);
1.630 - connect( a, SIGNAL( activated() ), this, SLOT( editLowerBranch() ) );
1.631 + connect( a, SIGNAL( triggered() ), this, SLOT( editLowerBranch() ) );
1.632 a = new QAction(tr( "Select left branch" ), this);
1.633 a->setStatusTip ( tr( "Select left branch" ));
1.634 a->setShortcut (Qt::Key_Left );
1.635 a->setShortcutContext (Qt::WindowShortcut);
1.636 addAction (a);
1.637 - connect( a, SIGNAL( activated() ), this, SLOT( editLeftBranch() ) );
1.638 + connect( a, SIGNAL( triggered() ), this, SLOT( editLeftBranch() ) );
1.639 a = new QAction( tr( "Select child branch" ), this);
1.640 a->setStatusTip (tr( "Select right branch" ));
1.641 a->setShortcut (Qt::Key_Right);
1.642 a->setShortcutContext (Qt::WindowShortcut);
1.643 addAction (a);
1.644 - connect( a, SIGNAL( activated() ), this, SLOT( editRightBranch() ) );
1.645 + connect( a, SIGNAL( triggered() ), this, SLOT( editRightBranch() ) );
1.646 a = new QAction( tr( "Select first branch" ), this);
1.647 a->setStatusTip (tr( "Select first branch" ));
1.648 a->setShortcut (Qt::Key_Home );
1.649 @@ -840,13 +819,13 @@
1.650 editMenu->addAction (a);
1.651 actionListBranches.append(a);
1.652 actionEditSelectFirst=a;
1.653 - connect( a, SIGNAL( activated() ), this, SLOT( editFirstBranch() ) );
1.654 + connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) );
1.655 a = new QAction( tr( "Select last branch" ),this);
1.656 a->setStatusTip (tr( "Select last branch" ));
1.657 a->setShortcut ( Qt::Key_End );
1.658 a->setShortcutContext (Qt::WindowShortcut);
1.659 addAction (a);
1.660 - connect( a, SIGNAL( activated() ), this, SLOT( editLastBranch() ) );
1.661 + connect( a, SIGNAL( triggered() ), this, SLOT( editLastBranch() ) );
1.662 a->setEnabled (false);
1.663 editMenu->addAction (a);
1.664 actionListBranches.append(a);
1.665 @@ -854,7 +833,7 @@
1.666
1.667 a = new QAction( tr( "Add Image" )+QString("..."), this);
1.668 a->setStatusTip (tr( "Add Image" ));
1.669 - connect( a, SIGNAL( activated() ), this, SLOT( editLoadImage() ) );
1.670 + connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
1.671 actionEditLoadImage=a;
1.672
1.673 }
1.674 @@ -870,14 +849,14 @@
1.675 pix.fill (Qt::black);
1.676 a= new QAction(pix, tr( "Set &Color" )+QString("..."), this);
1.677 a->setStatusTip ( tr( "Set Color" ));
1.678 - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) );
1.679 + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectColor() ) );
1.680 a->addTo( tb );
1.681 formatMenu->addAction (a);
1.682 actionFormatColor=a;
1.683 a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), this);
1.684 a->setStatusTip (tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ) );
1.685 a->setShortcut (Qt::CTRL + Qt::Key_K );
1.686 - connect( a, SIGNAL( activated() ), this, SLOT( formatPickColor() ) );
1.687 + connect( a, SIGNAL( triggered() ), this, SLOT( formatPickColor() ) );
1.688 a->setEnabled (false);
1.689 a->addTo( tb );
1.690 formatMenu->addAction (a);
1.691 @@ -887,7 +866,7 @@
1.692 a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), this);
1.693 a->setStatusTip ( tr( "Color branch" ) );
1.694 a->setShortcut (Qt::CTRL + Qt::Key_I);
1.695 - connect( a, SIGNAL( activated() ), this, SLOT( formatColorItem() ) );
1.696 + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) );
1.697 a->setEnabled (false);
1.698 a->addTo( tb );
1.699 formatMenu->addAction (a);
1.700 @@ -897,7 +876,7 @@
1.701 a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), this);
1.702 a->setStatusTip ( tr( "Color Subtree" ));
1.703 a->setShortcut (Qt::CTRL + Qt::Key_T);
1.704 - connect( a, SIGNAL( activated() ), this, SLOT( formatColorBranch() ) );
1.705 + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
1.706 a->setEnabled (false);
1.707 formatMenu->addAction (a);
1.708 a->addTo( tb );
1.709 @@ -910,26 +889,26 @@
1.710 a= new QAction( tr( "Linkstyle Line" ), actionGroupFormatLinkStyles);
1.711 a->setStatusTip (tr( "Line" ));
1.712 a->setToggleAction(true);
1.713 - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleLine() ) );
1.714 + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleLine() ) );
1.715 formatMenu->addAction (a);
1.716 actionFormatLinkStyleLine=a;
1.717 a= new QAction( tr( "Linkstyle Parabel" ), actionGroupFormatLinkStyles);
1.718 a->setStatusTip (tr( "Line" ));
1.719 a->setToggleAction(true);
1.720 - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleParabel() ) );
1.721 + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleParabel() ) );
1.722 formatMenu->addAction (a);
1.723 actionFormatLinkStyleParabel=a;
1.724 a= new QAction( tr( "Linkstyle Thick Line" ), actionGroupFormatLinkStyles );
1.725 a->setStatusTip (tr( "PolyLine" ));
1.726 a->setToggleAction(true);
1.727 - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyLine() ) );
1.728 + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyLine() ) );
1.729 formatMenu->addAction (a);
1.730 actionFormatLinkStylePolyLine=a;
1.731 a= new QAction( tr( "Linkstyle Thick Parabel" ), actionGroupFormatLinkStyles);
1.732 a->setStatusTip (tr( "PolyParabel" ) );
1.733 a->setToggleAction(true);
1.734 a->setChecked (true);
1.735 - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyParabel() ) );
1.736 + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyParabel() ) );
1.737 formatMenu->addAction (a);
1.738 actionFormatLinkStylePolyParabel=a;
1.739
1.740 @@ -938,37 +917,37 @@
1.741 a = new QAction( tr( "No Frame" ), actionGroupFormatFrameTypes );
1.742 a->setStatusTip (tr("No Frame"));
1.743 a->setToggleAction(true);
1.744 - connect( a, SIGNAL( activated() ), this, SLOT( formatFrameNone() ) );
1.745 + connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameNone() ) );
1.746 actionFormatFrameNone=a;
1.747 a = new QAction( tr( "Rectangle" ), actionGroupFormatFrameTypes);
1.748 a->setStatusTip (tr( "Rectangle" ));
1.749 a->setToggleAction(true);
1.750 - connect( a, SIGNAL( activated() ), this, SLOT( formatFrameRectangle() ) );
1.751 + connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameRectangle() ) );
1.752 actionFormatFrameRectangle=a;
1.753
1.754 a = new QAction( tr( "Include images vertically" ), actionFormatIncludeImagesVer);
1.755 a->setStatusTip ( tr ("Include top and bottom position of images into branch"));
1.756 a->setToggleAction(true);
1.757 - connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesVer() ) );
1.758 + connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesVer() ) );
1.759 actionFormatIncludeImagesVer=a;
1.760
1.761 a = new QAction( tr( "Include images horizontally" ), actionFormatIncludeImagesHor );
1.762 a->setStatusTip ( tr ("Include left and right position of images into branch"));
1.763 a->setToggleAction(true);
1.764 - connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesHor() ) );
1.765 + connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesHor() ) );
1.766 actionFormatIncludeImagesHor=a;
1.767
1.768 a = new QAction( tr( "Hide link if object is not selected" ), actionFormatHideLinkUnselected);
1.769 a->setStatusTip (tr( "Hide link" ));
1.770 a->setToggleAction(true);
1.771 - connect( a, SIGNAL( activated() ), this, SLOT( formatHideLinkUnselected() ) );
1.772 + connect( a, SIGNAL( triggered() ), this, SLOT( formatHideLinkUnselected() ) );
1.773 actionFormatHideLinkUnselected=a;
1.774
1.775 formatMenu->addSeparator();
1.776 a= new QAction( tr( "&Use color of heading for link" ), this);
1.777 a->setStatusTip (tr( "Use same color for links and headings" ));
1.778 a->setToggleAction(true);
1.779 - connect( a, SIGNAL( activated() ), this, SLOT( formatToggleLinkColorHint() ) );
1.780 + connect( a, SIGNAL( triggered() ), this, SLOT( formatToggleLinkColorHint() ) );
1.781 formatMenu->addAction (a);
1.782 actionFormatLinkColorHint=a;
1.783
1.784 @@ -976,13 +955,13 @@
1.785 a= new QAction( pix, tr( "Set &Link Color"+QString("...") ), this );
1.786 a->setStatusTip (tr( "Set Link Color" ));
1.787 formatMenu->addAction (a);
1.788 - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectLinkColor() ) );
1.789 + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectLinkColor() ) );
1.790 actionFormatLinkColor=a;
1.791
1.792 a= new QAction( pix, tr( "Set &Background Color" )+QString("..."), this );
1.793 a->setStatusTip (tr( "Set Background Color" ));
1.794 formatMenu->addAction (a);
1.795 - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectBackColor() ) );
1.796 + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectBackColor() ) );
1.797 actionFormatBackColor=a;
1.798 }
1.799
1.800 @@ -999,21 +978,21 @@
1.801 a->setShortcut (Qt::CTRL + Qt::Key_0 );
1.802 a->addTo( tb );
1.803 viewMenu->addAction (a);
1.804 - connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) );
1.805 + connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) );
1.806
1.807 a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), this);
1.808 a->setStatusTip (tr( "Zoom in" ));
1.809 a->setShortcut (Qt::CTRL + Qt::Key_Plus);
1.810 a->addTo( tb );
1.811 viewMenu->addAction (a);
1.812 - connect( a, SIGNAL( activated() ), this, SLOT(viewZoomIn() ) );
1.813 + connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) );
1.814
1.815 a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), this);
1.816 a->setStatusTip (tr( "Zoom out" ));
1.817 a->setShortcut (Qt::CTRL + Qt::Key_Minus );
1.818 a->addTo( tb );
1.819 viewMenu->addAction (a);
1.820 - connect( a, SIGNAL( activated() ), this, SLOT( viewZoomOut() ) );
1.821 + connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
1.822
1.823
1.824 a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ),this);
1.825 @@ -1026,7 +1005,7 @@
1.826 a->setOn(false);
1.827 a->addTo( tb );
1.828 viewMenu->addAction (a);
1.829 - connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) );
1.830 + connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) );
1.831 actionViewToggleNoteEditor=a;
1.832
1.833 a = new QAction( tr( "Show history window" ),this );
1.834 @@ -1034,20 +1013,20 @@
1.835 a->setShortcut ( Qt::CTRL + Qt::Key_H );
1.836 a->setToggleAction(false);
1.837 viewMenu->addAction (a);
1.838 - connect( a, SIGNAL( activated() ), this, SLOT(windowToggleHistory() ) );
1.839 + connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
1.840 actionViewToggleHistoryWindow=a;
1.841
1.842 a = new QAction(tr( "Next Window" ), this);
1.843 a->setStatusTip ( tr( "&Next Window" ) );
1.844 a->setShortcut (Qt::ALT + Qt::Key_N );
1.845 viewMenu->addAction (a);
1.846 - connect( a, SIGNAL( activated() ), this, SLOT(windowNextEditor() ) );
1.847 + connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
1.848
1.849 a = new QAction (tr( "Previous Window" ), this );
1.850 a->setStatusTip (tr( "&Previous Window" ));
1.851 a->setShortcut (Qt::ALT + Qt::Key_P );
1.852 viewMenu->addAction (a);
1.853 - connect( a, SIGNAL( activated() ), this, SLOT(windowPreviousEditor() ) );
1.854 + connect( a, SIGNAL( triggered() ), this, SLOT(windowPreviousEditor() ) );
1.855 }
1.856
1.857 // Mode Actions
1.858 @@ -1124,12 +1103,14 @@
1.859
1.860 // Create Standard Flags
1.861 QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
1.862 - TB_standardFlags=tb;
1.863 + //FIXMEtoolbars.add (tb);
1.864
1.865 standardFlagsDefault = new FlagRowObj ();
1.866 standardFlagsDefault->setVisibility (false);
1.867 standardFlagsDefault->setName ("standardFlagsDef");
1.868 standardFlagsDefault->setToolBar (tb);
1.869 + TB_standardFlags=tb;
1.870 + tb->setObjectName ("standardFlagTB");
1.871
1.872 fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
1.873 fo->setName ("exclamationmark");
1.874 @@ -1140,7 +1121,7 @@
1.875 a->setCheckable(true);
1.876 a->setObjectName(fo->getName());
1.877 a->setToolTip(tr("Take care!","Standardflag"));
1.878 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.879 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.880 standardFlagsDefault->addFlag (fo); // makes deep copy
1.881
1.882 fo->load(QPixmap(flagsPath+"flag-questionmark.png"));
1.883 @@ -1152,7 +1133,7 @@
1.884 a->setCheckable(true);
1.885 a->setObjectName(fo->getName());
1.886 a->setToolTip(tr("Really?","Standardflag"));
1.887 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.888 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.889 standardFlagsDefault->addFlag (fo);
1.890
1.891 fo->load(QPixmap(flagsPath+"flag-hook-green.png"));
1.892 @@ -1164,7 +1145,7 @@
1.893 a->setCheckable(true);
1.894 a->setObjectName(fo->getName());
1.895 a->setToolTip(tr("ok!","Standardflag"));
1.896 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.897 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.898 standardFlagsDefault->addFlag (fo);
1.899
1.900 fo->load(QPixmap(flagsPath+"flag-cross-red.png"));
1.901 @@ -1176,7 +1157,7 @@
1.902 a->setCheckable(true);
1.903 a->setObjectName(fo->getName());
1.904 a->setToolTip(tr("Not ok!","Standardflag"));
1.905 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.906 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.907 standardFlagsDefault->addFlag (fo);
1.908
1.909 fo->load(QPixmap(flagsPath+"flag-stopsign.png"));
1.910 @@ -1187,7 +1168,7 @@
1.911 a->setCheckable(true);
1.912 a->setObjectName(fo->getName());
1.913 a->setToolTip(tr("This won't work!","Standardflag"));
1.914 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.915 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.916 standardFlagsDefault->addFlag (fo);
1.917
1.918 fo->load(QPixmap(flagsPath+"flag-smiley-good.png"));
1.919 @@ -1199,7 +1180,7 @@
1.920 a->setCheckable(true);
1.921 a->setObjectName(fo->getName());
1.922 a->setToolTip(tr("Good","Standardflag"));
1.923 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.924 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.925 standardFlagsDefault->addFlag (fo);
1.926
1.927 fo->load(QPixmap(flagsPath+"flag-smiley-sad.png"));
1.928 @@ -1211,7 +1192,7 @@
1.929 a->setCheckable(true);
1.930 a->setObjectName(fo->getName());
1.931 a->setToolTip(tr("Bad","Standardflag"));
1.932 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.933 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.934 standardFlagsDefault->addFlag (fo);
1.935
1.936 fo->load(QPixmap(flagsPath+"flag-smiley-omg.png"));
1.937 @@ -1224,7 +1205,7 @@
1.938 a->setCheckable(true);
1.939 a->setObjectName(fo->getName());
1.940 a->setToolTip(tr("Oh no!","Standardflag"));
1.941 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.942 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.943 standardFlagsDefault->addFlag (fo);
1.944
1.945 fo->load(QPixmap(flagsPath+"flag-kalarm.png"));
1.946 @@ -1235,7 +1216,7 @@
1.947 a->setCheckable(true);
1.948 a->setObjectName(fo->getName());
1.949 a->setToolTip(tr("Time critical","Standardflag"));
1.950 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.951 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.952 standardFlagsDefault->addFlag (fo);
1.953
1.954 fo->load(QPixmap(flagsPath+"flag-phone.png"));
1.955 @@ -1246,7 +1227,7 @@
1.956 a->setCheckable(true);
1.957 a->setObjectName(fo->getName());
1.958 a->setToolTip(tr("Call...","Standardflag"));
1.959 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.960 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.961 standardFlagsDefault->addFlag (fo);
1.962
1.963 fo->load(QPixmap(flagsPath+"flag-lamp.png"));
1.964 @@ -1257,7 +1238,7 @@
1.965 a->setCheckable(true);
1.966 a->setObjectName(fo->getName());
1.967 a->setToolTip(tr("Idea!","Standardflag"));
1.968 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.969 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.970 standardFlagsDefault->addFlag (fo);
1.971
1.972 fo->load(QPixmap(flagsPath+"flag-arrow-up.png"));
1.973 @@ -1269,7 +1250,7 @@
1.974 a->setCheckable(true);
1.975 a->setObjectName(fo->getName());
1.976 a->setToolTip(tr("Important","Standardflag"));
1.977 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.978 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.979 standardFlagsDefault->addFlag (fo);
1.980
1.981 fo->load(QPixmap(flagsPath+"flag-arrow-down.png"));
1.982 @@ -1281,7 +1262,7 @@
1.983 a->setCheckable(true);
1.984 a->setObjectName(fo->getName());
1.985 a->setToolTip(tr("Unimportant","Standardflag"));
1.986 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.987 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.988 standardFlagsDefault->addFlag (fo);
1.989
1.990 fo->load(QPixmap(flagsPath+"flag-arrow-2up.png"));
1.991 @@ -1293,7 +1274,7 @@
1.992 a->setCheckable(true);
1.993 a->setObjectName(fo->getName());
1.994 a->setToolTip(tr("Very important!","Standardflag"));
1.995 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.996 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.997 standardFlagsDefault->addFlag (fo);
1.998
1.999 fo->load(QPixmap(flagsPath+"flag-arrow-2down.png"));
1.1000 @@ -1305,7 +1286,7 @@
1.1001 a->setCheckable(true);
1.1002 a->setObjectName(fo->getName());
1.1003 a->setToolTip(tr("Very unimportant!","Standardflag"));
1.1004 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1005 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1006 standardFlagsDefault->addFlag (fo);
1.1007
1.1008 fo->load(QPixmap(flagsPath+"flag-thumb-up.png"));
1.1009 @@ -1317,7 +1298,7 @@
1.1010 a->setCheckable(true);
1.1011 a->setObjectName(fo->getName());
1.1012 a->setToolTip(tr("I like this","Standardflag"));
1.1013 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1014 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1015 standardFlagsDefault->addFlag (fo);
1.1016
1.1017 fo->load(QPixmap(flagsPath+"flag-thumb-down.png"));
1.1018 @@ -1329,7 +1310,7 @@
1.1019 a->setCheckable(true);
1.1020 a->setObjectName(fo->getName());
1.1021 a->setToolTip(tr("I do not like this","Standardflag"));
1.1022 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1023 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1024 standardFlagsDefault->addFlag (fo);
1.1025
1.1026 fo->load(QPixmap(flagsPath+"flag-rose.png"));
1.1027 @@ -1340,7 +1321,7 @@
1.1028 a->setCheckable(true);
1.1029 a->setObjectName(fo->getName());
1.1030 a->setToolTip(tr("Rose","Standardflag"));
1.1031 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1032 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1033 standardFlagsDefault->addFlag (fo);
1.1034
1.1035 fo->load(QPixmap(flagsPath+"flag-heart.png"));
1.1036 @@ -1350,7 +1331,7 @@
1.1037 a->setCheckable(true);
1.1038 a->setObjectName(fo->getName());
1.1039 a->setToolTip(tr("I just love... ","Standardflag"));
1.1040 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1041 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1042 standardFlagsDefault->addFlag (fo);
1.1043
1.1044 fo->load(QPixmap(flagsPath+"flag-present.png"));
1.1045 @@ -1361,7 +1342,7 @@
1.1046 a->setCheckable(true);
1.1047 a->setObjectName(fo->getName());
1.1048 a->setToolTip(tr("Surprise!","Standardflag"));
1.1049 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1050 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1051 standardFlagsDefault->addFlag (fo);
1.1052
1.1053 fo->load(QPixmap(flagsPath+"flag-flash.png"));
1.1054 @@ -1372,7 +1353,7 @@
1.1055 a->setCheckable(true);
1.1056 a->setObjectName(fo->getName());
1.1057 a->setToolTip(tr("Dangerous","Standardflag"));
1.1058 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1059 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1060 standardFlagsDefault->addFlag (fo);
1.1061
1.1062 fo->load(QPixmap(flagsPath+"flag-info.png"));
1.1063 @@ -1384,7 +1365,7 @@
1.1064 a->setCheckable(true);
1.1065 a->setObjectName(fo->getName());
1.1066 a->setToolTip(tr("Info","Standardflag"));
1.1067 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1068 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1069 standardFlagsDefault->addFlag (fo);
1.1070
1.1071 fo->load(QPixmap(flagsPath+"flag-lifebelt.png"));
1.1072 @@ -1396,7 +1377,7 @@
1.1073 a->setCheckable(true);
1.1074 a->setObjectName(fo->getName());
1.1075 a->setToolTip(tr("This will help","Standardflag"));
1.1076 - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) );
1.1077 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.1078 standardFlagsDefault->addFlag (fo);
1.1079
1.1080 delete (fo);
1.1081 @@ -1411,62 +1392,62 @@
1.1082
1.1083 a = new QAction( tr( "Set application to open pdf files"), this);
1.1084 a->setStatusTip ( tr( "Set application to open pdf files"));
1.1085 - connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
1.1086 + connect( a, SIGNAL( triggered() ), this, SLOT( settingsPDF() ) );
1.1087 settingsMenu->addAction (a);
1.1088
1.1089 a = new QAction( tr( "Set application to open external links"), this);
1.1090 a->setStatusTip( tr( "Set application to open external links"));
1.1091 - connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
1.1092 + connect( a, SIGNAL( triggered() ), this, SLOT( settingsURL() ) );
1.1093 settingsMenu->addAction (a);
1.1094
1.1095 settingsMenu->addSeparator();
1.1096 a = new QAction( tr( "Edit branch after adding it" ), this );
1.1097 a->setStatusTip( tr( "Edit branch after adding it" ));
1.1098 a->setToggleAction(true);
1.1099 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoedit",true) );
1.1100 + a->setOn ( settings.value ("/mapeditor/editmode/autoedit",true).toBool());
1.1101 settingsMenu->addAction (a);
1.1102 actionSettingsAutoedit=a;
1.1103
1.1104 a= new QAction( tr( "Select branch after adding it" ), this );
1.1105 a->setStatusTip( tr( "Select branch after adding it" ));
1.1106 a->setToggleAction(true);
1.1107 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselect",false) );
1.1108 + a->setOn ( settings.value ("/mapeditor/editmode/autoselect",false).toBool() );
1.1109 settingsMenu->addAction (a);
1.1110 actionSettingsAutoselectHeading=a;
1.1111
1.1112 a= new QAction(tr( "Select existing heading" ), this);
1.1113 a->setStatusTip( tr( "Select heading before editing" ));
1.1114 a->setToggleAction(true);
1.1115 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselectexistingtext",true) );
1.1116 + a->setOn ( settings.value ("/mapeditor/editmode/autoselectexistingtext",true).toBool() );
1.1117 settingsMenu->addAction (a);
1.1118 actionSettingsAutoselectText=a;
1.1119
1.1120 a= new QAction(tr( "pasting into new branch" ), this );
1.1121 a->setStatusTip( tr( "Pasting into new branch" ));
1.1122 a->setToggleAction(true);
1.1123 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/newheadingisempty",true) );
1.1124 + a->setOn ( settings.value ("/mapeditor/editmode/newheadingisempty",true).toBool() );
1.1125 settingsMenu->addAction (a);
1.1126 actionSettingsPasteNewHeading=a;
1.1127
1.1128 a= new QAction( tr( "Delete key" ), this);
1.1129 a->setStatusTip( tr( "Delete key for deleting branches" ));
1.1130 a->setToggleAction(true);
1.1131 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
1.1132 + a->setOn ( settings.value ("/mapeditor/editmode/useDelKey",false).toBool() );
1.1133 settingsMenu->addAction (a);
1.1134 - connect( a, SIGNAL( activated() ), this, SLOT( settingsToggleDelKey() ) );
1.1135 + connect( a, SIGNAL( triggered() ), this, SLOT( settingsToggleDelKey() ) );
1.1136 actionSettingsUseDelKey=a;
1.1137
1.1138 a= new QAction( tr( "Exclusive flags" ), this);
1.1139 a->setStatusTip( tr( "Use exclusive flags in flag toolbars" ));
1.1140 a->setToggleAction(true);
1.1141 - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
1.1142 + a->setOn ( settings.value ("/mapeditor/editmode/useFlagGroups",true).toBool() );
1.1143 settingsMenu->addAction (a);
1.1144 actionSettingsUseFlagGroups=a;
1.1145
1.1146 a= new QAction( tr( "Use hide flags" ), this);
1.1147 a->setStatusTip( tr( "Use hide flag during exports " ));
1.1148 a->setToggleAction(true);
1.1149 - a->setOn ( settings.readBoolEntry ("/vym/export/useHideExport",true) );
1.1150 + a->setOn ( settings.value ("/export/useHideExport",true).toBool() );
1.1151 settingsMenu->addAction (a);
1.1152 actionSettingsUseHideExport=a;
1.1153 }
1.1154 @@ -1479,7 +1460,7 @@
1.1155 QAction *a;
1.1156 a = new QAction( tr( "test flag" ), this);
1.1157 a->setStatusTip( tr( "Call test function" ));
1.1158 - connect( a, SIGNAL( activated() ), this, SLOT( testFunction() ) );
1.1159 + connect( a, SIGNAL( triggered() ), this, SLOT( testFunction() ) );
1.1160 testMenu->addAction (a);
1.1161 }
1.1162
1.1163 @@ -1491,17 +1472,17 @@
1.1164 QAction *a;
1.1165 a = new QAction( tr( "Open VYM Documentation (pdf) " ), this );
1.1166 a->setStatusTip( tr( "Open VYM Documentation (pdf)" ));
1.1167 - connect( a, SIGNAL( activated() ), this, SLOT( helpDoc() ) );
1.1168 + connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) );
1.1169 helpMenu->addAction (a);
1.1170
1.1171 a = new QAction( tr( "About VYM" ), this);
1.1172 a->setStatusTip( tr( "About VYM")+" "__VYM);
1.1173 - connect( a, SIGNAL( activated() ), this, SLOT( helpAbout() ) );
1.1174 + connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ) );
1.1175 helpMenu->addAction (a);
1.1176
1.1177 a = new QAction( tr( "About QT" ), this);
1.1178 a->setStatusTip( tr( "Information about QT toolkit" ));
1.1179 - connect( a, SIGNAL( activated() ), this, SLOT( helpAboutQT() ) );
1.1180 + connect( a, SIGNAL( triggered() ), this, SLOT( helpAboutQT() ) );
1.1181 helpMenu->addAction (a);
1.1182 }
1.1183
1.1184 @@ -1543,7 +1524,7 @@
1.1185 branchContextMenu->addAction ( actionEditURL );
1.1186 branchContextMenu->addAction ( actionEditHeading2URL );
1.1187 branchContextMenu->addAction ( actionEditBugzilla2URL );
1.1188 - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
1.1189 + if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
1.1190 {
1.1191 branchContextMenu->addAction ( actionEditFATE2URL );
1.1192 }
1.1193 @@ -1596,10 +1577,10 @@
1.1194 // Menu for last opened files
1.1195 // Read settings initially
1.1196 QString s;
1.1197 - int j=settings.readNumEntry( "/vym/lastMaps/number",0);
1.1198 + int j=settings.readNumEntry( "/lastMaps/number",0);
1.1199 for (int i=1;i<=j;i++)
1.1200 {
1.1201 - s=settings.readEntry(QString("/vym/lastMaps/map-%1").arg(i),"");
1.1202 + s=settings.value(QString("/lastMaps/map-%1").arg(i),"").toString();
1.1203 if (!s.isEmpty() && j<=maxLastMaps)
1.1204 lastMaps.append(s);
1.1205 }
1.1206 @@ -2535,7 +2516,7 @@
1.1207 {
1.1208 QString url=currentMapEditor()->getURL();
1.1209 if (url=="") return;
1.1210 - QString browser=settings.readEntry("/vym/mainwindow/readerURL" );
1.1211 + QString browser=settings.value("/mainwindow/readerURL" ).toString();
1.1212 procBrowser = new Q3Process( this );
1.1213
1.1214 procBrowser->addArgument( browser);
1.1215 @@ -2558,7 +2539,7 @@
1.1216 {
1.1217 QString url=currentMapEditor()->getURL();
1.1218 if (url=="") return;
1.1219 - QString browser=settings.readEntry("/vym/mainwindow/readerURL" );
1.1220 + QString browser=settings.value("/mainwindow/readerURL" ).toString();
1.1221 if (procBrowser && procBrowser->isRunning())
1.1222 {
1.1223 if (browser.contains("konqueror"))
1.1224 @@ -2990,9 +2971,9 @@
1.1225 bool ok;
1.1226 QString text = QInputDialog::getText(
1.1227 "VYM", tr("Set application to open PDF files")+":", QLineEdit::Normal,
1.1228 - settings.readEntry("/vym/mainwindow/readerPDF"), &ok, this );
1.1229 + settings.value("/mainwindow/readerPDF").toString(), &ok, this );
1.1230 if (ok)
1.1231 - settings.writeEntry ("/vym/mainwindow/readerPDF",text);
1.1232 + settings.setValue ("/mainwindow/readerPDF",text);
1.1233 return ok;
1.1234 }
1.1235
1.1236 @@ -3003,10 +2984,10 @@
1.1237 bool ok;
1.1238 QString text = QInputDialog::getText(
1.1239 "VYM", tr("Set application to open an URL")+":", QLineEdit::Normal,
1.1240 - settings.readEntry("/vym/mainwindow/readerURL")
1.1241 + settings.value("/mainwindow/readerURL").toString()
1.1242 , &ok, this );
1.1243 if (ok)
1.1244 - settings.writeEntry ("/vym/mainwindow/readerURL",text);
1.1245 + settings.setValue ("/mainwindow/readerURL",text);
1.1246 return ok;
1.1247 }
1.1248
1.1249 @@ -3074,7 +3055,9 @@
1.1250
1.1251 void Main::testFunction()
1.1252 {
1.1253 + cout <<TB_standardFlags->isMovable()<<endl;
1.1254 cout <<TB_standardFlags->pos()<<endl;
1.1255 + TB_standardFlags->move(QPoint (0,66));
1.1256 //currentMapEditor()->testFunction();
1.1257 }
1.1258
1.1259 @@ -3114,7 +3097,7 @@
1.1260
1.1261 Process *pdfProc = new Process();
1.1262 pdfProc->clearArguments();
1.1263 - pdfProc->addArgument( settings.readEntry("/vym/mainwindow/readerPDF"));
1.1264 + pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString());
1.1265 pdfProc->addArgument( docpath);
1.1266
1.1267 if ( !pdfProc->start() )