mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-19 23:41:51 +02:00
Code Issues Releases Wiki Activity

* Emit finished() when SettingsDialog closes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2013-09-03 22:37:52 +02:00
parent a5ff52ca91
commit e88252880f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tomahawk/SettingsDialog.cpp
View File

@ -78,7 +78,6 @@ SettingsDialog::SettingsDialog(QObject *parent )
, m_advancedWidgetUi( new Ui_Settings_Advanced )
, m_advancedWidget( new QWidget )
, m_proxySettings( 0 )
, m_rejected( false )
, m_restartRequired( false )
, m_accountModel( 0 )
, m_sipSpinner( 0 )
@ -308,6 +307,7 @@ SettingsDialog::saveSettings()
}
}
emit finished( true );
}
@ -338,7 +338,7 @@ SettingsDialog::serventReady()
void
SettingsDialog::onRejected()
{
m_rejected = true;
emit finished( false );
}
@ -478,7 +478,7 @@ SettingsDialog::installFromFile()
0,
QFileDialog::ReadOnly );
if( !resolver.isEmpty() )
if ( !resolver.isEmpty() )
{
const QFileInfo resolverAbsoluteFilePath( resolver );
TomahawkSettings::instance()->setScriptDefaultPath( resolverAbsoluteFilePath.absolutePath() );

10
src/tomahawk/SettingsDialog.h
View File

@ -78,12 +78,13 @@ public:
void show();
signals:
void finished( bool saved );
protected:
void changeEvent( QEvent* e );
private slots:
void onRejected();
void toggleRemoteMode();
void toggleProxyEnabled();
void toggleAutoDetectIp( bool checked );
@ -101,10 +102,10 @@ private slots:
void updateScanOptionsView();
void serventReady();
void aclEntryClearButtonClicked();
void requiresRestart();
private slots:
void requiresRestart();
void saveSettings();
void onRejected();
private:
Ui_Settings_Accounts* m_accountsWidgetUi;
@ -119,7 +120,6 @@ private:
QToolbarTabDialog* m_dialog;
ProxyDialog m_proxySettings;
bool m_rejected;
bool m_restartRequired;
Tomahawk::Accounts::AccountModel* m_accountModel;
Tomahawk::Accounts::AccountModelFilterProxy* m_accountProxy;