From 85eca91a13bc5e51005f07900526c25dd01a2faa Mon Sep 17 00:00:00 2001
From: un1versal
Date: Sun, 15 May 2016 09:08:46 +0100
Subject: Various fixes
---
src/modules/eventeditor/EventEditorWindow.cpp | 2 +-
src/modules/objects/KvsObject_popupMenu.cpp | 2 +-
src/modules/options/OptionsWidget_logging.cpp | 14 +++---
src/modules/options/OptionsWidget_nickserv.cpp | 63 +++++++++++--------------
src/modules/options/OptionsWidget_servers.cpp | 4 +-
src/modules/options/OptionsWidget_textIcons.cpp | 2 +-
6 files changed, 38 insertions(+), 49 deletions(-)
(limited to 'src/modules')
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 63e9c531a..d54d110d3 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -413,7 +413,7 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *)
m_pEditor->setEnabled(false);
QString parms = ((EventEditorEventTreeWidgetItem *)it)->m_szParams;
if(parms.isEmpty())
- parms = __tr2qs_ctx("none", "editor");
+ parms = __tr2qs_ctx("None", "editor");
KviCommandFormatter::indent(parms);
KviCommandFormatter::indent(parms);
QString szTmp = QString(__tr2qs_ctx("\n\nEvent:\n%1\n\nParameters:\n%2", "editor")).arg(((EventEditorEventTreeWidgetItem *)it)->m_szName, parms);
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index f2075ab7c..bf2270590 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -382,7 +382,7 @@ void KvsObject_popupMenu::slothovered(QAction * a)
}
void KvsObject_popupMenu::aboutToDie(QObject * pObject)
{
- qDebug("Removing popup from kvs dict");
+ qDebug("Removing popup from KVS dict");
removeMenuAllActions((QMenu *)pObject);
}
KVSO_CLASS_FUNCTION(popupMenu, highlightedEvent)
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 5ece8dadd..181fa9a04 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -43,23 +43,21 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
addBoolSelector(g, __tr2qs_ctx("Console windows", "options"), KviOption_boolAutoLogConsole);
QWidget * w = addDirectorySelector(0, 1, 0, 1, __tr2qs_ctx("Save logs to folder:", "options"), KviOption_stringLogsPath);
+
mergeTip(w, __tr2qs_ctx("This is the base log directory:
"
- "all the log files will be saved inside this directory",
- "options"));
+ "all the log files will be saved inside this directory", "options"));
w = addStringSelector(0, 2, 0, 2, __tr2qs_ctx("Dynamic subfolder:", "options"), KviOption_stringLogsDynamicPath);
mergeTip(w, __tr2qs_ctx("You can specify a subdirectory where log files will be saved: "
- "use kvs code to create dynamic subfolders.",
- "options"));
+ "use KVS code to create dynamic subfolders.", "options"));
addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Strip message type numbers in logs", "options"), KviOption_boolStripMsgTypeInLogs);
addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Strip colors in logs", "options"), KviOption_boolStripControlCodesInLogs);
KviUIntSelector * us = addUIntSelector(0, 5, 0, 5, __tr2qs_ctx("Auto flush logs every:", "options"), KviOption_uintAutoFlushLogs, 0, 99999, 0);
us->setSuffix(__tr2qs_ctx(" min", "options"));
- mergeTip(us,
- __tr2qs_ctx("Save logs with the current interval.
"
- "Set to 0 to disable this feature",
- "options"));
+
+ mergeTip(us, __tr2qs_ctx("Save logs with the current interval.
"
+ "Set to 0 to disable this feature", "options"));
#ifdef COMPILE_ZLIB_SUPPORT
addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Compress logs", "options"), KviOption_boolGzipLogs);
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 383a371c1..e61f16713 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -59,13 +59,12 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
gl->addWidget(l, 1, 0);
m_pNickServMaskEdit = new QLineEdit(this);
- KviTalToolTip::add(m_pNickServMaskEdit,
- __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. "
- "This usually will be something like NickServ!service@services.dalnet.
"
- "You can use wildcards for this field, but generally it is a security flaw. "
- "If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", "
- "the mask NickServ!*@* may be safe to use in this field.",
- "options"));
+ KviTalToolTip::add(m_pNickServMaskEdit, __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. "
+ "This usually will be something like NickServ!service@services.dalnet.
"
+ "You can use wildcards for this field, but generally it is a security flaw. "
+ "If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", "
+ "the mask NickServ!*@* may be safe to use in this field.", "options"));
+
gl->addWidget(m_pNickServMaskEdit, 1, 1, 1, 3);
// gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3);
@@ -76,24 +75,20 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
gl->addWidget(m_pMessageRegexpEdit, 2, 1, 1, 3);
// gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3);
- KviTalToolTip::add(m_pMessageRegexpEdit,
- __tr2qs_ctx("This is the simple regular expression that the identification request message "
- "from NickServ must match in order to be correctly recognized.
"
- "The message is usually something like \"To identify yourself please use /ns IDENTIFY password\" "
- "and it is sent when the NickServ wants you to authenticate yourself. "
- "You can use the * and ? wildcards.",
- "options"));
+ KviTalToolTip::add(m_pMessageRegexpEdit, __tr2qs_ctx("This is the simple regular expression that the identification request message "
+ "from NickServ must match in order to be correctly recognized.
"
+ "The message is usually something like \"To identify yourself please use /ns IDENTIFY password\" "
+ "and it is sent when the NickServ wants you to authenticate yourself. "
+ "You can use the * and ? wildcards.", "options"));
l = new QLabel(__tr2qs_ctx("Identify command:", "options"), this);
gl->addWidget(l, 3, 0);
m_pIdentifyCommandEdit = new QLineEdit(this);
- KviTalToolTip::add(m_pIdentifyCommandEdit,
- __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication "
- "for the nickname described in this rule (if the both server and NickServ mask are matched). "
- "This usually will be something like msg NickServ identify <yourpassword>.
"
- "You can use msg -q if you don't want the password echoed on the screen. "
- "Please note that there is no leading slash in this command.",
- "options"));
+ KviTalToolTip::add(m_pIdentifyCommandEdit, __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication "
+ "for the nickname described in this rule (if the both server and NickServ mask are matched). "
+ "This usually will be something like msg NickServ identify <yourpassword>.
"
+ "You can use msg -q if you don't want the password echoed on the screen. "
+ "Please note that there is no leading slash in this command.", "options"));
gl->addWidget(m_pIdentifyCommandEdit, 3, 1, 1, 3);
// gl->addMultiCellWidget(m_pIdentifyCommandEdit,3,3,1,3);
@@ -105,10 +100,9 @@ NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField)
gl->addWidget(l, 4, 0);
m_pServerMaskEdit = new QLineEdit(this);
- KviTalToolTip::add(m_pServerMaskEdit,
- __tr2qs_ctx("This is the mask that the current server must match in order "
- "for this rule to apply. It can contain * and ? wildcards.
Do NOT use simply \"*\" here...",
- "options"));
+ KviTalToolTip::add(m_pServerMaskEdit, __tr2qs_ctx("This is the mask that the current server must match in order "
+ "for this rule to apply. It can contain * and ? wildcards.
Do NOT use simply \"*\" here...", "options"));
+
gl->addWidget(m_pServerMaskEdit, 4, 1, 1, 3);
// gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3);
iNextLine++;
@@ -250,17 +244,14 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent)
gl->addWidget(m_pNickServTreeWidget, 1, 0, 1, 3);
// gl->addMultiCellWidget(m_pNickServTreeWidget,1,1,0,2);
- KviTalToolTip::add(m_pNickServTreeWidget,
- __tr2qs_ctx("This is a list of NickServ identification rules. "
- "KVIrc will use them to model its automatic interaction with NickServ on all the networks.
"
- "Please be aware that this feature can cause your NickServ passwords to be stolen "
- "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
"
- "In other words, be sure to know what you're doing.
"
- "Also note that the password that you provide is stored as PLAIN TEXT.
"
- "KVIrc supports also per-network NickServ authentication rules that can be "
- "created in the \"Advanced...\" network options (accessible from the servers dialog)."
- "",
- "options"));
+ KviTalToolTip::add(m_pNickServTreeWidget, __tr2qs_ctx("This is a list of NickServ identification rules. "
+ "KVIrc will use them to model its automatic interaction with NickServ on all the networks.
"
+ "Please be aware that this feature can cause your NickServ passwords to be stolen "
+ "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
"
+ "In other words, be sure to know what you're doing.
"
+ "Also note that the password that you provide is stored as PLAIN TEXT.
"
+ "KVIrc supports also per-network NickServ authentication rules that can be "
+ "created in the \"Advanced...\" network options (accessible from the servers dialog).", "options"));
m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule", "options"), this);
connect(m_pAddRuleButton, SIGNAL(clicked()), this, SLOT(addNickServRule()));
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 61986a754..c4219ff10 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1343,14 +1343,14 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
m_pFavoriteServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ServerFavorite))));
m_pFavoriteServerButton->setAutoRaise(true);
connect(m_pFavoriteServerButton, SIGNAL(clicked()), this, SLOT(favoriteServer()));
- KviTalToolTip::add(m_pFavoriteServerButton, __tr2qs_ctx("Favorite/Unfavorite server", "options"));
+ KviTalToolTip::add(m_pFavoriteServerButton, __tr2qs_ctx("Favorite / Unfavorite server", "options"));
m_pRemoveButton = new QToolButton(vbox);
m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove))));
m_pRemoveButton->setEnabled(false);
m_pRemoveButton->setAutoRaise(true);
connect(m_pRemoveButton, SIGNAL(clicked()), this, SLOT(removeCurrent()));
- KviTalToolTip::add(m_pRemoveButton, __tr2qs_ctx("Remove network/server", "options"));
+ KviTalToolTip::add(m_pRemoveButton, __tr2qs_ctx("Remove network / server", "options"));
m_pCopyServerButton = new QToolButton(vbox);
m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Copy))));
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index 5d3c84b19..05235a59a 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -87,7 +87,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
m_pTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
mergeTip(m_pTable->viewport(), __tr2qs_ctx("This table contains the text icon associations.
"
- "KVIrc will use them to display the CTRL+I escape sequences "
+ "KVIrc will use them to display the Ctrl+I escape sequences "
"and eventually the emoticons.", "options"));
layout()->addWidget(m_pTable, 0, 0, 1, 3);
--
cgit v1.3.1-10-gc9f91