From b30da266aa4e8b3b4c0f938a5f082506d8a18cc4 Mon Sep 17 00:00:00 2001 From: uncor3 Date: Sun, 19 Oct 2025 03:42:09 -0700 Subject: [PATCH] fix styles --- src/appswidget.cpp | 2 ++ src/mainwindow.cpp | 13 +++++-------- src/toolboxwidget.cpp | 23 ++++++++++++++++------- src/toolboxwidget.h | 6 ++++++ src/welcomewidget.cpp | 7 +------ src/wirelessphotoimportwidget.cpp | 1 + 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/appswidget.cpp b/src/appswidget.cpp index 83835c1..e19546f 100644 --- a/src/appswidget.cpp +++ b/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); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index edb9f5a..eff22f1 100644 --- a/src/mainwindow.cpp +++ b/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 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 } \ No newline at end of file diff --git a/src/toolboxwidget.cpp b/src/toolboxwidget.cpp index 55c1c16..8384def 100644 --- a/src/toolboxwidget.cpp +++ b/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: { diff --git a/src/toolboxwidget.h b/src/toolboxwidget.h index 2969bf4..abcade4 100644 --- a/src/toolboxwidget.h +++ b/src/toolboxwidget.h @@ -16,6 +16,9 @@ #include #include #include +#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: diff --git a/src/welcomewidget.cpp b/src/welcomewidget.cpp index fe33fc8..64b8083 100644 --- a/src/welcomewidget.cpp +++ b/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); diff --git a/src/wirelessphotoimportwidget.cpp b/src/wirelessphotoimportwidget.cpp index 94b7731..2527363 100644 --- a/src/wirelessphotoimportwidget.cpp +++ b/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);