diff -r 58e7594239df -r 9aadd0f58300 mainwindow.cpp --- a/mainwindow.cpp Tue Aug 01 09:31:22 2006 +0000 +++ b/mainwindow.cpp Tue Aug 15 11:42:10 2006 +0000 @@ -155,10 +155,8 @@ setCaption ("VYM - View Your Mind"); // Load window settings - resize (settings.readNumEntry( "/vym/mainwindow/geometry/width", 800), - settings.readNumEntry( "/vym/mainwindow/geometry/height",600)); - move (settings.readNumEntry( "/vym/mainwindow/geometry/posX", 100), - settings.readNumEntry( "/vym/mainwindow/geometry/posY", 100)); + resize (settings.value( "/mainwindow/geometry/size",QSize (800,600)).toSize()); + move (settings.value( "/mainwindow/geometry/pos", QPoint(300,100)).toPoint()); // Create unique temporary directory @@ -183,30 +181,30 @@ QString p,s; // application to open URLs - p="/vym/mainwindow/readerURL"; + p="/mainwindow/readerURL"; #if defined(Q_OS_LINUX) - s=settings.readEntry (p,"konqueror"); + s=settings.value (p,"konqueror").toString(); #else #if defined(Q_OS_MACX) - s=settings.readEntry (p,"/usr/bin/open"); + s=settings.value (p,"/usr/bin/open").toString(); #else - s=settings.readEntry (p,"mozilla"); + s=settings.value (p,"mozilla"); #endif #endif - settings.writeEntry( p,s); + settings.setValue( p,s); // application to open PDFs - p="/vym/mainwindow/readerPDF"; + p="/mainwindow/readerPDF"; #if defined(Q_OS_LINUX) - s=settings.readEntry (p,"acroread"); + s=settings.value (p,"acroread").toString(); #else #if defined(Q_OS_MACX) - s=settings.readEntry (p,"/usr/bin/open"); + s=settings.value (p,"/usr/bin/open").toString(); #else - s=settings.readEntry (p,"acroread"); + s=settings.value (p,"acroread").toString(); #endif #endif - settings.writeEntry( p,s); + settings.setValue( p,s); maxLastMaps=9; @@ -226,23 +224,12 @@ setupFlagActions(); setupSettingsActions(); setupContextMenus(); - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) setupTestActions(); + if (settings.value( "/mainwindow/showTestMenu",false).toBool()) setupTestActions(); setupHelpActions(); - // After menu is created, we can enable some actions -//FIXME QT3 testing actionFilePrint->setEnabled (true); - statusBar(); - // Position toolbars - settings.beginGroup("/vym/mainwindow/toolbars/standardFlags"); - TB_standardFlags->move(settings.value("pos").toPoint()); - cout << "moving TB to pos="<setOrientation(settings.value("orientation").toInt()); -// TB_standardFlags->setVisible(settings.value("visible",true)); - settings.endGroup(); - + restoreState (settings.value("/mainwindow/state",0).toByteArray()); // Initialize Find window findWindow=new FindWindow(NULL,"findwindow"); @@ -260,38 +247,30 @@ Main::~Main() { // Save Settings - settings.writeEntry( "/vym/mainwindow/geometry/width", width() ); - settings.writeEntry( "/vym/mainwindow/geometry/height", height() ); - settings.writeEntry( "/vym/mainwindow/geometry/posX", pos().x() ); - settings.writeEntry( "/vym/mainwindow/geometry/posY", pos().y() ); - - settings.beginGroup ("/vym/mainwindow/toolbar/standardFlags"); - settings.setValue ("pos",TB_standardFlags->pos()); - settings.setValue ("visible",TB_standardFlags->isVisible()); - settings.setValue ("orientation",TB_standardFlags->orientation()); - settings.endGroup(); - - settings.writeEntry( "/vym/mainwindow/toobar/posY", pos().y() ); - - settings.writeEntry( "/vym/version/version", __VYM_VERSION ); - settings.writeEntry( "/vym/version/builddate", __BUILD_DATE ); - - settings.writeEntry( "/vym/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() ); - settings.writeEntry( "/vym/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() ); - settings.writeEntry( "/vym/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() ); - settings.writeEntry( "/vym/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() ); - settings.writeEntry( "/vym/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() ); - settings.writeEntry( "/vym/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() ); - settings.writeEntry( "/vym/export/useHideExport",actionSettingsUseHideExport->isOn() ); + settings.setValue ( "/mainwindow/geometry/size", size() ); + settings.setValue ( "/mainwindow/geometry/pos", pos() ); + + settings.setValue ("/mainwindow/state",saveState(0)); + + settings.setValue( "/version/version", __VYM_VERSION ); + settings.setValue( "/version/builddate", __BUILD_DATE ); + + settings.setValue( "/mapeditor/editmode/autoselectheading",actionSettingsAutoselectHeading->isOn() ); + settings.setValue( "/mapeditor/editmode/autoselecttext",actionSettingsAutoselectText->isOn() ); + settings.setValue( "/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() ); + settings.setValue( "/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() ); + settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() ); + settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() ); + settings.setValue( "/export/useHideExport",actionSettingsUseHideExport->isOn() ); QString s; int maps=lastMaps.count(); - settings.writeEntry( "/vym/lastMaps/number",maps ); + settings.setValue( "/lastMaps/number",maps ); for (int i=1;i<=maps;i++) { - s=QString("/vym/lastMaps/map-%1").arg(i); + s=QString("/lastMaps/map-%1").arg(i); if (!s.isEmpty() && i<=maxLastMaps) - settings.writeEntry (s, lastMaps.at(i-1)); + settings.setValue (s, lastMaps.at(i-1)); } @@ -334,8 +313,8 @@ // File Actions void Main::setupFileActions() { - QMenu *fileMenu = menuBar()->addMenu ( tr ("&File") ); - QToolBar *tb = addToolBar( tr ("&File") ); + QMenu *fileMenu = menuBar()->addMenu ( tr ("&Map") ); + QToolBar *tb = addToolBar( tr ("&Map") ); QAction *a; a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this); @@ -343,14 +322,14 @@ a->setShortcut ( Qt::CTRL + Qt::Key_N ); a->addTo( tb ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) ); a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ),this); a->setStatusTip (tr( "Open","File menu" ) ); a->setShortcut ( Qt::CTRL + Qt::Key_O ); a->addTo( tb ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileLoad() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) ); fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent")); fileMenu->addSeparator(); @@ -360,13 +339,13 @@ a->setShortcut (Qt::CTRL + Qt::Key_S ); a->addTo( tb ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileSave() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) ); actionFileSave=a; a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), this); a->setStatusTip (tr( "Save &As" ) ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileSaveAs() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) ); fileMenu->addSeparator(); @@ -375,67 +354,67 @@ a = new QAction(tr("KDE Bookmarks"), this); a->setStatusTip ( tr( "Import")+" "+tr("KDE Bookmarks" )); a->addTo (fileImportMenu); - connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) ); - - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDEBookmarks() ) ); + + if (settings.value( "/mainwindow/showTestMenu",false).toBool()) { a = new QAction( QPixmap(), tr("Firefox Bookmarks"),this); a->setStatusTip (tr( "Import")+" "+tr("Firefox Bookmarks" ) ); a->addTo (fileImportMenu); - connect( a, SIGNAL( activated() ), this, SLOT( fileImportFirefoxBookmarks() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) ); } a = new QAction("Mind Manager...",this); a->setStatusTip ( tr( "Import")+" Mind Manager" ); fileImportMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) ); a = new QAction( tr( "Import Dir"+QString("...") ), this); a->setStatusTip (tr( "Import directory structure (experimental)" ) ); fileImportMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileImportDir() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) ); fileExportMenu = fileMenu->addMenu (tr("Export")); a = new QAction( tr("Image")+QString("..."), this); a->setStatusTip( tr( "Export map as image" )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportImage() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) ); fileExportMenu->addAction (a); a = new QAction( "Open Office"+QString("..."), this); a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office " )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportOOPresentation() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) ); fileExportMenu->addAction (a); a = new QAction( "Webpage (XHTML)...",this ); a->setShortcut (Qt::ALT + Qt::Key_X); a->setStatusTip ( tr( "Export as")+" webpage (XHTML)"); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) ); fileExportMenu->addAction (a); a = new QAction( "Text (ASCII)...", this); a->setStatusTip ( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) ); fileExportMenu->addAction (a); a = new QAction( tr("KDE Bookmarks"), this); a->setStatusTip( tr( "Export as")+" "+tr("KDE Bookmarks" )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDEBookmarks() ) ); fileExportMenu->addAction (a); a = new QAction( "Taskjuggler...", this ); a->setStatusTip( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) ); fileExportMenu->addAction (a); a = new QAction( "LaTeX...", this); a->setStatusTip( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" )); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportLaTeX() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) ); fileExportMenu->addAction (a); a = new QAction( "XML..." , this ); a->setStatusTip (tr( "Export as")+" XML"); - connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) ); fileExportMenu->addAction (a); fileMenu->addSeparator(); @@ -445,34 +424,34 @@ a->setShortcut (Qt::CTRL + Qt::Key_P ); a->addTo( tb ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) ); actionFilePrint=a; a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), this); a->setStatusTip (tr( "Close Map" ) ); a->setShortcut (Qt::ALT + Qt::Key_C ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileCloseMap() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) ); a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, this); a->setStatusTip ( tr( "Exit")+" "+__VYM ); a->setShortcut (Qt::CTRL + Qt::Key_Q ); fileMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( fileExitVYM() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExitVYM() ) ); } //Edit Actions void Main::setupEditActions() { - QToolBar *tb = addToolBar( tr ("&Edit") ); + QToolBar *tb = addToolBar( tr ("&Actions") ); tb->setLabel( "Edit Actions" ); QMenu *editMenu = menuBar()->addMenu( tr("&Edit") ); QAction *a; QAction *alt; a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo" ),this); - connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) ); a->setStatusTip (tr( "Undo" ) ); a->setShortcut ( Qt::CTRL + Qt::Key_Z ); a->setEnabled (false); @@ -480,13 +459,13 @@ editMenu->addAction (a); actionEditUndo=a; - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) + if (settings.value( "/mainwindow/showTestMenu",false).toBool()) { a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo" ), this); a->setStatusTip (tr( "Redo" )); a->setShortcut (Qt::CTRL + Qt::Key_Y ); editMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) ); } editMenu->addSeparator(); @@ -496,7 +475,7 @@ a->setEnabled (false); tb->addAction (a); editMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) ); actionEditCopy=a; a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), this); @@ -506,10 +485,10 @@ tb->addAction (a); editMenu->addAction (a); actionEditCut=a; - connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) ); a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ),this); - connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) ); a->setStatusTip ( tr( "Paste" ) ); a->setShortcut ( Qt::CTRL + Qt::Key_V ); a->setEnabled (false); @@ -530,7 +509,7 @@ a->setShortcut (Qt::Key_Return ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) ); actionListBranches.append(a); editMenu->addAction (a); actionEditHeading=a; @@ -539,7 +518,7 @@ a->setShortcut ( Qt::Key_F2 ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) ); actionListBranches.append(a); // Shortcut to delete selection @@ -548,7 +527,7 @@ a->setShortcut ( Qt::Key_Delete); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteSelection() ) ); actionEditDelete=a; // Shortcut to add branch @@ -557,11 +536,11 @@ alt->setShortcut (Qt::Key_A); alt->setShortcutContext (Qt::WindowShortcut); addAction (alt); - connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) ); + connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) ); a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this); a->setStatusTip ( tr( "Add a branch as child of selection" )); a->setShortcut (Qt::Key_Insert); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) ); actionListBranches.append(a); #if defined (Q_OS_MACX) // In OSX show different shortcut in menues, the keys work indepently always @@ -579,7 +558,7 @@ a->setShortcut (Qt::ALT + Qt::Key_Insert ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditAddBranchHere=a; @@ -588,7 +567,7 @@ a->setShortcut ( Qt::ALT + Qt::Key_A ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchHere() ) ); actionListBranches.append(a); // Add branch above @@ -597,7 +576,7 @@ a->setShortcut (Qt::SHIFT+Qt::Key_Insert ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditAddBranchAbove=a; @@ -606,7 +585,7 @@ a->setShortcut (Qt::SHIFT+Qt::Key_A ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchAbove() ) ); actionListBranches.append(a); // Add branch below @@ -615,7 +594,7 @@ a->setShortcut (Qt::CTRL +Qt::Key_Insert ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditAddBranchBelow=a; @@ -624,7 +603,7 @@ a->setShortcut (Qt::CTRL +Qt::Key_A ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) ); actionListBranches.append(a); a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up" ), this); @@ -633,11 +612,11 @@ a->setEnabled (false); tb->addAction (a); editMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editMoveUp() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) ); actionEditMoveUp=a; a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down" ),this); - connect( a, SIGNAL( activated() ), this, SLOT( editMoveDown() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) ); a->setStatusTip (tr( "Move branch down" ) ); a->setShortcut ( Qt::Key_PageDown ); a->setEnabled (false); @@ -649,11 +628,11 @@ a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ),this); a->setShortcut ( Qt::Key_ScrollLock ); a->setStatusTip (tr( "Scroll branch" ) ); - connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) ); alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this); alt->setShortcut ( Qt::Key_S ); alt->setStatusTip (tr( "Scroll branch" )); - connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) ); + connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) ); #if defined(Q_OS_MACX) actionEditToggleScroll=alt; #else @@ -669,7 +648,7 @@ a = new QAction( tr( "Unscroll all scrolled branches" ), this); a->setStatusTip (tr( "Unscroll all" )); editMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editUnScrollAll() ) ); editMenu->addSeparator(); @@ -677,7 +656,7 @@ a->setStatusTip (tr( "Find" ) ); a->setShortcut (Qt::CTRL + Qt::Key_F ); editMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editOpenFindWindow() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenFindWindow() ) ); editMenu->addSeparator(); @@ -686,14 +665,14 @@ a->setShortcut (tr( "Open URL" )); tb->addAction (a); addAction(a); - connect( a, SIGNAL( activated() ), this, SLOT( editOpenURL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) ); actionEditOpenURL=a; a = new QAction( tr( "Open URL in new tab" ), this); a->setStatusTip (tr( "Open URL in new tab" )); a->setShortcut (Qt::CTRL+Qt::Key_U ); addAction(a); - connect( a, SIGNAL( activated() ), this, SLOT( editOpenURLTab() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) ); actionEditOpenURLTab=a; a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this); @@ -703,48 +682,48 @@ a->setShortcutContext (Qt::WindowShortcut); actionListBranches.append(a); addAction(a); - connect( a, SIGNAL( activated() ), this, SLOT( editURL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) ); actionEditURL=a; a = new QAction( tr( "Use heading for URL" ), this); a->setStatusTip ( tr( "Use heading of selected branch as URL" )); a->setEnabled (false); actionListBranches.append(a); - connect( a, SIGNAL( activated() ), this, SLOT( editHeading2URL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) ); actionEditHeading2URL=a; a = new QAction(tr( "Create URL to Bugzilla" ), this); a->setStatusTip ( tr( "Create URL to Bugzilla" )); a->setEnabled (false); actionListBranches.append(a); - connect( a, SIGNAL( activated() ), this, SLOT( editBugzilla2URL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) ); actionEditBugzilla2URL=a; a = new QAction(tr( "Create URL to FATE" ), this); a->setStatusTip ( tr( "Create URL to FATE" )); a->setEnabled (false); actionListBranches.append(a); - connect( a, SIGNAL( activated() ), this, SLOT( editFATE2URL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) ); actionEditFATE2URL=a; a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Jump to map" ), this); a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" )); tb->addAction (a); a->setEnabled (false); - connect( a, SIGNAL( activated() ), this, SLOT( editOpenVymLink() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) ); actionEditOpenVymLink=a; a = new QAction(tr( "Edit vym link"+QString("...") ), this); a->setEnabled (false); a->setStatusTip ( tr( "Edit link to another vym map" )); - connect( a, SIGNAL( activated() ), this, SLOT( editVymLink() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) ); actionListBranches.append(a); actionEditVymLink=a; a = new QAction(tr( "Delete vym link" ),this); a->setStatusTip ( tr( "Delete link to another vym map" )); a->setEnabled (false); - connect( a, SIGNAL( activated() ), this, SLOT( editDeleteVymLink() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) ); actionEditDeleteVymLink=a; a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), this); @@ -753,13 +732,13 @@ a->setToggleAction(true); tb->addAction (a); a->setEnabled (false); - connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) ); actionEditToggleHideExport=a; a = new QAction(tr( "Edit Map Info"+QString("...") ),this); a->setStatusTip ( tr( "Edit Map Info" )); a->setEnabled (true); - connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) ); actionEditMapInfo=a; editMenu->addSeparator(); @@ -767,7 +746,7 @@ // Import at selection (adding to selection) a = new QAction( tr( "Add map (insert)" ),this); a->setStatusTip (tr( "Add map at selection" )); - connect( a, SIGNAL( activated() ), this, SLOT( editImportAdd() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditImportAdd=a; @@ -775,7 +754,7 @@ // Import at selection (replacing selection) a = new QAction( tr( "Add map (replace)" ), this); a->setStatusTip (tr( "Replace selection with map" )); - connect( a, SIGNAL( activated() ), this, SLOT( editImportReplace() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditImportReplace=a; @@ -783,7 +762,7 @@ // Save selection a = new QAction( tr( "Save selection" ), this); a->setStatusTip (tr( "Save selection" )); - connect( a, SIGNAL( activated() ), this, SLOT( editSaveBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditSaveBranch=a; @@ -792,7 +771,7 @@ a = new QAction(tr( "Remove only branch " ), this); a->setStatusTip ( tr( "Remove only branch and keep its childs" )); a->setShortcut (Qt::ALT + Qt::Key_Delete ); - connect( a, SIGNAL( activated() ), this, SLOT( editRemoveBranchKeepChilds() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditRemoveBranchKeepChilds=a; @@ -801,7 +780,7 @@ a = new QAction( tr( "Remove childs" ), this); a->setStatusTip (tr( "Remove childs of branch" )); a->setShortcut (Qt::SHIFT + Qt::Key_Delete ); - connect( a, SIGNAL( activated() ), this, SLOT( editRemoveChilds() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveChilds() ) ); a->setEnabled (false); actionListBranches.append(a); actionEditRemoveChilds=a; @@ -812,25 +791,25 @@ a->setShortcut (Qt::Key_Up ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editUpperBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editUpperBranch() ) ); a = new QAction( tr( "Select lower branch" ),this); a->setStatusTip (tr( "Select lower branch" )); a->setShortcut ( Qt::Key_Down ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editLowerBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editLowerBranch() ) ); a = new QAction(tr( "Select left branch" ), this); a->setStatusTip ( tr( "Select left branch" )); a->setShortcut (Qt::Key_Left ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editLeftBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editLeftBranch() ) ); a = new QAction( tr( "Select child branch" ), this); a->setStatusTip (tr( "Select right branch" )); a->setShortcut (Qt::Key_Right); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editRightBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editRightBranch() ) ); a = new QAction( tr( "Select first branch" ), this); a->setStatusTip (tr( "Select first branch" )); a->setShortcut (Qt::Key_Home ); @@ -840,13 +819,13 @@ editMenu->addAction (a); actionListBranches.append(a); actionEditSelectFirst=a; - connect( a, SIGNAL( activated() ), this, SLOT( editFirstBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) ); a = new QAction( tr( "Select last branch" ),this); a->setStatusTip (tr( "Select last branch" )); a->setShortcut ( Qt::Key_End ); a->setShortcutContext (Qt::WindowShortcut); addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( editLastBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editLastBranch() ) ); a->setEnabled (false); editMenu->addAction (a); actionListBranches.append(a); @@ -854,7 +833,7 @@ a = new QAction( tr( "Add Image" )+QString("..."), this); a->setStatusTip (tr( "Add Image" )); - connect( a, SIGNAL( activated() ), this, SLOT( editLoadImage() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) ); actionEditLoadImage=a; } @@ -870,14 +849,14 @@ pix.fill (Qt::black); a= new QAction(pix, tr( "Set &Color" )+QString("..."), this); a->setStatusTip ( tr( "Set Color" )); - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectColor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectColor() ) ); a->addTo( tb ); formatMenu->addAction (a); actionFormatColor=a; a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), this); a->setStatusTip (tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ) ); a->setShortcut (Qt::CTRL + Qt::Key_K ); - connect( a, SIGNAL( activated() ), this, SLOT( formatPickColor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatPickColor() ) ); a->setEnabled (false); a->addTo( tb ); formatMenu->addAction (a); @@ -887,7 +866,7 @@ a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), this); a->setStatusTip ( tr( "Color branch" ) ); a->setShortcut (Qt::CTRL + Qt::Key_I); - connect( a, SIGNAL( activated() ), this, SLOT( formatColorItem() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) ); a->setEnabled (false); a->addTo( tb ); formatMenu->addAction (a); @@ -897,7 +876,7 @@ a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), this); a->setStatusTip ( tr( "Color Subtree" )); a->setShortcut (Qt::CTRL + Qt::Key_T); - connect( a, SIGNAL( activated() ), this, SLOT( formatColorBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) ); a->setEnabled (false); formatMenu->addAction (a); a->addTo( tb ); @@ -910,26 +889,26 @@ a= new QAction( tr( "Linkstyle Line" ), actionGroupFormatLinkStyles); a->setStatusTip (tr( "Line" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleLine() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleLine() ) ); formatMenu->addAction (a); actionFormatLinkStyleLine=a; a= new QAction( tr( "Linkstyle Parabel" ), actionGroupFormatLinkStyles); a->setStatusTip (tr( "Line" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStyleParabel() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStyleParabel() ) ); formatMenu->addAction (a); actionFormatLinkStyleParabel=a; a= new QAction( tr( "Linkstyle Thick Line" ), actionGroupFormatLinkStyles ); a->setStatusTip (tr( "PolyLine" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyLine() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyLine() ) ); formatMenu->addAction (a); actionFormatLinkStylePolyLine=a; a= new QAction( tr( "Linkstyle Thick Parabel" ), actionGroupFormatLinkStyles); a->setStatusTip (tr( "PolyParabel" ) ); a->setToggleAction(true); a->setChecked (true); - connect( a, SIGNAL( activated() ), this, SLOT( formatLinkStylePolyParabel() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatLinkStylePolyParabel() ) ); formatMenu->addAction (a); actionFormatLinkStylePolyParabel=a; @@ -938,37 +917,37 @@ a = new QAction( tr( "No Frame" ), actionGroupFormatFrameTypes ); a->setStatusTip (tr("No Frame")); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatFrameNone() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameNone() ) ); actionFormatFrameNone=a; a = new QAction( tr( "Rectangle" ), actionGroupFormatFrameTypes); a->setStatusTip (tr( "Rectangle" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatFrameRectangle() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameRectangle() ) ); actionFormatFrameRectangle=a; a = new QAction( tr( "Include images vertically" ), actionFormatIncludeImagesVer); a->setStatusTip ( tr ("Include top and bottom position of images into branch")); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesVer() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesVer() ) ); actionFormatIncludeImagesVer=a; a = new QAction( tr( "Include images horizontally" ), actionFormatIncludeImagesHor ); a->setStatusTip ( tr ("Include left and right position of images into branch")); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatIncludeImagesHor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesHor() ) ); actionFormatIncludeImagesHor=a; a = new QAction( tr( "Hide link if object is not selected" ), actionFormatHideLinkUnselected); a->setStatusTip (tr( "Hide link" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatHideLinkUnselected() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatHideLinkUnselected() ) ); actionFormatHideLinkUnselected=a; formatMenu->addSeparator(); a= new QAction( tr( "&Use color of heading for link" ), this); a->setStatusTip (tr( "Use same color for links and headings" )); a->setToggleAction(true); - connect( a, SIGNAL( activated() ), this, SLOT( formatToggleLinkColorHint() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatToggleLinkColorHint() ) ); formatMenu->addAction (a); actionFormatLinkColorHint=a; @@ -976,13 +955,13 @@ a= new QAction( pix, tr( "Set &Link Color"+QString("...") ), this ); a->setStatusTip (tr( "Set Link Color" )); formatMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectLinkColor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectLinkColor() ) ); actionFormatLinkColor=a; a= new QAction( pix, tr( "Set &Background Color" )+QString("..."), this ); a->setStatusTip (tr( "Set Background Color" )); formatMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( formatSelectBackColor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectBackColor() ) ); actionFormatBackColor=a; } @@ -999,21 +978,21 @@ a->setShortcut (Qt::CTRL + Qt::Key_0 ); a->addTo( tb ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(viewZoomReset() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) ); a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), this); a->setStatusTip (tr( "Zoom in" )); a->setShortcut (Qt::CTRL + Qt::Key_Plus); a->addTo( tb ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(viewZoomIn() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) ); a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), this); a->setStatusTip (tr( "Zoom out" )); a->setShortcut (Qt::CTRL + Qt::Key_Minus ); a->addTo( tb ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( viewZoomOut() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) ); a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ),this); @@ -1026,7 +1005,7 @@ a->setOn(false); a->addTo( tb ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(windowToggleNoteEditor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) ); actionViewToggleNoteEditor=a; a = new QAction( tr( "Show history window" ),this ); @@ -1034,20 +1013,20 @@ a->setShortcut ( Qt::CTRL + Qt::Key_H ); a->setToggleAction(false); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(windowToggleHistory() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) ); actionViewToggleHistoryWindow=a; a = new QAction(tr( "Next Window" ), this); a->setStatusTip ( tr( "&Next Window" ) ); a->setShortcut (Qt::ALT + Qt::Key_N ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(windowNextEditor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) ); a = new QAction (tr( "Previous Window" ), this ); a->setStatusTip (tr( "&Previous Window" )); a->setShortcut (Qt::ALT + Qt::Key_P ); viewMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT(windowPreviousEditor() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT(windowPreviousEditor() ) ); } // Mode Actions @@ -1124,12 +1103,14 @@ // Create Standard Flags QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar")); - TB_standardFlags=tb; + //FIXMEtoolbars.add (tb); standardFlagsDefault = new FlagRowObj (); standardFlagsDefault->setVisibility (false); standardFlagsDefault->setName ("standardFlagsDef"); standardFlagsDefault->setToolBar (tb); + TB_standardFlags=tb; + tb->setObjectName ("standardFlagTB"); fo->load(QPixmap(flagsPath+"flag-exclamationmark.png")); fo->setName ("exclamationmark"); @@ -1140,7 +1121,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Take care!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); // makes deep copy fo->load(QPixmap(flagsPath+"flag-questionmark.png")); @@ -1152,7 +1133,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Really?","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-hook-green.png")); @@ -1164,7 +1145,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("ok!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-cross-red.png")); @@ -1176,7 +1157,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Not ok!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-stopsign.png")); @@ -1187,7 +1168,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("This won't work!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-smiley-good.png")); @@ -1199,7 +1180,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Good","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-smiley-sad.png")); @@ -1211,7 +1192,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Bad","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-smiley-omg.png")); @@ -1224,7 +1205,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Oh no!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-kalarm.png")); @@ -1235,7 +1216,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Time critical","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-phone.png")); @@ -1246,7 +1227,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Call...","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-lamp.png")); @@ -1257,7 +1238,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Idea!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-arrow-up.png")); @@ -1269,7 +1250,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Important","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-arrow-down.png")); @@ -1281,7 +1262,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Unimportant","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-arrow-2up.png")); @@ -1293,7 +1274,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Very important!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-arrow-2down.png")); @@ -1305,7 +1286,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Very unimportant!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-thumb-up.png")); @@ -1317,7 +1298,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("I like this","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-thumb-down.png")); @@ -1329,7 +1310,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("I do not like this","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-rose.png")); @@ -1340,7 +1321,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Rose","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-heart.png")); @@ -1350,7 +1331,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("I just love... ","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-present.png")); @@ -1361,7 +1342,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Surprise!","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-flash.png")); @@ -1372,7 +1353,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Dangerous","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-info.png")); @@ -1384,7 +1365,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("Info","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); fo->load(QPixmap(flagsPath+"flag-lifebelt.png")); @@ -1396,7 +1377,7 @@ a->setCheckable(true); a->setObjectName(fo->getName()); a->setToolTip(tr("This will help","Standardflag")); - connect (a, SIGNAL( activated() ), this, SLOT( standardFlagChanged() ) ); + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); standardFlagsDefault->addFlag (fo); delete (fo); @@ -1411,62 +1392,62 @@ a = new QAction( tr( "Set application to open pdf files"), this); a->setStatusTip ( tr( "Set application to open pdf files")); - connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( settingsPDF() ) ); settingsMenu->addAction (a); a = new QAction( tr( "Set application to open external links"), this); a->setStatusTip( tr( "Set application to open external links")); - connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( settingsURL() ) ); settingsMenu->addAction (a); settingsMenu->addSeparator(); a = new QAction( tr( "Edit branch after adding it" ), this ); a->setStatusTip( tr( "Edit branch after adding it" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoedit",true) ); + a->setOn ( settings.value ("/mapeditor/editmode/autoedit",true).toBool()); settingsMenu->addAction (a); actionSettingsAutoedit=a; a= new QAction( tr( "Select branch after adding it" ), this ); a->setStatusTip( tr( "Select branch after adding it" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselect",false) ); + a->setOn ( settings.value ("/mapeditor/editmode/autoselect",false).toBool() ); settingsMenu->addAction (a); actionSettingsAutoselectHeading=a; a= new QAction(tr( "Select existing heading" ), this); a->setStatusTip( tr( "Select heading before editing" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/autoselectexistingtext",true) ); + a->setOn ( settings.value ("/mapeditor/editmode/autoselectexistingtext",true).toBool() ); settingsMenu->addAction (a); actionSettingsAutoselectText=a; a= new QAction(tr( "pasting into new branch" ), this ); a->setStatusTip( tr( "Pasting into new branch" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/newheadingisempty",true) ); + a->setOn ( settings.value ("/mapeditor/editmode/newheadingisempty",true).toBool() ); settingsMenu->addAction (a); actionSettingsPasteNewHeading=a; a= new QAction( tr( "Delete key" ), this); a->setStatusTip( tr( "Delete key for deleting branches" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) ); + a->setOn ( settings.value ("/mapeditor/editmode/useDelKey",false).toBool() ); settingsMenu->addAction (a); - connect( a, SIGNAL( activated() ), this, SLOT( settingsToggleDelKey() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( settingsToggleDelKey() ) ); actionSettingsUseDelKey=a; a= new QAction( tr( "Exclusive flags" ), this); a->setStatusTip( tr( "Use exclusive flags in flag toolbars" )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) ); + a->setOn ( settings.value ("/mapeditor/editmode/useFlagGroups",true).toBool() ); settingsMenu->addAction (a); actionSettingsUseFlagGroups=a; a= new QAction( tr( "Use hide flags" ), this); a->setStatusTip( tr( "Use hide flag during exports " )); a->setToggleAction(true); - a->setOn ( settings.readBoolEntry ("/vym/export/useHideExport",true) ); + a->setOn ( settings.value ("/export/useHideExport",true).toBool() ); settingsMenu->addAction (a); actionSettingsUseHideExport=a; } @@ -1479,7 +1460,7 @@ QAction *a; a = new QAction( tr( "test flag" ), this); a->setStatusTip( tr( "Call test function" )); - connect( a, SIGNAL( activated() ), this, SLOT( testFunction() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( testFunction() ) ); testMenu->addAction (a); } @@ -1491,17 +1472,17 @@ QAction *a; a = new QAction( tr( "Open VYM Documentation (pdf) " ), this ); a->setStatusTip( tr( "Open VYM Documentation (pdf)" )); - connect( a, SIGNAL( activated() ), this, SLOT( helpDoc() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) ); helpMenu->addAction (a); a = new QAction( tr( "About VYM" ), this); a->setStatusTip( tr( "About VYM")+" "__VYM); - connect( a, SIGNAL( activated() ), this, SLOT( helpAbout() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ) ); helpMenu->addAction (a); a = new QAction( tr( "About QT" ), this); a->setStatusTip( tr( "Information about QT toolkit" )); - connect( a, SIGNAL( activated() ), this, SLOT( helpAboutQT() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( helpAboutQT() ) ); helpMenu->addAction (a); } @@ -1543,7 +1524,7 @@ branchContextMenu->addAction ( actionEditURL ); branchContextMenu->addAction ( actionEditHeading2URL ); branchContextMenu->addAction ( actionEditBugzilla2URL ); - if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) + if (settings.value( "/mainwindow/showTestMenu",false).toBool() ) { branchContextMenu->addAction ( actionEditFATE2URL ); } @@ -1596,10 +1577,10 @@ // Menu for last opened files // Read settings initially QString s; - int j=settings.readNumEntry( "/vym/lastMaps/number",0); + int j=settings.readNumEntry( "/lastMaps/number",0); for (int i=1;i<=j;i++) { - s=settings.readEntry(QString("/vym/lastMaps/map-%1").arg(i),""); + s=settings.value(QString("/lastMaps/map-%1").arg(i),"").toString(); if (!s.isEmpty() && j<=maxLastMaps) lastMaps.append(s); } @@ -2535,7 +2516,7 @@ { QString url=currentMapEditor()->getURL(); if (url=="") return; - QString browser=settings.readEntry("/vym/mainwindow/readerURL" ); + QString browser=settings.value("/mainwindow/readerURL" ).toString(); procBrowser = new Q3Process( this ); procBrowser->addArgument( browser); @@ -2558,7 +2539,7 @@ { QString url=currentMapEditor()->getURL(); if (url=="") return; - QString browser=settings.readEntry("/vym/mainwindow/readerURL" ); + QString browser=settings.value("/mainwindow/readerURL" ).toString(); if (procBrowser && procBrowser->isRunning()) { if (browser.contains("konqueror")) @@ -2990,9 +2971,9 @@ bool ok; QString text = QInputDialog::getText( "VYM", tr("Set application to open PDF files")+":", QLineEdit::Normal, - settings.readEntry("/vym/mainwindow/readerPDF"), &ok, this ); + settings.value("/mainwindow/readerPDF").toString(), &ok, this ); if (ok) - settings.writeEntry ("/vym/mainwindow/readerPDF",text); + settings.setValue ("/mainwindow/readerPDF",text); return ok; } @@ -3003,10 +2984,10 @@ bool ok; QString text = QInputDialog::getText( "VYM", tr("Set application to open an URL")+":", QLineEdit::Normal, - settings.readEntry("/vym/mainwindow/readerURL") + settings.value("/mainwindow/readerURL").toString() , &ok, this ); if (ok) - settings.writeEntry ("/vym/mainwindow/readerURL",text); + settings.setValue ("/mainwindow/readerURL",text); return ok; } @@ -3074,7 +3055,9 @@ void Main::testFunction() { + cout <isMovable()<pos()<move(QPoint (0,66)); //currentMapEditor()->testFunction(); } @@ -3114,7 +3097,7 @@ Process *pdfProc = new Process(); pdfProc->clearArguments(); - pdfProc->addArgument( settings.readEntry("/vym/mainwindow/readerPDF")); + pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString()); pdfProc->addArgument( docpath); if ( !pdfProc->start() )