aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar wodim2011-03-10 11:07:22 +0000
committerGravatar wodim2011-03-10 11:07:22 +0000
commitae2e8b6751ad799cb2d05803e36f1fd0992cc0cf (patch)
treef76c36a0281ae6be601ec7ac78c5a1478e6df7c9
parentzlib *IS* required by cmake when compiling under windows (diff)
downloadKVIrc-ae2e8b6751ad799cb2d05803e36f1fd0992cc0cf.tar.gz
KVIrc-ae2e8b6751ad799cb2d05803e36f1fd0992cc0cf.tar.bz2
KVIrc-ae2e8b6751ad799cb2d05803e36f1fd0992cc0cf.zip
add minimal label widths, make network status dialog text copyable under windows
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5562 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--po/modules/options/options_es.po24
-rw-r--r--src/kvirc/ui/KviStatusBar.cpp14
-rw-r--r--src/modules/options/OptionsWidget_ctcp.cpp3
-rw-r--r--src/modules/options/OptionsWidget_dcc.cpp4
-rw-r--r--src/modules/options/OptionsWidget_urlHandlers.cpp6
5 files changed, 29 insertions, 22 deletions
diff --git a/po/modules/options/options_es.po b/po/modules/options/options_es.po
index a7a7e3290..4f9cb123f 100644
--- a/po/modules/options/options_es.po
+++ b/po/modules/options/options_es.po
@@ -116,23 +116,23 @@ msgstr "<b>Nota:</b> Debes reiniciar KVIrc para aplicar un cambio de idioma."
#: src/modules/options/OptionsWidget_urlHandlers.cpp:76
msgid "<b>file://</b> handler command:"
-msgstr "Comando manejador de <b>file://</b>"
+msgstr "Manejador de <b>file://</b>"
#: src/modules/options/OptionsWidget_urlHandlers.cpp:74
msgid "<b>ftp://</b> handler command:"
-msgstr "Comando manejador de <b>ftp://</b>"
+msgstr "Manejador de <b>ftp://</b>"
#: src/modules/options/OptionsWidget_urlHandlers.cpp:72
msgid "<b>http://</b> handler command:"
-msgstr "Comando manejador de <b>http://</b>"
+msgstr "Manejador de <b>http://</b>"
#: src/modules/options/OptionsWidget_urlHandlers.cpp:73
msgid "<b>https://</b> handler command:"
-msgstr "Comando manejador de <b>https://</b>"
+msgstr "Manejador de <b>https://</b>"
#: src/modules/options/OptionsWidget_urlHandlers.cpp:75
msgid "<b>mailto:</b> handler command:"
-msgstr "Comando manejador de <b>mailto:</b>"
+msgstr "Manejador de <b>mailto:</b>"
#: src/modules/options/OptionsWidget_ctcp.cpp:39
msgid ""
@@ -2843,9 +2843,7 @@ msgstr "Resaltar siempre los mensajes que contengan mi nick"
#: src/modules/options/OptionsWidget_alertsAndHighlighting.cpp:79
msgid "Highlight only whole words splitting on space and on:"
-msgstr ""
-"Resaltar sólo palabras completas usando el espacio y los siguientes "
-"separadores de palabras:"
+msgstr "Resaltar sólo palabras completas separadas por espacios y:"
#: src/modules/options/OptionsWidget_sound.cpp:340
msgid "Highlighted message in inactive window"
@@ -3630,7 +3628,7 @@ msgstr "Opacidad de la ventana padre:"
#: src/modules/options/OptionsWidget_identity.cpp:663
msgid "Part message:"
-msgstr "Mensaje de salida de canal:"
+msgstr "Salida de canal:"
#: src/modules/options/OptionsWidget_proxy.cpp:120
#: src/modules/options/OptionsWidget_servers.cpp:152
@@ -3875,7 +3873,7 @@ msgstr "Discreto"
#: src/modules/options/OptionsWidget_identity.cpp:669
msgid "Quit message:"
-msgstr "Mensaje de salida de IRC:"
+msgstr "Salida del IRC:"
#: src/modules/options/OptionsWidget_mediaTypes.cpp:139
msgid "Re&move"
@@ -3985,7 +3983,7 @@ msgstr "Autenticación SASL"
#: src/modules/options/OptionsWidget_ctcpFloodProtection.cpp:102
msgid "SOURCE"
-msgstr "FUENTE"
+msgstr "SOURCE"
#: src/modules/options/OptionsWidget_connection.h:60
msgid "SSL"
@@ -4692,7 +4690,7 @@ msgstr "No se pudo escribir información del idioma a"
#: src/modules/options/OptionsWidget_urlHandlers.cpp:77
msgid "Unknown protocol handler command:"
-msgstr "Comando manejador de protocolos desconocidos:"
+msgstr "Manejador de otros protocolos:"
#: src/modules/options/OptionsWidget_servers.cpp:1681
msgid "UnknownNet"
@@ -5205,4 +5203,4 @@ msgstr "lista,usuarios,canal"
#: src/modules/options/OptionsWidget_ctcpFloodProtection.cpp:91
msgid "within:"
-msgstr "cada:" \ No newline at end of file
+msgstr "cada:"
diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp
index ce44ead3b..de6c61c23 100644
--- a/src/kvirc/ui/KviStatusBar.cpp
+++ b/src/kvirc/ui/KviStatusBar.cpp
@@ -555,31 +555,31 @@ void KviStatusBar::mouseDoubleClickEvent(QMouseEvent *)
szText += __tr2qs("Network");
szText += ": ";
szText += c->connection()->currentNetworkName();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Server");
szText += ": ";
szText += c->connection()->currentServerName();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Nickname");
szText += ": ";
szText += c->connection()->userInfo()->nickName();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Username");
szText += ": ";
szText += c->connection()->userInfo()->userName();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Hostname");
szText += ": ";
szText += c->connection()->userInfo()->hostName();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Local IP");
szText += ": ";
szText += c->connection()->userInfo()->localHostIp();
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("User Modes");
szText += ": ";
szText += szUserModes;
- szText += "<br>";
+ szText += "\n";
szText += __tr2qs("Away");
szText += ": ";
szText += szAway;
diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index 47b381c70..248eba781 100644
--- a/src/modules/options/OptionsWidget_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -45,11 +45,13 @@ OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent)
KviTalGroupBox *gs = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("CTCP Replies","options"));
KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:","options"),KviOption_stringCtcpVersionPostfix);
+ s->setMinimumLabelWidth(200);
mergeTip(s,
__tr2qs_ctx("<center>This text will be appended to the CTCP VERSION reply.<br>For example, you can place a script name here.</center>","options"));
s = addStringSelector(gs, __tr2qs_ctx("Append to SOURCE reply:","options"),KviOption_stringCtcpSourcePostfix);
+ s->setMinimumLabelWidth(200);
mergeTip(s,
__tr2qs_ctx("<center>This text will be appended to the CTCP SOURCE reply.<br>For example, you can place the source URL for a script here.</center>","options"));
@@ -60,6 +62,7 @@ OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent)
// __tr2qs_ctx("<center>This is the CTCP USERINFO reply.<br>It can contain some information about yourself.</center>","options"));
s = addStringSelector(gs, __tr2qs_ctx("PAGE reply:","options"),KviOption_stringCtcpPageReply);
+ s->setMinimumLabelWidth(200);
mergeTip(s,
__tr2qs_ctx("<center>This is the CTCP PAGE reply.<br>It should contain some sort of acknowledgement for CTCP PAGE messages.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index bfeede363..585d5b6ab 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -354,8 +354,8 @@ OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p)
addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex);
addBoolSelector(0,3,0,3,__tr2qs_ctx("Volume slider controls PCM, not Master","options"), KviOption_boolDccVoiceVolumeSliderControlsPCM);
- addStringSelector(0,4,0,4,__tr2qs_ctx("Sound device:","options"), KviOption_stringDccVoiceSoundDevice);
- addStringSelector(0,5,0,5,__tr2qs_ctx("Mixer device:","options"), KviOption_stringDccVoiceMixerDevice);
+ addStringSelector(0,4,0,4,__tr2qs_ctx("Sound device:","options"), KviOption_stringDccVoiceSoundDevice)->setMinimumLabelWidth(150);
+ addStringSelector(0,5,0,5,__tr2qs_ctx("Mixer device:","options"), KviOption_stringDccVoiceMixerDevice)->setMinimumLabelWidth(150);
KviUIntSelector * u = addUIntSelector(0,6,0,6,__tr2qs_ctx("Pre-buffer size:","options"), KviOption_uintDccVoicePreBufferSize, 2048, 65536, 32000);
u->setSuffix(" bytes");
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index 6651125e9..54bb2f311 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -70,11 +70,17 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
#endif
m_pHttpHandler=addStringSelector(gbox,__tr2qs_ctx("<b>http://</b> handler command:","options"),KviOption_stringUrlHttpCommand);
+ m_pHttpHandler->setMinimumLabelWidth(225);
m_pHttpsHandler=addStringSelector(gbox,__tr2qs_ctx("<b>https://</b> handler command:","options"),KviOption_stringUrlHttpsCommand);
+ m_pHttpsHandler->setMinimumLabelWidth(225);
m_pFtpHandler=addStringSelector(gbox,__tr2qs_ctx("<b>ftp://</b> handler command:","options"),KviOption_stringUrlFtpCommand);
+ m_pFtpHandler->setMinimumLabelWidth(225);
m_pMailtoHandler=addStringSelector(gbox,__tr2qs_ctx("<b>mailto:</b> handler command:","options"),KviOption_stringUrlMailtoCommand);
+ m_pMailtoHandler->setMinimumLabelWidth(225);
m_pFileHandler=addStringSelector(gbox,__tr2qs_ctx("<b>file://</b> handler command:","options"),KviOption_stringUrlFileCommand);
+ m_pFileHandler->setMinimumLabelWidth(225);
m_pOtherHandler=addStringSelector(gbox,__tr2qs_ctx("Unknown protocol handler command:","options"),KviOption_stringUrlUnknownCommand);
+ m_pOtherHandler->setMinimumLabelWidth(225);
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
m_pHttpHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers));