diff --git a/images/dark/drive-harddisk-root.svg b/images/dark/drive-harddisk-root.svg deleted file mode 100755 index bc8476c..0000000 --- a/images/dark/drive-harddisk-root.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/images/dark/drive-harddisk.svg b/images/dark/drive-harddisk.svg deleted file mode 100755 index c53f4e3..0000000 --- a/images/dark/drive-harddisk.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/images/dark/drive-optical.svg b/images/dark/drive-optical.svg deleted file mode 100755 index 9d9333e..0000000 --- a/images/dark/drive-optical.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/images/dark/drive-removable-media-usb.svg b/images/dark/drive-removable-media-usb.svg deleted file mode 100755 index 18ec008..0000000 --- a/images/dark/drive-removable-media-usb.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/images/dark/folder-desktop.svg b/images/dark/folder-desktop.svg deleted file mode 100755 index f110623..0000000 --- a/images/dark/folder-desktop.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/folder-document.svg b/images/dark/folder-document.svg deleted file mode 100755 index 5cb586f..0000000 --- a/images/dark/folder-document.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/dark/folder-download.svg b/images/dark/folder-download.svg deleted file mode 100755 index cbd716f..0000000 --- a/images/dark/folder-download.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/folder-home.svg b/images/dark/folder-home.svg deleted file mode 100755 index 1ccafdf..0000000 --- a/images/dark/folder-home.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/folder-music.svg b/images/dark/folder-music.svg deleted file mode 100755 index ddf4877..0000000 --- a/images/dark/folder-music.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/folder-picture.svg b/images/dark/folder-picture.svg deleted file mode 100755 index 1c24813..0000000 --- a/images/dark/folder-picture.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/folder-video.svg b/images/dark/folder-video.svg deleted file mode 100755 index c98de6a..0000000 --- a/images/dark/folder-video.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/dark/user-trash.svg b/images/dark/user-trash.svg deleted file mode 100755 index 1ef8d84..0000000 --- a/images/dark/user-trash.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/drive-harddisk-root.svg b/images/drive-harddisk-root.svg deleted file mode 100755 index 2489006..0000000 --- a/images/drive-harddisk-root.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/images/drive-harddisk.svg b/images/drive-harddisk.svg deleted file mode 100755 index 2489006..0000000 --- a/images/drive-harddisk.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/images/drive-optical.svg b/images/drive-optical.svg deleted file mode 100755 index 0a31fff..0000000 --- a/images/drive-optical.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/images/drive-removable-media-usb.svg b/images/drive-removable-media-usb.svg deleted file mode 100755 index c5cc0ef..0000000 --- a/images/drive-removable-media-usb.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/images/folder-desktop.svg b/images/folder-desktop.svg deleted file mode 100755 index 0009563..0000000 --- a/images/folder-desktop.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/folder-document.svg b/images/folder-document.svg deleted file mode 100755 index 809cf9c..0000000 --- a/images/folder-document.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/images/folder-download.svg b/images/folder-download.svg deleted file mode 100755 index b7c8ae5..0000000 --- a/images/folder-download.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/folder-home.svg b/images/folder-home.svg deleted file mode 100755 index 88a7042..0000000 --- a/images/folder-home.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/folder-music.svg b/images/folder-music.svg deleted file mode 100755 index f2d0256..0000000 --- a/images/folder-music.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/folder-picture.svg b/images/folder-picture.svg deleted file mode 100755 index 9488b22..0000000 --- a/images/folder-picture.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/folder-video.svg b/images/folder-video.svg deleted file mode 100755 index 283795c..0000000 --- a/images/folder-video.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/light/drive-harddisk-root.svg b/images/light/drive-harddisk-root.svg deleted file mode 100755 index 7f1d52d..0000000 --- a/images/light/drive-harddisk-root.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/images/light/drive-harddisk.svg b/images/light/drive-harddisk.svg deleted file mode 100755 index 9cafad0..0000000 --- a/images/light/drive-harddisk.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/images/light/drive-optical.svg b/images/light/drive-optical.svg deleted file mode 100755 index 84ddb12..0000000 --- a/images/light/drive-optical.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/images/light/drive-removable-media-usb.svg b/images/light/drive-removable-media-usb.svg deleted file mode 100755 index 12722ed..0000000 --- a/images/light/drive-removable-media-usb.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/images/light/folder-desktop.svg b/images/light/folder-desktop.svg deleted file mode 100755 index 621ad62..0000000 --- a/images/light/folder-desktop.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/light/folder-document.svg b/images/light/folder-document.svg deleted file mode 100755 index fbdae6b..0000000 --- a/images/light/folder-document.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/light/folder-download.svg b/images/light/folder-download.svg deleted file mode 100755 index d0138e2..0000000 --- a/images/light/folder-download.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/light/folder-home.svg b/images/light/folder-home.svg deleted file mode 100755 index 756ff2e..0000000 --- a/images/light/folder-home.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/images/light/folder-music.svg b/images/light/folder-music.svg deleted file mode 100755 index 8b15f75..0000000 --- a/images/light/folder-music.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/images/light/folder-picture.svg b/images/light/folder-picture.svg deleted file mode 100755 index dd86d5d..0000000 --- a/images/light/folder-picture.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/images/light/folder-video.svg b/images/light/folder-video.svg deleted file mode 100755 index a1e0c3e..0000000 --- a/images/light/folder-video.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/images/light/user-trash.svg b/images/light/user-trash.svg deleted file mode 100755 index 4f37501..0000000 --- a/images/light/user-trash.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/images/media-optical-data.svg b/images/media-optical-data.svg deleted file mode 100755 index f983c9b..0000000 --- a/images/media-optical-data.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/images/media-optical-mixed-cd.svg b/images/media-optical-mixed-cd.svg deleted file mode 100755 index a3978bf..0000000 --- a/images/media-optical-mixed-cd.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/images/media-optical.svg b/images/media-optical.svg deleted file mode 100755 index 68ce9f0..0000000 --- a/images/media-optical.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/images/user-trash.svg b/images/user-trash.svg deleted file mode 100755 index 7b0c00a..0000000 --- a/images/user-trash.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/model/placesitem.cpp b/model/placesitem.cpp index 262ec04..5d36535 100644 --- a/model/placesitem.cpp +++ b/model/placesitem.cpp @@ -55,16 +55,6 @@ void PlacesItem::setIconName(const QString &name) m_iconName = name; } -QString PlacesItem::iconPath() const -{ - return m_iconPath; -} - -void PlacesItem::setIconPath(const QString &path) -{ - m_iconPath = path; -} - QUrl PlacesItem::url() const { return m_url; @@ -118,7 +108,6 @@ void PlacesItem::updateDeviceInfo(const QString &udi) if (m_device.isValid()) { m_access = m_device.as(); m_iconName = m_device.icon(); - m_iconPath = QString("%1.svg").arg(m_iconName); #if SOLID_VERSION_MAJOR >= 5 && SOLID_VERSION_MINOR >= 71 m_displayName = m_device.displayName(); diff --git a/model/placesitem.h b/model/placesitem.h index cd4e515..1701470 100644 --- a/model/placesitem.h +++ b/model/placesitem.h @@ -42,9 +42,6 @@ public: QString iconName() const; void setIconName(const QString &name); - QString iconPath() const; - void setIconPath(const QString &path); - QUrl url() const; void setUrl(const QUrl &url); @@ -71,7 +68,6 @@ private slots: private: QString m_displayName; QString m_iconName; - QString m_iconPath; QString m_udi; QUrl m_url; QString m_category; diff --git a/model/placesmodel.cpp b/model/placesmodel.cpp index a8cc341..9a00028 100644 --- a/model/placesmodel.cpp +++ b/model/placesmodel.cpp @@ -38,7 +38,6 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(homePath).exists()) { PlacesItem *item = new PlacesItem(tr("Home"), QUrl::fromLocalFile(homePath)); item->setIconName("folder-home"); - item->setIconPath("folder-home.svg"); m_items.append(item); } @@ -46,15 +45,13 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(desktopPath).exists()) { PlacesItem *item = new PlacesItem(tr("Desktop"), QUrl::fromLocalFile(desktopPath)); item->setIconName("folder-desktop"); - item->setIconPath("folder-desktop.svg"); m_items.append(item); } const QString documentsPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); if (QDir(documentsPath).exists()) { PlacesItem *item = new PlacesItem(tr("Documents"), QUrl::fromLocalFile(documentsPath)); - item->setIconName("folder-document"); - item->setIconPath("folder-document.svg"); + item->setIconName("folder-documents"); m_items.append(item); } @@ -62,7 +59,6 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(downloadPath).exists()) { PlacesItem *item = new PlacesItem(tr("Downloads"), QUrl::fromLocalFile(downloadPath)); item->setIconName("folder-download"); - item->setIconPath("folder-download.svg"); m_items.append(item); } @@ -70,7 +66,6 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(musicPath).exists()) { PlacesItem *item = new PlacesItem(tr("Music"), QUrl::fromLocalFile(musicPath)); item->setIconName("folder-music"); - item->setIconPath("folder-music.svg"); m_items.append(item); } @@ -78,7 +73,6 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(picturePath).exists()) { PlacesItem *item = new PlacesItem(tr("Pictures"), QUrl::fromLocalFile(picturePath)); item->setIconName("folder-picture"); - item->setIconPath("folder-picture.svg"); m_items.append(item); } @@ -86,13 +80,11 @@ PlacesModel::PlacesModel(QObject *parent) if (QDir(videoPath).exists()) { PlacesItem *item = new PlacesItem(tr("Videos"), QUrl::fromLocalFile(videoPath)); item->setIconName("folder-video"); - item->setIconPath("folder-video.svg"); m_items.append(item); } PlacesItem *trashItem = new PlacesItem(tr("Trash"), QUrl(QStringLiteral("trash:///"))); - trashItem->setIconName("folder-trash"); - trashItem->setIconPath("user-trash.svg"); + trashItem->setIconName("user-trash"); m_items.append(trashItem); QString predicateStr( @@ -133,7 +125,6 @@ QHash PlacesModel::roleNames() const QHash roleNames; roleNames[PlacesModel::NameRole] = "name"; roleNames[PlacesModel::IconNameRole] = "iconName"; - roleNames[PlacesModel::IconPathRole] = "iconPath"; roleNames[PlacesModel::UrlRole] = "url"; roleNames[PlacesModel::PathRole] = "path"; roleNames[PlacesModel::IsDeviceRole] = "isDevice"; @@ -171,9 +162,6 @@ QVariant PlacesModel::data(const QModelIndex &index, int role) const case PlacesModel::IconNameRole: return item->iconName(); break; - case PlacesModel::IconPathRole: - return item->iconPath(); - break; case PlacesModel::UrlRole: return item->url(); break; diff --git a/model/placesmodel.h b/model/placesmodel.h index a407dee..37dcdce 100644 --- a/model/placesmodel.h +++ b/model/placesmodel.h @@ -32,7 +32,6 @@ public: enum DataRole { NameRole = Qt::UserRole + 1, IconNameRole, - IconPathRole, UrlRole, PathRole, IsDeviceRole, diff --git a/qml.qrc b/qml.qrc index 29d2971..ec22118 100644 --- a/qml.qrc +++ b/qml.qrc @@ -34,47 +34,8 @@ images/light/up.svg images/dark/up.svg qml/Dialogs/EmptyTrashDialog.qml - images/light/drive-harddisk-root.svg - images/light/drive-harddisk.svg - images/light/drive-removable-media-usb.svg - images/light/folder-desktop.svg - images/light/folder-document.svg - images/light/folder-download.svg - images/light/folder-home.svg - images/light/folder-music.svg - images/light/folder-picture.svg - images/light/folder-video.svg - images/light/user-trash.svg - images/dark/drive-harddisk-root.svg - images/dark/drive-harddisk.svg - images/dark/drive-removable-media-usb.svg - images/dark/folder-desktop.svg - images/dark/folder-document.svg - images/dark/folder-download.svg - images/dark/folder-home.svg - images/dark/folder-music.svg - images/dark/folder-picture.svg - images/dark/folder-video.svg - images/dark/user-trash.svg - images/dark/drive-optical.svg - images/light/drive-optical.svg qml/Dialogs/OpenWithDialog.qml qml/Dialogs/DeleteDialog.qml - images/folder-document.svg - images/folder-desktop.svg - images/folder-download.svg - images/folder-home.svg - images/folder-music.svg - images/folder-picture.svg - images/folder-video.svg - images/user-trash.svg - images/drive-harddisk-root.svg - images/drive-harddisk.svg - images/drive-optical.svg - images/drive-removable-media-usb.svg templates/TextFile.txt - images/media-optical-data.svg - images/media-optical-mixed-cd.svg - images/media-optical.svg diff --git a/qml/FolderPage.qml b/qml/FolderPage.qml index a07520f..ff0667e 100644 --- a/qml/FolderPage.qml +++ b/qml/FolderPage.qml @@ -122,27 +122,7 @@ Item { Rectangle { id: _background anchors.fill: parent - anchors.rightMargin: 1 - radius: FishUI.Theme.mediumRadius color: FishUI.Theme.secondBackgroundColor - - Rectangle { - id: _topRightRect - anchors.right: parent.right - anchors.top: parent.top - height: FishUI.Theme.mediumRadius - width: FishUI.Theme.mediumRadius - color: FishUI.Theme.secondBackgroundColor - } - - Rectangle { - id: _bottomLeftRect - anchors.left: parent.left - anchors.bottom: parent.bottom - height: FishUI.Theme.mediumRadius - width: FishUI.Theme.mediumRadius - color: FishUI.Theme.secondBackgroundColor - } } Label { diff --git a/qml/SideBar.qml b/qml/SideBar.qml index a0470bb..e0872d1 100644 --- a/qml/SideBar.qml +++ b/qml/SideBar.qml @@ -238,7 +238,7 @@ Item { width: listView.snap(22) height: width - source: "qrc:/images/" + model.iconPath + source: model.iconName color: checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor }