From 7bae6c6b8afead51c29e6891632ebd1deb19dfac Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 10 Feb 2012 18:45:28 -0500
Subject: [PATCH 1/2] fix deleting
---
src/delegateconfigwrapper.h | 2 +-
src/settingsdialog.cpp | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/delegateconfigwrapper.h b/src/delegateconfigwrapper.h
index 5bd4faad6..4a2d4bfd1 100644
--- a/src/delegateconfigwrapper.h
+++ b/src/delegateconfigwrapper.h
@@ -89,7 +89,7 @@ public slots:
else if ( b == m_deleteButton )
{
m_deleted = true;
- emit deleted();
+ emit closedWithDelete();
reject();
}
else
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index e3f73d2b3..388977d18 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -444,7 +444,7 @@ SettingsDialog::openAccountConfig( Account* account, bool showDelete )
{
if( account->configurationWidget() )
{
-#ifndef Q_WS_MAC
+#if 0
DelegateConfigWrapper dialog( account->configurationWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), this );
dialog.setShowDelete( showDelete );
QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
@@ -491,8 +491,6 @@ SettingsDialog::accountConfigDelete()
Account* account = qobject_cast< Account* >( dialog->property( "accountplugin" ).value< QObject* >() );
Q_ASSERT( account );
AccountManager::instance()->removeAccount( account );
-
- sender()->deleteLater();
}
From eea70f104fa859e1cc524ccb84ded7660c69f4f9 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 10 Feb 2012 18:47:30 -0500
Subject: [PATCH 2/2] dialogs--
---
src/stackedsettingsdialog.ui | 42 +-----------------------------------
1 file changed, 1 insertion(+), 41 deletions(-)
diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui
index c04c387ef..a32f74f67 100644
--- a/src/stackedsettingsdialog.ui
+++ b/src/stackedsettingsdialog.ui
@@ -102,51 +102,11 @@
<number>2</number>
</property>
<item>
- <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>
+ <layout class="QHBoxLayout" name="horizontalLayout_2"/>
</item>
<item>
<widget class="QListView" name="accountsView"/>
</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>
</widget>
</item>