onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 00:19:55 +02:00
Code Issues Releases Wiki Activity

fixes #1881 update About dialog to print version number less prominently

Browse Source
This commit is contained in:
Vadim Kurland
2010-12-30 17:10:36 -08:00
parent 7a485614ae
commit bfdaf10efe
7 changed files with 329 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+4 -5
View File
@@ -4,16 +4,15 @@ FWB_MAJOR_VERSION=4
FWB_MINOR_VERSION=2 FWB_MINOR_VERSION=2
FWB_MICRO_VERSION=0 FWB_MICRO_VERSION=0
# build number is like "nano" version number. Complete version is # build number is like "nano" version number. I am incrementing build
# composed like this: # number during development cycle
# $FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM
#
# I am incrementing build number during development cycle
# #
BUILD_NUM="3425" BUILD_NUM="3425"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
GENERATION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION"
# Data format version # Data format version
FWBUILDER_XML_VERSION=17 FWBUILDER_XML_VERSION=17
VERSION.h
+1
View File
@@ -1 +1,2 @@
#define VERSION "4.2.0.3425" #define VERSION "4.2.0.3425"
#define GENERATION "4.2"
configure.in
+4 -1
View File
@@ -37,7 +37,10 @@ AC_DEFINE_UNQUOTED(FWBUILDER_XML_VERSION, "$FWBUILDER_XML_VERSION")
echo "Creating VERSION.h file..." echo "Creating VERSION.h file..."
echo "#define VERSION \"$VERSION\"" > VERSION.h cat <<EOF > VERSION.h
#define VERSION "$VERSION"
#define GENERATION "$GENERATION"
EOF
dnl try to find QT dnl try to find QT
dnl dnl
src/libgui/FWBAboutDialog.cpp
+5 -3
View File
@@ -35,9 +35,11 @@ FWBAboutDialog::FWBAboutDialog(QWidget *parent): QDialog(parent)
{ {
m_aboutDialog = new Ui::AboutDialog_q; m_aboutDialog = new Ui::AboutDialog_q;
m_aboutDialog->setupUi(this); m_aboutDialog->setupUi(this);
m_aboutDialog->titleLbl->setText(
QString("Firewall Builder v%1").arg(VERSION) ); QString pgm = m_aboutDialog->titleLbl->text();
m_aboutDialog->revLbl->setText(""); m_aboutDialog->titleLbl->setText(pgm.arg(GENERATION));
m_aboutDialog->revLbl->setText(VERSION);
m_aboutDialog->apiLbl->setText(""); m_aboutDialog->apiLbl->setText("");
ABOUT_DLG_BLANKS; ABOUT_DLG_BLANKS;
src/libgui/StartTipDialog.cpp
+3 -4
View File
@@ -57,10 +57,9 @@ StartTipDialog::StartTipDialog(QWidget *parent): QDialog(parent)
m_dialog = new Ui::StartTipDialog_q; m_dialog = new Ui::StartTipDialog_q;
m_dialog->setupUi(this); m_dialog->setupUi(this);
QString pgm = m_dialog->program_name_and_version->text(); QString pgm = m_dialog->program_name->text();
m_dialog->program_name->setText(pgm.arg(GENERATION));
m_dialog->program_name_and_version->setText(pgm.arg(VERSION)); m_dialog->program_version->setText(VERSION);
QString locale = QLocale::system().name(); //"en_US"; QString locale = QLocale::system().name(); //"en_US";
QStringList paths; QStringList paths;
src/libgui/aboutdialog_q.ui
+297 -311
View File
@@ -1,131 +1,132 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialog_q</class> <class>AboutDialog_q</class>
<widget class="QDialog" name="AboutDialog_q" > <widget class="QDialog" name="AboutDialog_q">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>296</width> <width>419</width>
<height>311</height> <height>311</height>
</rect> </rect>
</property> </property>
<property name="palette" > <property name="palette">
<palette> <palette>
<active> <active>
<colorrole role="WindowText" > <colorrole role="WindowText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Button" > <colorrole role="Button">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Light" > <colorrole role="Light">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Midlight" > <colorrole role="Midlight">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Dark" > <colorrole role="Dark">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Mid" > <colorrole role="Mid">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>170</red> <red>170</red>
<green>170</green> <green>170</green>
<blue>170</blue> <blue>170</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Text" > <colorrole role="Text">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="BrightText" > <colorrole role="BrightText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="ButtonText" > <colorrole role="ButtonText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Base" > <colorrole role="Base">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Window" > <colorrole role="Window">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Shadow" > <colorrole role="Shadow">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="AlternateBase" > <colorrole role="AlternateBase">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
@@ -134,117 +135,117 @@
</colorrole> </colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="WindowText" > <colorrole role="WindowText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Button" > <colorrole role="Button">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Light" > <colorrole role="Light">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Midlight" > <colorrole role="Midlight">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Dark" > <colorrole role="Dark">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Mid" > <colorrole role="Mid">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>170</red> <red>170</red>
<green>170</green> <green>170</green>
<blue>170</blue> <blue>170</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Text" > <colorrole role="Text">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="BrightText" > <colorrole role="BrightText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="ButtonText" > <colorrole role="ButtonText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Base" > <colorrole role="Base">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Window" > <colorrole role="Window">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Shadow" > <colorrole role="Shadow">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="AlternateBase" > <colorrole role="AlternateBase">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
@@ -253,117 +254,117 @@
</colorrole> </colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="WindowText" > <colorrole role="WindowText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Button" > <colorrole role="Button">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Light" > <colorrole role="Light">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Midlight" > <colorrole role="Midlight">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Dark" > <colorrole role="Dark">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Mid" > <colorrole role="Mid">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>170</red> <red>170</red>
<green>170</green> <green>170</green>
<blue>170</blue> <blue>170</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Text" > <colorrole role="Text">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="BrightText" > <colorrole role="BrightText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="ButtonText" > <colorrole role="ButtonText">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>127</red> <red>127</red>
<green>127</green> <green>127</green>
<blue>127</blue> <blue>127</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Base" > <colorrole role="Base">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Window" > <colorrole role="Window">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="Shadow" > <colorrole role="Shadow">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="AlternateBase" > <colorrole role="AlternateBase">
<brush brushstyle="SolidPattern" > <brush brushstyle="SolidPattern">
<color alpha="255" > <color alpha="255">
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
@@ -373,30 +374,86 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Firewall Builder</string> <string>Firewall Builder</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon">
<iconset> <iconset>
<normaloff/> <normaloff/>
</iconset> </iconset>
</property> </property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" > <item row="0" column="0" colspan="2">
<number>20</number> <widget class="QLabel" name="titleLbl">
</property> <property name="sizePolicy">
<item row="3" column="0" > <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<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:'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>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="revLbl">
<property name="text">
<string>Revision: </string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="apiLbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Using libfwbuilder API v</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="branding">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@@ -404,17 +461,109 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="9" column="0" > <item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" > <widget class="QLabel" name="copyright">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Copyright 2002-2010 NetCitadel, LLC</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QTextEdit" name="web_site_url">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>20</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>-3</number>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="documentTitle">
<string/>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<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:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.fwbuilder.org&quot;&gt;&lt;span style=&quot; font-family:'Lucida Grande'; font-size:13pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.fwbuilder.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="reg">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="Line" name="line6_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<layout class="QHBoxLayout">
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@@ -423,191 +572,28 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonOk" > <widget class="QPushButton" name="buttonOk">
<property name="text" > <property name="text">
<string>&amp;OK</string> <string>&amp;OK</string>
</property> </property>
<property name="shortcut" > <property name="shortcut">
<string/> <string/>
</property> </property>
<property name="autoDefault" > <property name="autoDefault">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="default" > <property name="default">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0" >
<widget class="QLabel" name="titleLbl" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font" >
<font>
<pointsize>24</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Firewall Builder</string>
</property>
<property name="scaledContents" >
<bool>false</bool>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
<property name="margin" >
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="revLbl" >
<property name="text" >
<string>Revision: </string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="apiLbl" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Using libfwbuilder API v</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="branding" >
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="6" column="0" >
<widget class="QTextEdit" name="web_site_url" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>20</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>32767</width>
<height>20</height>
</size>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth" >
<number>-3</number>
</property>
<property name="verticalScrollBarPolicy" >
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy" >
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="documentTitle" >
<string/>
</property>
<property name="readOnly" >
<bool>true</bool>
</property>
<property name="html" >
<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
&lt;p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;a href="http://www.fwbuilder.org">&lt;span style=" text-decoration: underline; color:#0000ff;">http://www.fwbuilder.org&lt;/span>&lt;/a>&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
<item row="7" column="0" >
<widget class="QLabel" name="reg" >
<property name="text" >
<string/>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="8" column="0" >
<widget class="Line" name="line6_2" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="copyright" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Copyright 2002-2010 NetCitadel, LLC</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<resources> <resources>
<include location="MainRes.qrc" /> <include location="MainRes.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
@@ -616,11 +602,11 @@ p, li { white-space: pre-wrap; }
<receiver>AboutDialog_q</receiver> <receiver>AboutDialog_q</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>20</x> <x>20</x>
<y>20</y> <y>20</y>
</hint> </hint>
src/libgui/starttipdialog_q.ui
+15 -5
View File
@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>527</width> <width>529</width>
<height>403</height> <height>403</height>
</rect> </rect>
</property> </property>
@@ -29,8 +29,8 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="0" column="0" colspan="3">
<widget class="QLabel" name="program_name_and_version"> <widget class="QLabel" name="program_name">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -63,9 +63,12 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="start_tutorial"> <widget class="QLabel" name="program_version">
<property name="text"> <property name="text">
<string>Watch Getting Started Tutorial</string> <string>Version</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@@ -95,6 +98,13 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="1">
<widget class="QPushButton" name="start_tutorial">
<property name="text">
<string>Watch Getting Started Tutorial</string>
</property>
</widget>
</item>
<item row="2" column="2"> <item row="2" column="2">
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">