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

Small bugfixes

Browse source
This commit is contained in:
Nicolas Mailloux 2022-03-03 22:52:29 -05:00
parent a9929fc87f
commit 1671f78e5b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generaldialog.cpp
View file

@ -128,7 +128,7 @@ generalDialog::generalDialog(QWidget *parent) :
else if(global::usbms::usbmsDialog == true) { else if(global::usbms::usbmsDialog == true) {
usbmsDialog = true; usbmsDialog = true;
ui->okBtn->setText("Connect"); ui->okBtn->setText("Connect");
ui->cancelBtn->setText("Cancel"); ui->cancelBtn->setText("Not now");
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->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"); ui->headerLabel->setText("USB cable connected");
QTimer::singleShot(50, this, SLOT(adjust_size())); QTimer::singleShot(50, this, SLOT(adjust_size()));

2
generaldialog.ui
View file

@ -268,7 +268,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="bodyLabel"> <widget class="QLabel" name="bodyLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

3
mainwindow.cpp
View file

@ -350,7 +350,6 @@ MainWindow::MainWindow(QWidget *parent)
if(checkconfig(".config/18-encrypted_storage/status") == true) { if(checkconfig(".config/18-encrypted_storage/status") == true) {
QDir encfsDropboxDir("/mnt/onboard/onboard/encfs-dropbox"); QDir encfsDropboxDir("/mnt/onboard/onboard/encfs-dropbox");
if(!encfsDropboxDir.isEmpty()) { if(!encfsDropboxDir.isEmpty()) {
global::usbms::showUsbmsDialog = false;
QTimer::singleShot(1000, this, SLOT(openEncfsRepackDialog())); QTimer::singleShot(1000, this, SLOT(openEncfsRepackDialog()));
} }
} }
@ -1076,6 +1075,8 @@ void MainWindow::checkForUpdate() {
void MainWindow::openEncfsRepackDialog() { void MainWindow::openEncfsRepackDialog() {
global::encfs::repackDialog = true; global::encfs::repackDialog = true;
global::usbms::showUsbmsDialog = false;
global::usbms::usbmsDialog = false;
generalDialogWindow = new generalDialog(this); generalDialogWindow = new generalDialog(this);
generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose); generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
} }