AliasEditorWindow: dont mess with tooltip text breaks for now

issue #1860 comes into play here and clearly this lion wont be so easily
tamed

1 files changed, 22 insertions, 21 deletions

diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 649cfd650..d8be80a07 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -72,7 +72,7 @@ ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v, ActionDa
 	m_pTreeWidget = v;
 	//setFlags(Qt::ItemIsUserSelectable);
 	QString t = "<b>" + m_pActionData->m_szName + "</b>";
-	t += "<br><font color=\"#808080\" size=\"-1\">" + m_pActionData->m_szVisibleName + "</font>";
+	t += "<br><font color=\"#454545\" size=\"-1\">" + m_pActionData->m_szVisibleName + "</font>";
 	m_szKey = m_pActionData->m_szName.toUpper();
 	setText(0, t);
 	QPixmap * p = g_pIconManager->getBigIcon(m_pActionData->m_szBigIcon);
@@ -176,8 +176,8 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
 	gl->addWidget(m_pKeySequenceEdit, 4, 1, 2, 1);
 	m_pKeySequenceEdit->setToolTip(__tr2qs_ctx("Optional keyboard sequence that will activate this action.<br>"
 	                                           "The sequence has to be expressed as a string of up to four key codes separated by commas "
-	                                           "eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>"
-	                                           "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ...", "editor"));
+	                                           "eventually combined with the modifiers \"Ctrl\", \"Shift\", \"Alt\" and \"Meta\".<br>"
+	                                           "Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\".", "editor"));
 	l = new QLabel(tab);
 	gl->addWidget(l, 6, 0, 1, 4);
 
@@ -194,6 +194,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
 	connect(m_pNeedsContextCheck, SIGNAL(toggled(bool)), this, SLOT(needsContextCheckToggled(bool)));
 	m_pNeedsContextCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
 	                                             "the active window belongs to an IRC context", "editor"));
+
 	gl->addWidget(m_pNeedsContextCheck, 0, 0, 1, 4);
 
 	l = new QLabel(tab);
@@ -202,7 +203,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
 
 	m_pNeedsConnectionCheck = new QCheckBox(__tr2qs_ctx("Needs IRC connection", "editor"), tab);
 	connect(m_pNeedsConnectionCheck, SIGNAL(toggled(bool)), this, SLOT(needsConnectionCheckToggled(bool)));
-	m_pNeedsConnectionCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when<br>"
+	m_pNeedsConnectionCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
 	                                                "the active window has an active IRC connection", "editor"));
 
 	gl->addWidget(m_pNeedsConnectionCheck, 1, 0, 1, 4);
@@ -212,60 +213,60 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
 	gl->addWidget(l, 2, 1);
 
 	m_pEnableAtLoginCheck = new QCheckBox(__tr2qs_ctx("Enable at login", "editor"), tab);
-	m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during the login operations<br>"
+	m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during the login operations. "
 	                                              "i.e. when the logical IRC connection hasn't been established yet.", "editor"));
 
 	gl->addWidget(m_pEnableAtLoginCheck, 2, 0, 1, 4);
 
 	m_pSpecificWindowsCheck = new QCheckBox(__tr2qs_ctx("Enable only in specified windows", "editor"), tab);
 	connect(m_pSpecificWindowsCheck, SIGNAL(toggled(bool)), this, SLOT(specificWindowsCheckToggled(bool)));
-	m_pSpecificWindowsCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled<br>"
-	                                                "only when the active window is of a specified type", "editor"));
+	m_pSpecificWindowsCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+	                                                "the active window is of a specified type", "editor"));
 
 	gl->addWidget(m_pSpecificWindowsCheck, 3, 0, 1, 4);
 
 	m_pWindowConsoleCheck = new QCheckBox(__tr2qs_ctx("Enable in console windows", "editor"), tab);
-	m_pWindowConsoleCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled<br>"
-	                                              "only when the active window is a console", "editor"));
+	m_pWindowConsoleCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+	                                              "the active window is a console", "editor"));
 
 	connect(m_pWindowConsoleCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addWidget(m_pWindowConsoleCheck, 4, 1, 1, 4);
 
 	m_pConsoleOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
-	m_pConsoleOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there<br>"
-	                                                           "are selected users in the active window", "editor"));
+	m_pConsoleOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are"
+	                                                           "selected users in the active window", "editor"));
 
 	gl->addWidget(m_pConsoleOnlyIfUsersSelectedCheck, 5, 1, 1, 4);
 
 	m_pWindowChannelCheck = new QCheckBox(__tr2qs_ctx("Enable in channel windows", "editor"), tab);
-	m_pWindowChannelCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled<br>"
-	                                              "only when the active window is a channel", "editor"));
+	m_pWindowChannelCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when" 
+	                                              "the active window is a channel", "editor"));
 
 	connect(m_pWindowChannelCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addWidget(m_pWindowChannelCheck, 6, 1, 1, 4);
 
 	m_pChannelOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
-	m_pChannelOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there<br>"
-	                                                           "are selected users in the active window", "editor"));
+	m_pChannelOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are "
+	                                                           "selected users in the active window", "editor"));
 
 	gl->addWidget(m_pChannelOnlyIfUsersSelectedCheck, 7, 1, 1, 4);
 
 	m_pWindowQueryCheck = new QCheckBox(__tr2qs_ctx("Enable in query windows", "editor"), tab);
-	m_pWindowQueryCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled<br>"
-	                                            "only when the active window is a query", "editor"));
+	m_pWindowQueryCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+	                                            "the active window is a query", "editor"));
 
 	connect(m_pWindowQueryCheck, SIGNAL(toggled(bool)), this, SLOT(channelQueryOrConsoleWindowCheckToggled(bool)));
 	gl->addWidget(m_pWindowQueryCheck, 8, 1, 1, 4);
 
 	m_pQueryOnlyIfUsersSelectedCheck = new QCheckBox(__tr2qs_ctx("Only if there are selected users", "editor"), tab);
-	m_pQueryOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there<br>"
-	                                                         "are selected users in the active window", "editor"));
+	m_pQueryOnlyIfUsersSelectedCheck->setToolTip(__tr2qs_ctx("This will enable the action only if there are"
+	                                                         "selected users in the active window", "editor"));
 
 	gl->addWidget(m_pQueryOnlyIfUsersSelectedCheck, 9, 1, 1, 4);
 
 	m_pWindowDccChatCheck = new QCheckBox(__tr2qs_ctx("Enable in DCC chat windows", "editor"), tab);
-	m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled<br>"
-	                                              "only when the active window is a DCC chat", "editor"));
+	m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when "
+	                                              "the active window is a DCC chat", "editor"));
 
 	gl->addWidget(m_pWindowDccChatCheck, 10, 1, 1, 4);