diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-16 08:22:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-16 08:22:39 +0000 |
| commit | e66cfb6dc471fe445615a17cec31f916fe2d0433 (patch) | |
| tree | 5911986a912d71064d36d00ff861856a5974f4b4 | |
| parent | a81880a78a60da19ad8a441a0688d00b68c7fc35 (diff) | |
| download | tdebase-e66cfb6d.tar.gz tdebase-e66cfb6d.zip | |
Second part of prior commit
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1175949 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kdesktop/init/Web_Browser | 2 | ||||
| -rw-r--r-- | konqueror/client/kfmclient.cc | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/kdesktop/init/Web_Browser b/kdesktop/init/Web_Browser index 27fedec39..e11733188 100644 --- a/kdesktop/init/Web_Browser +++ b/kdesktop/init/Web_Browser @@ -1,7 +1,7 @@ [Desktop Entry] Comment=Browse the World Wide Web Comment[en_US]=Browse the World Wide Web -Exec=kfmclient exec http://www.google.com %u +Exec=kfmclient openBrowser %u GenericName=Web Browser GenericName[en_US]=Web Browser Icon=konqueror diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 5df26bb68..00e946e2a 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -124,6 +124,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) " # 'src' may be a list of URLs.\n\n").local8Bit()); puts(i18n(" kfmclient sortDesktop\n" " # Rearranges all icons on the desktop.\n\n").local8Bit()); + puts(i18n(" kfmclient openBrowser\n" + " # Opens the system default Web browser.\n\n").local8Bit()); puts(i18n(" kfmclient configure\n" " # Re-read Konqueror's configuration.\n\n").local8Bit()); puts(i18n(" kfmclient configureDesktop\n" @@ -532,6 +534,13 @@ bool clientApp::doIt() KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); } + else if ( command == "openBrowser" ) + { + KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ ); + TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + app.exec(); + return !krun_has_error; } else if ( command == "move" ) { |