michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-27 16:17:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Miscellanous design fixes

Browse source
This commit is contained in:
Nicolas Mailloux 2022-03-26 14:50:39 -04:00
parent 6cc6737d8d
commit 8065b8e1b6
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
generaldialog.cpp
View file

@ -9,7 +9,6 @@
#include <QProcess> #include <QProcess>
#include <QScreen> #include <QScreen>
#include <QTimer> #include <QTimer>
#include <QMessageBox>
#include <QDirIterator> #include <QDirIterator>
#include <QStringListModel> #include <QStringListModel>
#include <QListView> #include <QListView>
@ -111,10 +110,10 @@ generalDialog::generalDialog(QWidget *parent) :
ui->stackedWidget->setCurrentIndex(1); ui->stackedWidget->setCurrentIndex(1);
if(global::kobox::koboxSettingsRebootDialog == true or global::encfs::enableStorageEncryptionDialog) { if(global::kobox::koboxSettingsRebootDialog == true or global::encfs::enableStorageEncryptionDialog) {
koboxSettingsRebootDialog = true; koboxSettingsRebootDialog = true;
ui->bodyLabel->setText("The device will reboot now, since the settings you chose require it to work properly."); ui->bodyLabel->setText("The device will reboot now, since<br>the settings you defined require it to work properly.");
} }
else { else {
ui->bodyLabel->setText("The settings you chose might require a complete reboot of the device for them to work properly."); ui->bodyLabel->setText("The settings you defined might<br>require a complete reboot of the device for them to work properly.");
} }
ui->headerLabel->setText("Information"); ui->headerLabel->setText("Information");
QTimer::singleShot(50, this, SLOT(adjust_size())); QTimer::singleShot(50, this, SLOT(adjust_size()));
@ -421,7 +420,8 @@ void generalDialog::on_okBtn_clicked()
} }
} }
else { else {
QMessageBox::critical(this, tr("Invalid argument"), tr("Please type in a search term.")); global::toast::delay = 3000;
emit showToast("Please type in a search term");
} }
} }
else if(global::keyboard::vncDialog == true) { else if(global::keyboard::vncDialog == true) {
@ -447,7 +447,8 @@ void generalDialog::on_okBtn_clicked()
} }
} }
else { else {
QMessageBox::critical(this, tr("Invalid argument"), tr("Please type in the required argument.")); global::toast::delay = 3000;
emit showToast("Please type in the required argument");
} }
} }
else if(global::keyboard::wifiPassphraseDialog == true) { else if(global::keyboard::wifiPassphraseDialog == true) {
@ -462,7 +463,8 @@ void generalDialog::on_okBtn_clicked()
global::keyboard::keyboardDialog = false; global::keyboard::keyboardDialog = false;
} }
else { else {
QMessageBox::critical(this, tr("Invalid argument"), tr("Please type in the required argument.")); global::toast::delay = 3000;
showToast("Please type in the required argument");
} }
} }
else if(global::keyboard::encfsDialog == true) { else if(global::keyboard::encfsDialog == true) {
@ -474,7 +476,8 @@ void generalDialog::on_okBtn_clicked()
this->close(); this->close();
} }
else { else {
QMessageBox::critical(this, tr("Invalid argument"), tr("Please type in the required argument.")); global::toast::delay = 3000;
showToast("Please type in the required argument");
} }
} }
else { else {