diff --git a/YACReaderLibrary/add_label_dialog.cpp b/YACReaderLibrary/add_label_dialog.cpp index 359d9c18..18f3f9ed 100644 --- a/YACReaderLibrary/add_label_dialog.cpp +++ b/YACReaderLibrary/add_label_dialog.cpp @@ -11,18 +11,18 @@ AddLabelDialog::AddLabelDialog(QWidget *parent) layout->addWidget(new QLabel(tr("Choose a color:"))); layout->addWidget(list = new QListWidget()); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.png"), tr("red"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.png"), tr("orange"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.png"), tr("yellow"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.png"), tr("green"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.png"), tr("cyan"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.png"), tr("blue"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.png"), tr("violet"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.png"), tr("purple"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.png"), tr("pink"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.png"), tr("white"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.png"), tr("light"))); - list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.png"), tr("dark"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.svg"), tr("red"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.svg"), tr("orange"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.svg"), tr("yellow"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.svg"), tr("green"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.svg"), tr("cyan"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.svg"), tr("blue"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.svg"), tr("violet"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.svg"), tr("purple"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.svg"), tr("pink"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.svg"), tr("white"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.svg"), tr("light"))); + list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.svg"), tr("dark"))); QColor backgroundColor = this->palette().window().color(); list->setStyleSheet(QString("QListWidget {border : none; background-color: rgb(%1,%2,%3);}").arg(backgroundColor.red()).arg(backgroundColor.green()).arg(backgroundColor.blue())); diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp index dafd1a9b..0fd59c4d 100644 --- a/YACReaderLibrary/db/folder_model.cpp +++ b/YACReaderLibrary/db/folder_model.cpp @@ -54,7 +54,7 @@ void drawMacOSXFinishedFolderIcon() #define ROOT 1 FolderModel::FolderModel(QObject *parent) - : QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr) + : QAbstractItemModel(parent), isSubfolder(false), rootItem(nullptr), folderIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg")), folderFinishedIcon(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.svg")) { } @@ -138,9 +138,9 @@ QVariant FolderModel::data(const QModelIndex &index, int role) const } #else if (item->data(FolderModel::Finished).toBool()) - return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder_finished.png")); + return QVariant(folderFinishedIcon); else - return QVariant(YACReader::noHighlightedIcon(":/images/sidebar/folder.png")); + return QVariant(folderIcon); #endif } diff --git a/YACReaderLibrary/db/folder_model.h b/YACReaderLibrary/db/folder_model.h index dbf056fc..8f0093ec 100644 --- a/YACReaderLibrary/db/folder_model.h +++ b/YACReaderLibrary/db/folder_model.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "folder.h" #include "folder_query_result_processor.h" @@ -117,6 +118,9 @@ private: QMap items; // relación entre folders QString _databasePath; + + QIcon folderIcon; + QIcon folderFinishedIcon; }; #endif diff --git a/YACReaderLibrary/db/reading_list_item.cpp b/YACReaderLibrary/db/reading_list_item.cpp index eaec184b..a7b7edff 100644 --- a/YACReaderLibrary/db/reading_list_item.cpp +++ b/YACReaderLibrary/db/reading_list_item.cpp @@ -36,7 +36,7 @@ QIcon SpecialListItem::getIcon() const { if (itemData.count() > Id) { QString id = itemData.at(Id).toString(); - return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.png").arg(id)); + return YACReader::noHighlightedIcon(QString(":/images/lists/default_%1.svg").arg(id)); } QLOG_WARN() << "Icon for SpecialListItem not available"; @@ -76,7 +76,7 @@ QIcon LabelItem::getIcon() const { if (itemData.count() > Color) { QString color = itemData.at(Color).toString(); - return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.png").arg(color).toLower()); + return YACReader::noHighlightedIcon(QString(":/images/lists/label_%1.svg").arg(color).toLower()); } QLOG_WARN() << "Icon for label item not available"; @@ -127,19 +127,19 @@ qulonglong LabelItem::getId() const //------------------------------------------------------ ReadingListItem::ReadingListItem(const QList &data, ReadingListItem *p) - : ListItem(data), parent(p) + : ListItem(data), parent(p), list(YACReader::noHighlightedIcon(":/images/lists/list.svg")), folder(YACReader::noHighlightedIcon(":/images/sidebar/folder.svg")) { } QIcon ReadingListItem::getIcon() const { if (parent->getId() == 0) - return YACReader::noHighlightedIcon(":/images/lists/list.png"); // top level list + return list; // top level list else #ifdef Q_OS_MAC return QFileIconProvider().icon(QFileIconProvider::Folder); #else - return YACReader::noHighlightedIcon(":/images/sidebar/folder.png"); // sublist + return folder; // sublist #endif } diff --git a/YACReaderLibrary/db/reading_list_item.h b/YACReaderLibrary/db/reading_list_item.h index 58af7483..b7d06685 100644 --- a/YACReaderLibrary/db/reading_list_item.h +++ b/YACReaderLibrary/db/reading_list_item.h @@ -82,6 +82,9 @@ public: private: QList childItems; + QIcon list; + QIcon folder; + enum DataIndexes { Name, Id, diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index a4846d6f..fec010ca 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -86,19 +86,34 @@ ../images/shortcuts_group_reading.svg ../images/shortcuts_group_visualization.svg ../images/shownCovers.png - ../images/sidebar/branch-closed.png - ../images/sidebar/branch-open.png + ../images/sidebar/branch-closed.svg + ../images/sidebar/branch-open.svg ../images/sidebar/collapsed_branch_osx.png ../images/sidebar/collapsed_branch_selected.png ../images/sidebar/expanded_branch_osx.png ../images/sidebar/expanded_branch_selected.png - ../images/sidebar/folder.png - ../images/sidebar/folder_finished.png - ../images/sidebar/libraryIconSelected.png - ../images/sidebar/libraryOptions.png - ../images/sidebar/libraryOptions@2x.png + ../images/sidebar/folder.svg + ../images/sidebar/folder_finished.svg + ../images/sidebar/libraryIconSelected.svg + ../images/sidebar/libraryOptions.svg ../images/updatingIcon.png ../images/custom_dialog/custom_close_button.svg ../images/whats_new/whatsnew_header.svg + + ../images/lists/default_0.svg + ../images/lists/default_1.svg + ../images/lists/label_blue.svg + ../images/lists/label_cyan.svg + ../images/lists/label_dark.svg + ../images/lists/label_green.svg + ../images/lists/label_light.svg + ../images/lists/label_orange.svg + ../images/lists/label_pink.svg + ../images/lists/label_purple.svg + ../images/lists/label_red.svg + ../images/lists/label_violet.svg + ../images/lists/label_white.svg + ../images/lists/label_yellow.svg + ../images/lists/list.svg diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc index 62e7adfb..b9f5f34a 100644 --- a/YACReaderLibrary/images_osx.qrc +++ b/YACReaderLibrary/images_osx.qrc @@ -23,37 +23,7 @@ ../images/iconSearch@2x.png ../images/clearSearch.png ../images/clearSearch@2x.png - ../images/lists/default_0_osx.png - ../images/lists/default_1_osx.png - ../images/lists/label_blue_osx.png - ../images/lists/label_cyan_osx.png - ../images/lists/label_dark_osx.png - ../images/lists/label_green_osx.png - ../images/lists/label_light_osx.png - ../images/lists/label_orange_osx.png - ../images/lists/label_pink_osx.png - ../images/lists/label_purple_osx.png - ../images/lists/label_red_osx.png - ../images/lists/label_violet_osx.png - ../images/lists/label_white_osx.png - ../images/lists/label_yellow_osx.png - ../images/lists/list_osx.png ../images/empty_reading_list_osx.png - ../images/lists/default_0_osx@2x.png - ../images/lists/default_1_osx@2x.png - ../images/lists/label_blue_osx@2x.png - ../images/lists/label_cyan_osx@2x.png - ../images/lists/label_dark_osx@2x.png - ../images/lists/label_green_osx@2x.png - ../images/lists/label_light_osx@2x.png - ../images/lists/label_orange_osx@2x.png - ../images/lists/label_pink_osx@2x.png - ../images/lists/label_purple_osx@2x.png - ../images/lists/label_red_osx@2x.png - ../images/lists/label_violet_osx@2x.png - ../images/lists/label_white_osx@2x.png - ../images/lists/label_yellow_osx@2x.png - ../images/lists/list_osx@2x.png ../images/sidebar/libraryIcon_osx.png ../images/sidebar/setRoot_osx.png ../images/sidebar/expand_osx.png diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc index e9fa80f2..d907444a 100644 --- a/YACReaderLibrary/images_win.qrc +++ b/YACReaderLibrary/images_win.qrc @@ -11,31 +11,16 @@ ../images/main_toolbar/flow.svg ../images/main_toolbar/grid.svg ../images/main_toolbar/info.svg - ../images/sidebar/libraryIcon.png - ../images/sidebar/setRoot.png - ../images/sidebar/expand.png - ../images/sidebar/colapse.png - ../images/sidebar/newLibraryIcon.png - ../images/sidebar/openLibraryIcon.png - ../images/sidebar/addNew_sidebar.png - ../images/sidebar/delete_sidebar.png - ../images/sidebar/addLabelIcon.png - ../images/sidebar/renameListIcon.png - ../images/lists/default_0.png - ../images/lists/default_1.png - ../images/lists/label_blue.png - ../images/lists/label_cyan.png - ../images/lists/label_dark.png - ../images/lists/label_green.png - ../images/lists/label_light.png - ../images/lists/label_orange.png - ../images/lists/label_pink.png - ../images/lists/label_purple.png - ../images/lists/label_red.png - ../images/lists/label_violet.png - ../images/lists/label_white.png - ../images/lists/label_yellow.png - ../images/lists/list.png + ../images/sidebar/libraryIcon.svg + ../images/sidebar/setRoot.svg + ../images/sidebar/expand.svg + ../images/sidebar/colapse.svg + ../images/sidebar/newLibraryIcon.svg + ../images/sidebar/openLibraryIcon.svg + ../images/sidebar/addNew_sidebar.svg + ../images/sidebar/delete_sidebar.svg + ../images/sidebar/addLabelIcon.svg + ../images/sidebar/renameListIcon.svg ../images/empty_folder.png ../images/empty_search.png ../images/iconSearchNew.png diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index e0f45dbb..c1dae294 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -484,13 +484,13 @@ void LibraryWindow::createActions() createLibraryAction->setToolTip(tr("Create a new library")); createLibraryAction->setData(CREATE_LIBRARY_ACTION_YL); createLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CREATE_LIBRARY_ACTION_YL)); - createLibraryAction->setIcon(QIcon(":/images/sidebar/newLibraryIcon.png")); + createLibraryAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/newLibraryIcon"))); openLibraryAction = new QAction(this); openLibraryAction->setToolTip(tr("Open an existing library")); openLibraryAction->setData(OPEN_LIBRARY_ACTION_YL); openLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_LIBRARY_ACTION_YL)); - openLibraryAction->setIcon(QIcon(":/images/sidebar/openLibraryIcon.png")); + openLibraryAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/openLibraryIcon"))); exportComicsInfoAction = new QAction(tr("Export comics info"), this); exportComicsInfoAction->setToolTip(tr("Export comics info")); @@ -610,31 +610,31 @@ void LibraryWindow::createActions() addFolderAction->setData(ADD_FOLDER_ACTION_YL); addFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_FOLDER_ACTION_YL)); addFolderAction->setToolTip(tr("Add new folder to the current library")); - addFolderAction->setIcon(QIcon(":/images/sidebar/addNew_sidebar.png")); + addFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addNew_sidebar"))); deleteFolderAction = new QAction(tr("Delete folder"), this); deleteFolderAction->setData(REMOVE_FOLDER_ACTION_YL); deleteFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_FOLDER_ACTION_YL)); deleteFolderAction->setToolTip(tr("Delete current folder from disk")); - deleteFolderAction->setIcon(QIcon(":/images/sidebar/delete_sidebar.png")); + deleteFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/delete_sidebar"))); setRootIndexAction = new QAction(this); setRootIndexAction->setData(SET_ROOT_INDEX_ACTION_YL); setRootIndexAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_ROOT_INDEX_ACTION_YL)); setRootIndexAction->setToolTip(tr("Select root node")); - setRootIndexAction->setIcon(QIcon(":/images/sidebar/setRoot.png")); + setRootIndexAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/setRoot"))); expandAllNodesAction = new QAction(this); expandAllNodesAction->setToolTip(tr("Expand all nodes")); expandAllNodesAction->setData(EXPAND_ALL_NODES_ACTION_YL); expandAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPAND_ALL_NODES_ACTION_YL)); - expandAllNodesAction->setIcon(QIcon(":/images/sidebar/expand.png")); + expandAllNodesAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/expand"))); colapseAllNodesAction = new QAction(this); colapseAllNodesAction->setToolTip(tr("Collapse all nodes")); colapseAllNodesAction->setData(COLAPSE_ALL_NODES_ACTION_YL); colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL)); - colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png")); + colapseAllNodesAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/colapse"))); optionsAction = new QAction(this); optionsAction->setToolTip(tr("Show options dialog")); @@ -793,25 +793,25 @@ void LibraryWindow::createActions() addReadingListAction->setData(ADD_READING_LIST_ACTION_YL); addReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_READING_LIST_ACTION_YL)); addReadingListAction->setToolTip(tr("Add a new reading list to the current library")); - addReadingListAction->setIcon(QIcon(":/images/sidebar/addNew_sidebar.png")); + addReadingListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addNew_sidebar"))); deleteReadingListAction = new QAction(tr("Remove reading list"), this); deleteReadingListAction->setData(REMOVE_READING_LIST_ACTION_YL); deleteReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_READING_LIST_ACTION_YL)); deleteReadingListAction->setToolTip(tr("Remove current reading list from the library")); - deleteReadingListAction->setIcon(QIcon(":/images/sidebar/delete_sidebar.png")); + deleteReadingListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/delete_sidebar"))); addLabelAction = new QAction(tr("Add new label"), this); addLabelAction->setData(ADD_LABEL_ACTION_YL); addLabelAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_LABEL_ACTION_YL)); addLabelAction->setToolTip(tr("Add a new label to this library")); - addLabelAction->setIcon(QIcon(":/images/sidebar/addLabelIcon.png")); + addLabelAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/addLabelIcon"))); renameListAction = new QAction(tr("Rename selected list"), this); renameListAction->setData(RENAME_LIST_ACTION_YL); renameListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIST_ACTION_YL)); renameListAction->setToolTip(tr("Rename any selected labels or lists")); - renameListAction->setIcon(QIcon(":/images/sidebar/renameListIcon.png")); + renameListAction->setIcon(QIcon(addExtensionToIconPath(":/images/sidebar/renameListIcon"))); //-- addToMenuAction = new QAction(tr("Add to..."), this); @@ -820,7 +820,7 @@ void LibraryWindow::createActions() addToFavoritesAction->setData(ADD_TO_FAVORITES_ACTION_YL); addToFavoritesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_TO_FAVORITES_ACTION_YL)); addToFavoritesAction->setToolTip(tr("Add selected comics to favorites list")); - addToFavoritesAction->setIcon(QIcon(":/images/lists/default_1.png")); + addToFavoritesAction->setIcon(QIcon(":/images/lists/default_1.svg")); // actions not asigned to any widget this->addAction(saveCoversToAction); diff --git a/common/yacreader_global_gui.cpp b/common/yacreader_global_gui.cpp index 8df3855d..4f03fa4b 100644 --- a/common/yacreader_global_gui.cpp +++ b/common/yacreader_global_gui.cpp @@ -21,9 +21,10 @@ QAction *YACReader::createSeparator() QIcon YACReader::noHighlightedIcon(const QString &path) { - QPixmap p(path); + QPixmap sp(path); + QPixmap p = hdpiPixmap(path, sp.size()); - QIcon icon; //(path); + QIcon icon; icon.addFile(path, p.size(), QIcon::Normal); icon.addFile(path, p.size(), QIcon::Selected); return icon; diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp index d5b3ba2c..54c8e9ea 100644 --- a/custom_widgets/yacreader_library_item_widget.cpp +++ b/custom_widgets/yacreader_library_item_widget.cpp @@ -1,10 +1,14 @@ #include "yacreader_library_item_widget.h" +#include "yacreader_global_gui.h" + #include #include #include #include +using namespace YACReader; + YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QString p /*ath*/, QWidget *parent) : QWidget(parent), name(n), path(p), isSelected(false) { @@ -14,7 +18,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin // installEventFilter(this); - QPixmap iconPixmap(":/images/sidebar/libraryIcon.png"); + QPixmap iconPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryIcon"), QSize(16, 16)); icon = new QLabel(this); icon->setPixmap(iconPixmap); @@ -22,17 +26,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin options = new QToolButton(this); - // TODO fix this crazy hack for having a propper retina icon for the options, this is still a problem in 2022 - // 1.- QPixmap won't pick the right @2x asset - // 2.- Using QToolButton::setIcon(QIcon(":/images/sidebar/libraryOptions.png")) will pick the right asset and then QToolButton will fail to set the right image size, it will use a image size twice bigger - // 3.- Using a QAction + QToolButton doesn't fix the problem either - // 4.- SVG support is also buggy QTBUG-96553 - QString sourceOptionsImage; - if (devicePixelRatioF() > 1) - sourceOptionsImage = ":/images/sidebar/libraryOptions@2x.png"; - else - sourceOptionsImage = ":/images/sidebar/libraryOptions.png"; - QPixmap iconOptionsPixmap(sourceOptionsImage); + QPixmap iconOptionsPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryOptions"), QSize(8, 8)); iconOptionsPixmap.setDevicePixelRatio(devicePixelRatioF()); QLabel *helperLabel = new QLabel(options); helperLabel->move(4, 3); @@ -131,7 +125,7 @@ void YACReaderLibraryItemWidget::deselect() setStyleSheet(styleSheet); #endif - QPixmap iconPixmap(":/images/sidebar/libraryIcon.png"); + QPixmap iconPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryIcon"), QSize(16, 16)); icon->setPixmap(iconPixmap); /*up->setHidden(true); @@ -153,7 +147,7 @@ void YACReaderLibraryItemWidget::select() options->setHidden(false); - QPixmap iconPixmap(":/images/sidebar/libraryIconSelected.png"); + QPixmap iconPixmap = hdpiPixmap(addExtensionToIconPath(":/images/sidebar/libraryIconSelected"), QSize(16, 16)); icon->setPixmap(iconPixmap); isSelected = true; diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp index dce617fe..bcfef266 100644 --- a/custom_widgets/yacreader_table_view.cpp +++ b/custom_widgets/yacreader_table_view.cpp @@ -147,7 +147,7 @@ void YACReaderTableView::performDrag() QLOG_DEBUG() << "performDrag"; QDrag *drag = new QDrag(this); drag->setMimeData(model()->mimeData(selectionModel()->selectedRows())); - drag->setPixmap(YACReader::hdpiPixmap(":/images/comics_view_toolbar/openInYACReader.png", QSize(18, 18))); // TODO add better image + drag->setPixmap(YACReader::hdpiPixmap(":/images/comics_view_toolbar/openInYACReader.svg", QSize(18, 18))); // TODO add better image /*Qt::DropAction dropAction =*/drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction); } diff --git a/custom_widgets/yacreader_treeview.cpp b/custom_widgets/yacreader_treeview.cpp index 67df09dc..1a70a4d4 100644 --- a/custom_widgets/yacreader_treeview.cpp +++ b/custom_widgets/yacreader_treeview.cpp @@ -44,10 +44,10 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent) "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }" - "QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-closed.png');}" + "QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-closed.svg');}" "QTreeView::branch:has-children:selected:!has-siblings:closed,QTreeView::branch:closed:selected:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/collapsed_branch_selected.png');}" - "QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-open.png');}" + "QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings {border-image: none;image: url(':/images/sidebar/branch-open.svg');}" "QTreeView::branch:open:has-children:selected:!has-siblings,QTreeView::branch:open:has-children:selected:has-siblings {border-image: none;image: url(':/images/sidebar/expanded_branch_selected.png');}"); #endif } diff --git a/images/lists/default_0.png b/images/lists/default_0.png deleted file mode 100644 index b00a0b6f..00000000 Binary files a/images/lists/default_0.png and /dev/null differ diff --git a/images/lists/default_0.svg b/images/lists/default_0.svg new file mode 100644 index 00000000..1b290d53 --- /dev/null +++ b/images/lists/default_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/default_0_osx.png b/images/lists/default_0_osx.png deleted file mode 100644 index 0473058d..00000000 Binary files a/images/lists/default_0_osx.png and /dev/null differ diff --git a/images/lists/default_0_osx@2x.png b/images/lists/default_0_osx@2x.png deleted file mode 100644 index b623e0d0..00000000 Binary files a/images/lists/default_0_osx@2x.png and /dev/null differ diff --git a/images/lists/default_1.png b/images/lists/default_1.png deleted file mode 100644 index 93b55e47..00000000 Binary files a/images/lists/default_1.png and /dev/null differ diff --git a/images/lists/default_1.svg b/images/lists/default_1.svg new file mode 100644 index 00000000..837ec29c --- /dev/null +++ b/images/lists/default_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/default_1_osx.png b/images/lists/default_1_osx.png deleted file mode 100644 index da69a01d..00000000 Binary files a/images/lists/default_1_osx.png and /dev/null differ diff --git a/images/lists/default_1_osx@2x.png b/images/lists/default_1_osx@2x.png deleted file mode 100644 index 963abad8..00000000 Binary files a/images/lists/default_1_osx@2x.png and /dev/null differ diff --git a/images/lists/label_blue.png b/images/lists/label_blue.png deleted file mode 100644 index fb4d538a..00000000 Binary files a/images/lists/label_blue.png and /dev/null differ diff --git a/images/lists/label_blue.svg b/images/lists/label_blue.svg new file mode 100644 index 00000000..d735f3bc --- /dev/null +++ b/images/lists/label_blue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_blue_osx.png b/images/lists/label_blue_osx.png deleted file mode 100644 index fb4d538a..00000000 Binary files a/images/lists/label_blue_osx.png and /dev/null differ diff --git a/images/lists/label_blue_osx@2x.png b/images/lists/label_blue_osx@2x.png deleted file mode 100644 index 35190ea7..00000000 Binary files a/images/lists/label_blue_osx@2x.png and /dev/null differ diff --git a/images/lists/label_cyan.png b/images/lists/label_cyan.png deleted file mode 100644 index c750224c..00000000 Binary files a/images/lists/label_cyan.png and /dev/null differ diff --git a/images/lists/label_cyan.svg b/images/lists/label_cyan.svg new file mode 100644 index 00000000..e028467b --- /dev/null +++ b/images/lists/label_cyan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_cyan_osx.png b/images/lists/label_cyan_osx.png deleted file mode 100644 index c750224c..00000000 Binary files a/images/lists/label_cyan_osx.png and /dev/null differ diff --git a/images/lists/label_cyan_osx@2x.png b/images/lists/label_cyan_osx@2x.png deleted file mode 100644 index 9c430a0c..00000000 Binary files a/images/lists/label_cyan_osx@2x.png and /dev/null differ diff --git a/images/lists/label_dark.png b/images/lists/label_dark.png deleted file mode 100644 index 5ae096ba..00000000 Binary files a/images/lists/label_dark.png and /dev/null differ diff --git a/images/lists/label_dark.svg b/images/lists/label_dark.svg new file mode 100644 index 00000000..c25fb521 --- /dev/null +++ b/images/lists/label_dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_dark_osx.png b/images/lists/label_dark_osx.png deleted file mode 100644 index 5ae096ba..00000000 Binary files a/images/lists/label_dark_osx.png and /dev/null differ diff --git a/images/lists/label_dark_osx@2x.png b/images/lists/label_dark_osx@2x.png deleted file mode 100644 index 179ef5c2..00000000 Binary files a/images/lists/label_dark_osx@2x.png and /dev/null differ diff --git a/images/lists/label_green.png b/images/lists/label_green.png deleted file mode 100644 index d791c59e..00000000 Binary files a/images/lists/label_green.png and /dev/null differ diff --git a/images/lists/label_green.svg b/images/lists/label_green.svg new file mode 100644 index 00000000..7cbe3942 --- /dev/null +++ b/images/lists/label_green.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_green_osx.png b/images/lists/label_green_osx.png deleted file mode 100644 index d791c59e..00000000 Binary files a/images/lists/label_green_osx.png and /dev/null differ diff --git a/images/lists/label_green_osx@2x.png b/images/lists/label_green_osx@2x.png deleted file mode 100644 index 4a75b5bb..00000000 Binary files a/images/lists/label_green_osx@2x.png and /dev/null differ diff --git a/images/lists/label_light.png b/images/lists/label_light.png deleted file mode 100644 index a1111a81..00000000 Binary files a/images/lists/label_light.png and /dev/null differ diff --git a/images/lists/label_light.svg b/images/lists/label_light.svg new file mode 100644 index 00000000..fea8b87f --- /dev/null +++ b/images/lists/label_light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_light_osx.png b/images/lists/label_light_osx.png deleted file mode 100644 index a1111a81..00000000 Binary files a/images/lists/label_light_osx.png and /dev/null differ diff --git a/images/lists/label_light_osx@2x.png b/images/lists/label_light_osx@2x.png deleted file mode 100644 index eb875990..00000000 Binary files a/images/lists/label_light_osx@2x.png and /dev/null differ diff --git a/images/lists/label_orange.png b/images/lists/label_orange.png deleted file mode 100644 index 19d6dcb4..00000000 Binary files a/images/lists/label_orange.png and /dev/null differ diff --git a/images/lists/label_orange.svg b/images/lists/label_orange.svg new file mode 100644 index 00000000..a2838c64 --- /dev/null +++ b/images/lists/label_orange.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_orange_osx.png b/images/lists/label_orange_osx.png deleted file mode 100644 index 19d6dcb4..00000000 Binary files a/images/lists/label_orange_osx.png and /dev/null differ diff --git a/images/lists/label_orange_osx@2x.png b/images/lists/label_orange_osx@2x.png deleted file mode 100644 index eeb72ee4..00000000 Binary files a/images/lists/label_orange_osx@2x.png and /dev/null differ diff --git a/images/lists/label_pink.png b/images/lists/label_pink.png deleted file mode 100644 index f17df136..00000000 Binary files a/images/lists/label_pink.png and /dev/null differ diff --git a/images/lists/label_pink.svg b/images/lists/label_pink.svg new file mode 100644 index 00000000..c957673d --- /dev/null +++ b/images/lists/label_pink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_pink_osx.png b/images/lists/label_pink_osx.png deleted file mode 100644 index f17df136..00000000 Binary files a/images/lists/label_pink_osx.png and /dev/null differ diff --git a/images/lists/label_pink_osx@2x.png b/images/lists/label_pink_osx@2x.png deleted file mode 100644 index 4089a47b..00000000 Binary files a/images/lists/label_pink_osx@2x.png and /dev/null differ diff --git a/images/lists/label_purple.png b/images/lists/label_purple.png deleted file mode 100644 index 3864b692..00000000 Binary files a/images/lists/label_purple.png and /dev/null differ diff --git a/images/lists/label_purple.svg b/images/lists/label_purple.svg new file mode 100644 index 00000000..85dd2a23 --- /dev/null +++ b/images/lists/label_purple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_purple_osx.png b/images/lists/label_purple_osx.png deleted file mode 100644 index 3864b692..00000000 Binary files a/images/lists/label_purple_osx.png and /dev/null differ diff --git a/images/lists/label_purple_osx@2x.png b/images/lists/label_purple_osx@2x.png deleted file mode 100644 index c2fbded9..00000000 Binary files a/images/lists/label_purple_osx@2x.png and /dev/null differ diff --git a/images/lists/label_red.png b/images/lists/label_red.png deleted file mode 100644 index 53e17209..00000000 Binary files a/images/lists/label_red.png and /dev/null differ diff --git a/images/lists/label_red.svg b/images/lists/label_red.svg new file mode 100644 index 00000000..8ef4a8a8 --- /dev/null +++ b/images/lists/label_red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_red_osx.png b/images/lists/label_red_osx.png deleted file mode 100644 index 53e17209..00000000 Binary files a/images/lists/label_red_osx.png and /dev/null differ diff --git a/images/lists/label_red_osx@2x.png b/images/lists/label_red_osx@2x.png deleted file mode 100644 index 694f0959..00000000 Binary files a/images/lists/label_red_osx@2x.png and /dev/null differ diff --git a/images/lists/label_violet.png b/images/lists/label_violet.png deleted file mode 100644 index 067104d7..00000000 Binary files a/images/lists/label_violet.png and /dev/null differ diff --git a/images/lists/label_violet.svg b/images/lists/label_violet.svg new file mode 100644 index 00000000..3400101f --- /dev/null +++ b/images/lists/label_violet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_violet_osx.png b/images/lists/label_violet_osx.png deleted file mode 100644 index 067104d7..00000000 Binary files a/images/lists/label_violet_osx.png and /dev/null differ diff --git a/images/lists/label_violet_osx@2x.png b/images/lists/label_violet_osx@2x.png deleted file mode 100644 index d1607a6f..00000000 Binary files a/images/lists/label_violet_osx@2x.png and /dev/null differ diff --git a/images/lists/label_white.png b/images/lists/label_white.png deleted file mode 100644 index c4c3f855..00000000 Binary files a/images/lists/label_white.png and /dev/null differ diff --git a/images/lists/label_white.svg b/images/lists/label_white.svg new file mode 100644 index 00000000..dfe2ffc8 --- /dev/null +++ b/images/lists/label_white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_white_osx.png b/images/lists/label_white_osx.png deleted file mode 100644 index c4c3f855..00000000 Binary files a/images/lists/label_white_osx.png and /dev/null differ diff --git a/images/lists/label_white_osx@2x.png b/images/lists/label_white_osx@2x.png deleted file mode 100644 index b7a75773..00000000 Binary files a/images/lists/label_white_osx@2x.png and /dev/null differ diff --git a/images/lists/label_yellow.png b/images/lists/label_yellow.png deleted file mode 100644 index 91e89b46..00000000 Binary files a/images/lists/label_yellow.png and /dev/null differ diff --git a/images/lists/label_yellow.svg b/images/lists/label_yellow.svg new file mode 100644 index 00000000..3d2f0da1 --- /dev/null +++ b/images/lists/label_yellow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/label_yellow_osx.png b/images/lists/label_yellow_osx.png deleted file mode 100644 index 91e89b46..00000000 Binary files a/images/lists/label_yellow_osx.png and /dev/null differ diff --git a/images/lists/label_yellow_osx@2x.png b/images/lists/label_yellow_osx@2x.png deleted file mode 100644 index d588e587..00000000 Binary files a/images/lists/label_yellow_osx@2x.png and /dev/null differ diff --git a/images/lists/list.png b/images/lists/list.png deleted file mode 100644 index 9d890d42..00000000 Binary files a/images/lists/list.png and /dev/null differ diff --git a/images/lists/list.svg b/images/lists/list.svg new file mode 100644 index 00000000..aabef84b --- /dev/null +++ b/images/lists/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/lists/list_osx.png b/images/lists/list_osx.png deleted file mode 100644 index 0e9e496a..00000000 Binary files a/images/lists/list_osx.png and /dev/null differ diff --git a/images/lists/list_osx@2x.png b/images/lists/list_osx@2x.png deleted file mode 100644 index 9e29a489..00000000 Binary files a/images/lists/list_osx@2x.png and /dev/null differ diff --git a/images/sidebar/addLabelIcon.png b/images/sidebar/addLabelIcon.png deleted file mode 100644 index 3145a01a..00000000 Binary files a/images/sidebar/addLabelIcon.png and /dev/null differ diff --git a/images/sidebar/addLabelIcon.svg b/images/sidebar/addLabelIcon.svg new file mode 100644 index 00000000..732fb362 --- /dev/null +++ b/images/sidebar/addLabelIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/addNew_sidebar.png b/images/sidebar/addNew_sidebar.png deleted file mode 100644 index 00cdef8f..00000000 Binary files a/images/sidebar/addNew_sidebar.png and /dev/null differ diff --git a/images/sidebar/addNew_sidebar.svg b/images/sidebar/addNew_sidebar.svg new file mode 100644 index 00000000..4c8b6e42 --- /dev/null +++ b/images/sidebar/addNew_sidebar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/branch-closed.png b/images/sidebar/branch-closed.png deleted file mode 100644 index 5903e65b..00000000 Binary files a/images/sidebar/branch-closed.png and /dev/null differ diff --git a/images/sidebar/branch-closed.svg b/images/sidebar/branch-closed.svg new file mode 100644 index 00000000..ea226963 --- /dev/null +++ b/images/sidebar/branch-closed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/branch-open.png b/images/sidebar/branch-open.png deleted file mode 100644 index 4a25b96f..00000000 Binary files a/images/sidebar/branch-open.png and /dev/null differ diff --git a/images/sidebar/branch-open.svg b/images/sidebar/branch-open.svg new file mode 100644 index 00000000..c60277d1 --- /dev/null +++ b/images/sidebar/branch-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/colapse.png b/images/sidebar/colapse.png deleted file mode 100644 index b70c8171..00000000 Binary files a/images/sidebar/colapse.png and /dev/null differ diff --git a/images/sidebar/colapse.svg b/images/sidebar/colapse.svg new file mode 100644 index 00000000..2cd75c8f --- /dev/null +++ b/images/sidebar/colapse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/delete_sidebar.png b/images/sidebar/delete_sidebar.png deleted file mode 100644 index c68fddd3..00000000 Binary files a/images/sidebar/delete_sidebar.png and /dev/null differ diff --git a/images/sidebar/delete_sidebar.svg b/images/sidebar/delete_sidebar.svg new file mode 100644 index 00000000..bc7f2fb7 --- /dev/null +++ b/images/sidebar/delete_sidebar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/expand.png b/images/sidebar/expand.png deleted file mode 100644 index 36a41fba..00000000 Binary files a/images/sidebar/expand.png and /dev/null differ diff --git a/images/sidebar/expand.svg b/images/sidebar/expand.svg new file mode 100644 index 00000000..867974b5 --- /dev/null +++ b/images/sidebar/expand.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/folder.png b/images/sidebar/folder.png deleted file mode 100644 index 22262293..00000000 Binary files a/images/sidebar/folder.png and /dev/null differ diff --git a/images/sidebar/folder.svg b/images/sidebar/folder.svg new file mode 100644 index 00000000..acd1186b --- /dev/null +++ b/images/sidebar/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/folder_finished.png b/images/sidebar/folder_finished.png deleted file mode 100644 index 8313e892..00000000 Binary files a/images/sidebar/folder_finished.png and /dev/null differ diff --git a/images/sidebar/folder_finished.svg b/images/sidebar/folder_finished.svg new file mode 100644 index 00000000..7a437f00 --- /dev/null +++ b/images/sidebar/folder_finished.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/libraryIcon.png b/images/sidebar/libraryIcon.png deleted file mode 100644 index fdee3b28..00000000 Binary files a/images/sidebar/libraryIcon.png and /dev/null differ diff --git a/images/sidebar/libraryIcon.svg b/images/sidebar/libraryIcon.svg new file mode 100644 index 00000000..b9d1deb3 --- /dev/null +++ b/images/sidebar/libraryIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/libraryIconSelected.png b/images/sidebar/libraryIconSelected.png deleted file mode 100644 index ecd31b01..00000000 Binary files a/images/sidebar/libraryIconSelected.png and /dev/null differ diff --git a/images/sidebar/libraryIconSelected.svg b/images/sidebar/libraryIconSelected.svg new file mode 100644 index 00000000..5a46ca6f --- /dev/null +++ b/images/sidebar/libraryIconSelected.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/libraryOptions.png b/images/sidebar/libraryOptions.png deleted file mode 100644 index 761b5826..00000000 Binary files a/images/sidebar/libraryOptions.png and /dev/null differ diff --git a/images/sidebar/libraryOptions.svg b/images/sidebar/libraryOptions.svg new file mode 100644 index 00000000..f2fddde2 --- /dev/null +++ b/images/sidebar/libraryOptions.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/libraryOptions@2x.png b/images/sidebar/libraryOptions@2x.png deleted file mode 100644 index b8413890..00000000 Binary files a/images/sidebar/libraryOptions@2x.png and /dev/null differ diff --git a/images/sidebar/newLibraryIcon.png b/images/sidebar/newLibraryIcon.png deleted file mode 100644 index f23c0676..00000000 Binary files a/images/sidebar/newLibraryIcon.png and /dev/null differ diff --git a/images/sidebar/newLibraryIcon.svg b/images/sidebar/newLibraryIcon.svg new file mode 100644 index 00000000..4c8b6e42 --- /dev/null +++ b/images/sidebar/newLibraryIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/openLibraryIcon.png b/images/sidebar/openLibraryIcon.png deleted file mode 100644 index 1ab86322..00000000 Binary files a/images/sidebar/openLibraryIcon.png and /dev/null differ diff --git a/images/sidebar/openLibraryIcon.svg b/images/sidebar/openLibraryIcon.svg new file mode 100644 index 00000000..3e49f2c1 --- /dev/null +++ b/images/sidebar/openLibraryIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/renameListIcon.png b/images/sidebar/renameListIcon.png deleted file mode 100644 index ec8098da..00000000 Binary files a/images/sidebar/renameListIcon.png and /dev/null differ diff --git a/images/sidebar/renameListIcon.svg b/images/sidebar/renameListIcon.svg new file mode 100644 index 00000000..3420e0ad --- /dev/null +++ b/images/sidebar/renameListIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/sidebar/setRoot.png b/images/sidebar/setRoot.png deleted file mode 100644 index da846f78..00000000 Binary files a/images/sidebar/setRoot.png and /dev/null differ diff --git a/images/sidebar/setRoot.svg b/images/sidebar/setRoot.svg new file mode 100644 index 00000000..863bd2c1 --- /dev/null +++ b/images/sidebar/setRoot.svg @@ -0,0 +1 @@ + \ No newline at end of file