ui: Changed all font-sizes from pt to px for same results on all platforms

This commit is contained in:
Eberhard Graether
2016-09-09 02:31:11 +02:00
parent f1be68b1a0
commit 1335f9512a
11 changed files with 39 additions and 39 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
background: transparent; background: transparent;
border: none; border: none;
color: white; color: white;
font-size: 14pt; font-size: 14px;
height: 24px; height: 24px;
width: 24px; width: 24px;
} }
+8 -8
View File
@@ -8,7 +8,7 @@
border-radius: 12px; border-radius: 12px;
border-top-left-radius: 14px; border-top-left-radius: 14px;
border-top-right-radius: 14px; border-top-right-radius: 14px;
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
padding-bottom: 7px; padding-bottom: 7px;
} }
@@ -16,7 +16,7 @@
background-color: <color:code/file/background>; background-color: <color:code/file/background>;
border-top-left-radius: 7px; border-top-left-radius: 7px;
border-top-right-radius: 7px; border-top-right-radius: 7px;
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
padding-right: 5px; padding-right: 5px;
} }
@@ -25,7 +25,7 @@
border: none; border: none;
border-radius: 3px; border-radius: 3px;
color: <color:code/file/title/text>; color: <color:code/file/title/text>;
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
padding: 2px 4px; padding: 2px 4px;
margin: 1px 8px 3px; margin: 1px 8px 3px;
} }
@@ -43,7 +43,7 @@
border: none; border: none;
border-radius: 10px; border-radius: 10px;
color: <color:code/file/ref_count/text>; color: <color:code/file/ref_count/text>;
font-size: <setting:font_size-2>pt; font-size: <setting:font_size-2>px;
padding: 0px 3px; padding: 0px 3px;
margin: 4px 0px 4px; margin: 4px 0px 4px;
} }
@@ -51,7 +51,7 @@
#code_file #code_snippet { #code_file #code_snippet {
background-color: <color:code/snippet/background>; background-color: <color:code/snippet/background>;
border-top: 2px solid <color:code/file/background>; border-top: 2px solid <color:code/file/background>;
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
#code_file #code_snippet[isFirst=true] { #code_file #code_snippet[isFirst=true] {
@@ -64,7 +64,7 @@
border: none; border: none;
color: <color:code/snippet/title/text>; color: <color:code/snippet/title/text>;
font-family: "<setting:font_name>"; font-family: "<setting:font_name>";
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
#code_file #code_snippet #scope_name:hover { #code_file #code_snippet #scope_name:hover {
@@ -87,14 +87,14 @@
border: none; border: none;
color: <color:code/snippet/line_number/text>; color: <color:code/snippet/line_number/text>;
font-family: "<setting:font_name>"; font-family: "<setting:font_name>";
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
#code_area { #code_area {
background-color: transparent; background-color: transparent;
color: <color:code/snippet/syntax/normal>; color: <color:code/snippet/syntax/normal>;
font-family: "<setting:font_name>"; font-family: "<setting:font_name>";
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
#code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button { #code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
@@ -10,29 +10,29 @@ QLabel {
#title { #title {
color: white; color: white;
font-size: 22pt; font-size: 22px;
font-weight: bold; font-weight: bold;
} }
#percent { #percent {
font-size: 22pt; font-size: 22px;
font-weight: bold; font-weight: bold;
} }
#message { #message {
font-size: 14pt; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
#filePath { #filePath {
font-size: 11pt; font-size: 11px;
} }
#errorCount { #errorCount {
border: none; border: none;
background: transparent; background: transparent;
color: white; color: white;
font-size: 14pt; font-size: 14px;
} }
#windowButton { #windowButton {
+3 -2
View File
@@ -1,10 +1,11 @@
QLabel { QLabel {
font-size: 12pt; font-size: 12px;
color: black;
} }
#licenseField { #licenseField {
font-family: "<setting:font_name>"; font-family: "<setting:font_name>";
font-size: 10pt; font-size: 11px;
height: 200px; height: 200px;
padding: 5px; padding: 5px;
width: 470px; width: 470px;
+1 -1
View File
@@ -1,5 +1,5 @@
QToolTip { QToolTip {
background-color: #E0E0E0; background-color: #E0E0E0;
color: black; color: black;
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
+2 -2
View File
@@ -1,10 +1,10 @@
* { * {
font-size: <setting:font_size>pt; font-size: <setting:font_size>px;
} }
#search_box, #search_box * { #search_box, #search_box * {
font-family: "<setting:font_name>"; font-family: "<setting:font_name>";
font-size: <setting:font_size+2>pt; font-size: <setting:font_size+2>px;
} }
#search_bar { #search_bar {
+7 -7
View File
@@ -4,7 +4,7 @@
border-radius: 8px; border-radius: 8px;
color: black; color: black;
padding: 3px 5px 2px; padding: 3px 5px 2px;
font-size: 14pt; font-size: 14px;
min-width: 6em; min-width: 6em;
} }
@@ -17,14 +17,14 @@
background: none; background: none;
border: none; border: none;
color: black; color: black;
font-size: 12pt; font-size: 12px;
} }
#recentButtonMissing { #recentButtonMissing {
background: none; background: none;
border: none; border: none;
color: grey; color: grey;
font-size: 12pt; font-size: 12px;
} }
#recentButton:hover, #recentButtonMissing:hover { #recentButton:hover, #recentButtonMissing:hover {
@@ -34,23 +34,23 @@
#recentLabel { #recentLabel {
color: black; color: black;
font-size: 16pt; font-size: 16px;
font-weight: bold; font-weight: bold;
margin-left: 6px; margin-left: 6px;
} }
#versionLabel { #versionLabel {
color: black; color: black;
font-size: 12pt; font-size: 12px;
font-weight: bold; font-weight: bold;
} }
#updateLabel { #updateLabel {
color: black; color: black;
font-size: 12pt; font-size: 12px;
} }
#welcomeLabel { #welcomeLabel {
color: black; color: black;
font-size: 12pt; font-size: 12px;
} }
+1 -1
View File
@@ -1,5 +1,5 @@
* { * {
font-size: 12pt; font-size: 12px;
} }
QtDirectoryListBox { QtDirectoryListBox {
+10 -10
View File
@@ -1,5 +1,5 @@
* { * {
font-size: 12pt; font-size: 12px;
} }
QLabel, QCheckBox { QLabel, QCheckBox {
@@ -7,12 +7,12 @@ QLabel, QCheckBox {
} }
#title { #title {
font-size: 16pt; font-size: 16px;
font-weight: bold; font-weight: bold;
} }
#projectTitle { #projectTitle {
font-size: 14pt; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
@@ -23,21 +23,21 @@ QLabel, QCheckBox {
} }
#projectDescription { #projectDescription {
font-size: 12pt; font-size: 12px;
margin-left: 20px; margin-left: 20px;
} }
#description { #description {
font-size: 12pt; font-size: 12px;
} }
#label { #label {
font-size: 12pt; font-size: 12px;
font-weight: bold; font-weight: bold;
} }
#titleLabel { #titleLabel {
font-size: 14pt; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
@@ -115,7 +115,7 @@ QLabel, QCheckBox {
border-radius: 8px; border-radius: 8px;
color: black; color: black;
padding: 3px 5px 2px; padding: 3px 5px 2px;
font-size: 14pt; font-size: 14px;
min-width: 5em; min-width: 5em;
} }
@@ -126,7 +126,7 @@ QLabel, QCheckBox {
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
color: black; color: black;
font-size: 15pt; font-size: 15px;
margin-right: 0px; margin-right: 0px;
height: 25px; height: 25px;
width: 90px; width: 90px;
@@ -161,7 +161,7 @@ QLabel, QCheckBox {
background: white; background: white;
border-radius: 8px; border-radius: 8px;
color: black; color: black;
font-size: 12pt; font-size: 12px;
width: 7em; width: 7em;
height: 7em; height: 7em;
margin-top: 10px; margin-top: 10px;
+1 -1
View File
@@ -125,7 +125,7 @@ void QtLicense::populateWindow(QWidget* widget)
void QtLicense::windowReady() 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(); addLogo();
-1
View File
@@ -30,7 +30,6 @@ QtWindow::QtWindow(QWidget* parent)
std::string frameStyle = std::string frameStyle =
"#window {" "#window {"
" font-size: 17pt;"
" border: 1px solid lightgray;" " border: 1px solid lightgray;"
" border-radius: 15px;" " border-radius: 15px;"
" background: white;" " background: white;"