diff --git a/bin/app/data/gui/graph_view/images/template.png b/bin/app/data/gui/graph_view/images/template.png new file mode 100644 index 00000000..2ccd921b Binary files /dev/null and b/bin/app/data/gui/graph_view/images/template.png differ diff --git a/bin/app/data/gui/license/license.css b/bin/app/data/gui/license/license.css index ffb7b030..03c0e7ec 100644 --- a/bin/app/data/gui/license/license.css +++ b/bin/app/data/gui/license/license.css @@ -1,3 +1,7 @@ +QLabel { + font-size: 12pt; +} + #licenseField { font-family: ""; font-size: 12pt; diff --git a/bin/app/data/gui/setting_window/dots.png b/bin/app/data/gui/setting_window/dots.png index 8bb1956a..7690b83f 100644 Binary files a/bin/app/data/gui/setting_window/dots.png and b/bin/app/data/gui/setting_window/dots.png differ diff --git a/bin/app/data/gui/setting_window/dots_hover.png b/bin/app/data/gui/setting_window/dots_hover.png index 7ebf7142..47b52807 100644 Binary files a/bin/app/data/gui/setting_window/dots_hover.png and b/bin/app/data/gui/setting_window/dots_hover.png differ diff --git a/bin/app/data/gui/setting_window/help.png b/bin/app/data/gui/setting_window/help.png index 149b878d..92bfa678 100644 Binary files a/bin/app/data/gui/setting_window/help.png and b/bin/app/data/gui/setting_window/help.png differ diff --git a/bin/app/data/gui/setting_window/help_hover.png b/bin/app/data/gui/setting_window/help_hover.png index aa442d67..212a0c31 100644 Binary files a/bin/app/data/gui/setting_window/help_hover.png and b/bin/app/data/gui/setting_window/help_hover.png differ diff --git a/bin/app/data/gui/setting_window/minus.png b/bin/app/data/gui/setting_window/minus.png index 9e66a794..70e89a82 100644 Binary files a/bin/app/data/gui/setting_window/minus.png and b/bin/app/data/gui/setting_window/minus.png differ diff --git a/bin/app/data/gui/setting_window/minus_hover.png b/bin/app/data/gui/setting_window/minus_hover.png index dc82e816..089a7144 100644 Binary files a/bin/app/data/gui/setting_window/minus_hover.png and b/bin/app/data/gui/setting_window/minus_hover.png differ diff --git a/bin/app/data/gui/setting_window/plus.png b/bin/app/data/gui/setting_window/plus.png index f8232feb..743de91e 100644 Binary files a/bin/app/data/gui/setting_window/plus.png and b/bin/app/data/gui/setting_window/plus.png differ diff --git a/bin/app/data/gui/setting_window/plus_hover.png b/bin/app/data/gui/setting_window/plus_hover.png index 12270077..67bbc8ac 100644 Binary files a/bin/app/data/gui/setting_window/plus_hover.png and b/bin/app/data/gui/setting_window/plus_hover.png differ diff --git a/bin/app/data/gui/setting_window/refresh.png b/bin/app/data/gui/setting_window/refresh.png index ab663e01..9a9371b4 100644 Binary files a/bin/app/data/gui/setting_window/refresh.png and b/bin/app/data/gui/setting_window/refresh.png differ diff --git a/bin/app/data/gui/setting_window/refresh_hover.png b/bin/app/data/gui/setting_window/refresh_hover.png index fdbc1849..e7d5b14f 100644 Binary files a/bin/app/data/gui/setting_window/refresh_hover.png and b/bin/app/data/gui/setting_window/refresh_hover.png differ diff --git a/bin/app/data/gui/setting_window/window.css b/bin/app/data/gui/setting_window/window.css index c2620d50..fc04aa4e 100644 --- a/bin/app/data/gui/setting_window/window.css +++ b/bin/app/data/gui/setting_window/window.css @@ -65,11 +65,11 @@ QLineEdit:disabled { #windowButton { background: white; border: 1px solid lightgray; - border-radius: 10px; + border-radius: 8px; color: black; - font-size: 17pt; - height: 30px; - width: 140px; + padding: 3px 5px 2px; + font-size: 14pt; + min-width: 5em; } #windowButton:hover { diff --git a/bin/app/data/gui/startscreen/Icon_CPP.png b/bin/app/data/gui/startscreen/Icon_CPP.png deleted file mode 100644 index 1ce2a01f..00000000 Binary files a/bin/app/data/gui/startscreen/Icon_CPP.png and /dev/null differ diff --git a/bin/app/data/gui/startscreen/startscreen.css b/bin/app/data/gui/startscreen/startscreen.css index ceac74cd..c00789fb 100644 --- a/bin/app/data/gui/startscreen/startscreen.css +++ b/bin/app/data/gui/startscreen/startscreen.css @@ -1,13 +1,16 @@ #projectButton { background: white; border: 1px solid lightgray; - border-radius: 10px; - font-size: 17pt; + border-radius: 8px; + color: black; + padding: 3px 5px 2px; + font-size: 14pt; + min-width: 6em; } #projectButton:hover { - background: #2D3F85; color: white; + background: #2D3F85; } #recentButton { @@ -18,7 +21,7 @@ } #recentButton:hover { - background-color: rgba(45, 63, 133, 70); + background-color: #CFD2E0; border-radius: 10px; } diff --git a/bin/app/data/gui/statusbar_view/dot.png b/bin/app/data/gui/statusbar_view/dot.png new file mode 100644 index 00000000..9ff022d4 Binary files /dev/null and b/bin/app/data/gui/statusbar_view/dot.png differ diff --git a/bin/app/data/gui/statusbar_view/octagon.png b/bin/app/data/gui/statusbar_view/octagon.png deleted file mode 100644 index 71894336..00000000 Binary files a/bin/app/data/gui/statusbar_view/octagon.png and /dev/null differ diff --git a/src/app/main.cpp b/src/app/main.cpp index 1ed945f9..4490edd7 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -15,7 +15,6 @@ #include "qt/utility/utilityQt.h" #include "qt/view/QtViewFactory.h" #include "qt/window/QtMainWindow.h" -#include "qt/window/QtSplashScreen.h" #include "version.h" #include "settings/ProjectSettings.h" @@ -49,11 +48,6 @@ int main(int argc, char *argv[]) QPixmap whitePixmap(500, 500); whitePixmap.fill(Qt::white); - QtSplashScreen* splash = new QtSplashScreen(whitePixmap, Qt::WindowStaysOnTopHint); - splash->setMessage("Loading UI"); - splash->setVersion(version.toDisplayString().c_str()); - splash->exec(qtApp); - init(); QtCommandLineParser commandLineParser; @@ -74,11 +68,6 @@ int main(int argc, char *argv[]) checker.setApp(app.get()); - if (splash) - { - delete splash; - } - commandLineParser.parseCommandline(); return qtApp.exec(); diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp index 3ed2cd90..a9459012 100644 --- a/src/lib_gui/qt/element/QtCodeArea.cpp +++ b/src/lib_gui/qt/element/QtCodeArea.cpp @@ -496,10 +496,10 @@ void QtCodeArea::mouseMoveEvent(QMouseEvent* event) } } - QToolTip::hideText(); - if (!same) { + QToolTip::hideText(); + setHoveredAnnotations(annotations); const std::vector& errorMessages = m_fileWidget->getErrorMessages(); diff --git a/src/lib_gui/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp index 0016a1f2..61f239f5 100644 --- a/src/lib_gui/qt/element/QtStatusBar.cpp +++ b/src/lib_gui/qt/element/QtStatusBar.cpp @@ -26,11 +26,12 @@ QtStatusBar::QtStatusBar() m_errorButton.hide(); m_errorButton.setFlat(true); + m_errorButton.setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac m_errorButton.setStyleSheet("QPushButton { color: #D00000; margin-right: 0; spacing: none; }"); m_errorButton.setIcon(utility::colorizePixmap( - QPixmap((ResourcePaths::getGuiPath() + "statusbar_view/octagon.png").c_str()), + QPixmap((ResourcePaths::getGuiPath() + "statusbar_view/dot.png").c_str()), "#D00000" - ).scaledToHeight(10)); + ).scaledToHeight(12)); addPermanentWidget(&m_errorButton); connect(&m_errorButton, SIGNAL(clicked()), this, SLOT(showErrors())); diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp index e2c4d9fa..da2bd02c 100644 --- a/src/lib_gui/qt/view/QtGraphView.cpp +++ b/src/lib_gui/qt/view/QtGraphView.cpp @@ -89,7 +89,7 @@ void QtGraphView::initView() QGraphicsView* view = new QtGraphicsView(widget); view->setScene(scene); view->setDragMode(QGraphicsView::ScrollHandDrag); - view->setRenderHints(QPainter::Antialiasing); + view->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); view->viewport()->setCursor(Qt::ArrowCursor); diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp index c9b12c92..8f72c5b6 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp @@ -33,6 +33,9 @@ QtGraphNodeAccess::QtGraphNodeAccess(TokenComponentAccess::AccessType accessType case TokenComponentAccess::ACCESS_PRIVATE: fileName = "private"; break; + case TokenComponentAccess::ACCESS_TEMPLATE: + fileName = "template"; + break; default: break; } @@ -44,6 +47,7 @@ QtGraphNodeAccess::QtGraphNodeAccess(TokenComponentAccess::AccessType accessType pixmap.scaleToHeight(m_accessIconSize); m_accessIcon = new QGraphicsPixmapItem(pixmap.pixmap(), this); + m_accessIcon->setTransformationMode(Qt::SmoothTransformation); } } diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp index 8f3276a2..872cdb26 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp @@ -23,6 +23,7 @@ QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSub const int iconHeight = 4; m_icon = new QGraphicsPixmapItem(this); + m_icon->setTransformationMode(Qt::SmoothTransformation); QtDeviceScaledPixmap pixmap((ResourcePaths::getGuiPath() + "graph_view/images/arrow.png").c_str()); pixmap.scaleToHeight(iconHeight); diff --git a/src/lib_gui/qt/window/QtLicense.cpp b/src/lib_gui/qt/window/QtLicense.cpp index 8452778f..fdd0e557 100644 --- a/src/lib_gui/qt/window/QtLicense.cpp +++ b/src/lib_gui/qt/window/QtLicense.cpp @@ -72,7 +72,7 @@ void QtLicense::setup() layout->setContentsMargins(25, 100, 25, 30); QVBoxLayout* subLayout = new QVBoxLayout(); - subLayout->setContentsMargins(250, 0, 0, 0); + subLayout->setContentsMargins(200, 0, 0, 0); QLabel* licenseName = new QLabel(this); licenseName->setText(QString::fromLatin1("Enter Licence")); @@ -114,7 +114,7 @@ void QtLicense::setup() QLabel* linkLabel = new QLabel(this); linkLabel->setObjectName("linkLabel"); - linkLabel->setText("Don't have a license key yet?"); + linkLabel->setText("Don't have a license key yet?"); linkLabel->setOpenExternalLinks(true); linkLabel->setGeometry(275, 300, 300, 50); subLayout->addWidget(linkLabel); diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp index 83b9f799..8ed30931 100644 --- a/src/lib_gui/qt/window/QtMainWindow.cpp +++ b/src/lib_gui/qt/window/QtMainWindow.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -308,6 +309,11 @@ void QtMainWindow::openSettings() wizzard->showPreferences(); } +void QtMainWindow::showDocumentation() +{ + QDesktopServices::openUrl(QUrl("https://coati.io/documentation/")); +} + QtSettingsWindow* QtMainWindow::showLicenses() { QtAboutLicense* licenseWindow = new QtAboutLicense(this); @@ -624,6 +630,7 @@ void QtMainWindow::setupHelpMenu() menuBar()->addMenu(menu); menu->addAction(tr("&About"), this, SLOT(about())); + menu->addAction(tr("Documentation"), this, SLOT(showDocumentation())); menu->addAction(tr("Licences"), this, SLOT(showLicenses())); if(!isTrial()) diff --git a/src/lib_gui/qt/window/QtMainWindow.h b/src/lib_gui/qt/window/QtMainWindow.h index 732a41b6..0c935bc8 100644 --- a/src/lib_gui/qt/window/QtMainWindow.h +++ b/src/lib_gui/qt/window/QtMainWindow.h @@ -98,6 +98,7 @@ public slots: QtSettingsWindow* about(); void openSettings(); + void showDocumentation(); QtSettingsWindow* showLicenses(); QtSettingsWindow* enterLicense(); diff --git a/src/lib_gui/qt/window/QtSettingsWindow.cpp b/src/lib_gui/qt/window/QtSettingsWindow.cpp index 62759025..b56d49ee 100644 --- a/src/lib_gui/qt/window/QtSettingsWindow.cpp +++ b/src/lib_gui/qt/window/QtSettingsWindow.cpp @@ -143,7 +143,7 @@ void QtSettingsWindow::setupForm() populateWindow(form); windowLayout->addWidget(scrollArea); - windowLayout->addSpacing(20); + windowLayout->addSpacing(25); showButtons(windowLayout); @@ -160,12 +160,12 @@ void QtSettingsWindow::populateWindow(QWidget* widget) void QtSettingsWindow::addLogo() { QtDeviceScaledPixmap coatiLogo((ResourcePaths::getGuiPath() + "startscreen/logo.png").c_str()); - coatiLogo.scaleToWidth(200); + coatiLogo.scaleToWidth(150); QLabel* coatiLogoLabel = new QLabel(this); coatiLogoLabel->setPixmap(coatiLogo.pixmap()); coatiLogoLabel->resize(coatiLogo.width(), coatiLogo.height()); - coatiLogoLabel->move(30, 10); + coatiLogoLabel->move(30, 25); } void QtSettingsWindow::showButtons(QVBoxLayout* layout) diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp index 7303e74b..4a9a146e 100644 --- a/src/lib_gui/qt/window/QtStartScreen.cpp +++ b/src/lib_gui/qt/window/QtStartScreen.cpp @@ -42,13 +42,13 @@ void QtStartScreen::setup() { m_newProjectButton = new QPushButton("New Project", this); m_newProjectButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac - m_newProjectButton->setGeometry(30, 495, 140, 30); + m_newProjectButton->move(30, 505); m_newProjectButton->setObjectName("projectButton"); connect(m_newProjectButton, SIGNAL(clicked()), this, SLOT(handleNewProjectButton())); m_openProjectButton = new QPushButton("Open Project", this); m_openProjectButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac - m_openProjectButton->setGeometry(30, 540, 140, 30); + m_openProjectButton->move(30, 540); m_openProjectButton->setObjectName("projectButton"); connect(m_openProjectButton, SIGNAL(clicked()), this, SLOT(handleOpenProjectButton())); } @@ -58,7 +58,7 @@ void QtStartScreen::setup() recentProjectsLabel->setObjectName("recentLabel"); int position = 290; - QIcon cpp_icon((ResourcePaths::getGuiPath() + "startscreen/icon_cpp.png").c_str()); + QIcon cpp_icon((ResourcePaths::getGuiPath() + "icon/project_256_256.png").c_str()); std::vector recentProjects = ApplicationSettings::getInstance()->getRecentProjects(); for (size_t i = 0; i < recentProjects.size() && i < ApplicationSettings::MaximalAmountOfRecentProjects; i++) { @@ -74,7 +74,7 @@ void QtStartScreen::setup() position += 40; } - resize(600, 600); + resize(520, 600); } QSize QtStartScreen::sizeHint() const diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp index 6be7f0f1..20d94d54 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentBuildFile.cpp @@ -31,7 +31,7 @@ void QtProjectWizzardContentBuildFile::populateForm(QGridLayout* layout, int& ro case QtProjectWizzardContentSelect::PROJECT_EMPTY: name = "Build Text"; filter = "Text (*.txt)"; - break; + return; case QtProjectWizzardContentSelect::PROJECT_VS: name = "Visual Studio Solution"; filter = "Visual Studio Solution (*.sln)"; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp index a69adfe7..da6c240b 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp @@ -138,5 +138,5 @@ bool QtProjectWizzardContentSelect::check() QSize QtProjectWizzardContentSelect::preferredWindowSize() const { - return QSize(750, 340); + return QSize(700, 340); } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSummary.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSummary.cpp index 1d50cd0a..efa5b303 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSummary.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSummary.cpp @@ -41,13 +41,28 @@ void QtProjectWizzardContentSummary::populateWindow(QGridLayout* layout) row++; m_data->populateForm(layout, row); + layout->setRowMinimumHeight(row, 15); + row++; + + int row2 = row; m_buildFile->populateForm(layout, row); + if (row != row2) + { + layout->setRowMinimumHeight(row, 15); + row++; + } + m_source->populateForm(layout, row); + layout->setRowMinimumHeight(row, 15); + row++; + m_simple->populateForm(layout, row); m_headerSearch->populateForm(layout, row); if (m_frameworkSearch) { + layout->setRowMinimumHeight(row, 15); + row++; m_frameworkSearch->populateForm(layout, row); }