From f2989dd4d956f6e466d29aa651525c877752f046 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 18 Jun 2012 20:27:55 -0400 Subject: [PATCH] Add link to legal page in Help menu. Note: will work properly when stage is pushed to main, as .html differs --- src/TomahawkWindow.cpp | 12 +++++++++++- src/TomahawkWindow.h | 1 + src/TomahawkWindow.ui | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 83db1ba4e..706080c76 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -341,6 +342,7 @@ TomahawkWindow::setupSignals() // connect( ui->actionAddPeerManually, SIGNAL( triggered() ), SLOT( addPeerManually() ) ); connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) ); connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) ); + connect( ui->actionLegalInfo, SIGNAL( triggered() ), SLOT( legalInfo() ) ); connect( ui->actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) ); connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) ); connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) ); @@ -512,13 +514,21 @@ TomahawkWindow::showSettingsDialog() } -void TomahawkWindow::showDiagnosticsDialog() +void +TomahawkWindow::showDiagnosticsDialog() { DiagnosticsDialog win; win.exec(); } +void +TomahawkWindow::legalInfo() +{ + QDesktopServices::openUrl( QUrl( "http://www.tomahawk-player.org/legal.html" ) ); +} + + void TomahawkWindow::updateCollectionManually() { diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h index dee2122ff..3496e241e 100644 --- a/src/TomahawkWindow.h +++ b/src/TomahawkWindow.h @@ -82,6 +82,7 @@ public slots: void loadSpiff(); void showSettingsDialog(); void showDiagnosticsDialog(); + void legalInfo(); void updateCollectionManually(); void rescanCollectionManually(); void pluginMenuAdded(QMenu*); diff --git a/src/TomahawkWindow.ui b/src/TomahawkWindow.ui index 59f8dbe1d..8b5207a00 100644 --- a/src/TomahawkWindow.ui +++ b/src/TomahawkWindow.ui @@ -115,6 +115,7 @@ + @@ -217,6 +218,14 @@ Meta+Ctrl+Z + + + &Legal Info... + + + QAction::ApplicationSpecificRole + + Diagnostics...