michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-26 23:57:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

New UI/UX font: U001/Univers

Browse source 
Inter is still there in a lot of areas and blends quite well with this new font.
This commit is contained in:
Nicolas Mailloux 2022-03-03 00:40:11 -05:00
parent 493d217ebe
commit 0756004db6
19 changed files with 563 additions and 510 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
alert.cpp
View file

@ -12,6 +12,7 @@ alert::alert(QWidget *parent) :
ui(new Ui::alert)
{
ui->setupUi(this);
alert::setFont(QFont("u001"));
// Getting the screen's size
float sW = QGuiApplication::screens()[0]->size().width();
@ -80,9 +81,9 @@ alert::alert(QWidget *parent) :
poweroff(false);
}
ui->warningLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 16pt}");
ui->messageLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 9pt}");
ui->securityLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 11pt}");
ui->warningLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 18pt }");
ui->messageLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 10pt }");
ui->securityLabel->setStyleSheet("QLabel { background-color : black; color : white; font-size: 12pt }");
ui->continueBtn->setProperty("type", "borderless");
ui->resetBtn->setProperty("type", "borderless");
ui->continueBtn->setStyleSheet("padding: 20px");

1
bookinfodialog.cpp
View file

@ -9,6 +9,7 @@ bookInfoDialog::bookInfoDialog(QWidget *parent) :
ui(new Ui::bookInfoDialog)
{
ui->setupUi(this);
bookInfoDialog::setFont(QFont("u001"));
// Stylesheet
QFile stylesheetFile(":/resources/eink.qss");

1
brightnessdialog.cpp
View file

@ -12,6 +12,7 @@ brightnessDialog::brightnessDialog(QWidget *parent) :
ui(new Ui::brightnessDialog)
{
ui->setupUi(this);
brightnessDialog::setFont(QFont("u001"));
// Stylesheet, style & misc.
QFile stylesheetFile(":/resources/eink.qss");

4
dictionarywidget.cpp
View file

@ -14,6 +14,10 @@ dictionaryWidget::dictionaryWidget(QWidget *parent) :
ui(new Ui::dictionaryWidget)
{
ui->setupUi(this);
ui->wordLabel->setFont(QFont("u001"));
ui->wordLabel->setStyleSheet("font-weight: bold");
ui->definitionStatusLabel->setFont(QFont("u001"));
ui->backBtn->setProperty("type", "borderless");
ui->backBtn->setStyleSheet("background: lightGrey; font-size: 9pt; padding: 8px");
ui->nextDefinitionBtn->setProperty("type", "borderless");

24
encryptionmanager.cpp
View file

@ -16,6 +16,14 @@ encryptionManager::encryptionManager(QWidget *parent) :
ui(new Ui::encryptionManager)
{
ui->setupUi(this);
ui->encryptionSetupLabel->setFont(QFont("u001"));
ui->successLabel->setFont(QFont("u001"));
ui->failureLabel->setFont(QFont("u001"));
ui->descriptionLabel->setFont(QFont("u001"));
ui->successDescriptionLabel->setFont(QFont("u001"));
ui->failureDescriptionLabel->setFont(QFont("u001"));
ui->warningLabel->setFont(QFont("u001"));
ui->warningDescriptionLabel->setFont(QFont("u001"));
// Stylesheet
QFile stylesheetFile(":/resources/eink.qss");
@ -23,20 +31,20 @@ encryptionManager::encryptionManager(QWidget *parent) :
this->setStyleSheet(stylesheetFile.readAll());
stylesheetFile.close();
ui->encryptionSetupLabel->setStyleSheet("font-size: 15pt");
ui->descriptionLabel->setStyleSheet("font-size: 9pt");
ui->successLabel->setStyleSheet("font-size: 15pt");
ui->successDescriptionLabel->setStyleSheet("font-size: 9pt");
ui->failureLabel->setStyleSheet("font-size: 15pt");
ui->failureDescriptionLabel->setStyleSheet("font-size: 9pt");
ui->encryptionSetupLabel->setStyleSheet("font-size: 18pt; font-weight: bold");
ui->descriptionLabel->setStyleSheet("font-size: 10pt");
ui->successLabel->setStyleSheet("font-size: 18pt; font-weight: bold");
ui->successDescriptionLabel->setStyleSheet("font-size: 10pt");
ui->failureLabel->setStyleSheet("font-size: 18pt; font-weight: bold");
ui->failureDescriptionLabel->setStyleSheet("font-size: 10pt");
ui->setupContinueBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->setupAbortBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->exitSuccessBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->failureContinueBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->acceptBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->usbmsBtn->setStyleSheet("background: lightGrey; border: 3px solid black; color: black; padding: 10px; outline: none; font-size: 10pt; font-weight: bold; border-radius: 10px");
ui->warningLabel->setStyleSheet("font-size: 15pt");
ui->warningDescriptionLabel->setStyleSheet("font-size: 9pt");
ui->warningLabel->setStyleSheet("font-size: 18pt; font-weight: bold");
ui->warningDescriptionLabel->setStyleSheet("font-size: 10pt");
// Getting the screen's size
float sW = QGuiApplication::screens()[0]->size().width();

14
generaldialog.cpp
View file

@ -20,6 +20,9 @@ generalDialog::generalDialog(QWidget *parent) :
ui(new Ui::generalDialog)
{
ui->setupUi(this);
ui->bodyLabel->setFont(QFont("u001"));
ui->searchComboBox->setFont(QFont("u001"));
ui->label_2->setFont(QFont("u001"));
// Preventing outside interaction
this->setModal(true);
@ -45,7 +48,8 @@ generalDialog::generalDialog(QWidget *parent) :
ui->okBtn->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->acceptBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
ui->bodyLabel->setStyleSheet("font-size: 9pt");
ui->headerLabel->setStyleSheet("font-weight: bold");
ui->bodyLabel->setStyleSheet("font-size: 9.5pt");
ui->searchComboBox->setStyleSheet("font-size: 9pt");
// Disabling "Online library" search if device doesn't have Wi-Fi
@ -93,7 +97,7 @@ generalDialog::generalDialog(QWidget *parent) :
updateDialog = true;
ui->okBtn->setText("Update");
ui->cancelBtn->setText("Not now");
ui->bodyLabel->setText("Do you want to update InkBox now?");
ui->bodyLabel->setText("<font face='u001'>Do you want to update InkBox now</font><font face='Inter'>?</font>"); // Because I hate Univers/U001's question mark ...
ui->headerLabel->setText("Update available");
this->adjustSize();
string_writeconfig("/inkbox/updateDialog", "false");
@ -126,7 +130,7 @@ generalDialog::generalDialog(QWidget *parent) :
usbmsDialog = true;
ui->okBtn->setText("Connect");
ui->cancelBtn->setText("Cancel");
ui->bodyLabel->setText("Do you want to connect your device to a computer to manage books?");
ui->bodyLabel->setText("<font face='u001'>Do you want to connect your device to a computer to manage books</font><font face='Inter'>?</font>");
ui->headerLabel->setText("USB cable connected");
this->adjustSize();
}
@ -164,7 +168,7 @@ generalDialog::generalDialog(QWidget *parent) :
ui->headerLabel->setText("Warning");
ui->okBtn->setText("Proceed");
ui->cancelBtn->setText("Go back");
ui->bodyLabel->setText("This will delete all the files you have encrypted. Are you sure you want to continue?");
ui->bodyLabel->setText("<font face='u001'>This will delete all the files you have encrypted. Are you sure you want to continue</font><font face='Inter'>?</font>");
this->adjustSize();
}
else if(global::encfs::errorNoBooksInDropboxDialog == true) {
@ -177,7 +181,7 @@ generalDialog::generalDialog(QWidget *parent) :
ui->headerLabel->setText("Information");
ui->okBtn->setText("Proceed");
ui->cancelBtn->setText("Not now");
ui->bodyLabel->setText("New files have been found in 'encfs-dropbox'. Would you want to repack your encrypted storage?");
ui->bodyLabel->setText("<font face='u001'>New files have been found in 'encfs-dropbox'. Would you want to repack your encrypted storage</font><font face='Inter'>?</font>");
this->adjustSize();
}
else {

34
generaldialog.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<height>218</height>
</rect>
</property>
<property name="windowTitle">
@ -259,21 +259,14 @@
</property>
<item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="2" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="bodyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Inter</family>
@ -292,6 +285,19 @@
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<spacer name="verticalSpacer">
<property name="orientation">

1
koboxappsdialog.cpp
View file

@ -15,6 +15,7 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) :
ui(new Ui::koboxAppsDialog)
{
ui->setupUi(this);
ui->appsList->setFont(QFont("u001"));
// Preventing outside interaction
this->setModal(true);

3
koboxsettings.cpp
View file

@ -10,11 +10,14 @@ koboxSettings::koboxSettings(QWidget *parent) :
ui(new Ui::koboxSettings)
{
ui->setupUi(this);
koboxSettings::setFont(QFont("u001"));
ui->okBtn->setFont(QFont("Inter"));
// UI tweaks
ui->okBtn->setProperty("type", "borderless");
ui->pushButton->setProperty("type", "borderless");
ui->resetKoboxBtn->setProperty("type", "borderless");
ui->okBtn->setStyleSheet("font-weight: bold");
// Stylesheet
QFile stylesheetFile(":/resources/eink.qss");

6
mainwindow.cpp
View file

@ -28,6 +28,7 @@ MainWindow::MainWindow(QWidget *parent)
, ui(new Ui::MainWindow)
{
ui->setupUi(this);
ui->inkboxLabel->setFont(QFont("u001"));
ui->settingsBtn->setProperty("type", "borderless");
ui->appsBtn->setProperty("type", "borderless");
@ -53,6 +54,7 @@ MainWindow::MainWindow(QWidget *parent)
ui->quotePictureLabel->setText("");
ui->quoteHeadingLabel->setStyleSheet("padding: 30px");
ui->inkboxLabel->setStyleSheet("font-size: 10.5pt");
ui->homeBtn->setStyleSheet("padding: 5px");
// Initializing some variables
@ -801,7 +803,7 @@ void MainWindow::setBatteryIcon() {
QPixmap emptyPixmap(":/resources/battery_empty.png");
QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio);
// Checking battery level and status, then displaying the relevant icon on batteryIconLabel
// Checking battery level and status, then displaying the relevant icon on batteryIcon
if(isUsbPluggedIn() == true) {
ui->batteryIcon->setPixmap(scaledChargingPixmap);
}
@ -831,7 +833,7 @@ void MainWindow::setBatteryIcon() {
QPixmap emptyPixmap(":/resources/battery_empty.png");
QPixmap scaledEmptyPixmap = emptyPixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio);
// Checking battery level and status, then displaying the relevant icon on batteryIconLabel
// Checking battery level and status, then displaying the relevant icon on batteryIcon
if(isUsbPluggedIn() == true) {
ui->batteryIcon->setPixmap(scaledChargingPixmap);
}

1
quit.cpp
View file

@ -13,6 +13,7 @@ quit::quit(QWidget *parent) :
ui(new Ui::quit)
{
ui->setupUi(this);
ui->backBtn->setFont(QFont("u001"));
ui->pushButton->setProperty("type", "borderless");
ui->pushButton_2->setProperty("type", "borderless");

12
reader.cpp
View file

@ -37,6 +37,14 @@ reader::reader(QWidget *parent) :
wordwidgetLock = false;
ui->setupUi(this);
ui->brightnessStatus->setFont(QFont("u001"));
ui->fontLabel->setFont(QFont("u001"));
ui->sizeLabel->setFont(QFont("u001"));
ui->sizeValueLabel->setFont(QFont("u001"));
ui->alignmentLabel->setFont(QFont("u001"));
ui->fontChooser->setFont(QFont("u001"));
ui->pageProgressBar->setFont(QFont("u001"));
ui->previousBtn->setProperty("type", "borderless");
ui->nextBtn->setProperty("type", "borderless");
ui->optionsBtn->setProperty("type", "borderless");
@ -1162,9 +1170,11 @@ void reader::on_aboutBtn_clicked()
{
if(checkconfig("/opt/inkbox_genuine") == true) {
QString aboutmsg = "InkBox is an open-source, Qt-based eBook reader. It aims to bring you the latest Qt features while being also fast and responsive.";
aboutmsg.prepend("<font face='u001'>");
string_checkconfig_ro("/external_root/opt/isa/version");
aboutmsg.append("\n\nInkBox ");
aboutmsg.append("<br><br>InkBox ");
aboutmsg.append(checkconfig_str_val);
aboutmsg.append("</font>");
QMessageBox::information(this, tr("Information"), aboutmsg);
}
else {

1
savedwords.cpp
View file

@ -9,6 +9,7 @@ savedwords::savedwords(QWidget *parent) :
ui(new Ui::savedwords)
{
ui->setupUi(this);
savedwords::setFont(QFont("u001"));
QFile stylesheetFile(":/resources/eink.qss");
stylesheetFile.open(QFile::ReadOnly);
this->setStyleSheet(stylesheetFile.readAll());

1
searchresultswidget.cpp
View file

@ -13,6 +13,7 @@ searchResultsWidget::searchResultsWidget(QWidget *parent) :
// Variables
libraryResults = false;
ui->listView->setFont(QFont("u001"));
ui->listView->setStyleSheet("font-size: 10pt");
ui->backBtn->setProperty("type", "borderless");
ui->backBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");

12
settings.cpp
View file

@ -23,6 +23,12 @@ settings::settings(QWidget *parent) :
ui(new Ui::settings)
{
ui->setupUi(this);
settings::setFont(QFont("u001"));
ui->label->setFont(QFont("u001"));
ui->comboBox->setFont(QFont("u001"));
ui->sleepTimeoutComboBox->setFont(QFont("u001"));
ui->okBtn->setFont(QFont("Inter"));
ui->setPasscodeBtn->setProperty("type", "borderless");
ui->okBtn->setProperty("type", "borderless");
ui->aboutBtn->setProperty("type", "borderless");
@ -36,6 +42,8 @@ settings::settings(QWidget *parent) :
ui->previousBtn->setProperty("type", "borderless");
ui->nextBtn->setProperty("type", "borderless");
ui->repackBtn->setProperty("type", "borderless");
ui->label->setStyleSheet("font-size: 10.5pt; font-weight: bold");
ui->okBtn->setStyleSheet("font-weight: bold");
ui->aboutBtn->setStyleSheet("font-size: 9pt");
ui->requestLeaseBtn->setStyleSheet("font-size: 9pt");
ui->usbmsBtn->setStyleSheet("font-size: 9pt");
@ -401,9 +409,11 @@ void settings::on_aboutBtn_clicked()
{
if(checkconfig("/opt/inkbox_genuine") == true) {
QString aboutmsg = "InkBox is an open-source, Qt-based eBook reader. It aims to bring you the latest Qt features while being also fast and responsive.";
aboutmsg.prepend("<font face='u001'>");
string_checkconfig_ro("/external_root/opt/isa/version");
aboutmsg.append("\n\nInkBox ");
aboutmsg.append("<br><br>InkBox ");
aboutmsg.append(checkconfig_str_val);
aboutmsg.append("</font>");
QMessageBox::information(this, tr("Information"), aboutmsg);
}
else {

934
settings.ui
View file

File diff suppressed because it is too large Load diff

1
textwidget.cpp
View file

@ -10,6 +10,7 @@ textwidget::textwidget(QWidget *parent) :
ui(new Ui::textwidget)
{
ui->setupUi(this);
ui->textBrowser->setFont(QFont("u001"));
// Stylesheet
QFile stylesheetFile(":/resources/eink.qss");

5
usbms_splash.cpp
View file

@ -12,6 +12,7 @@ usbms_splash::usbms_splash(QWidget *parent) :
ui(new Ui::usbms_splash)
{
ui->setupUi(this);
usbms_splash::setFont(QFont("u001"));
// Getting the screen's size
sW = QGuiApplication::screens()[0]->size().width();
@ -48,8 +49,8 @@ usbms_splash::usbms_splash(QWidget *parent) :
float stdIconHeight = sH / 1.15;
this->setStyleSheet("background-color:black;");
ui->label->setStyleSheet("QLabel { background-color : black; color : white; }");
ui->label_3->setStyleSheet("QLabel { background-color : black; color : white; font-size: 9pt}");
ui->label->setStyleSheet("QLabel { background-color : black; color : white; font-size: 15pt }");
ui->label_3->setStyleSheet("QLabel { background-color : black; color : white; font-size: 10pt }");
QPixmap pixmap(":/resources/usbms.png");
QPixmap scaledPixmap = pixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio);

1
wifidialog.cpp
View file

@ -28,6 +28,7 @@ wifiDialog::wifiDialog(QWidget *parent) :
ui->cancelBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
ui->connectBtn->setStyleSheet("font-size: 9pt; padding: 10px; font-weight: bold; background: lightGrey");
ui->mainLabel->setStyleSheet("padding-left: 125px; padding-right: 125px");
ui->networksListWidget->setFont(QFont("u001"));
ui->networksListWidget->setStyleSheet("font-size: 9pt");
checkWifiNetworks();