[fwbuilder-commits] r3114 - in branches/v4_0: . doc src/gui

[<va...@in...>]

Author: vadim
Date: 2010-07-20 15:19:08 -0700 (Tue, 20 Jul 2010)
New Revision: 3114

Modified:
   branches/v4_0/build_num
   branches/v4_0/doc/ChangeLog
   branches/v4_0/src/gui/StartTipDialog.cpp
   branches/v4_0/src/gui/starttipdialog_q.ui
Log:
fixed #1603 Welcome dialog should show full version of the program

Modified: branches/v4_0/build_num
===================================================================
--- branches/v4_0/build_num	2010-07-20 18:02:45 UTC (rev 3113)
+++ branches/v4_0/build_num	2010-07-20 22:19:08 UTC (rev 3114)
@@ -1 +1 @@
-#define BUILD_NUM 3112
+#define BUILD_NUM 3113

Modified: branches/v4_0/doc/ChangeLog
===================================================================
--- branches/v4_0/doc/ChangeLog	2010-07-20 18:02:45 UTC (rev 3113)
+++ branches/v4_0/doc/ChangeLog	2010-07-20 22:19:08 UTC (rev 3114)
@@ -1,5 +1,8 @@
 2010-07-20  Vadim Kurland  <va...@vk...>
 
+	* StartTipDialog.cpp (StartTipDialog::StartTipDialog): fixed #1603
+	"Welcome dialog should show full version of the program".
+
 	* set version to 4.1.0 and version of the data file format to
 	"17". Data files need to be upgraded. Upgrade script changes the
 	version and makes sure Standard objects library is read-only. Some

Modified: branches/v4_0/src/gui/StartTipDialog.cpp
===================================================================
--- branches/v4_0/src/gui/StartTipDialog.cpp	2010-07-20 18:02:45 UTC (rev 3113)
+++ branches/v4_0/src/gui/StartTipDialog.cpp	2010-07-20 22:19:08 UTC (rev 3114)
@@ -56,6 +56,11 @@
     m_dialog = new Ui::StartTipDialog_q;
     m_dialog->setupUi(this);
 
+    QString pgm = m_dialog->program_name_and_version->text();
+
+    m_dialog->program_name_and_version->setText(pgm.arg(VERSION));
+
+
     QString locale = QLocale::system().name(); //"en_US";
     QStringList paths;
     paths.append(QString(respath.c_str()) + "/help/" + locale);

Modified: branches/v4_0/src/gui/starttipdialog_q.ui
===================================================================
--- branches/v4_0/src/gui/starttipdialog_q.ui	2010-07-20 18:02:45 UTC (rev 3113)
+++ branches/v4_0/src/gui/starttipdialog_q.ui	2010-07-20 22:19:08 UTC (rev 3114)
@@ -30,7 +30,7 @@
    <item row="0" column="1">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="1">
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="program_name_and_version">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -41,8 +41,8 @@
         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:28pt;&quot;&gt;Firewall Builder 4&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:28pt;&quot;&gt;Firewall Builder %1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>