diff options
Diffstat (limited to 'qdeduper')
-rw-r--r-- | qdeduper/img/maximize.svg | 32 | ||||
-rw-r--r-- | qdeduper/img/maximize_.svg | 57 | ||||
-rw-r--r-- | qdeduper/img/select_all.svg | 37 | ||||
-rw-r--r-- | qdeduper/img/select_all_.svg | 64 | ||||
-rw-r--r-- | qdeduper/img/sort.svg | 36 | ||||
-rw-r--r-- | qdeduper/img/sort_.svg | 50 | ||||
-rw-r--r-- | qdeduper/mingui.cpp | 8 | ||||
-rw-r--r-- | qdeduper/resources.qrc | 3 |
8 files changed, 283 insertions, 4 deletions
diff --git a/qdeduper/img/maximize.svg b/qdeduper/img/maximize.svg new file mode 100644 index 0000000..21bac9a --- /dev/null +++ b/qdeduper/img/maximize.svg @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866665 33.866665" + version="1.1" + id="svg920" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs917" /> + <g + id="layer1" + transform="matrix(0.77492164,0,0,0.7749225,3.8113323,3.8112912)"> + <path + id="path1085" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd" + d="m 31.717444,0.54673665 a 1.5614923,1.328362 44.999997 0 0 -0.412378,0.0397909 L 21.726839,3.0737142 a 1.9301106,1.6419457 44.999997 0 0 -0.459403,2.9005981 l 1.441772,1.4417725 -5.529378,5.5293782 3.74034,3.741891 5.530929,-5.529379 1.441255,1.441256 a 1.9301106,1.6419457 44.999997 0 0 2.900598,-0.459404 L 33.280139,2.5616007 A 1.5614923,1.328362 44.999997 0 0 31.717444,0.54673665 Z" /> + <g + id="g1079" + style="fill:#000000;fill-opacity:1" /> + <path + id="path1105" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd" + d="M 12.945463,17.17983 7.4160848,22.709208 5.9743123,21.267436 a 1.9301106,1.6419457 45.000003 0 0 -2.9005981,0.459403 l -2.48718669,9.578227 a 1.5614923,1.328362 45.000003 0 0 1.97507319,1.975073 l 9.5782263,-2.487187 a 1.9301106,1.6419457 45.000003 0 0 0.459404,-2.900598 l -1.441256,-1.441255 5.529379,-5.530929 z" /> + <g + id="g1099" + style="fill:#000000;fill-opacity:1" /> + </g> +</svg> diff --git a/qdeduper/img/maximize_.svg b/qdeduper/img/maximize_.svg new file mode 100644 index 0000000..d08a6c3 --- /dev/null +++ b/qdeduper/img/maximize_.svg @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866665 33.866665" + version="1.1" + id="svg920" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="maximize_.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview922" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="0.83860236" + inkscape:cx="83.472219" + inkscape:cy="45.313491" + inkscape:window-width="1280" + inkscape:window-height="700" + inkscape:window-x="0" + inkscape:window-y="20" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs917" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <path + id="path1085" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd" + d="M 31.717444 0.54673665 A 1.5614923 1.328362 44.999997 0 0 31.305066 0.58652751 L 21.726839 3.0737142 A 1.9301106 1.6419457 44.999997 0 0 21.267436 5.9743123 L 22.709208 7.4160848 L 17.17983 12.945463 L 20.92017 16.687354 L 26.451099 11.157975 L 27.892354 12.599231 A 1.9301106 1.6419457 44.999997 0 0 30.792952 12.139827 L 33.280139 2.5616007 A 1.5614923 1.328362 44.999997 0 0 31.717444 0.54673665 z " /> + <g + id="g1079" + style="fill:#000000;fill-opacity:1" /> + <path + id="path1105" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd" + d="M 12.945463 17.17983 L 7.4160848 22.709208 L 5.9743123 21.267436 A 1.9301106 1.6419457 45.000003 0 0 3.0737142 21.726839 L 0.58652751 31.305066 A 1.5614923 1.328362 45.000003 0 0 2.5616007 33.280139 L 12.139827 30.792952 A 1.9301106 1.6419457 45.000003 0 0 12.599231 27.892354 L 11.157975 26.451099 L 16.687354 20.92017 L 12.945463 17.17983 z " /> + <g + id="g1099" + style="fill:#000000;fill-opacity:1" /> + </g> +</svg> diff --git a/qdeduper/img/select_all.svg b/qdeduper/img/select_all.svg new file mode 100644 index 0000000..06246ed --- /dev/null +++ b/qdeduper/img/select_all.svg @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866666 33.866666" + version="1.1" + id="svg2292" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs2289" /> + <g + id="layer1"> + <rect + style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:stroke fill markers" + id="rect2465" + width="12.7" + height="12.7" + x="10.583335" + y="10.583335" + rx="0.52916664" + ry="0.52916664" /> + <g + id="rect2987"> + <path + style="color:#000000;fill:#000000;stroke-dasharray:2.11667, 2.11667;stroke-dashoffset:1.05833;-inkscape-stroke:none;paint-order:stroke fill markers" + d="M 5.2910156,4.2324219 4.2333333,4.2333333 4.2324219,5.2910156 V 6.3496094 H 5.2910156 6.3496094 V 5.2910156 4.2324219 Z m 3.1757813,0 V 6.3496094 H 10.583984 V 4.2324219 Z m 4.2324221,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.234375,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.232422,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.234375,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 2.117187,2.1171875 v 2.1171875 h 2.115234 V 6.3496094 Z M 4.2324219,8.4667969 V 10.583984 H 6.3496094 V 8.4667969 Z M 27.517578,10.583984 v 2.115235 h 2.115234 V 10.583984 Z M 4.2324219,12.699219 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.117188 h 2.115234 V 14.816406 Z M 4.2324219,16.933594 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.115235 h 2.115234 V 19.050781 Z M 4.2324219,21.166016 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.117188 h 2.115234 V 23.283203 Z M 4.2324219,25.400391 v 2.117187 h 2.1171875 v -2.117187 z m 2.1171875,2.117187 v 2.115234 h 2.1171875 v -2.115234 z m 4.2343746,0 v 2.115234 h 2.115235 v -2.115234 z m 4.232422,0 v 2.115234 h 2.117188 v -2.115234 z m 4.234375,0 v 2.115234 h 2.115235 v -2.115234 z m 4.232422,0 v 2.115234 h 2.117188 v -2.115234 z m 4.234375,0 v 1.056641 1.058593 h 2.115234 v -2.115234 h -1.058593 z" + id="path3013" /> + <path + style="color:#000000;fill:#000000;fill-opacity:0;stroke-width:2.11667;stroke-dasharray:2.11667, 2.11667;stroke-dashoffset:1.05833;-inkscape-stroke:none;paint-order:stroke fill markers" + d="M 5.2916684,5.2916684 H 28.575001 V 28.575001 H 5.2916684 Z" + id="path3015" /> + </g> + </g> +</svg> diff --git a/qdeduper/img/select_all_.svg b/qdeduper/img/select_all_.svg new file mode 100644 index 0000000..3d16754 --- /dev/null +++ b/qdeduper/img/select_all_.svg @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866666 33.866666" + version="1.1" + id="svg2292" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="select_all_.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview2294" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + showgrid="false" + inkscape:zoom="3.2436918" + inkscape:cx="35.761721" + inkscape:cy="38.844628" + inkscape:window-width="1280" + inkscape:window-height="700" + inkscape:window-x="0" + inkscape:window-y="20" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs2289" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;paint-order:stroke fill markers" + id="rect2465" + width="12.7" + height="12.7" + x="10.583335" + y="10.583335" + rx="0.52916664" + ry="0.52916664" /> + <g + id="rect2987"> + <path + style="color:#000000;fill:#000000;stroke-dasharray:2.11667, 2.11667;stroke-dashoffset:1.05833;-inkscape-stroke:none;paint-order:stroke fill markers" + d="M 5.2910156,4.2324219 4.2333333,4.2333333 4.2324219,5.2910156 V 6.3496094 H 5.2910156 6.3496094 V 5.2910156 4.2324219 Z m 3.1757813,0 V 6.3496094 H 10.583984 V 4.2324219 Z m 4.2324221,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.234375,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.232422,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 4.234375,0 v 2.1171875 h 2.117187 V 4.2324219 Z m 2.117187,2.1171875 v 2.1171875 h 2.115234 V 6.3496094 Z M 4.2324219,8.4667969 V 10.583984 H 6.3496094 V 8.4667969 Z M 27.517578,10.583984 v 2.115235 h 2.115234 V 10.583984 Z M 4.2324219,12.699219 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.117188 h 2.115234 V 14.816406 Z M 4.2324219,16.933594 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.115235 h 2.115234 V 19.050781 Z M 4.2324219,21.166016 v 2.117187 h 2.1171875 v -2.117187 z m 23.2851561,2.117187 v 2.117188 h 2.115234 V 23.283203 Z M 4.2324219,25.400391 v 2.117187 h 2.1171875 v -2.117187 z m 2.1171875,2.117187 v 2.115234 h 2.1171875 v -2.115234 z m 4.2343746,0 v 2.115234 h 2.115235 v -2.115234 z m 4.232422,0 v 2.115234 h 2.117188 v -2.115234 z m 4.234375,0 v 2.115234 h 2.115235 v -2.115234 z m 4.232422,0 v 2.115234 h 2.117188 v -2.115234 z m 4.234375,0 v 1.056641 1.058593 h 2.115234 v -2.115234 h -1.058593 z" + id="path3013" + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /> + <path + style="color:#000000;fill:#000000;fill-opacity:0;stroke-width:2.11667;stroke-dasharray:2.11667, 2.11667;stroke-dashoffset:1.05833;-inkscape-stroke:none;paint-order:stroke fill markers" + d="M 5.2916684,5.2916684 H 28.575001 V 28.575001 H 5.2916684 Z" + id="path3015" /> + </g> + </g> +</svg> diff --git a/qdeduper/img/sort.svg b/qdeduper/img/sort.svg new file mode 100644 index 0000000..3d6c089 --- /dev/null +++ b/qdeduper/img/sort.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866666 33.866666" + version="1.1" + id="svg1204" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs1201" /> + <g + id="layer1"> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,9.5250016 H 28.680839" + id="path1486" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,16.404169 H 22.330839" + id="path1490" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,23.283335 H 18.097506" + id="path1492" /> + <path + id="path2258" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd" + d="M 4.8689535 8.4666667 L 4.8689535 18.394743 L 3.5284668 18.394743 A 0.98821757 0.89560756 0 0 0 2.644283 19.690788 L 5.2115682 24.34425 A 0.79948479 0.72456172 0 0 0 6.6419718 24.34425 L 9.209257 19.690788 A 0.98821757 0.89560756 0 0 0 8.3250732 18.394743 L 6.9845866 18.394743 L 6.9845866 8.4666667 L 4.8689535 8.4666667 z " /> + <g + id="g2252" + style="fill:#000000;fill-opacity:1" /> + </g> +</svg> diff --git a/qdeduper/img/sort_.svg b/qdeduper/img/sort_.svg new file mode 100644 index 0000000..3003eb7 --- /dev/null +++ b/qdeduper/img/sort_.svg @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="128" + height="128" + viewBox="0 0 33.866666 33.866666" + version="1.1" + id="svg1204" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs1201"> + <marker + style="overflow:visible" + id="RoundedArrow" + refX="0" + refY="0" + orient="auto-start-reverse" + markerWidth="3" + markerHeight="3.2" + viewBox="0 0 6.1347524 5.9304951" + preserveAspectRatio="none"> + <path + transform="scale(0.7)" + d="m -0.21114562,-4.1055728 6.42229122,3.21114561 a 1,1 90 0 1 0,1.78885438 L -0.21114562,4.1055728 A 1.236068,1.236068 31.717474 0 1 -2,3 v -6 a 1.236068,1.236068 148.28253 0 1 1.78885438,-1.1055728 z" + style="fill:context-stroke;fill-rule:evenodd;stroke:none" + id="path1367" /> + </marker> + </defs> + <g + id="layer1"> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,9.5250016 H 28.680839" + id="path1486" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,16.404169 H 22.330839" + id="path1490" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="M 9.6308389,23.283335 H 18.097506" + id="path1492" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11667;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#RoundedArrow)" + d="M 5.9266719,8.4666683 V 19.843752" + id="path1857" /> + </g> +</svg> diff --git a/qdeduper/mingui.cpp b/qdeduper/mingui.cpp index 89628f1..22f8ccb 100644 --- a/qdeduper/mingui.cpp +++ b/qdeduper/mingui.cpp @@ -93,9 +93,6 @@ DeduperMainWindow::DeduperMainWindow() sb = this->statusBar(); sb->addPermanentWidget(dbramusg = new QLabel()); sb->addPermanentWidget(permamsg = new QLabel()); - QLabel *opm = new QLabel(); - opm->setText("placeholder status bar text"); - sb->addWidget(opm); l = new QSplitter(Qt::Orientation::Horizontal, this); l->setContentsMargins(6, 6, 6, 6); l->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -231,7 +228,7 @@ DeduperMainWindow::DeduperMainWindow() l->setStretchFactor(1, 1); l->setCollapsible(0, false); marked.clear(); - infopanel->setText("bleh"); + infopanel->setText("(Difference between images)"); infopanel->setSizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Minimum); nohotkeywarn = false; sort_role = ImageItem::ImageItemRoles::default_order_role; @@ -360,6 +357,7 @@ void DeduperMainWindow::setup_menu() view->addSeparator(); QAction *singlemode = view->addAction("Single Item Mode"); + singlemode->setIcon(QIcon(":/img/maximize.svg")); singlemode->setCheckable(true); register_action("single_mode_toggle", singlemode); QObject::connect(singlemode, &QAction::triggered, [this] (bool c) { @@ -368,6 +366,7 @@ void DeduperMainWindow::setup_menu() view->addSeparator(); QAction *sort = view->addAction("Sort by"); + sort->setIcon(QIcon(":/img/sort.svg")); QMenu *sortm = new QMenu(this); sort->setMenu(sortm); QAction *sfsz = sortm->addAction("File size"); @@ -439,6 +438,7 @@ void DeduperMainWindow::setup_menu() register_action("sort", sort); QAction *mall = mark->addAction("Mark All"); + mall->setIcon(QIcon(":/img/select_all.svg")); QObject::connect(mall, &QAction::triggered, [this]{this->mark_all();}); register_action("mark_all", mall); diff --git a/qdeduper/resources.qrc b/qdeduper/resources.qrc index ce622ca..dcd73a3 100644 --- a/qdeduper/resources.qrc +++ b/qdeduper/resources.qrc @@ -1,5 +1,8 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>img/deduper.png</file> + <file>img/maximize.svg</file> + <file>img/sort.svg</file> + <file>img/select_all.svg</file> </qresource> </RCC> |