diff --git a/icons/ArrowMoveDownRight.svg b/icons/ArrowMoveDownRight.svg deleted file mode 100644 index 6e81b95..0000000 --- a/icons/ArrowMoveDownRight.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/LineMdEmojiSmileWink.svg b/icons/LineMdEmojiSmileWink.svg deleted file mode 100644 index 4d9099f..0000000 --- a/icons/LineMdEmojiSmileWink.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icons/icon.png b/icons/icon.png deleted file mode 100644 index 405e507..0000000 Binary files a/icons/icon.png and /dev/null differ diff --git a/resources.qrc b/resources.qrc index 5b98687..7c562b0 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,16 +1,16 @@ - icons/ArrowMoveDownRight.svg - icons/video-x-generic.png - icons/MdiLightningBolt.png - icons/MingcuteSettings7Line.png - icons/ClarityHardDiskSolidAlerted.png - icons/IcOutlinePowerSettingsNew.png - icons/HugeiconsWrench01.png - icons/IcTwotoneRestartAlt.png - icons/icon.png + resources/icons/video-x-generic.png + resources/icons/MdiLightningBolt.png + resources/icons/MingcuteSettings7Line.png + resources/icons/ClarityHardDiskSolidAlerted.png + resources/icons/IcOutlinePowerSettingsNew.png + resources/icons/HugeiconsWrench01.png + resources/icons/IcTwotoneRestartAlt.png + qml/MapView.qml - resources/dump.js + + resources/iphone.png resources/ios-wallpapers/iphone-ios4.png resources/ios-wallpapers/iphone-ios5.png diff --git a/icons/ClarityHardDiskSolidAlerted.png b/resources/icons/ClarityHardDiskSolidAlerted.png similarity index 100% rename from icons/ClarityHardDiskSolidAlerted.png rename to resources/icons/ClarityHardDiskSolidAlerted.png diff --git a/icons/HealthiconsArtificialIntelligenceOutline.png b/resources/icons/HealthiconsArtificialIntelligenceOutline.png similarity index 100% rename from icons/HealthiconsArtificialIntelligenceOutline.png rename to resources/icons/HealthiconsArtificialIntelligenceOutline.png diff --git a/icons/HugeiconsWrench01.png b/resources/icons/HugeiconsWrench01.png similarity index 100% rename from icons/HugeiconsWrench01.png rename to resources/icons/HugeiconsWrench01.png diff --git a/icons/IcOutlinePowerSettingsNew.png b/resources/icons/IcOutlinePowerSettingsNew.png similarity index 100% rename from icons/IcOutlinePowerSettingsNew.png rename to resources/icons/IcOutlinePowerSettingsNew.png diff --git a/icons/IcTwotoneRestartAlt.png b/resources/icons/IcTwotoneRestartAlt.png similarity index 100% rename from icons/IcTwotoneRestartAlt.png rename to resources/icons/IcTwotoneRestartAlt.png diff --git a/icons/MdiLightningBolt.png b/resources/icons/MdiLightningBolt.png similarity index 100% rename from icons/MdiLightningBolt.png rename to resources/icons/MdiLightningBolt.png diff --git a/icons/MingcuteSettings7Line.png b/resources/icons/MingcuteSettings7Line.png similarity index 100% rename from icons/MingcuteSettings7Line.png rename to resources/icons/MingcuteSettings7Line.png diff --git a/resources/icons/app-icon/icon-16.png b/resources/icons/app-icon/icon-16.png new file mode 100644 index 0000000..b73b071 Binary files /dev/null and b/resources/icons/app-icon/icon-16.png differ diff --git a/resources/icons/app-icon/icon-256.png b/resources/icons/app-icon/icon-256.png new file mode 100644 index 0000000..19538d8 Binary files /dev/null and b/resources/icons/app-icon/icon-256.png differ diff --git a/resources/icons/app-icon/icon-32.png b/resources/icons/app-icon/icon-32.png new file mode 100644 index 0000000..e746e0f Binary files /dev/null and b/resources/icons/app-icon/icon-32.png differ diff --git a/resources/icons/app-icon/icon-512.png b/resources/icons/app-icon/icon-512.png new file mode 100644 index 0000000..7cab97c Binary files /dev/null and b/resources/icons/app-icon/icon-512.png differ diff --git a/resources/icons/app-icon/icon.ico b/resources/icons/app-icon/icon.ico new file mode 100644 index 0000000..9dbe1a1 Binary files /dev/null and b/resources/icons/app-icon/icon.ico differ diff --git a/resources/icons/app-icon/icon.png b/resources/icons/app-icon/icon.png new file mode 100755 index 0000000..2799797 Binary files /dev/null and b/resources/icons/app-icon/icon.png differ diff --git a/icons/video-x-generic.png b/resources/icons/video-x-generic.png similarity index 100% rename from icons/video-x-generic.png rename to resources/icons/video-x-generic.png diff --git a/src/deviceinfowidget.cpp b/src/deviceinfowidget.cpp index 731724e..10ecc47 100644 --- a/src/deviceinfowidget.cpp +++ b/src/deviceinfowidget.cpp @@ -55,19 +55,20 @@ DeviceInfoWidget::DeviceInfoWidget(iDescriptorDevice *device, QWidget *parent) actionsLayout->setSpacing(10); ClickableIconWidget *shutdownBtn = new ClickableIconWidget( - QIcon(":/icons/IcOutlinePowerSettingsNew.png"), "Shutdown", this); + QIcon(":/resources/icons/IcOutlinePowerSettingsNew.png"), "Shutdown", + this); shutdownBtn->setIconSize(QSize(20, 20)); connect(shutdownBtn, &ClickableIconWidget::clicked, this, [device]() { ToolboxWidget::shutdownDevice(device); }); ClickableIconWidget *restartBtn = new ClickableIconWidget( - QIcon(":/icons/IcTwotoneRestartAlt.png"), "Restart", this); + QIcon(":/resources/icons/IcTwotoneRestartAlt.png"), "Restart", this); restartBtn->setIconSize(QSize(20, 20)); connect(restartBtn, &ClickableIconWidget::clicked, this, [device]() { ToolboxWidget::restartDevice(device); }); ClickableIconWidget *recoveryBtn = new ClickableIconWidget( - QIcon(":/icons/HugeiconsWrench01.png"), "Recovery", this); + QIcon(":/resources/icons/HugeiconsWrench01.png"), "Recovery", this); recoveryBtn->setIconSize(QSize(20, 20)); connect(recoveryBtn, &ClickableIconWidget::clicked, this, [device]() { ToolboxWidget::_enterRecoveryMode(device); }); @@ -130,7 +131,7 @@ DeviceInfoWidget::DeviceInfoWidget(iDescriptorDevice *device, QWidget *parent) // Create icon label m_lightningIconLabel = new QLabel(); - QPixmap lightningIcon(":/icons/MdiLightningBolt.png"); + QPixmap lightningIcon(":/resources/icons/MdiLightningBolt.png"); QPixmap scaledIcon = lightningIcon.scaled(26, 26, Qt::KeepAspectRatio, Qt::SmoothTransformation); m_lightningIconLabel->setPixmap(scaledIcon); diff --git a/src/ifusediskunmountbutton.cpp b/src/ifusediskunmountbutton.cpp index ec771b2..00784b4 100644 --- a/src/ifusediskunmountbutton.cpp +++ b/src/ifusediskunmountbutton.cpp @@ -6,7 +6,7 @@ iFuseDiskUnmountButton::iFuseDiskUnmountButton(const QString &path, QWidget *parent) : QPushButton{parent} { - setIcon(QIcon(":/icons/ClarityHardDiskSolidAlerted.png")); + setIcon(QIcon(":/resources/icons/ClarityHardDiskSolidAlerted.png")); setToolTip("Unmount iFuse at " + path); setFlat(true); setCursor(Qt::PointingHandCursor); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 97d8769..d66170e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -110,8 +110,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); - - setWindowIcon(QIcon(":/icons/icon.png")); + // TODO + // setWindowIcon(QIcon(":/resources/icons/icon.png")); // Create custom tab widget m_customTabWidget = new CustomTabWidget(this); @@ -150,7 +150,7 @@ MainWindow::MainWindow(QWidget *parent) this, &MainWindow::updateNoDevicesConnected); // Add tabs with icons - QIcon deviceIcon(":/icons/MdiLightningBolt.png"); + QIcon deviceIcon(":/resources/icons/MdiLightningBolt.png"); m_customTabWidget->addTab(m_mainStackedWidget, deviceIcon, "iDevice"); m_customTabWidget->addTab(new AppsWidget(this), "Apps"); m_customTabWidget->addTab(new ToolboxWidget(this), "Toolbox"); @@ -170,7 +170,8 @@ MainWindow::MainWindow(QWidget *parent) // settings button QPushButton *settingsButton = new QPushButton(); - settingsButton->setIcon(QIcon(":/icons/MingcuteSettings7Line.png")); + settingsButton->setIcon( + QIcon(":/resources/icons/MingcuteSettings7Line.png")); settingsButton->setToolTip("Settings"); settingsButton->setFlat(true); settingsButton->setCursor(Qt::PointingHandCursor); diff --git a/src/photomodel.cpp b/src/photomodel.cpp index 546115c..87fc24c 100644 --- a/src/photomodel.cpp +++ b/src/photomodel.cpp @@ -142,7 +142,7 @@ QVariant PhotoModel::data(const QModelIndex &index, int role) const info.fileName.endsWith(".MP4", Qt::CaseInsensitive) || info.fileName.endsWith(".M4V", Qt::CaseInsensitive)) { // return QIcon::fromTheme("video-x-generic"); - return QIcon(":/icons/video-x-generic.png"); + return QIcon(":/resources/icons/video-x-generic.png"); } else { return QIcon::fromTheme("image-x-generic"); } @@ -160,7 +160,7 @@ QVariant PhotoModel::data(const QModelIndex &index, int role) const info.fileName.endsWith(".MP4", Qt::CaseInsensitive) || info.fileName.endsWith(".M4V", Qt::CaseInsensitive)) { // return QIcon::fromTheme("video-x-generic"); - return QIcon(":/icons/video-x-generic.png"); + return QIcon(":/resources/icons/video-x-generic.png"); } else { return QIcon::fromTheme("image-x-generic"); }