mirror of
https://github.com/Quill-OS/quill.git
synced 2024-10-31 21:33:22 -07:00
UI fonts standardization in some areas
This commit is contained in:
parent
cc6715f0a2
commit
5648b6351a
6 changed files with 19 additions and 28 deletions
|
@ -13,8 +13,8 @@ powerDaemonSettings::powerDaemonSettings(QWidget *parent) :
|
||||||
ui->mainLabel->setFont(QFont("Inter"));
|
ui->mainLabel->setFont(QFont("Inter"));
|
||||||
|
|
||||||
// Avoid some display issues (label moving because width of text would change with a proportional font)
|
// Avoid some display issues (label moving because width of text would change with a proportional font)
|
||||||
ui->CBSLabel->setFont(QFont("Noto Sans Mono"));
|
ui->CBSLabel->setFont(QFont("Roboto Mono"));
|
||||||
ui->idleSleepLabel->setFont(QFont("Noto Sans Mono"));
|
ui->idleSleepLabel->setFont(QFont("Roboto Mono"));
|
||||||
|
|
||||||
// Font tweaks
|
// Font tweaks
|
||||||
ui->label_2->setFont(QFont("Inter"));
|
ui->label_2->setFont(QFont("Inter"));
|
||||||
|
@ -67,10 +67,10 @@ powerDaemonSettings::powerDaemonSettings(QWidget *parent) :
|
||||||
// Padding
|
// Padding
|
||||||
ui->CBSDecreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->CBSDecreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
||||||
ui->CBSIncreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->CBSIncreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
||||||
ui->idleSleepDecreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->idleSleepDecreaseBtn->setStyleSheet("font-family: 'Roboto Mono'; font-weight: bold; padding: 10px; font-size: 10pt");
|
||||||
ui->idleSleepIncreaseBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->idleSleepIncreaseBtn->setStyleSheet("font-family: 'Roboto Mono'; font-weight: bold; padding: 10px; font-size: 10pt");
|
||||||
ui->idleSleepDecreaseMBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->idleSleepDecreaseMBtn->setStyleSheet("font-family: 'Roboto Mono'; font-weight: bold; padding: 10px; font-size: 10pt");
|
||||||
ui->idleSleepIncreaseMBtn->setStyleSheet("padding: 10px; font-size: 10pt");
|
ui->idleSleepIncreaseMBtn->setStyleSheet("font-family: 'Roboto Mono'; font-weight: bold; padding: 10px; font-size: 10pt");
|
||||||
|
|
||||||
// Stylesheet
|
// Stylesheet
|
||||||
QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss");
|
QFile stylesheetFile("/mnt/onboard/.adds/inkbox/eink.qss");
|
||||||
|
@ -403,7 +403,7 @@ void powerDaemonSettings::on_deepSleepBtn_clicked(bool checked)
|
||||||
void powerDaemonSettings::convertCinematicInt() {
|
void powerDaemonSettings::convertCinematicInt() {
|
||||||
QString text = QString::number(cinematicBrightnessInt);
|
QString text = QString::number(cinematicBrightnessInt);
|
||||||
// To avoid moving other widgets when the value changes
|
// To avoid moving other widgets when the value changes
|
||||||
text.append("ms");
|
text.append(" ms");
|
||||||
ui->CBSLabel->setText(text);
|
ui->CBSLabel->setText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ brightnessDialog::brightnessDialog(QWidget *parent) :
|
||||||
ui->incBtn->setProperty("type", "borderless");
|
ui->incBtn->setProperty("type", "borderless");
|
||||||
ui->incBtn->setText("");
|
ui->incBtn->setText("");
|
||||||
ui->incBtn->setIcon(QIcon(":/resources/plus.png"));
|
ui->incBtn->setIcon(QIcon(":/resources/plus.png"));
|
||||||
ui->brightnessLabel->setStyleSheet("font-size: 11pt; padding-left: 125px; padding-right: 125px; font:bold");
|
ui->brightnessLabel->setStyleSheet("padding-left: 125px; padding-right: 125px; font:bold");
|
||||||
ui->valueLabel->setStyleSheet("font-size: 9pt");
|
ui->valueLabel->setStyleSheet("font-size: 9pt");
|
||||||
ui->warmthValueLabel->setStyleSheet("font-size: 9pt");
|
ui->warmthValueLabel->setStyleSheet("font-size: 9pt");
|
||||||
|
|
||||||
|
@ -101,13 +101,6 @@ brightnessDialog::brightnessDialog(QWidget *parent) :
|
||||||
ui->warmthValueLabel->setText(warmthValueStr);
|
ui->warmthValueLabel->setText(warmthValueStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
// UI fonts
|
|
||||||
int id = QFontDatabase::addApplicationFont(":/resources/fonts/CrimsonPro-Bold.ttf");
|
|
||||||
QString family = QFontDatabase::applicationFontFamilies(id).at(0);
|
|
||||||
QFont crimson_bold(family);
|
|
||||||
|
|
||||||
ui->brightnessLabel->setFont(QFont(crimson_bold));
|
|
||||||
|
|
||||||
// Saving current brightness value in case we want to go backwards
|
// Saving current brightness value in case we want to go backwards
|
||||||
if(global::isN705 == true or global::isN905C == true or global::isKT == true or global::isN873 == true) {
|
if(global::isN705 == true or global::isN905C == true or global::isKT == true or global::isN873 == true) {
|
||||||
oldValue = get_brightness();
|
oldValue = get_brightness();
|
||||||
|
|
|
@ -145,8 +145,9 @@
|
||||||
<widget class="QLabel" name="brightnessLabel">
|
<widget class="QLabel" name="brightnessLabel">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
<font>
|
<font>
|
||||||
<family>Chivo</family>
|
<family>Inter</family>
|
||||||
<italic>true</italic>
|
<weight>75</weight>ı
|
||||||
|
<bold>true</bold>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
|
|
@ -198,6 +198,11 @@
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Where:</string>
|
<string>Where:</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<family>u001</family>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
|
|
|
@ -15,6 +15,7 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) :
|
||||||
ui(new Ui::koboxAppsDialog)
|
ui(new Ui::koboxAppsDialog)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ui->definitionLabel->setFont(QFont("u001"));
|
||||||
ui->appsList->setFont(QFont("u001"));
|
ui->appsList->setFont(QFont("u001"));
|
||||||
|
|
||||||
// Preventing outside interaction
|
// Preventing outside interaction
|
||||||
|
@ -26,24 +27,16 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) :
|
||||||
this->setStyleSheet(stylesheetFile.readAll());
|
this->setStyleSheet(stylesheetFile.readAll());
|
||||||
stylesheetFile.close();
|
stylesheetFile.close();
|
||||||
|
|
||||||
if(global::deviceID == "n705\n") {
|
|
||||||
// If we don't do this, the text will clip out of the display.
|
|
||||||
ui->definitionLabel->setText("Please select an application.\nClick on 'Launch' to start it.");
|
ui->definitionLabel->setText("Please select an application.\nClick on 'Launch' to start it.");
|
||||||
}
|
|
||||||
|
|
||||||
ui->launchBtn->setProperty("type", "borderless");
|
ui->launchBtn->setProperty("type", "borderless");
|
||||||
ui->cancelBtn->setProperty("type", "borderless");
|
ui->cancelBtn->setProperty("type", "borderless");
|
||||||
ui->launchBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
|
ui->launchBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
|
||||||
ui->cancelBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
|
ui->cancelBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
|
||||||
ui->appsList->setStyleSheet("font-size: 9pt");
|
ui->appsList->setStyleSheet("font-size: 9pt");
|
||||||
|
ui->definitionLabel->setStyleSheet("font-size: 9.5pt");
|
||||||
ui->headerLabel->setStyleSheet("font-weight: bold");
|
ui->headerLabel->setStyleSheet("font-weight: bold");
|
||||||
|
|
||||||
// UI fonts
|
|
||||||
int id = QFontDatabase::addApplicationFont(":/resources/fonts/CrimsonPro-Regular.ttf");
|
|
||||||
QString family = QFontDatabase::applicationFontFamilies(id).at(0);
|
|
||||||
QFont crimson(family);
|
|
||||||
ui->definitionLabel->setFont(QFont(crimson));
|
|
||||||
|
|
||||||
this->adjustSize();
|
this->adjustSize();
|
||||||
|
|
||||||
// Centering dialog
|
// Centering dialog
|
||||||
|
|
|
@ -14,7 +14,6 @@ dictionaryWidget::dictionaryWidget(QWidget *parent) :
|
||||||
ui(new Ui::dictionaryWidget)
|
ui(new Ui::dictionaryWidget)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->wordLabel->setFont(QFont("u001"));
|
|
||||||
ui->wordLabel->setStyleSheet("font-weight: bold");
|
ui->wordLabel->setStyleSheet("font-weight: bold");
|
||||||
ui->definitionStatusLabel->setFont(QFont("u001"));
|
ui->definitionStatusLabel->setFont(QFont("u001"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue