diff --git a/bin/app/data/gui/about/about.css b/bin/app/data/gui/about/about.css index c9944979..21d34c87 100644 --- a/bin/app/data/gui/about/about.css +++ b/bin/app/data/gui/about/about.css @@ -4,6 +4,10 @@ font-weight: 100; } +#small { + font-size: 12px; +} + #window { background: qlineargradient( x1:0 y1:0.4, x2:0 y2:1, stop:0 #2F3F86, stop:1 #1C7BBC ); } diff --git a/bin/app/data/gui/about/logo_aws.png b/bin/app/data/gui/about/logo_aws.png deleted file mode 100644 index f8c9d0d7..00000000 Binary files a/bin/app/data/gui/about/logo_aws.png and /dev/null differ diff --git a/bin/app/data/gui/about/logo_fhs.png b/bin/app/data/gui/about/logo_fhs.png deleted file mode 100644 index 5bbae4f7..00000000 Binary files a/bin/app/data/gui/about/logo_fhs.png and /dev/null differ diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp index b045ae41..0506363b 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(500, 520); + return QSize(450, 480); } void QtAbout::setupAbout() @@ -31,40 +31,13 @@ void QtAbout::setupAbout() m_content->setLayout(windowLayout); { - QHBoxLayout* row = new QHBoxLayout(); - windowLayout->addLayout(row); - { - QtDeviceScaledPixmap sourcetrailLogo(QString::fromStdWString(ResourcePaths::getGuiPath().wstr() + L"about/logo_sourcetrail.png")); - sourcetrailLogo.scaleToHeight(150); + QtDeviceScaledPixmap sourcetrailLogo(QString::fromStdWString(ResourcePaths::getGuiPath().wstr() + L"about/logo_sourcetrail.png")); + sourcetrailLogo.scaleToHeight(150); - QLabel* sourcetrailLogoLabel = new QLabel(this); - sourcetrailLogoLabel->setPixmap(sourcetrailLogo.pixmap()); - sourcetrailLogoLabel->resize(sourcetrailLogo.width(), sourcetrailLogo.height()); - row->addWidget(sourcetrailLogoLabel); - } - - row->addSpacing(50); - - { - QVBoxLayout* column = new QVBoxLayout(); - row->addLayout(column); - - column->addStretch(); - - QLabel* developerTitle = new QLabel("Developed by:", this); - column->addWidget(developerTitle); - - 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); - } + QLabel* sourcetrailLogoLabel = new QLabel(this); + sourcetrailLogoLabel->setPixmap(sourcetrailLogo.pixmap()); + sourcetrailLogoLabel->resize(sourcetrailLogo.width(), sourcetrailLogo.height()); + windowLayout->addWidget(sourcetrailLogoLabel); } windowLayout->addSpacing(10); @@ -76,29 +49,12 @@ void QtAbout::setupAbout() ( "Version " + Version::getApplicationVersion().toDisplayString() + " - " + std::string(utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32 ? "32" : "64") + " bit" - ).c_str(), + ).c_str(), this ); row->addWidget(versionLabel); } - windowLayout->addStretch(); - windowLayout->addStretch(); - - QLabel* acknowledgementsTitle = new QLabel("Acknowledgements:", this); - windowLayout->addWidget(acknowledgementsTitle); - - QLabel* acknowledgementsLabel = new QLabel( - "Sourcetrail (aka Coati) 0.1 was created in the context of education at " - "Salzburg University of Applied Sciences. " - "Coati Software OG takes part in the Startup Salzburg initiative. " - "The development of Sourcetrail was funded by aws.", - this - ); - acknowledgementsLabel->setWordWrap(true); - acknowledgementsLabel->setOpenExternalLinks(true); - windowLayout->addWidget(acknowledgementsLabel); - windowLayout->addStretch(); { @@ -106,42 +62,43 @@ void QtAbout::setupAbout() windowLayout->addLayout(row); QLabel* companyLabel = new QLabel( - "Coati Software OG
" + "Coati Software KG
" "Jakob-Haringer-Straße 1/127
" "5020 Salzburg
" "Austria
" "support@sourcetrail.com
" - "sourcetrail.com", - this); + "sourcetrail.com"); companyLabel->setOpenExternalLinks(true); row->addWidget(companyLabel); - { - QVBoxLayout* column = new QVBoxLayout(); - row->addLayout(column); + row->addSpacing(80); - column->addStretch(); - - { - QHBoxLayout* rowAcknowledgementsLogos = new QHBoxLayout(); - column->addLayout(rowAcknowledgementsLogos); - - QtDeviceScaledPixmap fhsLogo(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"about/logo_fhs.png").wstr())); - fhsLogo.scaleToHeight(30); - QLabel* fhsLabel = new QLabel(this); - fhsLabel->setPixmap(fhsLogo.pixmap()); - fhsLabel->resize(fhsLogo.width(), fhsLogo.height()); - rowAcknowledgementsLogos->addWidget(fhsLabel); - - QtDeviceScaledPixmap awsLogo(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"about/logo_aws.png").wstr())); - awsLogo.scaleToHeight(30); - QLabel* awsLabel = new QLabel(this); - awsLabel->setPixmap(awsLogo.pixmap()); - awsLabel->resize(awsLogo.width(), awsLogo.height()); - rowAcknowledgementsLogos->addWidget(awsLabel); - } - } + QLabel* developerLabel = new QLabel( + "

" + "Team:
" + "Manuel Dobusch
" + "Eberhard Gräther
" + "Malte Langkabel
" + "Viktoria Pfausler
" + "Andreas Stallinger
" + ); + developerLabel->setObjectName("small"); + row->addWidget(developerLabel); } + windowLayout->addStretch(); + + QLabel* acknowledgementsLabel = new QLabel( + "Acknowledgements:
" + "Sourcetrail (aka Coati) 0.1 was created in the context of education at " + "Salzburg University of Applied Sciences.
" + "Coati Software KG is member of Startup Salzburg.
" + "The development of Sourcetrail was funded by aws." + ); + acknowledgementsLabel->setObjectName("small"); + acknowledgementsLabel->setWordWrap(true); + acknowledgementsLabel->setOpenExternalLinks(true); + windowLayout->addWidget(acknowledgementsLabel); + windowLayout->addSpacing(10); }