[kde-doc-english] [trojita] src: GUI: About box: talk about Qt
Jan Kundrát
jkt at kde.org
Thu Jun 30 17:48:51 UTC 2016
Git commit 28fd451c204e2b5b1f1395784bae8f66cb8e3dc2 by Jan Kundrát.
Committed on 20/06/2016 at 18:55.
Pushed by gerrit into branch 'master'.
GUI: About box: talk about Qt
This adds the "Built with Qt" logo, hopefully according to the Qt's
trademark policies outlined in [1].
I don't have any real reason for adding this except being a little bit
bored, and willing to advertise our usage of Qt. So I guess that their
blogpost worked, it managed to get my interest :).
The dimensions and alignments and spacer behavior are altered so that
the end result looks a bit more nicely altogether in my opinion.
[1] http://blog.qt.io/blog/2016/06/20/introducing-new-built-with-qt-logo/
Change-Id: I34c0442ddc95f1adce58bbfda877132fea0d91d9
M +65 -4 src/Gui/AboutDialog.ui
M +2 -0 src/Gui/Window.cpp
M +1 -0 src/icons.qrc
http://commits.kde.org/trojita/28fd451c204e2b5b1f1395784bae8f66cb8e3dc2
diff --git a/src/Gui/AboutDialog.ui b/src/Gui/AboutDialog.ui
index 61af996..78574ca 100644
--- a/src/Gui/AboutDialog.ui
+++ b/src/Gui/AboutDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>623</width>
- <height>264</height>
+ <height>382</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,7 +20,7 @@
<number>10</number>
</property>
<item>
- <layout class="QVBoxLayout" name="leftColumn" stretch="0,1,0">
+ <layout class="QVBoxLayout" name="leftColumn">
<item>
<widget class="QLabel" name="iconLabel">
<property name="sizePolicy">
@@ -32,7 +32,7 @@
<property name="minimumSize">
<size>
<width>144</width>
- <height>120</height>
+ <height>128</height>
</size>
</property>
<property name="pixmap">
@@ -65,7 +65,7 @@
<string notr="true"><a href="http://trojita.flaska.net/">http://trojita.flaska.net/</a></string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
<property name="openExternalLinks">
<bool>true</bool>
@@ -75,6 +75,67 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="spacer1">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="qtLogo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>142</width>
+ <height>34</height>
+ </size>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="../icons.qrc">:/icons/Built_with_Qt_logo_RGB.svg</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="qtVersion">
+ <property name="text">
+ <string notr="true">QtVersion</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
<item>
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index c39f1b4..3c4560a 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -1877,6 +1877,8 @@ void MainWindow::slotShowAboutTrojita()
widget->setAttribute(Qt::WA_DeleteOnClose);
ui.setupUi(widget);
ui.versionLabel->setText(Common::Application::version);
+ ui.qtVersion->setText(QStringLiteral("<a href=\"about-qt\">Qt " QT_VERSION_STR "</a>"));
+ connect(ui.qtVersion, &QLabel::linkActivated, qApp, &QApplication::aboutQt);
std::vector<std::pair<QString, bool>> features;
features.emplace_back(tr("Plugins"),
diff --git a/src/icons.qrc b/src/icons.qrc
index 5a90130..3bf1306 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -82,5 +82,6 @@
<file>icons/breeze/mail-reply-list.svg</file>
<file>icons/breeze/mail-reply-all.svg</file>
<file>icons/breeze/mail-forward.svg</file>
+ <file>icons/Built_with_Qt_logo_RGB.svg</file>
</qresource>
</RCC>
More information about the kde-doc-english
mailing list