mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'lfranchi/accounts' into accounts

Browse Source
This commit is contained in:
Leo Franchi
2012-02-10 18:53:03 -05:00
parent 41b146f38a eea70f104f
commit 478ff17e67
3 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/delegateconfigwrapper.h
View File

@@ -89,7 +89,7 @@ public slots:
else if ( b == m_deleteButton ) else if ( b == m_deleteButton )
{ {
m_deleted = true; m_deleted = true;
emit deleted(); emit closedWithDelete();
reject(); reject();
} }
else else

4
src/settingsdialog.cpp
View File

@@ -443,7 +443,7 @@ SettingsDialog::openAccountConfig( Account* account, bool showDelete )
{ {
if( account->configurationWidget() ) if( account->configurationWidget() )
{ {
#ifndef Q_WS_MAC #if 0
DelegateConfigWrapper dialog( account->configurationWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), this ); DelegateConfigWrapper dialog( account->configurationWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), this );
dialog.setShowDelete( showDelete ); dialog.setShowDelete( showDelete );
QWeakPointer< DelegateConfigWrapper > watcher( &dialog ); QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
@@ -490,8 +490,6 @@ SettingsDialog::accountConfigDelete()
Account* account = qobject_cast< Account* >( dialog->property( "accountplugin" ).value< QObject* >() ); Account* account = qobject_cast< Account* >( dialog->property( "accountplugin" ).value< QObject* >() );
Q_ASSERT( account ); Q_ASSERT( account );
AccountManager::instance()->removeAccount( account ); AccountManager::instance()->removeAccount( account );
sender()->deleteLater();
} }

42
src/stackedsettingsdialog.ui
View File

@@ -102,51 +102,11 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2"/>
<item>
<widget class="QPushButton" name="showResolvers">
<property name="text">
<string>Show music sources</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="showSIP">
<property name="text">
<string>Show friend sources</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="showPushAccounts">
<property name="text">
<string>Show update services</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QListView" name="accountsView"/> <widget class="QListView" name="accountsView"/>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QPushButton" name="addNewServiceBtn">
<property name="text">
<string>Add new service...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeServiceBtn">
<property name="text">
<string>Remove Service</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>