AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplified About dialog

Browse Source 
FossilOrigin-Name: e5adb715a5bbbce1fc488d7802c2367120c3007f
This commit is contained in:
Kostas 2015-08-13 11:39:09 +00:00
parent 65dd35a592
commit 623a6ad297
4 changed files with 80 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C -\sReimplemented\sthe\sabout\sdialog\n-\sAdded\slicenses\sfor\sexternal\slibraries\n-\sTranslators\sand\slicense\stext\snow\slive\sin\sseparate\sresource\sfiles\n C Simplified\sAbout\sdialog
D 2015-08-13T11:16:53.424 D 2015-08-13T11:39:09.217
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -211,7 +211,7 @@ F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038 F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
F rsrc/resources.qrc 21ae6205e27ac989001eb0edc075d7e405b992c8 F rsrc/resources.qrc 21ae6205e27ac989001eb0edc075d7e405b992c8
F src/AboutDialog.cpp b5ba08d7707552356c287f7274f55f89cf32557e F src/AboutDialog.cpp fc9e3ba03aa6cb145ace610d9b38a2de157551ba
F src/AboutDialog.h 269f3a0589067c08f19b542e4576b0ef58bc6ec5 F src/AboutDialog.h 269f3a0589067c08f19b542e4576b0ef58bc6ec5
F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
@ -250,7 +250,7 @@ F src/Workspace.h 842c195cf830422f2066c7190156e7c8b82a93a1
F src/main.cpp d8c65ea5e54102e4989fef9fd8cfd4f13ef8a8f0 F src/main.cpp d8c65ea5e54102e4989fef9fd8cfd4f13ef8a8f0
F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
F ui/AboutDialog.ui 96b9105409325ab977d4c6754fb05aef06a5050b F ui/AboutDialog.ui 26109b7e85445d164089e5958e4901cc50c06ed0
F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f F ui/BrowserWidget.ui 994ad9ea0e9f5815d6b1a27acc2f6f39164c507f
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712 F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199 F ui/CommitDialog.ui 1e5dafa742e9ae07ec937bcda8cda3297ddc6199
@ -260,7 +260,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043
F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
P 2c93f1713207d90729d6d1f105560bc0a24e365b P 8b95a9008769c1082936f3083d65428c262385db
R 0665a31eba11e051d35b7b46216dd3d2 R 91454ed4fd7301cbdca79e4edbeb9e55
U Kostas U Kostas
Z 88f3e4c9ada968acf4416e29621a6af2 Z 415a4eb7f15fa7d4eb2ceaa4883ed4f9

2
manifest.uuid
View File

@ -1 +1 @@
8b95a9008769c1082936f3083d65428c262385db e5adb715a5bbbce1fc488d7802c2367120c3007f

13
src/AboutDialog.cpp
View File

@ -7,25 +7,32 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &fossilVersion) :
ui(new Ui::AboutDialog) ui(new Ui::AboutDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->lblApp->setText(QCoreApplication::applicationName() + " "+ QCoreApplication::applicationVersion()); QString banner(QCoreApplication::applicationName() + " " + QCoreApplication::applicationVersion());
ui->lblBanner->setText(banner + "\n" + ui->lblBanner->text());
ui->lblQtVersion->setText(tr("QT version %0").arg(QT_VERSION_STR)); ui->lblQtVersion->setText(tr("QT version %0").arg(QT_VERSION_STR));
if(!fossilVersion.isEmpty()) if(!fossilVersion.isEmpty())
ui->lblFossilVersion->setText(tr("Fossil version %0").arg(fossilVersion)); ui->lblFossilVersion->setText(tr("Fossil version %0").arg(fossilVersion));
QString additional;
QFile ftrans(":/docs/docs/Translators.txt"); QFile ftrans(":/docs/docs/Translators.txt");
if(ftrans.open(QFile::ReadOnly)) if(ftrans.open(QFile::ReadOnly))
{ {
ui->txtTranslators->setText(ftrans.readAll()); additional.append(tr("Translations with the help of:")+"\n");
additional.append(ftrans.readAll());
additional.append("\n\n");
ftrans.close(); ftrans.close();
} }
QFile flicenses(":/docs/docs/Licenses.txt"); QFile flicenses(":/docs/docs/Licenses.txt");
if(flicenses.open(QFile::ReadOnly)) if(flicenses.open(QFile::ReadOnly))
{ {
ui->txtLicenses->setText(flicenses.readAll()); additional.append(tr("This sofware uses the following open-source libraries and assets:")+"\n");
additional.append(flicenses.readAll());
flicenses.close(); flicenses.close();
} }
ui->txtAdditional->setText(additional);
} }
AboutDialog::~AboutDialog() AboutDialog::~AboutDialog()

170
ui/AboutDialog.ui
View File

@ -7,120 +7,74 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>577</width> <width>577</width>
<height>434</height> <height>379</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>About Fuel...</string> <string>About Fuel...</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QFormLayout" name="formLayout">
<item> <item row="0" column="0">
<layout class="QFormLayout" name="formLayout"> <widget class="QLabel" name="lblIcon">
<item row="0" column="0"> <property name="maximumSize">
<widget class="QLabel" name="lblIcon"> <size>
<property name="maximumSize"> <width>64</width>
<size> <height>64</height>
<width>64</width> </size>
<height>64</height> </property>
</size> <property name="text">
</property> <string notr="true"/>
<property name="text"> </property>
<string notr="true"/> <property name="pixmap">
</property> <pixmap resource="../rsrc/resources.qrc">:/icons/icon-application</pixmap>
<property name="pixmap"> </property>
<pixmap resource="../rsrc/resources.qrc">:/icons/icon-application</pixmap> <property name="scaledContents">
</property> <bool>true</bool>
<property name="scaledContents"> </property>
<bool>true</bool> <property name="alignment">
</property> <set>Qt::AlignHCenter|Qt::AlignTop</set>
<property name="alignment"> </property>
<set>Qt::AlignHCenter|Qt::AlignTop</set> </widget>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="lblApp">
<property name="text">
<string notr="true">APPNAME VERSION</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>a GUI frontend to the Fossil SCM
by Kostas Karanikolas
Released under the GNU GPL</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblFossilVersion">
<property name="text">
<string notr="true">FOSSIL VERSION</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblQtVersion">
<property name="text">
<string notr="true">QT VERSION</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string notr="true">Translations with the help of:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QTextEdit" name="txtTranslators">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string notr="true">This sofware uses the following open source libraries and assets:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QTextEdit" name="txtLicenses">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLabel" name="lblBanner">
<property name="text">
<string>A GUI front-end for the Fossil SCM by Kostas Karanikolas
Released under the GNU GPL</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblFossilVersion">
<property name="text">
<string notr="true">FOSSIL VERSION</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="lblQtVersion">
<property name="text">
<string notr="true">QT VERSION</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QTextEdit" name="txtAdditional">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>