Move the option to be able to copy text only when the Control key is held and don't allow the user to select text at all if it is not to be copied to the clipboard.

4 files changed, 10 insertions, 5 deletions

diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index ca36906f1..1e5685a82 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -1341,7 +1341,7 @@ void KviIrcView::paintEvent(QPaintEvent *p)
 				curFore=KVI_OPTION_MSGTYPE(KVI_OUT_SEARCH).fore();
 			}
 
-			if(m_bMouseIsDown)
+			if(m_bMouseIsDown && !(KVI_OPTION_BOOL(KviOption_boolRequireControlToCopy) && !m_bCtrlPressed))
 			{
 				//Check if the block or a part of it is selected
 				if(checkSelectionBlock(pCurTextLine,i))
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index abe34c6b0..566c0fc59 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -657,7 +657,8 @@ void KviIrcView::mouseMoveEvent(QMouseEvent * e)
 {
 	bool bCursorOverMarker = checkMarkerArea(e->pos());
 
-	if(m_bMouseIsDown && (e->buttons() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?)
+	if(m_bMouseIsDown && (e->buttons() & Qt::LeftButton) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?)
+		&& !(KVI_OPTION_BOOL(KviOption_boolRequireControlToCopy) && !m_bCtrlPressed))
 	{
 		if(m_iSelectTimer == 0)
 			m_iSelectTimer = startTimer(KVI_IRCVIEW_SELECT_REPAINT_INTERVAL);
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 89f7be96f..03a04ee9f 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -144,7 +144,6 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable the input history logging","options"),KviOption_boolEnableInputHistory); //G&N 2005
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons);
 	addBoolSelector(0,3,0,3,__tr2qs_ctx("Commandline in user-friendly mode by default","options"),KviOption_boolCommandlineInUserFriendlyModeByDefault);
-	addBoolSelector(0,4,0,4,__tr2qs_ctx("Require 'Control' to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
 	addUIntSelector(0,5,0,5,__tr2qs_ctx("Expand tabulations in input using this amount of spaces:","options"),KviOption_uintSpacesToExpandTabulationInput,1,24,8,true);
 
 	KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Nick Completion","options"));
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index 891abc3b7..3e7d44556 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -54,14 +54,19 @@ OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * paren
 
 	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);
+#ifdef COMPILE_ON_MAC
+	addBoolSelector(0,6,0,6,__tr2qs_ctx("Require ⌘ to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
+#else
+	addBoolSelector(0,6,0,6,__tr2qs_ctx("Require the Control key to be held down to copy text","options"),KviOption_boolRequireControlToCopy);
+#endif
 
-	KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window for","options"));
+	KviTalGroupBox * g = addGroupBox(0,7,0,7,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,7,0,7);
+	addRowSpacer(0,8,0,8);
 }
 
 OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures()