From 1671f78e5bf376abae0873095c6426a45e8f1df7 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Thu, 3 Mar 2022 22:52:29 -0500
Subject: [PATCH] Small bugfixes

---
 generaldialog.cpp | 2 +-
 generaldialog.ui  | 2 +-
 mainwindow.cpp    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/generaldialog.cpp b/generaldialog.cpp
index 363918e..18b43cc 100644
--- a/generaldialog.cpp
+++ b/generaldialog.cpp
@@ -128,7 +128,7 @@ generalDialog::generalDialog(QWidget *parent) :
     else if(global::usbms::usbmsDialog == true) {
         usbmsDialog = true;
         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->headerLabel->setText("USB cable connected");
         QTimer::singleShot(50, this, SLOT(adjust_size()));
diff --git a/generaldialog.ui b/generaldialog.ui
index da81cff..1d07d21 100644
--- a/generaldialog.ui
+++ b/generaldialog.ui
@@ -268,7 +268,7 @@
            <item row="1" column="0">
             <widget class="QLabel" name="bodyLabel">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e3234bd..24eefe1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -350,7 +350,6 @@ MainWindow::MainWindow(QWidget *parent)
     if(checkconfig(".config/18-encrypted_storage/status") == true) {
         QDir encfsDropboxDir("/mnt/onboard/onboard/encfs-dropbox");
         if(!encfsDropboxDir.isEmpty()) {
-            global::usbms::showUsbmsDialog = false;
             QTimer::singleShot(1000, this, SLOT(openEncfsRepackDialog()));
         }
     }
@@ -1076,6 +1075,8 @@ void MainWindow::checkForUpdate() {
 
 void MainWindow::openEncfsRepackDialog() {
     global::encfs::repackDialog = true;
+    global::usbms::showUsbmsDialog = false;
+    global::usbms::usbmsDialog = false;
     generalDialogWindow = new generalDialog(this);
     generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
 }