diff --git a/bin/app/data/fonts/Roboto-Bold.ttf b/bin/app/data/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..68822caf Binary files /dev/null and b/bin/app/data/fonts/Roboto-Bold.ttf differ diff --git a/bin/app/data/fonts/Roboto-Regular.ttf b/bin/app/data/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..0e58508a Binary files /dev/null and b/bin/app/data/fonts/Roboto-Regular.ttf differ diff --git a/bin/app/data/fonts/Roboto_License.txt b/bin/app/data/fonts/Roboto_License.txt new file mode 100644 index 00000000..989e2c59 --- /dev/null +++ b/bin/app/data/fonts/Roboto_License.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/bin/app/data/gui/about/about.css b/bin/app/data/gui/about/about.css index 1dd221a0..be45f6dc 100644 --- a/bin/app/data/gui/about/about.css +++ b/bin/app/data/gui/about/about.css @@ -1,6 +1,6 @@ * { color: white; - font-size: 12px; + font-size: 14px; font-weight: 100; } @@ -13,11 +13,11 @@ border: none; color: white; font-size: 14pt; - height: 20px; - width: 20px; + height: 24px; + width: 24px; } #closeButton:hover { border: 2px solid white; - border-radius: 10px; + border-radius: 12px; } diff --git a/bin/app/data/gui/about/icon_close.png b/bin/app/data/gui/about/icon_close.png new file mode 100644 index 00000000..89101f37 Binary files /dev/null and b/bin/app/data/gui/about/icon_close.png differ diff --git a/bin/app/data/gui/about/logo.png b/bin/app/data/gui/about/logo.png deleted file mode 100644 index 13c94b1b..00000000 Binary files a/bin/app/data/gui/about/logo.png and /dev/null differ diff --git a/bin/app/data/gui/about/logo_aws.png b/bin/app/data/gui/about/logo_aws.png index 7817e99c..3762e5d7 100644 Binary files a/bin/app/data/gui/about/logo_aws.png and b/bin/app/data/gui/about/logo_aws.png differ diff --git a/bin/app/data/gui/about/logo_coati.png b/bin/app/data/gui/about/logo_coati.png new file mode 100644 index 00000000..ab69c8ed Binary files /dev/null and b/bin/app/data/gui/about/logo_coati.png differ diff --git a/bin/app/data/gui/about/logo_fhs.png b/bin/app/data/gui/about/logo_fhs.png index ba90bfe9..560eb794 100644 Binary files a/bin/app/data/gui/about/logo_fhs.png and b/bin/app/data/gui/about/logo_fhs.png differ diff --git a/bin/app/data/gui/main.css b/bin/app/data/gui/main.css index b8a93f5a..fb588f9a 100644 --- a/bin/app/data/gui/main.css +++ b/bin/app/data/gui/main.css @@ -5,5 +5,5 @@ QToolTip { } * { - font-family: "Fira Sans"; + font-family: "Roboto"; } diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp index aa4b87e1..add2102b 100644 --- a/src/lib_gui/qt/window/QtAbout.cpp +++ b/src/lib_gui/qt/window/QtAbout.cpp @@ -18,7 +18,7 @@ QtAbout::QtAbout(QWidget *parent) QSize QtAbout::sizeHint() const { - return QSize(370, 750); + return QSize(480, 520); } void QtAbout::setup() @@ -37,110 +37,114 @@ void QtAbout::setup() windowLayout->setContentsMargins(30, 30, 30, 20); m_window->setLayout(windowLayout); - QHBoxLayout* rowTitle = new QHBoxLayout(); - windowLayout->addLayout(rowTitle); - - QtDeviceScaledPixmap coatiLogo((ResourcePaths::getGuiPath() + "about/logo.png").c_str()); - coatiLogo.scaleToWidth(120); - - QLabel* coatiLogoLabel = new QLabel(this); - coatiLogoLabel->setPixmap(coatiLogo.pixmap()); - coatiLogoLabel->resize(coatiLogo.width(), coatiLogo.height()); - rowTitle->addWidget(coatiLogoLabel); - - rowTitle->addSpacing(40); - - QVBoxLayout* columnLayout = new QVBoxLayout(); - rowTitle->addLayout(columnLayout); - - columnLayout->addStretch(); - - QLabel* versionLabel = new QLabel(("Version " + Version::getApplicationVersion().toDisplayString()).c_str(), this); - columnLayout->addWidget(versionLabel); - windowLayout->addStretch(); - QHBoxLayout* rowDeveloperTitle = new QHBoxLayout(); - windowLayout->addLayout(rowDeveloperTitle); + { + QHBoxLayout* row = new QHBoxLayout(); + windowLayout->addLayout(row); + { + QVBoxLayout* column = new QVBoxLayout(); + row->addLayout(column); - QLabel* developerTitle = new QLabel("Developed by:", this); - rowDeveloperTitle->addWidget(developerTitle); + QtDeviceScaledPixmap coatiLogo((ResourcePaths::getGuiPath() + "about/logo_coati.png").c_str()); + coatiLogo.scaleToHeight(180); + QLabel* coatiLogoLabel = new QLabel(this); + coatiLogoLabel->setPixmap(coatiLogo.pixmap()); + coatiLogoLabel->resize(coatiLogo.width(), coatiLogo.height()); + column->addWidget(coatiLogoLabel); + } + { + QVBoxLayout* column = new QVBoxLayout(); + row->addLayout(column); - QHBoxLayout* rowTeam = new QHBoxLayout(); - windowLayout->addLayout(rowTeam); + column->addStretch(); - QLabel* developerLabel = new QLabel( - "Manuel Dobusch\n" - "Eberhard Gräther\n" - "Malte Langkabel\n" - "Viktoria Pfausler\n" - "Andreas Stallinger\n", - this - ); - rowTeam->addWidget(developerLabel); + QLabel* developerTitle = new QLabel("Developed by:", this); + column->addWidget(developerTitle); - rowTeam->addSpacing(40); - - QLabel* companyLabel = new QLabel( - "Coati Software OG\n" - "Schlossallee 7/1\n" - "5412 Puch bei Hallein\n" - "Austria\n" - "support@coati.io\n", - this - ); - rowTeam->addWidget(companyLabel); + QLabel* developerLabel = new QLabel( + "Manuel Dobusch\n" + "Eberhard Gräther\n" + "Malte Langkabel\n" + "Viktoria Pfausler\n" + "Andreas Stallinger\n", + this + ); + column->addWidget(developerLabel); + column->addSpacing(-10); + } + } + { + QHBoxLayout* row = new QHBoxLayout(); + windowLayout->addLayout(row); + QLabel* versionLabel = new QLabel(("Version " + Version::getApplicationVersion().toDisplayString()).c_str(), this); + row->addWidget(versionLabel); + } windowLayout->addStretch(); - - QHBoxLayout* rowAcknowledgementsTitle = new QHBoxLayout(); - windowLayout->addLayout(rowAcknowledgementsTitle); + windowLayout->addStretch(); QLabel* acknowledgementsTitle = new QLabel("Acknowledgements:", this); - rowAcknowledgementsTitle->addWidget(acknowledgementsTitle); - + windowLayout->addWidget(acknowledgementsTitle); QLabel* acknowledgementsLabel = new QLabel( - "Coati 0.1 was created in the context of education \n" - "at the University of Applied Sciences Salzburg\n" - "\n" - "Coati Software OG takes part in the Startup Salzburg\n" - "initiative.\n" - "\n" - "The development of Coati is funded by the AWS\n", + "Coati 0.1 was created in the context of education at the\n" + "University of Applied Sciences Salzburg.\n" + "Coati Software OG takes part in the Startup Salzburg initiative.\n" + "The development of Coati is funded by the AWS.\n", this ); windowLayout->addWidget(acknowledgementsLabel); - QHBoxLayout* rowAcknowledgementsLogos = new QHBoxLayout(); - windowLayout->addLayout(rowAcknowledgementsLogos); - rowAcknowledgementsLogos->addStretch(); + { + QHBoxLayout* row = new QHBoxLayout(); + windowLayout->addLayout(row); - QtDeviceScaledPixmap fhsLogo((ResourcePaths::getGuiPath() + "about/logo_fhs.png").c_str()); - fhsLogo.scaleToHeight(60); + QLabel* companyLabel = new QLabel( + "Coati Software OG
" + "Schlossallee 7/1
" + "5412 Puch bei Hallein
" + "Austria
" + "support@coati.io", + this); + row->addWidget(companyLabel); + + { + QVBoxLayout* column = new QVBoxLayout(); + row->addLayout(column); - QLabel* fhsLabel = new QLabel(this); - fhsLabel->setPixmap(fhsLogo.pixmap()); - fhsLabel->resize(fhsLogo.width(), fhsLogo.height()); - rowAcknowledgementsLogos->addWidget(fhsLabel); + column->addStretch(); - rowAcknowledgementsLogos->addStretch(); + { + QHBoxLayout* rowAcknowledgementsLogos = new QHBoxLayout(); + column->addLayout(rowAcknowledgementsLogos); - QtDeviceScaledPixmap awsLogo("data/gui/about/logo_aws.png"); - awsLogo.scaleToHeight(60); - QLabel* awsLabel = new QLabel(this); - awsLabel->setPixmap(awsLogo.pixmap()); - awsLabel->resize(awsLogo.width(), awsLogo.height()); - rowAcknowledgementsLogos->addWidget(awsLabel); + QtDeviceScaledPixmap fhsLogo((ResourcePaths::getGuiPath() + "about/logo_fhs.png").c_str()); + fhsLogo.scaleToHeight(30); + QLabel* fhsLabel = new QLabel(this); + fhsLabel->setPixmap(fhsLogo.pixmap()); + fhsLabel->resize(fhsLogo.width(), fhsLogo.height()); + rowAcknowledgementsLogos->addWidget(fhsLabel); - rowAcknowledgementsLogos->addStretch(); + QtDeviceScaledPixmap awsLogo((ResourcePaths::getGuiPath() + "about/logo_aws.png").c_str()); + awsLogo.scaleToHeight(30); + QLabel* awsLabel = new QLabel(this); + awsLabel->setPixmap(awsLogo.pixmap()); + awsLabel->resize(awsLogo.width(), awsLogo.height()); + rowAcknowledgementsLogos->addWidget(awsLabel); + } + } + } windowLayout->addStretch(); - QPushButton* closeButton = new QPushButton("X", this); + QtDeviceScaledPixmap closePixmap((ResourcePaths::getGuiPath() + "about/icon_close.png").c_str()); + closePixmap.scaleToHeight(20); + QPushButton* closeButton = new QPushButton(this); + closeButton->setIcon(QIcon(closePixmap.pixmap())); closeButton->setObjectName("closeButton"); - closeButton->move(320, 20); + closeButton->move(430, 20); connect(closeButton, SIGNAL(clicked()), this, SLOT(handleUpdateButtonPress())); }