aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar un1versal2016-05-23 00:28:35 +0100
committerGravatar un1versal2016-05-23 02:54:26 +0100
commit7eb4cd4388bb80824faefb385eff79cd6454386a (patch)
treef61164a65651f65461e8a3776c3fc0d98c698ede
parentAdd Cuff-Link to server list. (#1986) (diff)
downloadKVIrc-7eb4cd4388bb80824faefb385eff79cd6454386a.tar.gz
KVIrc-7eb4cd4388bb80824faefb385eff79cd6454386a.tar.bz2
KVIrc-7eb4cd4388bb80824faefb385eff79cd6454386a.zip
various: minor tweaks and string fix
Diffstat
-rw-r--r--src/kvirc/ui/KviConsoleWindow.cpp12
-rw-r--r--src/kvirc/ui/KviIrcToolBar.cpp4
-rw-r--r--src/kvirc/ui/KviIrcView_events.cpp33
-rw-r--r--src/kvirc/ui/KviTopicWidget.cpp2
4 files changed, 27 insertions, 24 deletions
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 9f36ad797..dc7cbb97e 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -259,7 +259,7 @@ void KviConsoleWindow::getUserTipText(const QString & nick, KviIrcUserEntry * e,
static QString bb("<b>");
static QString be("</b>");
static QString cln(":");
- static QString space(' ');
+ static QString space(" ");
static QString tds = "<tr><td style=\"background-color: rgb(48,48,48); white-space: pre; font-weight: bold; color: rgb(255,255,255); padding-left: 5px; padding-right: 5px;\">";
static QString nrs = "<tr><td>";
static QString enr = "</td></tr>";
@@ -320,15 +320,15 @@ void KviConsoleWindow::getUserTipText(const QString & nick, KviIrcUserEntry * e,
buffer += __tr2qs("Registered as");
buffer += cln + space + bb;
buffer += KviQString::toHtmlEscaped(u->user()->name());
- buffer += be + ";" + space;
+ buffer += be + br;
buffer += "Group";
buffer += cln + space + bb;
buffer += KviQString::toHtmlEscaped(u->user()->group());
buffer += be + enr + nrs;
buffer += __tr2qs("Matched by");
- buffer += cln + space + bb + "<font size=\"-1\">";
+ buffer += cln + space + bb;
buffer += KviQString::toHtmlEscaped(mask);
- buffer += "</font>" + be + enr;
+ buffer += be + enr;
}
if(connection())
@@ -452,8 +452,8 @@ void KviConsoleWindow::ircUriChanged(const QString & text)
int iStatus = KviIrcUrl::run(text, KviIrcUrl::CurrentContext, this);
if(iStatus & KviIrcUrl::InvalidProtocol || iStatus & KviIrcUrl::InvalidUrl)
{
- KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or ircs6:// URL's\n"
- "Your URL is invalid. Check spelling and try again"));
+ KviMessageBox::warning(__tr2qs("KVIrc can only recognize irc://, irc6://, ircs:// or ircs6:// URL's\n"
+ "The URL you provided is invalid. Check spelling and try again"));
}
m_pInput->setFocus();
}
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index 4577ac5fb..5d4fdc890 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -214,7 +214,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip, const QPoint &)
static QString bb("<b>");
static QString be("</b>");
static QString cln(":");
- static QString space(' ');
+ static QString space(" ");
static QString nbspc("&nbsp;");
static QString ths = "<html><body><table style=\"white-space: pre\">";
@@ -315,7 +315,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
KviWindow * wnd = g_pActiveWindow;
KviConsoleWindow * c = wnd ? wnd->console() : nullptr;
- static QString space(' ');
+ static QString space(" ");
static QString sprtr("-");
static QString cln(":");
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index f7e4dbc0a..c776aaa47 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -867,6 +867,7 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
static QString br("<br>");
static QString ub("<u>");
static QString ue("</u>");
+ static QString cln(":");
static QString nbspc("&nbsp;");
static QString tdp = "<tr><td style=\"background-color: rgb(245,245,245); white-space: pre; padding-left: 5px; padding-right: 5px;\">";
static QString pre = "<tr><td style=\"white-space: pre; padding-left: 5px; padding-right: 5px;\">";
@@ -892,15 +893,15 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
if(linkText.length() > 50)
{
tip += tdp;
- tip += __tr2qs("URL:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("URL") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText.left(47);
tip += ue + "...";
}
else
{ tip += tdp;
- tip += __tr2qs("URL:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("URL") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText + ue;
}
@@ -928,15 +929,15 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
if(linkText.length() > 50)
{
tip += tdp;
- tip += __tr2qs("Hostname:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("Hostname") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText.left(47);
tip += ue + "...";
}
else
{ tip += tdp;
- tip += __tr2qs("Hostname:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("Hostname") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText + ue;
}
@@ -977,22 +978,24 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
if(linkText.length() > 50)
{
tip += tdp;
- tip += __tr2qs("Server URL:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("Server URL") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText.left(47);
tip += ue + "...";
}
else
{ tip += tdp;
- tip += __tr2qs("Server URL:");
- tip += nbspc + "<font color=\"#0022FF\">" + ub;
+ tip += __tr2qs("Server URL") + cln + nbspc;
+ tip += "<font color=\"#0022FF\">" + ub;
tip += linkText + ue;
}
- tip += "</font>" + pre;
+ tip += "</font>";
if(linkText.indexOf('*') != -1)
{
+ tip += pre;
+
if(linkText.length() > 1)
tip += __tr2qs("Server appears to be a network hub");
else
@@ -1082,7 +1085,7 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
tip += KviQString::toHtmlEscaped(topic) + enr + tdp;
tip += __tr2qs("Channel modes: <b>+%1</b>").arg(KviQString::toHtmlEscaped(chanMode)) + enr + tdp;
tip += __tr2qs("Total users: <b>%1</b>").arg(c->count()) + enr + tdp;
- tip += __tr2qs("IRC URI:") + nbspc;
+ tip += __tr2qs("IRC URI") + cln + nbspc;
tip += "<font color=\"#0022FF\">" + ub + KviQString::toHtmlEscaped(szUrl) + ue + "</font>";
tip += enr;
}
@@ -1091,7 +1094,7 @@ void KviIrcView::doLinkToolTip(const QRect & rct, QString & linkCmd, QString & l
KviIrcUrl::join(szUrl, console()->connection()->target()->server());
szUrl.append(szChan);
- tip += tdp + __tr2qs("IRC URI: ") + nbspc;
+ tip += tdp + __tr2qs("IRC URI") + cln + nbspc;
tip += "<font color=\"#0022FF\">" + ub + KviQString::toHtmlEscaped(szUrl) + ue + "</font>" + enr;
tip += pre;
diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index ea49eb916..bee9492a0 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -379,7 +379,7 @@ void KviTopicWidget::updateToolTip()
static QString bb("<b>");
static QString be("</b>");
static QString cln(":");
- static QString space(' ');
+ static QString space(" ");
static QString tds = "<tr><td style=\"background-color: rgb(48,48,48); white-space: nowrap; font-weight: bold; color: rgb(255,255,255); text-align:center; padding-left: 5px; padding-right: 5px;\">";
static QString snr = "<tr><td style=\"white-space: pre; padding-left: 5px; padding-right: 5px;\">";
static QString nrs = "<tr><td>";
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 12:40:40 +0000