diff -r 96b8406d4a2f -r 7d91b35c1b6f mapeditor.cpp --- a/mapeditor.cpp Mon Mar 27 20:21:58 2006 +0000 +++ b/mapeditor.cpp Tue Mar 28 20:04:04 2006 +0000 @@ -59,6 +59,7 @@ extern QAction *actionEditMoveDown; extern QAction *actionEditToggleScroll; extern QAction *actionEditOpenURL; +extern QAction *actionEditOpenURLTab; extern QAction *actionEditURL; extern QAction *actionEditHeading2URL; extern QAction *actionEditBugzilla2URL; @@ -2211,28 +2212,6 @@ EOFind=false; } -void MapEditor::openURL() -{ - if (selection ) - { - if (typeid(*selection) == typeid(BranchObj) || - typeid(*selection) == typeid(MapCenterObj)) - { - QString url=((BranchObj*)selection)->getURL(); - - QProcess *proc = new QProcess( this ); - - proc->addArgument( settings.readEntry("/vym/mainwindow/readerURL" )); - proc->addArgument( url); - - if ( !proc->start() ) - // error handling - if (mainWindow->settingsURL() ) - openURL(); - } - } -} - void MapEditor::editURL() { if (selection && (typeid(*selection) == typeid(BranchObj) || @@ -2253,6 +2232,15 @@ } } +QString MapEditor::getURL() +{ + if (selection && (typeid(*selection) == typeid(BranchObj) || + typeid(*selection) == typeid(MapCenterObj)) ) + return ((BranchObj*)selection)->getURL(); + else + return ""; +} + void MapEditor::editHeading2URL() { if (selection && (typeid(*selection) == typeid(BranchObj) || @@ -2531,10 +2519,15 @@ actionEditToggleScroll->setOn(false); if ( bo->getURL().isEmpty() ) + { actionEditOpenURL->setEnabled (false); + actionEditOpenURLTab->setEnabled (false); + } else + { actionEditOpenURL->setEnabled (true); - + actionEditOpenURLTab->setEnabled (true); + } if ( bo->getVymLink().isEmpty() ) { actionEditOpenVymLink->setEnabled (false); @@ -3172,7 +3165,12 @@ { // Do not move, if systemFlag clicked if (foname=="url") - openURL(); + { + if (e->state() & QMouseEvent::ControlButton) + mainWindow->editOpenURLTab(); + else + mainWindow->editOpenURL(); + } else if (foname=="vymLink") { mainWindow->editOpenVymLink();