fix for #793:

- remove ability to manually show/hide the tray icon
- force the tray icon to show/hide itself when the option is changed
- disable close in tray and the other tray-related options when the tray icon is disabled
- of course you can still mess up all of this using with kvs: /trayicon.hide and /option boolShowDockExtension false

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

1 files changed, 10 insertions, 0 deletions

diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 105a8f73b..8152cf39f 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -24,6 +24,8 @@
 
 #include "optw_tray.h"
 
+#include "kvi_frame.h"
+#include "kvi_internalcmd.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
 #include "kvi_tal_tooltip.h"
@@ -77,11 +79,19 @@ void KviTrayOptionsWidget::setEnabled(bool)
 		else
 			m_pLevelsGroup->setEnabled(false);
 
+		g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW);
 	} else {
 		m_pCloseInTray->setEnabled(false);
 		m_pEnableFlashing->setEnabled(false);
 		m_pLevelBasedNotify->setEnabled(false);
 		m_pLevelsGroup->setEnabled(false);
+
+		m_pCloseInTray->setChecked(false);
+		m_pEnableFlashing->setChecked(false);
+		m_pLevelBasedNotify->setChecked(false);
+		m_pLevelsGroup->setChecked(false);
+
+		g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE);
 	}
 }