From f47219227d5f3caadf8b2682c522ff6451af8723 Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Thu, 17 Mar 2011 20:00:03 +0000
Subject: Client side improvements on the package management dialog

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5634 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/theme/ThemeManagementDialog.cpp   | 19 +++++++++++++------
 src/modules/theme/ThemeManagementDialog.h     |  2 +-
 src/modules/theme/WebThemeInterfaceDialog.cpp |  3 +--
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 6c890b017..441a8a212 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -119,10 +119,10 @@ ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0;
 ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 : QWidget(parent)
 {
-	m_pItemDelegate=0;
-	#if defined(COMPILE_WEBKIT_SUPPORT) && (QT_VERSION >= 0x040600)
-	m_pWebThemeInterfaceDialog = 0;
-	#endif
+	m_pItemDelegate = NULL;
+#ifdef COMPILE_WEBKIT_SUPPORT
+	m_pWebThemeInterfaceDialog = NULL;
+#endif
 	setObjectName("theme_options_widget");
 	setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Theme)));
@@ -257,8 +257,8 @@ ThemeManagementDialog::~ThemeManagementDialog()
 #ifdef COMPILE_WEBKIT_SUPPORT
 	if(m_pWebThemeInterfaceDialog)
 	{
-	    delete m_pWebThemeInterfaceDialog;
-	    m_pWebThemeInterfaceDialog = 0;
+		delete m_pWebThemeInterfaceDialog;
+		m_pWebThemeInterfaceDialog = NULL;
 	}
 #endif //COMPILE_WEBKIT_SUPPORT
 }
@@ -402,6 +402,7 @@ void ThemeManagementDialog::getMoreThemes()
 		m_pWebThemeInterfaceDialog->show();
 	} else {
 		m_pWebThemeInterfaceDialog = new WebThemeInterfaceDialog();
+		QObject::connect(m_pWebThemeInterfaceDialog,SIGNAL(destroyed()),this,SLOT(webThemeInterfaceDialogDestroyed()));
 		m_pWebThemeInterfaceDialog->show();
 	}
 #else
@@ -411,6 +412,12 @@ void ThemeManagementDialog::getMoreThemes()
 #endif
 }
 
+void ThemeManagementDialog::webThemeInterfaceDialogDestroyed()
+{
+	m_pWebThemeInterfaceDialog = NULL;
+	fillThemeBox();
+}
+
 
 void ThemeManagementDialog::saveCurrentTheme()
 {
diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h
index 916292fbd..0714050a2 100644
--- a/src/modules/theme/ThemeManagementDialog.h
+++ b/src/modules/theme/ThemeManagementDialog.h
@@ -85,7 +85,6 @@ protected:
 	bool hasSelectedItems();
 	virtual void closeEvent(QCloseEvent * e);
 protected slots:
-
 	void saveCurrentTheme();
 	void getMoreThemes();
 	void installFromFile();
@@ -99,6 +98,7 @@ protected slots:
 	void contextMenuRequested(const QPoint & pos);
 	//void tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt);
 	void tipRequest(QListWidgetItem *item,const QPoint &pnt);
+	void webThemeInterfaceDialogDestroyed();
 };
 
 #endif //!_MANAGEMENTDIALOG_H_
diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp
index 585f003dd..405b516f1 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.cpp
+++ b/src/modules/theme/WebThemeInterfaceDialog.cpp
@@ -39,7 +39,7 @@
 WebThemeInterfaceDialog::WebThemeInterfaceDialog(QWidget * par)
 : KviWebPackageManagementDialog(par)
 {
-	setWindowTitle(__tr2qs_ctx("KVIrc Web Theme Interface","theme"));
+	setWindowTitle(__tr2qs_ctx("KVIrc : Download Themes","theme"));
 
 	// local dir for user defined themes
 	g_pApp->getLocalKvircDirectory(m_szLocalThemesPath,KviApplication::Themes);
@@ -63,7 +63,6 @@ bool WebThemeInterfaceDialog::installPackage(const QString &szPath,QString &szEr
 	return ThemeFunctions::installThemePackage(szPath,szError,this);
 }
 
-
 bool WebThemeInterfaceDialog::packageIsInstalled(const QString &szName,const QString &szVersion)
 {
 	return \
-- 
cgit v1.3.1-10-gc9f91