diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-06-12 23:56:14 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-06-12 23:56:14 -0700 |
| commit | c4879a0c2fea705b6ad7956502acc7897838e841 (patch) | |
| tree | fefa1f3ce6a8e2cbe05154059de352275de3c469 | |
| parent | 609046df6a4f35e4074b5fc76ae8344e8999cdd7 (diff) | |
| parent | 9b1732baae6e0a31c463c9a0791ece789a87bb2d (diff) | |
Merge pull request #1444 from laanwj/2012_06_opendebuglog
Cross-platform “Open debug logfile”
| -rw-r--r-- | src/qt/guiutil.cpp | 6 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index e8df8ad7b0..5dedc90d69 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -241,11 +241,9 @@ void openDebugLogfile() { boost::filesystem::path pathDebug = GetDataDir() / "debug.log"; -#ifdef WIN32 + /* Open debug.log with the associated application */ if (boost::filesystem::exists(pathDebug)) - /* Open debug.log with the associated application */ - ShellExecuteA((HWND)0, (LPCSTR)"open", (LPCSTR)pathDebug.string().c_str(), NULL, NULL, SW_SHOWNORMAL); -#endif + QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(pathDebug.string()))); } ToolTipToRichTextFilter::ToolTipToRichTextFilter(int size_threshold, QObject *parent) : diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index f7b06b5b93..7b40db0765 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -114,12 +114,6 @@ RPCConsole::RPCConsole(QWidget *parent) : ui->showCLOptionsButton->setIcon(QIcon(":/icons/options")); #endif -#ifndef WIN32 - // Hide Debug logfile label and Open button for non Windows-OSes - ui->labelDebugLogfile->setVisible(false); - ui->openDebugLogfileButton->setVisible(false); -#endif - // Install event filter for up and down arrow ui->lineEdit->installEventFilter(this); |