removed minimizeOnTray

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

8 files changed, 17 insertions, 51 deletions

diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 8a401c78c..8b8376dd7 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -1454,12 +1454,7 @@ void KviApp::createFrame()
 
 	if(KVI_OPTION_BOOL(KviOption_boolStartupMinimized))
 	{
-		if(KVI_OPTION_BOOL(KviOption_boolMinimizeInTray) && KVI_OPTION_BOOL(KviOption_boolShowDockExtension))
-		{
-			g_pFrame->hide();
-		} else {
-			g_pFrame->showMinimized();
-		}
+		g_pFrame->showMinimized();
 	} else {
 		g_pFrame->show();
 	}
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 06ad5dcbc..ef277e192 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -275,7 +275,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("ShowExtendedInfoInQueryLabel",true,KviOption_resetUpdateGui),
 	BOOL_OPTION("UseUserListColorsAsNickColors",true,KviOption_sectFlagIrcView | KviOption_groupTheme),
 	BOOL_OPTION("GzipLogs",false,KviOption_sectFlagLogging),
-	BOOL_OPTION("MinimizeInTray",false,KviOption_resetUpdateGui),
+	BOOL_OPTION("UseFullWordHighlighting",false,KviOption_sectFlagIrcView),
 	BOOL_OPTION("NotifierFlashing",true,KviOption_sectFlagFrame),
 	BOOL_OPTION("CommandlineInUserFriendlyModeByDefault",false,KviOption_sectFlagFrame), // this confuses existing users and is not mentioned in the docs where there are commandline examples : we need it to be off by default for now
 	BOOL_OPTION("EnableVisualEffects",true,KviOption_resetUpdateGui),
@@ -314,7 +314,6 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("PasteLastLogOnChannelJoin",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("PasteLastLogOnQueryJoin",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("UseSpecifiedSmartColorForOwnNick",false,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
-	BOOL_OPTION("UseFullWordHighlighting",false,KviOption_sectFlagIrcView),
 	BOOL_OPTION("ZshLikeNickCompletion",false,KviOption_sectFlagInput),
 	BOOL_OPTION("AutoAcceptDccVideo", false, KviOption_sectFlagDcc),
 	BOOL_OPTION("CreateMinimizedDccVideo", false, KviOption_sectFlagDcc),
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 7330ea0c9..f6a6b19bc 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -282,7 +282,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolShowExtendedInfoInQueryLabel 188               /* query */
 #define KviOption_boolUseUserListColorsAsNickColors 189              /* irc::usermessages */
 #define KviOption_boolGzipLogs 190                                   /* ircengine::logging */
-#define KviOption_boolMinimizeInTray 191                                   /* interface */
+#define KviOption_boolUseFullWordHighlighting 191                    /* highlight */
 #define KviOption_boolNotifierFlashing 192                                   /* interface::notifier */
 #define KviOption_boolCommandlineInUserFriendlyModeByDefault 193     /* interface::input */
 #define KviOption_boolEnableVisualEffects 194     /* interface */
@@ -321,13 +321,12 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolPasteLastLogOnChannelJoin 227                /* channel */
 #define KviOption_boolPasteLastLogOnQueryJoin 228                  /* query */
 #define KviOption_boolUseSpecifiedSmartColorForOwnNick 229 /* interface::ircview */
-#define KviOption_boolUseFullWordHighlighting 230 /* highlight */
-#define KviOption_boolZshLikeNickCompletion 231
-#define KviOption_boolAutoAcceptDccVideo 232                          /* dcc::video */
-#define KviOption_boolCreateMinimizedDccVideo 233                     /* dcc::video */
-#define KviOption_boolCreateMinimizedDccVideoWhenAutoAccepted 234     /* dcc::video */
+#define KviOption_boolZshLikeNickCompletion 230
+#define KviOption_boolAutoAcceptDccVideo 231                          /* dcc::video */
+#define KviOption_boolCreateMinimizedDccVideo 232                     /* dcc::video */
+#define KviOption_boolCreateMinimizedDccVideoWhenAutoAccepted 233     /* dcc::video */
 
-#define KVI_NUM_BOOL_OPTIONS 235
+#define KVI_NUM_BOOL_OPTIONS 234
 
 
 #define KVI_STRING_OPTIONS_PREFIX "string"
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 27b33685e..cb9f40e44 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -788,28 +788,6 @@ void KviFrame::childWindowActivated(KviWindow *wnd, bool bForce)
 	KVS_TRIGGER_EVENT_0(KviEvent_OnWindowActivated,wnd);
 }
 
-void KviFrame::changeEvent(QEvent * e)
-{
-	if (e->type() == QEvent::WindowStateChange)
-	{
-		//MINIMIZED EVENT
-		if(isMinimized() && KVI_OPTION_BOOL(KviOption_boolMinimizeInTray) && e->spontaneous())
-		{
-			if(!dockExtension())
-				executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW);
-			if(dockExtension())
-			{
-				e->ignore();
-				QTimer::singleShot( 0, this, SLOT(hide()) );
-			}
-		}
-
-	} else {
-		KviTalMainWindow::changeEvent(e);
-	}
-}
-
-
 void KviFrame::closeEvent(QCloseEvent *e)
 {
 	//check if the user just want us to minimize in tray; if we're not the sender
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index b415fbfa3..508abd2ae 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -196,7 +196,6 @@ protected:
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void moveEvent(QMoveEvent *e);
 	virtual bool focusNextPrevChild(bool next);
-	virtual void changeEvent(QEvent * event);
 
 	void updatePseudoTransparency();
 	void installAccelerators();
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index a4c6d4842..105a8f73b 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -40,22 +40,21 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 
 	m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension);
 	m_pCloseInTray = addBoolSelector(0,1,0,1,__tr2qs_ctx("Close in tray","options"),KviOption_boolCloseInTray);
-	m_pMinimizeInTray =  addBoolSelector(0,2,0,2,__tr2qs_ctx("Minimize in tray","options"),KviOption_boolMinimizeInTray);
 
-	m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing);
-	m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification);
+	m_pEnableFlashing = addBoolSelector(0,2,0,2,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing);
+	m_pLevelBasedNotify = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification);
 
-	m_pLevelsGroup = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
+	m_pLevelsGroup = addGroupBox(0,4,0,4,Qt::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
 
 	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
 				KviOption_uintMinTrayLowLevelMessage,
-				1,5,1,true);
+				1,4,1,true);
 
 	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message","options"),
 				KviOption_uintMinTrayHighLevelMessage,
-				1,5,4,true);
+				1,4,4,true);
 
-	addRowSpacer(0,6,0,6);
+	addRowSpacer(0,5,0,5);
 
 	connect(m_pEnable,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
 	connect(m_pLevelBasedNotify,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
@@ -73,7 +72,6 @@ void KviTrayOptionsWidget::setEnabled(bool)
 		m_pEnableFlashing->setEnabled(true);
 		m_pLevelBasedNotify->setEnabled(true);
 		m_pCloseInTray->setEnabled(true);
-		m_pMinimizeInTray->setEnabled(true);
 		if(m_pLevelBasedNotify->isChecked())
 			m_pLevelsGroup->setEnabled(true);
 		else
@@ -81,7 +79,6 @@ void KviTrayOptionsWidget::setEnabled(bool)
 
 	} else {
 		m_pCloseInTray->setEnabled(false);
-		m_pMinimizeInTray->setEnabled(false);
 		m_pEnableFlashing->setEnabled(false);
 		m_pLevelBasedNotify->setEnabled(false);
 		m_pLevelsGroup->setEnabled(false);
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 6021ddfd3..5c6dfb031 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -43,7 +43,6 @@ protected:
 	KviBoolSelector * m_pEnable;
 	KviBoolSelector * m_pEnableFlashing;
 	KviBoolSelector * m_pLevelBasedNotify;
-	KviBoolSelector * m_pMinimizeInTray;
 	KviBoolSelector * m_pCloseInTray;
 	KviTalGroupBox * m_pLevelsGroup;
 protected slots:
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 4265a0e71..fde73d2e7 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -345,13 +345,13 @@ void KviTrayIcon::fillContextPopup()
 
 void KviTrayIcon::toggleParentFrame()
 {
-	if(m_pFrm->isVisible())
+	if(!m_pFrm->isVisible() || m_pFrm->isMinimized())
 	{
-		m_pFrm->hide();
-	} else {
 		//restore mainwindow
 		m_pFrm->setWindowState(m_pFrm->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
 		m_pFrm->show();
+	} else {
+		m_pFrm->hide();
 	}
 }