OptionsWidget: rename option labels to reflect current function

5 files changed, 52 insertions, 24 deletions

diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index d5e5df4d5..e5c7c5d4a 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -74,14 +74,13 @@ OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent)
 	mergeTip(b,
 		__tr2qs_ctx("This option will cause KVIrc to automatically " \
 			"join a channel when an INVITE message for that channel is received.<br>" \
-			"<b>Warning:</b> this may help spammers harass you. :)","options"));
+			"<b>Warning:</b> this may help spammers harass you.","options"));
 
-	b = addBoolSelector(0,3,0,3, __tr2qs_ctx("Always open channels as minimized","options"),KviOption_boolCreateMinimizedChannels);
-	mergeTip(b,
-		__tr2qs_ctx("This option causes newly created " \
-			"channel windows to be immediately minimized.<br>" \
+	b = addBoolSelector(0,3,0,3, __tr2qs_ctx("Open channel windows without focus","options"),KviOption_boolCreateMinimizedChannels);
+	mergeTip(b, __tr2qs_ctx("This option prevents newly created " \
+			"channel windows from diverting application focus.<br>" \
 			"Enable this if you don't like channels " \
-			"popping up while you're typing something in a channel. :D","options"));
+			"popping up while you're typing something in a channel.","options"));
 
 	addRowSpacer(0,4,0,4);
 }
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 1dbf100cc..10c5acf4b 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -173,7 +173,12 @@ OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Incoming File","options"));
 	KviBoolSelector * b2 = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccSend);
-	KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Open transfer window as minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend));
+	KviBoolSelector * b3 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted transfer window without focus","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend));
+	mergeTip(b3, __tr2qs_ctx("This option prevents the transfer window " \
+			"from opening and diverting application focus.<br>" \
+			"Enable this if you don't like the transfer window " \
+			"popping up while you're typing something in a channel.","options"));
+
 	KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Automatically resume when auto-accepted","options"),KviOption_boolAutoResumeDccSendWhenAutoAccepted,KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend));
 
 	g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Save Location","options"));
@@ -191,7 +196,11 @@ OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
 				"to be automatically removed from the transfer window.","options"));
 
 
-	KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend);
+	KviBoolSelector * b1 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Open transfer window without focus","options"), KviOption_boolCreateMinimizedDccSend);
+	mergeTip(b1, __tr2qs_ctx("This option prevents the transfer window " \
+			"from opening and diverting application focus.<br>" \
+			"Enable this if you don't like the transfer window " \
+			"popping up while you're typing something in a channel.","options"));
 
 	connect(b1,SIGNAL(toggled(bool)),b3,SLOT(setNotEnabled(bool)));
 	connect(b2,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool)));
@@ -318,9 +327,17 @@ OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options"));
 	addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat);
 
-	KviBoolSelector * b1 = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat));
+	KviBoolSelector * b1 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC chat windows without focus","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat));
+	mergeTip(b1, __tr2qs_ctx("This option prevents incoming " \
+				"auto-accepted DCC chat windows from diverting application focus.<br>" \
+				"Enable this if you don't like DCC chat windows " \
+				"popping up while you're typing something in a channel.","options"));
 
-	KviBoolSelector * b2 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
+	KviBoolSelector * b2 = addBoolSelector(0,1,0,1, __tr2qs_ctx("Open DCC chat windows without focus","options"),KviOption_boolCreateMinimizedDccChat);
+	mergeTip(b2, __tr2qs_ctx("This option prevents incoming " \
+				"DCC chat windows from diverting application focus.<br>" \
+				"Enable this if you don't like DCC chat windows " \
+				"popping up while you're typing something in a channel.","options"));
 
 	connect(b2,SIGNAL(toggled(bool)),b1,SLOT(setNotEnabled(bool)));
 
@@ -349,11 +366,21 @@ OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p)
 {
 	createLayout();
 
-	KviBoolSelector * b1 = addBoolSelector(0,0,0,0,__tr2qs_ctx("Open all minimized","options"),KviOption_boolCreateMinimizedDccVoice);
+	KviBoolSelector * b1 = addBoolSelector(0,0,0,0, __tr2qs_ctx("Open all DCC voice windows without focus","options"),KviOption_boolCreateMinimizedDccVoice);
+	mergeTip(b1, __tr2qs_ctx("This option prevents all incoming " \
+				"DCC voice windows from diverting application focus.<br>" \
+				"Enable this if you don't like DCC voice windows " \
+				"popping up while you're typing something in a channel.","options"));
+
 	KviTalGroupBox * g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Voice Request","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice);
 
-	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice));
+	b = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC voice windows without focus","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice));
+	mergeTip(b, __tr2qs_ctx("This option prevents incoming " \
+				"auto-accepted DCC voice windows from diverting application focus.<br>" \
+				"Enable this if you don't like DCC voice windows " \
+				"popping up while you're typing something in a channel.","options"));
+
 	connect(b1,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool)));
 
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex);
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index 6c1cb2e67..6784b2a3b 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -41,7 +41,7 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren
 	setObjectName("interfacefeatures_options_widget");
 	createLayout();
 
-	addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize on startup","options"),KviOption_boolStartupMinimized);
+	addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize application 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);
 
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 4f0b1e39f..43ed3e78f 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -55,13 +55,11 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 			"be shown in the active window or a common channel.","options"));
 
 
-	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Open incoming queries as minimized","options"),KviOption_boolCreateIncomingQueriesAsMinimized);
-
-	mergeTip(b,
-		__tr2qs_ctx("This option causes newly created " \
-			"query windows to be immediately minimized.<br>" \
+	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Open incoming query windows without focus","options"),KviOption_boolCreateIncomingQueriesAsMinimized);
+	mergeTip(b, __tr2qs_ctx("This option prevents incoming " \
+			"query windows from diverting application focus.<br>" \
 			"Enable this if you don't like queries " \
-			"popping up while you're typing something in a channel. :D","options"));
+			"popping up while you're typing something in a channel.","options"));
 
 
 	b = addBoolSelector(0,2,1,2, __tr2qs_ctx("Enable target user tracking","options"),KviOption_boolEnableQueryTracing);
diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index be6b2575b..42acea66a 100644
--- a/src/modules/options/OptionsWidget_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -37,6 +37,7 @@ OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent)
 	createLayout();
 
 	KviBoolSelector * b;
+	KviBoolSelector * b1;
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Disable parser warnings","options"),KviOption_boolAvoidParserWarnings);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable broken event handlers","options"),KviOption_boolDisableBrokenEventHandlers);
@@ -51,14 +52,17 @@ OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent)
 	addSeparator(0,7,0,7);
 
 	b = addBoolSelector(0,8,0,8,__tr2qs_ctx("Relay errors and warnings to debug window","options"),KviOption_boolScriptErrorsToDebugWindow);
-	mergeTip(b,
-		__tr2qs_ctx("This option will show the script errors and warnings " \
+	mergeTip(b, __tr2qs_ctx("This option will show the script errors and warnings " \
 			"also in the special debug window. This makes tracking of scripts that might " \
 			"be running in several windows far easier. The messages in the debug window " \
 			"also contain a deeper call stack which will help you identifying the " \
-			"scripting problems.","options")
-		);
-	addBoolSelector(0,9,0,9,__tr2qs_ctx("Create minimized debug window","options"),KviOption_boolShowMinimizedDebugWindow);
+			"scripting problems.","options"));
+	
+	b1 = addBoolSelector(0,9,0,9, __tr2qs_ctx("Create debug window without focus","options"),KviOption_boolShowMinimizedDebugWindow);
+	mergeTip(b1, __tr2qs_ctx("This option prevents the debug window " \
+			"from opening and diverting application focus.<br>" \
+			"Enable this if you don't like the debug window " \
+			"popping up while you're typing something in a channel.","options"));
 
 	addRowSpacer(0,10,0,10);
 }