Startup times are negligible nowadays. Remove splash screen. Close #1808.

3 files changed, 6 insertions, 45 deletions

diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index cba08387e..6c1cb2e67 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -45,48 +45,24 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Confirm quit with active connections","options"),KviOption_boolConfirmCloseWhenThereAreConnections);
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Remember window properties","options"),KviOption_boolWindowsRememberProperties);
 
-	QString szSplashDisableFile;
-	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApplication::Pics,"disable-splash");
-	bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile);
-	m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
-	addWidgetToLayout(m_pDisableSplash,0,3,0,3);
-	m_pDisableSplash->setChecked(bDisableSplash);
-
-	addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects);
-	addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons);
+	addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects);
+	addBoolSelector(0,4,0,4,__tr2qs_ctx("Hide channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons);
 #ifdef COMPILE_ON_MAC
-	addBoolSelector(0,6,0,6,__tr2qs_ctx("Require ⌘ to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
+	addBoolSelector(0,5,0,5,__tr2qs_ctx("Require ⌘ to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
 #else
-	addBoolSelector(0,6,0,6,__tr2qs_ctx("Require Ctrl to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
+	addBoolSelector(0,5,0,5,__tr2qs_ctx("Require Ctrl to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
 #endif
 
-	KviTalGroupBox * g = addGroupBox(0,7,0,7,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window for","options"));
+	KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window for","options"));
 	addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Registered users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Identity","options"),KviOption_boolShowIdentityDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Servers","options"),KviOption_boolShowServersConnectDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Join channels","options"),KviOption_boolShowChannelsJoinDialogAsToplevel);
-	addRowSpacer(0,8,0,8);
+	addRowSpacer(0,7,0,7);
 }
 
 OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures()
 {
 }
 
-void OptionsWidget_interfaceFeatures::commit()
-{
-	KviOptionsWidget::commit();
-
-	QString szSplashDisableFile;
-	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApplication::Pics,"disable-splash");
-
-	if(m_pDisableSplash->isChecked())
-	{
-		if(!KviFileUtils::fileExists(szSplashDisableFile))
-			KviFileUtils::writeFile(szSplashDisableFile,QString());
-	} else {
-		if(KviFileUtils::fileExists(szSplashDisableFile))
-			KviFileUtils::removeFile(szSplashDisableFile);
-	}
-
-}
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h
index ec54a80e3..2ae21508b 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.h
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.h
@@ -39,10 +39,6 @@ class OptionsWidget_interfaceFeatures : public KviOptionsWidget
 public:
 	OptionsWidget_interfaceFeatures(QWidget * parent);
 	~OptionsWidget_interfaceFeatures();
-protected:
-	QCheckBox * m_pDisableSplash;
-public:
-	virtual void commit();
 };
 
 #endif //!_OPTW_INTERFACEFEATURES_H_
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index f5bcba8a3..9cb3ad246 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -34,7 +34,6 @@
 #include "KviLocale.h"
 #include "KviControlCodes.h"
 #include "kvi_out.h"
-#include "KviSplashScreen.h"
 #include "KviPointerHashTable.h"
 
 #include <QSplitter>
@@ -229,16 +228,6 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 
 	//wc->setModal(true);
 
-	// a trick for the dialog covering the splash screen before the time (this is prolly a WM or Qt bug)
-	if(g_pSplashScreen)
-	{
-		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS true, even if the splash was hidden by a mouse click...
-		{
-			QObject::connect(g_pSplashScreen,SIGNAL(destroyed()),wc,SLOT(show()));
-			return true;
-		}
-	}
-
 	wc->show();
 	wc->raise();
 	return true;