mirror of
https://github.com/Quill-OS/quill.git
synced 2024-12-25 15:17:21 -08:00
Stylesheet improvements; Typo fix
This commit is contained in:
parent
8dfc7e3251
commit
522f09df63
22 changed files with 36 additions and 36 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
inkbox.pro.user
|
2
apps.cpp
2
apps.cpp
|
@ -61,7 +61,7 @@ apps::apps(QWidget *parent) :
|
|||
ui->lightmapsLaunchBtn->deleteLater();
|
||||
}
|
||||
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -11,7 +11,7 @@ bookInfoDialog::bookInfoDialog(QWidget *parent) :
|
|||
ui->setupUi(this);
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -15,7 +15,7 @@ brightnessDialog::brightnessDialog(QWidget *parent) :
|
|||
brightnessDialog::setFont(QFont("u001"));
|
||||
|
||||
// Stylesheet, style & misc.
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -10,7 +10,7 @@ calendarApp::calendarApp(QWidget *parent) :
|
|||
ui->setupUi(this);
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
1
eink.qrc
1
eink.qrc
|
@ -1,6 +1,5 @@
|
|||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>resources/eink.qss</file>
|
||||
<file>resources/checkbox-checked.png</file>
|
||||
<file>resources/checkbox-unchecked.png</file>
|
||||
<file>resources/align-center.png</file>
|
||||
|
|
|
@ -26,7 +26,7 @@ encryptionManager::encryptionManager(QWidget *parent) :
|
|||
ui->warningDescriptionLabel->setFont(QFont("u001"));
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -33,7 +33,7 @@ generalDialog::generalDialog(QWidget *parent) :
|
|||
stylesheetFile.close();
|
||||
}
|
||||
else {
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
@ -379,7 +379,7 @@ void generalDialog::on_okBtn_clicked()
|
|||
}
|
||||
}
|
||||
else if(ui->searchComboBox->currentText() == "Online library") {
|
||||
if(testPing() == 0) {
|
||||
if(testPing() == 0 or global::deviceID == "emu\n") {
|
||||
string_writeconfig("/inkbox/searchComboBoxFunction", "Online library");
|
||||
|
||||
if(!readFile("/external_root/opt/storage/gutenberg/last_sync").isEmpty()) {
|
||||
|
|
|
@ -21,7 +21,7 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) :
|
|||
this->setModal(true);
|
||||
|
||||
// Stylesheet, style & misc.
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -22,7 +22,7 @@ koboxSettings::koboxSettings(QWidget *parent) :
|
|||
ui->okBtn->setStyleSheet("font-weight: bold");
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
2
main.cpp
2
main.cpp
|
@ -178,7 +178,7 @@ int main(int argc, char *argv[])
|
|||
MainWindow w;
|
||||
|
||||
QApplication::setStyle("windows");
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
w.setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -191,7 +191,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
}
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
@ -419,7 +419,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
ui->book3Btn->show();
|
||||
ui->book4Btn->show();
|
||||
|
||||
setRecentBooksLabelsTruncateTreshold();
|
||||
setRecentBooksLabelsTruncateThreshold();
|
||||
// Book 1
|
||||
string_checkconfig(".config/08-recent_books/1");
|
||||
if(checkconfig_str_val == "") {
|
||||
|
@ -427,8 +427,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
}
|
||||
else {
|
||||
relative_path = checkconfig_str_val.split("/").last();
|
||||
if(relative_path.length() > truncateTreshold) {
|
||||
relative_path.truncate(truncateTreshold);
|
||||
if(relative_path.length() > truncateThreshold) {
|
||||
relative_path.truncate(truncateThreshold);
|
||||
relative_path.append(" ...");
|
||||
}
|
||||
ui->book1Btn->setText(relative_path);
|
||||
|
@ -441,8 +441,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
}
|
||||
else {
|
||||
relative_path = checkconfig_str_val.split("/").last();
|
||||
if(relative_path.length() > truncateTreshold) {
|
||||
relative_path.truncate(truncateTreshold);
|
||||
if(relative_path.length() > truncateThreshold) {
|
||||
relative_path.truncate(truncateThreshold);
|
||||
relative_path.append(" ...");
|
||||
}
|
||||
ui->book2Btn->setText(relative_path);
|
||||
|
@ -455,8 +455,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
}
|
||||
else {
|
||||
relative_path = checkconfig_str_val.split("/").last();
|
||||
if(relative_path.length() > truncateTreshold) {
|
||||
relative_path.truncate(truncateTreshold);
|
||||
if(relative_path.length() > truncateThreshold) {
|
||||
relative_path.truncate(truncateThreshold);
|
||||
relative_path.append(" ...");
|
||||
}
|
||||
ui->book3Btn->setText(relative_path);
|
||||
|
@ -469,8 +469,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
}
|
||||
else {
|
||||
relative_path = checkconfig_str_val.split("/").last();
|
||||
if(relative_path.length() > truncateTreshold) {
|
||||
relative_path.truncate(truncateTreshold);
|
||||
if(relative_path.length() > truncateThreshold) {
|
||||
relative_path.truncate(truncateThreshold);
|
||||
relative_path.append(" ...");
|
||||
}
|
||||
ui->book4Btn->setText(relative_path);
|
||||
|
@ -1098,7 +1098,7 @@ void MainWindow::openEncfsRepackDialog() {
|
|||
|
||||
void MainWindow::on_libraryButton_clicked()
|
||||
{
|
||||
if(testPing() == 0) {
|
||||
if(testPing() == 0 or global::deviceID == "emu\n") {
|
||||
resetFullWindowException = false;
|
||||
resetWindow(false);
|
||||
if(global::mainwindow::tabSwitcher::libraryWidgetSelected != true) {
|
||||
|
@ -1134,15 +1134,15 @@ void MainWindow::resetFullWindow() {
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::setRecentBooksLabelsTruncateTreshold() {
|
||||
void MainWindow::setRecentBooksLabelsTruncateThreshold() {
|
||||
if(global::deviceID == "n705\n" or global::deviceID == "n905b\n" or global::deviceID == "n905c\n") {
|
||||
truncateTreshold = 12;
|
||||
truncateThreshold = 12;
|
||||
}
|
||||
else if(global::deviceID == "n613\n" or global::deviceID == "n873\n" or global::deviceID == "n236\n" or global::deviceID == "n437\n" or global::deviceID == "n306\n"){
|
||||
truncateTreshold = 20;
|
||||
truncateThreshold = 20;
|
||||
}
|
||||
else {
|
||||
truncateTreshold = 12;
|
||||
truncateThreshold = 12;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ public:
|
|||
float wifiIconHeight;
|
||||
float sW;
|
||||
float sH;
|
||||
int truncateTreshold;
|
||||
int truncateThreshold;
|
||||
|
||||
bool existing_recent_books = false;
|
||||
bool reboot_after_update = false;
|
||||
|
@ -96,7 +96,7 @@ private slots:
|
|||
void on_libraryButton_clicked();
|
||||
void resetWindow(bool resetStackedWidget);
|
||||
void resetFullWindow();
|
||||
void setRecentBooksLabelsTruncateTreshold();
|
||||
void setRecentBooksLabelsTruncateThreshold();
|
||||
void resetWifiIconClickedWhileReconnecting();
|
||||
|
||||
private:
|
||||
|
|
2
quit.cpp
2
quit.cpp
|
@ -22,7 +22,7 @@ quit::quit(QWidget *parent) :
|
|||
ui->backBtn->setProperty("type", "borderless");
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -124,7 +124,7 @@ reader::reader(QWidget *parent) :
|
|||
QFont crimson(family);
|
||||
|
||||
// Stylesheet + misc.
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -10,7 +10,7 @@ savedwords::savedwords(QWidget *parent) :
|
|||
{
|
||||
ui->setupUi(this);
|
||||
savedwords::setFont(QFont("u001"));
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -381,7 +381,7 @@ settings::settings(QWidget *parent) :
|
|||
ui->checkOtaUpdateGridLayout->deleteLater();
|
||||
}
|
||||
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -12,7 +12,7 @@ settingsChooser::settingsChooser(QWidget *parent) :
|
|||
ui->setupUi(this);
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -13,7 +13,7 @@ textwidget::textwidget(QWidget *parent) :
|
|||
ui->textBrowser->setFont(QFont("u001"));
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -24,7 +24,7 @@ usbms_splash::usbms_splash(QWidget *parent) :
|
|||
float stdIconHeight = sH / 1.30;
|
||||
|
||||
// Stylesheet
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
|
@ -17,7 +17,7 @@ wifiDialog::wifiDialog(QWidget *parent) :
|
|||
wifiListTimer = new QTimer(this);
|
||||
|
||||
// Stylesheet, style & misc.
|
||||
QFile stylesheetFile(":/resources/eink.qss");
|
||||
QFile stylesheetFile("eink.qss");
|
||||
stylesheetFile.open(QFile::ReadOnly);
|
||||
this->setStyleSheet(stylesheetFile.readAll());
|
||||
stylesheetFile.close();
|
||||
|
|
Loading…
Reference in a new issue