diff options
author | Petr Mrázek <peterix@gmail.com> | 2018-03-28 00:51:24 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2018-03-28 00:51:24 +0200 |
commit | 1ef416cb5609bf33e9b67952feb7c182ae807e2f (patch) | |
tree | 3ff4db2bafbe2d46193284aa3b1d3565a42f34a5 | |
parent | b46a34d0aeda613a3c0b8eb8206c39a5dd45aef3 (diff) | |
download | MultiMC-1ef416cb5609bf33e9b67952feb7c182ae807e2f.tar MultiMC-1ef416cb5609bf33e9b67952feb7c182ae807e2f.tar.gz MultiMC-1ef416cb5609bf33e9b67952feb7c182ae807e2f.tar.lz MultiMC-1ef416cb5609bf33e9b67952feb7c182ae807e2f.tar.xz MultiMC-1ef416cb5609bf33e9b67952feb7c182ae807e2f.zip |
NOISSUE add pointless fun things, because.
-rw-r--r-- | application/CMakeLists.txt | 1 | ||||
-rw-r--r-- | application/main.cpp | 1 | ||||
-rw-r--r-- | application/pages/modplatform/TechnicPage.ui | 69 | ||||
-rw-r--r-- | application/pages/modplatform/TwitchPage.ui | 27 | ||||
-rw-r--r-- | application/resources/assets/assets.qrc | 7 | ||||
-rw-r--r-- | application/resources/assets/deadglitch.svg | 66 | ||||
-rw-r--r-- | application/resources/assets/underconstruction.png | bin | 0 -> 14490 bytes |
7 files changed, 149 insertions, 22 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 5eeca240..0ffe9267 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -271,6 +271,7 @@ SET(MULTIMC_UIS ) set(MULTIMC_QRCS + resources/assets/assets.qrc resources/backgrounds/backgrounds.qrc resources/multimc/multimc.qrc resources/pe_dark/pe_dark.qrc diff --git a/application/main.cpp b/application/main.cpp index ade05faf..2f90f2b3 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -42,6 +42,7 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(multimc); Q_INIT_RESOURCE(backgrounds); + Q_INIT_RESOURCE(assets); Q_INIT_RESOURCE(pe_dark); Q_INIT_RESOURCE(pe_light); diff --git a/application/pages/modplatform/TechnicPage.ui b/application/pages/modplatform/TechnicPage.ui index 6bb6e9e0..702427b5 100644 --- a/application/pages/modplatform/TechnicPage.ui +++ b/application/pages/modplatform/TechnicPage.ui @@ -24,14 +24,30 @@ <number>0</number> </property> <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QLabel" name="label"> <property name="font"> <font> <pointsize>40</pointsize> </font> </property> + <property name="styleSheet"> + <string notr="true">color:#ffc000</string> + </property> <property name="text"> - <string notr="true">¯\_(ツ)_/¯ </string> + <string notr="true">UNDER</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> @@ -41,8 +57,57 @@ </property> </widget> </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string notr="true"/> + </property> + <property name="pixmap"> + <pixmap resource="../../resources/assets/assets.qrc">:/assets/underconstruction</pixmap> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="font"> + <font> + <pointsize>40</pointsize> + </font> + </property> + <property name="styleSheet"> + <string notr="true">color:#7ca32b</string> + </property> + <property name="text"> + <string notr="true">CONSTRUCTION</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> - <resources/> + <resources> + <include location="../../resources/assets/assets.qrc"/> + </resources> <connections/> </ui> diff --git a/application/pages/modplatform/TwitchPage.ui b/application/pages/modplatform/TwitchPage.ui index 19178505..0930f541 100644 --- a/application/pages/modplatform/TwitchPage.ui +++ b/application/pages/modplatform/TwitchPage.ui @@ -10,31 +10,16 @@ <height>405</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="label_3"> <property name="font"> <font> <pointsize>40</pointsize> </font> </property> - <property name="text"> - <string notr="true">¯\_(ツ)_/¯ </string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> + <property name="pixmap"> + <pixmap resource="../../resources/assets/assets.qrc">:/assets/deadglitch</pixmap> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -43,6 +28,8 @@ </item> </layout> </widget> - <resources/> + <resources> + <include location="../../resources/assets/assets.qrc"/> + </resources> <connections/> </ui> diff --git a/application/resources/assets/assets.qrc b/application/resources/assets/assets.qrc new file mode 100644 index 00000000..8d213387 --- /dev/null +++ b/application/resources/assets/assets.qrc @@ -0,0 +1,7 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource prefix="/assets"> + <file alias="underconstruction">underconstruction.png</file> + <file alias="deadglitch">deadglitch.svg</file> + </qresource> +</RCC> diff --git a/application/resources/assets/deadglitch.svg b/application/resources/assets/deadglitch.svg new file mode 100644 index 00000000..5682b8a3 --- /dev/null +++ b/application/resources/assets/deadglitch.svg @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + class="tw-svg__asset tw-svg__asset--deadglitch tw-svg__asset--inherit" + width="92px" + height="96px" + version="1.1" + viewBox="0 0 30 30" + x="0px" + y="0px" + id="svg8" + sodipodi:docname="deadglitch.svg" + inkscape:version="0.92.2 2405546, 2018-03-11"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1353" + inkscape:window-height="828" + id="namedview10" + showgrid="false" + inkscape:zoom="4.9166667" + inkscape:cx="44.285787" + inkscape:cy="52.833458" + inkscape:window-x="2958" + inkscape:window-y="702" + inkscape:window-maximized="0" + inkscape:current-layer="svg8" /> + <g + id="g6" + style="fill:#898395;fill-opacity:1"> + <path + d="M26,17.4589613 L26,3 L4,3 L4,22.0601057 L10.0032868,22.0601057 L10.0032868,26 L14.0004537,22.0601057 L21.3322933,22.0601057 L26,17.4589613 L26,17.4589613 Z M21.0896458,26.0850335 L15.1583403,26.0850335 L11.2051771,30 L7.24798611,30 L7.24798611,26.0850335 L0,26.0850335 L0,5.21746493 L1.97773958,0 L29,0 L29,18.2620736 L21.0896458,26.0850335 L21.0896458,26.0850335 Z" + id="path2" + style="fill:#898395;fill-opacity:1" /> + <path + d="M20.8587626,12.1710126 L22.4052753,13.7175252 L23.7175252,12.4052753 L22.1710126,10.8587626 L23.7175252,9.31224999 L22.4052753,8 L20.8587626,9.54651264 L19.31225,8 L18,9.31224999 L19.5465126,10.8587626 L18,12.4052753 L19.31225,13.7175252 L20.8587626,12.1710126 Z M11.8587626,12.1710126 L13.4052753,13.7175252 L14.7175252,12.4052753 L13.1710126,10.8587626 L14.7175252,9.31224999 L13.4052753,8 L11.8587626,9.54651264 L10.31225,8 L9,9.31224999 L10.5465126,10.8587626 L9,12.4052753 L10.31225,13.7175252 L11.8587626,12.1710126 Z" + id="path4" + style="fill:#898395;fill-opacity:1" /> + </g> +</svg> diff --git a/application/resources/assets/underconstruction.png b/application/resources/assets/underconstruction.png Binary files differnew file mode 100644 index 00000000..6ae06476 --- /dev/null +++ b/application/resources/assets/underconstruction.png |