Changeset 5114

Timestamp:

08/08/07 05:40:39 (16 months ago)

Author:

eugene

Message:

Replicated r5113 from qt4_gui.

Location:

trunk/qt-gui/src

Files:

• mainwin.cpp (modified) (2 diffs)
• optionsdlg.cpp (modified) (1 diff)

trunk/qt-gui/src/mainwin.cpp

@@ -697 +697 @@
                     "<li><tt>%L - </tt>local time</li>"
                     "<li><tt>%m - </tt># pending messages</li>"
+                    "<li><tt>%M - </tt># pending messages (if any)</li>"
                     "<li><tt>%n - </tt>full name</li>"
                     "<li><tt>%o - </tt>last seen online</li>"
@@ -4958 +4959 @@
     "   For example in the send tab of the user function window.</li>"
     "<li>Here is the complete list of user % options, which can be used in <b>OnEvent</b>"
-    "   parameters, <b>auto responses</b>, and <b>utilities</b>:\n") + gMainWindow->usprintfHelp +
+    "   parameters, <b>auto responses</b>, and <b>utilities</b>:") + gMainWindow->usprintfHelp +
                    "</li></ul>" + tr(
     "<hr><p> For more information, see the Licq webpage (<tt>http://www.licq.org</tt>).</p>");

trunk/qt-gui/src/optionsdlg.cpp

@@ -1361 +1361 @@
   QWhatsThis::add(lblColFormat, QStyleSheet::convertFromPlainText(tr("The format string used to define what will "
                                    "appear in each column.\n"
-                                   "The following parameters can be used:\n")) + gMainWindow->usprintfHelp);
+                                   "The following parameters can be used:")) + gMainWindow->usprintfHelp);
   lblColWidth = new QLabel (tr("Width"), grp);
   QWhatsThis::add(lblColWidth, tr("The width of the column"));