Skip to content

Commit 8df2d78

Browse files
committed
0.1.3
1 parent 7ceb350 commit 8df2d78

File tree

10 files changed

+13
-41
lines changed

10 files changed

+13
-41
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# plainAbout
22

33
About plainDE window. <br><br>
4-
<img src="aboutscr.png" width=400 height=266>
4+
<img src="scr_about.png" width=400 height=266>

about.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,14 @@ about::about(QWidget *parent)
2929
ui->setupUi(this);
3030

3131
this->setWindowTitle("About plainDE");
32-
ui->versionLabel->setText("0.1.2a");
32+
ui->versionLabel->setText("0.1.3");
33+
34+
ui->logoLabel->setPixmap(QPixmap("/usr/share/plainDE/menuIcon.png"));
3335

3436
readConfig();
3537

36-
QString stylesheetPath;
37-
if (config["theme"].toString() == "light") {
38-
stylesheetPath = ":/assets/light.qss";
39-
}
40-
else {
41-
stylesheetPath = ":/assets/dark.qss";
42-
}
38+
QString stylesheetPath = "/usr/share/plainDE/styles/" + config["theme"].toString();
39+
4340
QFile stylesheetReader(stylesheetPath);
4441
stylesheetReader.open(QIODevice::ReadOnly | QIODevice::Text);
4542
QTextStream styleSheet(&stylesheetReader);

about.ui

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<string/>
8484
</property>
8585
<property name="pixmap">
86-
<pixmap resource="assets.qrc">:/assets/logo.png</pixmap>
86+
<pixmap>:/assets/logo.png</pixmap>
8787
</property>
8888
<property name="scaledContents">
8989
<bool>true</bool>
@@ -104,10 +104,10 @@ p, li { white-space: pre-wrap; }
104104
hr { height: 1px; border-width: 0; }
105105
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
106106
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;plainDE was brought to you by &lt;span style=&quot; font-weight:700;&quot;&gt;thm-unix&lt;/span&gt; and &lt;span style=&quot; font-weight:700;&quot;&gt;ivabus&lt;/span&gt;.&lt;/p&gt;
107-
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Found bug/want to help us/have an idea?&lt;br /&gt;Contact us at &lt;a href=&quot;mailto:segfault@plainde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;segfault@plainde.org&lt;/span&gt;&lt;/a&gt; or via GitHub Issues.&lt;/p&gt;
108-
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://plainde.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://plainde.org/&lt;br /&gt;&lt;/span&gt;&lt;/a&gt;&lt;a href=&quot;https://github.com/plainde/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/plainde/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
109-
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/thm-unix/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/thm-unix/&lt;br /&gt;&lt;/span&gt;&lt;/a&gt;&lt;a href=&quot;https://github.com/ivabus/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/ivabus/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
110-
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Learn more about GNU General Public License v3...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
107+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Found bug/want to help us/have an idea?&lt;br /&gt;Contact us at &lt;a href=&quot;mailto:segfault@plainde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;segfault@plainde.org&lt;/span&gt;&lt;/a&gt; or via GitHub Issues.&lt;/p&gt;
108+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://plainde.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;https://plainde.org/&lt;/span&gt;&lt;/a&gt;&lt;a href=&quot;https://plainde.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/a&gt;&lt;a href=&quot;https://github.com/plainde/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;https://github.com/plainde/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
109+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/thm-unix/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;https://github.com/thm-unix/&lt;br /&gt;&lt;/span&gt;&lt;/a&gt;&lt;a href=&quot;https://github.com/ivabus/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;https://github.com/ivabus/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
110+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#378edf;&quot;&gt;Learn more about GNU General Public License v3...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
111111
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;2022&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
112112
</property>
113113
<property name="textInteractionFlags">
@@ -141,9 +141,7 @@ hr { height: 1px; border-width: 0; }
141141
</item>
142142
</layout>
143143
</widget>
144-
<resources>
145-
<include location="assets.qrc"/>
146-
</resources>
144+
<resources/>
147145
<connections>
148146
<connection>
149147
<sender>okPushButton</sender>

aboutscr.png

-88.1 KB
Binary file not shown.

assets.qrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

dark.qss

Lines changed: 0 additions & 12 deletions
This file was deleted.

light.qss

Lines changed: 0 additions & 3 deletions
This file was deleted.

logo.png

-156 KB
Binary file not shown.

plainAbout.pro

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ qnx: target.path = /tmp/$${TARGET}/bin
2323
else: unix:!android: target.path = /opt/$${TARGET}/bin
2424
!isEmpty(target.path): INSTALLS += target
2525

26-
RESOURCES += \
27-
assets.qrc
26+
RESOURCES +=

scr_about.png

93.8 KB
Loading

0 commit comments

Comments
 (0)