fix styles

src/appswidget.cpp

@@ -365,8 +365,10 @@ void AppsWidget::createAppCard(const QString &name, const QString &bundleId,
     connect(downloadIpaLabel, &ZLabel::clicked, this,
             [this, name, bundleId]() { onDownloadIpaClicked(name, bundleId); });
 
+    buttonsLayout->addStretch();
     buttonsLayout->addWidget(installLabel);
     buttonsLayout->addWidget(downloadIpaLabel);
+    buttonsLayout->addStretch();
 
     cardLayout->addLayout(buttonsLayout);
     gridLayout->addWidget(cardWidget, row, col);

src/mainwindow.cpp

@@ -111,6 +111,9 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent), ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
+    const QSize minSize(900, 600);
+    setMinimumSize(minSize);
+    resize(minSize);
     // TODO
     // setWindowIcon(QIcon(":/resources/icons/icon.png"));
 
@@ -120,7 +123,7 @@ MainWindow::MainWindow(QWidget *parent)
                                     false);
 
     setContentsMargins(0, 0, 0, 0);
-#ifdef Q_OS_MAC
+#ifdef __APPLE__
     setupMacOSWindow(this);
     setAttribute(Qt::WA_ContentsMarginsRespectsSafeArea, false);
 #endif
@@ -180,7 +183,7 @@ MainWindow::MainWindow(QWidget *parent)
     ui->statusbar->setContentsMargins(0, 0, 0, 0);
     ui->statusbar->addPermanentWidget(settingsButton);
 
-#ifdef Q_OS_LINUX
+#ifdef __linux__
     QList<QString> mounted_iFusePaths = iFuseManager::getMountPoints();
 
     for (const QString &path : mounted_iFusePaths) {
@@ -249,12 +252,6 @@ MainWindow::~MainWindow()
 {
     idevice_event_unsubscribe();
     irecv_device_event_unsubscribe(context);
-    // TODO:Clean up all devices
-    // for (unsigned i = 0; i < idescriptor_devices.size(); ++i)
-    // {
-    //     cleanDevice(idescriptor_devices.at(i));
-    // }
-    // idescriptor_devices.clear();
     delete ui;
     sleep(2); // Give some time for cleanup to finish
 }

src/toolboxwidget.cpp

@@ -491,22 +491,31 @@ void ToolboxWidget::onToolboxClicked(iDescriptorTool tool)
     case iDescriptorTool::WirelessPhotoImport: {
         if (!m_wirelessPhotoImportWidget) {
             m_wirelessPhotoImportWidget = new WirelessPhotoImportWidget();
+            connect(m_wirelessPhotoImportWidget, &QObject::destroyed, this,
+                    [this]() { m_wirelessPhotoImportWidget = nullptr; });
             m_wirelessPhotoImportWidget->setAttribute(Qt::WA_DeleteOnClose);
             m_wirelessPhotoImportWidget->setWindowFlag(Qt::Window);
             // m_wirelessPhotoImportWidget->resize(800, 600);
             m_wirelessPhotoImportWidget->show();
         } else {
-            m_wirelessPhotoImportWidget->show();
-            m_wirelessPhotoImportWidget->show();
+            m_wirelessPhotoImportWidget->raise();
+            m_wirelessPhotoImportWidget->activateWindow();
         }
     } break;
 #ifndef __APPLE__
     case iDescriptorTool::iFuse: {
-        iFuseWidget *ifuseWidget = new iFuseWidget(m_currentDevice);
-        ifuseWidget->setAttribute(Qt::WA_DeleteOnClose);
-        ifuseWidget->setWindowFlag(Qt::Window);
-        ifuseWidget->resize(600, 400);
-        ifuseWidget->show();
+        if (!m_ifuseWidget) {
+            m_ifuseWidget = new iFuseWidget(m_currentDevice);
+            m_ifuseWidget->setAttribute(Qt::WA_DeleteOnClose);
+            connect(m_ifuseWidget, &QObject::destroyed, this,
+                    [this]() { m_ifuseWidget = nullptr; });
+            m_ifuseWidget->setWindowFlag(Qt::Window);
+            m_ifuseWidget->resize(600, 400);
+            m_ifuseWidget->show();
+        } else {
+            m_ifuseWidget->raise();
+            m_ifuseWidget->activateWindow();
+        }
     } break;
 #endif
     case iDescriptorTool::CableInfoWidget: {

src/toolboxwidget.h

@@ -16,6 +16,9 @@
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
+#ifndef __APPLE__
+#include "ifusewidget.h"
+#endif
 
 class ToolboxWidget : public QWidget
 {
@@ -50,6 +53,9 @@ private:
     DevDiskImagesWidget *m_devDiskImagesWidget = nullptr;
     NetworkDevicesWidget *m_networkDevicesWidget = nullptr;
     AirPlayWindow *m_airplayWindow = nullptr;
+#ifndef __APPLE__
+    iFuseWidget *m_ifuseWidget = nullptr;
+#endif
     WirelessPhotoImportWidget *m_wirelessPhotoImportWidget = nullptr;
 
 signals:

src/welcomewidget.cpp

@@ -83,7 +83,7 @@ void WelcomeWidget::setupUI()
     m_mainLayout->addStretch(1);
 
     // Set minimum size
-    setMinimumSize(400, 500);
+    setMinimumSize(600, 500);
 }
 
 QLabel *WelcomeWidget::createStyledLabel(const QString &text, int fontSize,
@@ -99,11 +99,6 @@ QLabel *WelcomeWidget::createStyledLabel(const QString &text, int fontSize,
         font.setWeight(QFont::Medium);
     }
 
-    // Use system font on macOS for better integration
-#ifdef Q_OS_MAC
-    font.setFamily(".AppleSystemUIFont");
-#endif
-
     label->setFont(font);
     label->setWordWrap(true);
 

src/wirelessphotoimportwidget.cpp

@@ -54,6 +54,7 @@ void WirelessPhotoImportWidget::setupUI()
 
     // Scroll area for file list
     m_scrollArea = new QScrollArea();
+    m_scrollArea->setStyleSheet("QScrollArea { border: none; }");
     m_scrollArea->setWidgetResizable(true);
     m_scrollArea->setMinimumWidth(300);