mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

More left side bar png to svg assets conversion

Browse Source
This commit is contained in:
Luis Ángel San Martín
2022-10-23 10:43:37 +02:00
parent c7a1a73432
commit 31c4ae6561
106 changed files with 116 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
custom_widgets/yacreader_library_item_widget.cpp
View File

@ -1,10 +1,14 @@
#include "yacreader_library_item_widget.h"
#include "yacreader_global_gui.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QToolButton>
#include <QMouseEvent>
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;

2
custom_widgets/yacreader_table_view.cpp
View File

@ -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);
}

4
custom_widgets/yacreader_treeview.cpp
View File

@ -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
}