diff --git a/bin/app/data/gui/about/about.css b/bin/app/data/gui/about/about.css index c9ebfe62..cd839e39 100644 --- a/bin/app/data/gui/about/about.css +++ b/bin/app/data/gui/about/about.css @@ -8,7 +8,7 @@ background: transparent; border: none; color: white; - font-size: 14pt; + font-size: 14px; height: 24px; width: 24px; } diff --git a/bin/app/data/gui/code_view/code_view.css b/bin/app/data/gui/code_view/code_view.css index bb5aa60e..6517c3c0 100644 --- a/bin/app/data/gui/code_view/code_view.css +++ b/bin/app/data/gui/code_view/code_view.css @@ -8,7 +8,7 @@ border-radius: 12px; border-top-left-radius: 14px; border-top-right-radius: 14px; - font-size: pt; + font-size: px; padding-bottom: 7px; } @@ -16,7 +16,7 @@ background-color: ; border-top-left-radius: 7px; border-top-right-radius: 7px; - font-size: pt; + font-size: px; padding-right: 5px; } @@ -25,7 +25,7 @@ border: none; border-radius: 3px; color: ; - font-size: pt; + font-size: px; padding: 2px 4px; margin: 1px 8px 3px; } @@ -43,7 +43,7 @@ border: none; border-radius: 10px; color: ; - font-size: pt; + font-size: px; padding: 0px 3px; margin: 4px 0px 4px; } @@ -51,7 +51,7 @@ #code_file #code_snippet { background-color: ; border-top: 2px solid ; - font-size: pt; + font-size: px; } #code_file #code_snippet[isFirst=true] { @@ -64,7 +64,7 @@ border: none; color: ; font-family: ""; - font-size: pt; + font-size: px; } #code_file #code_snippet #scope_name:hover { @@ -87,14 +87,14 @@ border: none; color: ; font-family: ""; - font-size: pt; + font-size: px; } #code_area { background-color: transparent; color: ; font-family: ""; - font-size: pt; + font-size: px; } #code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button { diff --git a/bin/app/data/gui/indexing_dialog/indexing_dialog.css b/bin/app/data/gui/indexing_dialog/indexing_dialog.css index 56e15a4e..95f2cf22 100644 --- a/bin/app/data/gui/indexing_dialog/indexing_dialog.css +++ b/bin/app/data/gui/indexing_dialog/indexing_dialog.css @@ -10,29 +10,29 @@ QLabel { #title { color: white; - font-size: 22pt; + font-size: 22px; font-weight: bold; } #percent { - font-size: 22pt; + font-size: 22px; font-weight: bold; } #message { - font-size: 14pt; + font-size: 14px; font-weight: bold; } #filePath { - font-size: 11pt; + font-size: 11px; } #errorCount { border: none; background: transparent; color: white; - font-size: 14pt; + font-size: 14px; } #windowButton { diff --git a/bin/app/data/gui/license/license.css b/bin/app/data/gui/license/license.css index 2b37e7ab..213e98f6 100644 --- a/bin/app/data/gui/license/license.css +++ b/bin/app/data/gui/license/license.css @@ -1,10 +1,11 @@ QLabel { - font-size: 12pt; + font-size: 12px; + color: black; } #licenseField { font-family: ""; - font-size: 10pt; + font-size: 11px; height: 200px; padding: 5px; width: 470px; diff --git a/bin/app/data/gui/main.css b/bin/app/data/gui/main.css index cb2084a4..7dbabac3 100644 --- a/bin/app/data/gui/main.css +++ b/bin/app/data/gui/main.css @@ -1,5 +1,5 @@ QToolTip { background-color: #E0E0E0; color: black; - font-size: pt; + font-size: px; } diff --git a/bin/app/data/gui/search_view/search_view.css b/bin/app/data/gui/search_view/search_view.css index 38084eae..0aff926a 100644 --- a/bin/app/data/gui/search_view/search_view.css +++ b/bin/app/data/gui/search_view/search_view.css @@ -1,10 +1,10 @@ * { - font-size: pt; + font-size: px; } #search_box, #search_box * { font-family: ""; - font-size: pt; + font-size: px; } #search_bar { diff --git a/bin/app/data/gui/startscreen/startscreen.css b/bin/app/data/gui/startscreen/startscreen.css index 934450bd..e7b15f7e 100644 --- a/bin/app/data/gui/startscreen/startscreen.css +++ b/bin/app/data/gui/startscreen/startscreen.css @@ -4,7 +4,7 @@ border-radius: 8px; color: black; padding: 3px 5px 2px; - font-size: 14pt; + font-size: 14px; min-width: 6em; } @@ -17,14 +17,14 @@ background: none; border: none; color: black; - font-size: 12pt; + font-size: 12px; } #recentButtonMissing { background: none; border: none; color: grey; - font-size: 12pt; + font-size: 12px; } #recentButton:hover, #recentButtonMissing:hover { @@ -34,23 +34,23 @@ #recentLabel { color: black; - font-size: 16pt; + font-size: 16px; font-weight: bold; margin-left: 6px; } #versionLabel { color: black; - font-size: 12pt; + font-size: 12px; font-weight: bold; } #updateLabel { color: black; - font-size: 12pt; + font-size: 12px; } #welcomeLabel { color: black; - font-size: 12pt; + font-size: 12px; } diff --git a/bin/app/data/gui/window/listbox.css b/bin/app/data/gui/window/listbox.css index e82447d0..9c662fc1 100644 --- a/bin/app/data/gui/window/listbox.css +++ b/bin/app/data/gui/window/listbox.css @@ -1,5 +1,5 @@ * { - font-size: 12pt; + font-size: 12px; } QtDirectoryListBox { diff --git a/bin/app/data/gui/window/window.css b/bin/app/data/gui/window/window.css index a5a667f3..8ba21eab 100644 --- a/bin/app/data/gui/window/window.css +++ b/bin/app/data/gui/window/window.css @@ -1,5 +1,5 @@ * { - font-size: 12pt; + font-size: 12px; } QLabel, QCheckBox { @@ -7,12 +7,12 @@ QLabel, QCheckBox { } #title { - font-size: 16pt; + font-size: 16px; font-weight: bold; } #projectTitle { - font-size: 14pt; + font-size: 14px; font-weight: bold; } @@ -23,21 +23,21 @@ QLabel, QCheckBox { } #projectDescription { - font-size: 12pt; + font-size: 12px; margin-left: 20px; } #description { - font-size: 12pt; + font-size: 12px; } #label { - font-size: 12pt; + font-size: 12px; font-weight: bold; } #titleLabel { - font-size: 14pt; + font-size: 14px; font-weight: bold; } @@ -115,7 +115,7 @@ QLabel, QCheckBox { border-radius: 8px; color: black; padding: 3px 5px 2px; - font-size: 14pt; + font-size: 14px; min-width: 5em; } @@ -126,7 +126,7 @@ QLabel, QCheckBox { border-bottom-right-radius: 0px; border-top-right-radius: 0px; color: black; - font-size: 15pt; + font-size: 15px; margin-right: 0px; height: 25px; width: 90px; @@ -161,7 +161,7 @@ QLabel, QCheckBox { background: white; border-radius: 8px; color: black; - font-size: 12pt; + font-size: 12px; width: 7em; height: 7em; margin-top: 10px; diff --git a/src/lib_gui/qt/window/QtLicense.cpp b/src/lib_gui/qt/window/QtLicense.cpp index 42aa9b19..fef01930 100644 --- a/src/lib_gui/qt/window/QtLicense.cpp +++ b/src/lib_gui/qt/window/QtLicense.cpp @@ -125,7 +125,7 @@ void QtLicense::populateWindow(QWidget* widget) void QtLicense::windowReady() { - setStyleSheet(styleSheet() + utility::getStyleSheet(ResourcePaths::getGuiPath() + "license/license.css").c_str()); + m_content->setStyleSheet(m_content->styleSheet() + utility::getStyleSheet(ResourcePaths::getGuiPath() + "license/license.css").c_str()); addLogo(); diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp index 78d5f934..45c9be0b 100644 --- a/src/lib_gui/qt/window/QtWindow.cpp +++ b/src/lib_gui/qt/window/QtWindow.cpp @@ -30,7 +30,6 @@ QtWindow::QtWindow(QWidget* parent) std::string frameStyle = "#window {" - " font-size: 17pt;" " border: 1px solid lightgray;" " border-radius: 15px;" " background: white;"