Rewritten KviTalWizard in a QtX independent form, working on a new setup too...

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@674 17fca916-40b9-46aa-a4ea-0a15b648b75c

7 files changed, 60 insertions, 52 deletions

diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 7bfa1d340..42245778e 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -28,6 +28,7 @@
 #include "kvi_locale.h"
 #include "kvi_config.h"
 #include "kvi_app.h"
+#include "kvi_qstring.h"
 
 
 #include <qmessagebox.h>
@@ -107,8 +108,9 @@ int KviMircServersIniImport::doImport(const QString& filename)
 			}
 		} while(!entry.isEmpty());
 	} else {
-		KviStr tmp(KviStr::Format,__tr("%s doesn't look like a servers.ini file.\nImport failed."),filename);
-		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),__tr2qs(tmp.ptr()));
+		QString tmp;
+		KviQString::sprintf(tmp,__tr2qs("%Q doesn't look like a servers.ini file.\nImport failed."),&filename);
+		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),tmp);
 	}
 	return iCount;
 }
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 83117af97..ca3302f3f 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -51,8 +51,6 @@
 	Add a page with title.<page_widget> must be a widget's object.
 	!fn: $insertPage(<page_widget>,<title:string>,<index:integer>)
 	Inserts a page at the position <index>. If index is -1, page will appended to the end of the wizard's page sequenze.
-	!fn: $removePage(<page_widget:object>)
-	Remove a page from the wizard sequence.
 	!fn: $setTitle(<page>,<title:string>)
 	Sets the title for page page to title text.
 	!fn: $setBackEnabled(<page_widget>,<bEnabled:boolean>)
@@ -95,7 +93,6 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_wizard,"wizard","widget")
 
 	KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"addPage", functionaddPage)
 	KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"insertPage", functioninsertPage)
-	KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"removePage", functionremovePage)
 	KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setTitle", functionsetTitle)
 
 	KVSO_REGISTER_HANDLER(KviKvsObject_wizard,"setBackEnabled", functionsetBackEnabled);
@@ -172,23 +169,7 @@ bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_wizard::functionremovePage(KviKvsObjectFunctionCall *c)
-{
-	KviKvsObject *ob;
-	kvs_hobject_t hObject;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("page_widget",KVS_PT_HOBJECT,0,hObject)
-	KVSO_PARAMETERS_END(c)
-	ob=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
-	if(!widget())return true;
-	if(!ob->object()->isWidgetType())
-	{
-		c->warning(__tr2qs("Not a widget object"));
-		return true;
-	}
-	((KviTalWizard *)widget())->removePage(((QWidget *)(ob->object())));
-	return true;
-}
+
 bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c)
 {
 	KviKvsObject *ob;
@@ -205,7 +186,7 @@ bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Widget object required"));
 		return true;
 	}
-	((KviTalWizard *)widget())->setTitle(((QWidget *)(ob->object())),szTitle);
+	((KviTalWizard *)widget())->setPageTitle(((QWidget *)(ob->object())),szTitle);
 	return true;
 }
 bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c)
@@ -360,7 +341,7 @@ void KviKvsObject_wizard::backClicked()
 	callFunction(this,"backClickedEvent",params);
 }
 KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wizard * parent)
-:KviTalWizard( par,name)
+:KviTalWizard(par)
 {
 	m_pParentScript=parent;
 	connect (this->backButton(),SIGNAL(clicked()),this,SLOT(slotBackClicked()));
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 6fefff089..327612824 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -49,10 +49,12 @@ extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 extern KviPtrList<KviRegistrationWizard> * g_pRegistrationWizardList;
 
 KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
-: KviTalWizard(par,"regusers_wizard",bModal)
+: KviTalWizard(par)
 {
 	m_pDb = db;
 	
+	setModal(bModal);
+	
 	m_bModal = bModal;
 
 	KviIrcMask mask(startMask ? startMask : "*!*@*");
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 8201e3a55..8618b164d 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -113,8 +113,10 @@ KviSetupPage::~KviSetupPage()
 
 
 KviSetupWizard::KviSetupWizard()
-: KviTalWizard(0,0,true)
+: KviTalWizard(0)
 {
+	setModal(true);
+
 	g_bFoundMirc = false;
 	QString szLabelText;
 
@@ -148,19 +150,10 @@ KviSetupWizard::KviSetupWizard()
 
 	addPage(m_pWelcome,__tr2qs("Welcome to KVIrc"));
 
-#ifdef COMPILE_ON_WINDOWS
-	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pWelcome->m_pVBox);
-	m_pCreateUrlHandlers->setChecked(true);
-#endif
-#ifdef COMPILE_KDE_SUPPORT
-	m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"),m_pWelcome->m_pVBox);
-	m_pCreateDesktopShortcut->setChecked(true);
-#endif
 	setBackEnabled(m_pWelcome,false);
 	setHelpEnabled(m_pWelcome,false);
 
 
-
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// License
 #ifndef COMPILE_ON_WINDOWS //it have been already shown by installer
@@ -465,6 +458,34 @@ KviSetupWizard::KviSetupWizard()
 	setHelpEnabled(m_pTheme,false);*/
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	// Desktop integration
+
+	m_pDesktopIntegration = new KviSetupPage(this);
+
+	szText  = __tr2qs( \
+				"<p>" \
+					"Here you can choose how much KVIrc will integrate with " \
+					"your system." \
+					"<br><br>" \
+					"The default settings are fine for most users so if " \
+					"you're in doubt just click \"<b>Next</b>\" and go to the next screen." \
+				"</p>");
+
+	m_pDesktopIntegration->m_pTextLabel->setText(szText);
+
+	addPage(m_pDesktopIntegration,__tr2qs("Desktop Integration"));
+
+#ifdef COMPILE_ON_WINDOWS
+	m_pCreateUrlHandlers = new QCheckBox(__tr2qs("Make KVIrc default IRC client"),m_pDesktopIntegration->m_pVBox);
+	m_pCreateUrlHandlers->setChecked(true);
+#endif
+#ifdef COMPILE_KDE_SUPPORT
+	m_pCreateDesktopShortcut = new QCheckBox(__tr2qs("Create desktop shortcut"),m_pDesktopIntegration->m_pVBox);
+	m_pCreateDesktopShortcut->setChecked(true);
+#endif
+	setHelpEnabled(m_pDesktopIntegration,false);
+
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Server config
 	m_pServers = new KviSetupPage(this);
 
@@ -512,7 +533,7 @@ KviSetupWizard::KviSetupWizard()
 		KviConfig cfg(szTmp,KviConfig::Read);
 		cfg.setGroup("Setup");
 		if(cfg.readBoolEntry("hideServerList",FALSE)) {
-			setAppropriate(m_pServers,false);
+			setPageEnabled(m_pServers,false);
 			setFinishEnabled(m_pIdentity,true);
 			KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc) = false;
 			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false;
@@ -524,11 +545,11 @@ KviSetupWizard::KviSetupWizard()
 			{
 				case 1:
 					m_pDirUseNew->toggle();
-					setAppropriate(m_pDirectory,false);
+					setPageEnabled(m_pDirectory,false);
 					break;
 				case 2:
 					m_pDirMakePortable->toggle();
-					setAppropriate(m_pDirectory,false);
+					setPageEnabled(m_pDirectory,false);
 					break;
 			}
 		}
@@ -607,9 +628,9 @@ void KviSetupWizard::oldDirClicked()
 	m_pNewPathBox->setEnabled(false);
 	m_pNewIncomingBox->setEnabled(false);
 	
-	if(m_pIdentity) setAppropriate(m_pIdentity,false);
-//	if(m_pTheme) setAppropriate(m_pTheme,false);
-	if(m_pServers) setAppropriate(m_pServers,false);
+	if(m_pIdentity) setPageEnabled(m_pIdentity,false);
+//	if(m_pTheme) setPageEnabled(m_pTheme,false);
+	if(m_pServers) setPageEnabled(m_pServers,false);
 	
 	if(m_pOldDataPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
 	else setNextEnabled(m_pDirectory,true);
@@ -636,9 +657,9 @@ void KviSetupWizard::newDirClicked()
 	m_pNewPathBox->setEnabled(true);
 	m_pNewIncomingBox->setEnabled(true);
 	
-	if(m_pIdentity) setAppropriate(m_pIdentity,true);
-//	if(m_pTheme) setAppropriate(m_pTheme,true);
-	if(m_pServers) setAppropriate(m_pServers,true);
+	if(m_pIdentity) setPageEnabled(m_pIdentity,true);
+//	if(m_pTheme) setPageEnabled(m_pTheme,true);
+	if(m_pServers) setPageEnabled(m_pServers,true);
 	
 	if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
 	else setNextEnabled(m_pDirectory,true);
@@ -886,7 +907,7 @@ void KviSetupWizard::accept()
 				KviMessageBox::warning(__tr("Cannot create directory %s.\n" \
 					"You may not have write permission " \
 					"for that path. Please go back and choose another directory."));
-				showPage(m_pDirectory);
+				setCurrentPage(m_pDirectory);
 				return;
 			}
 		} /*else {
@@ -917,7 +938,7 @@ void KviSetupWizard::accept()
 				KviMessageBox::warning(__tr("Cannot create directory %s.\n" \
 					"You may not have write permission " \
 					"for that path. Please go back and choose another directory."));
-				showPage(m_pDirectory);
+				setCurrentPage(m_pDirectory);
 				return;
 			}
 		}
@@ -1038,7 +1059,8 @@ void KviSetupWizard::accept()
 		}
 	}
 #ifdef COMPILE_ON_WINDOWS
-	if(m_pDirMakePortable->isOn()) {
+	if(m_pDirMakePortable->isOn())
+	{
 		KviFileUtils::writeFile(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable","true");
 	} else {
 #endif
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 0ffe90807..260de0838 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -1,11 +1,12 @@
 #ifndef _SETUPWIZARD_H_
 #define _SETUPWIZARD_H_
+//=============================================================================
 //
 //   File : setupwizard.h
 //   Creation date : Sat Oct  6 02:06:51 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2007 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -21,6 +22,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
+//=============================================================================
 
 
 #include <kvi_tal_wizard.h>
@@ -79,11 +81,10 @@ public:
 	KviSetupPage  * m_pDirectory;
 	KviSetupPage  * m_pIdentity;
 //	KviSetupPage  * m_pTheme;
+	KviSetupPage  * m_pDesktopIntegration;
 	KviSetupPage  * m_pServers;
 	
 	// Theme
-
-
 	KviTalVButtonGroup * m_pThemeButtonGroup;
 
 	QRadioButton  * m_pThemeHiRes;
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 5b9a23428..53fe5de98 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -386,7 +386,7 @@ bool KviPackThemeDialog::packTheme()
 		{
 			QMessageBox::critical(this,__tr2qs_ctx("Export Theme - KVIrc","theme"),__tr2qs_ctx("Failed to load the selected image: please fix it","theme"),
 				QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
-			showPage(m_pImageSelectionPage);
+			setCurrentPage(m_pImageSelectionPage);
 			return false;
 		}
 	}
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index a85be1fda..a98780a7d 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -285,7 +285,7 @@ bool KviSaveThemeDialog::saveTheme()
 		{
 			QMessageBox::critical(this,__tr2qs_ctx("Save Current Theme - KVIrc","theme"),__tr2qs_ctx("Failed to load the selected screenshot image: please fix it","theme"),
 				QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
-			showPage(m_pImageSelectionPage);
+			setCurrentPage(m_pImageSelectionPage);
 			return false;
 		}
 	}