Cleanup (#27)

misc updates: * shrink help/info icons + add text * hyperlink urls in about popup *adjust text in about popup *adjust wording of formatting text *adjust wording of custom img select *limit custom img select to zip files *adjust wording of invalid guid text *add text for missing guid
unraid · May 25, 2024 · 8f28eff · 8f28eff
1 parent 6f5a1b1
commit 8f28eff
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 94 deletions.
diff --git a/src/MsgPopup.qml b/src/MsgPopup.qml
@@ -20,6 +20,7 @@ Popup {
 
     property alias title: msgpopupheader.text
     property alias text: msgpopupbody.text
+    property alias body: msgpopupbody
     property bool continueButton: true
     property bool quitButton: false
     property bool yesButton: false

diff --git a/src/UnraidOptionsPopup.qml b/src/UnraidOptionsPopup.qml
@@ -101,7 +101,6 @@ Popup {
                 spacing: -10
 
                 RowLayout {
-                    Layout.fillWidth: True
                     Text {
                         text : "Server Name:"
                         color: !fieldServername.acceptableInput ? "red" : "white"
@@ -114,10 +113,6 @@ Popup {
                         maximumLength: 15
                         validator: RegExpValidator { regExp: /^[A-Za-z0-9]([A-Za-z0-9\-\.]{0,13}[A-Za-z0-9])?$/ }
                     }
-                    ImCheckBox {
-                        id: checkboxLegacyBoot
-                        text: "Enable Legacy Boot"
-                    }
                 }
 
                 RowLayout {
@@ -283,7 +278,6 @@ Popup {
         settings.dns = dnsField.fullAddress
         settings.netmask = fieldNetmask.currentText
         settings.servername = fieldServername.text
-        settings.legacyboot = checkboxLegacyBoot.checked
         imageWriter.setSavedCustomizationSettings(settings)
 
 

diff --git a/src/downloadextractthread.cpp b/src/downloadextractthread.cpp
@@ -417,23 +417,13 @@ void DownloadExtractThread::extractMultiFileRun()
                 QFile::copy(":/unraid/syslinux/syslinux.exe", folder + "/syslinux/syslinux.exe");
             }
 
-            QString permitUEFI{"Y"};
-            if(_imgWriterSettings.contains("legacyboot") && _imgWriterSettings["legacyboot"].toBool()) {
-                // if legacy boot is enabled, tell make bootable script not to permite uefi
-                permitUEFI = "N";
-            }
-
         #ifdef Q_OS_WIN
             QString makeBootableScriptName{"make_bootable.bat"};
             QString program{"cmd.exe"};
             QStringList args;
-            args << "/C" << "echo " + permitUEFI + " | make_bootable.bat";
+            args << "/C" << "echo Y | make_bootable.bat";
         #elif defined(Q_OS_DARWIN)
-            QString makeBootableScriptName{"make_bootable_mac");
-            QString program{"echo " + permitUEFI + " | ./" + makeBootableScriptName};
         #elif defined(Q_OS_LINUX)
-            QString makeBootableScriptName{"make_bootable_linux");
-            QString program{"echo " + permitUEFI + " | ./" + makeBootableScriptName};
         #else
             throw runtime_error(tr("Formatting not implemented for this platform"));
         #endif
@@ -450,10 +440,10 @@ void DownloadExtractThread::extractMultiFileRun()
             proc.waitForFinished();
 
             QByteArray output = proc.readAllStandardOutput();
-            qDebug() << output;
+            std::cout << output.toStdString() << std::endl;
             output = proc.readAllStandardError();
-            qDebug() << output;
-            qDebug() << "Done running make_bootable script. Exit status code =" << proc.exitCode();
+            std::cout << output.toStdString() << std::endl;
+            std::cout << "Done running make_bootable script. Exit status code =" << proc.exitCode() << std::endl;
 
             if (proc.exitCode())
             {

diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp
@@ -34,6 +34,7 @@
 #include <QDebug>
 #include <QVersionNumber>
 #include <QtNetwork>
+#include <QDesktopServices>
 #ifndef QT_NO_WIDGETS
 #include <QFileDialog>
 #include <QApplication>
@@ -218,7 +219,7 @@ void ImageWriter::setSrc(const QUrl &url, quint64 downloadLen, quint64 extrLen,
     }
     if (url.isLocalFile())
     {
-        _initFormat = "auto";
+        _initFormat = "UNRAID";
     }
 }
 
@@ -615,14 +616,14 @@ QByteArray ImageWriter::getFilteredOSlist() {
 
     reference_os_list_array.append(QJsonObject({
             {"name", QApplication::translate("main", "Erase")},
-            {"description", QApplication::translate("main", "Format card as FAT32")},
+            {"description", QApplication::translate("main", "Format USB Drive as FAT32")},
             {"icon", "icons/erase.png"},
             {"url", "internal://format"},
         }));
 
     reference_os_list_array.append(QJsonObject({
             {"name", QApplication::translate("main", "Use custom")},
-            {"description", QApplication::translate("main", "Select a custom .img from your computer")},
+            {"description", QApplication::translate("main", "Select an Unraid .zip file from your computer")},
             {"icon", "icons/use_custom.png"},
             {"url", ""},
         }));
@@ -807,7 +808,7 @@ void ImageWriter::openFileDialog()
 
     QFileDialog *fd = new QFileDialog(nullptr, tr("Select image"),
                                       path,
-                                      "Image files (*.img *.zip *.iso *.gz *.xz *.zst);;All files (*)");
+                                      "Unraid Image files (*.zip)");
     connect(fd, SIGNAL(fileSelected(QString)), SLOT(onFileSelected(QString)));
 
     if (_engine)
@@ -1498,3 +1499,7 @@ bool ImageWriter::getDstGuidValid()
     return _guidValid;
 }
 
+bool ImageWriter::openUrl(const QString& url)
+{
+    return QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode));
+}
diff --git a/src/imagewriter.h b/src/imagewriter.h
@@ -148,6 +148,7 @@ class ImageWriter : public QObject
     Q_INVOKABLE QString getInitFormat();
     Q_INVOKABLE QString getDstDevice();
     Q_INVOKABLE bool getDstGuidValid();
+    Q_INVOKABLE bool openUrl(const QString& url);
 
 signals:
     /* We are emiting signals with QVariant as parameters because QML likes it that way */