fix

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

3 files changed, 24 insertions, 16 deletions

diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index a067e60dc..48b77997a 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -36,32 +36,31 @@
 KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"interfacefeatures_options_widget")
 {
-	createLayout(10,1);
+	createLayout(8,1);
 
 
-	addBoolSelector(0,0,0,0,__tr2qs_ctx("Close in tray","options"),KviOption_boolCloseInTray);
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Minimize in tray","options"),KviOption_boolMinimizeInTray);
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Minimize on startup","options"),KviOption_boolStartupMinimized);
-	addBoolSelector(0,3,0,3,__tr2qs_ctx("Confirm quit with active connections","options"),KviOption_boolConfirmCloseWhenThereAreConnections);
-	addBoolSelector(0,4,0,4,__tr2qs_ctx("Remember window properties","options"),KviOption_boolWindowsRememberProperties);
+
+	addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize on startup","options"),KviOption_boolStartupMinimized);
+	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,KviApp::Pics,"disable-splash." KVI_VERSION);
 	bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile);
 	m_pDisableSplash = new KviStyledCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
-	addWidgetToLayout(m_pDisableSplash,0,5,0,5);
+	addWidgetToLayout(m_pDisableSplash,0,3,0,3);
 	m_pDisableSplash->setChecked(bDisableSplash);
 	
-	addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects);
-	addBoolSelector(0,7,0,7,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons);
+	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);
 	
-	QGroupBox * g = addGroupBox(0,8,0,8,1,QGroupBox::Horizontal,__tr2qs_ctx("Open Dialog Window For","options"));
+	QGroupBox * g = addGroupBox(0,6,0,6,1,QGroupBox::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,9,0,9);
+	addRowSpacer(0,7,0,7);
 }
 
 KviInterfaceFeaturesOptionsWidget::~KviInterfaceFeaturesOptionsWidget()
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index d3bc4efc5..0a8205d99 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -35,13 +35,16 @@
 KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"tray_options_widget")
 {
-	createLayout(5,1);
+	createLayout(7,1);
 	
 	m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension);
-	m_pEnableFlashing = addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing);
-	m_pLevelBasedNotify = addBoolSelector(0,2,0,2,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification);
+	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_pLevelsGroup = addGroupBox(0,3,0,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
+	m_pLevelsGroup = addGroupBox(0,5,0,5,1,QGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
 	
 	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
 				KviOption_uintMinTrayLowLevelMessage,
@@ -51,7 +54,7 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 				KviOption_uintMinTrayHighLevelMessage,
 				1,5,4,true);
 	
-	addRowSpacer(0,4,0,4);
+	addRowSpacer(0,6,0,6);
 	
 	connect(m_pEnable,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
 	connect(m_pLevelBasedNotify,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool)));
@@ -68,12 +71,16 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled)
 	{
 		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
 			m_pLevelsGroup->setEnabled(false);
 		
 	} 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 474d4ec9a..596459cf0 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -40,6 +40,8 @@ protected:
 	KviBoolSelector * m_pEnable;
 	KviBoolSelector * m_pEnableFlashing;
 	KviBoolSelector * m_pLevelBasedNotify;
+	KviBoolSelector * m_pMinimizeInTray;
+	KviBoolSelector * m_pCloseInTray;
 	QGroupBox * m_pLevelsGroup;
 protected slots:
 	void setEnabled(bool);