diff --git a/ico/128x128/plasmagik.png b/ico/128x128/plasmagik.png deleted file mode 100644 index 55c492e37..000000000 Binary files a/ico/128x128/plasmagik.png and /dev/null differ diff --git a/ico/128x128/project.png b/ico/128x128/project.png deleted file mode 100644 index d68d8bd7b..000000000 Binary files a/ico/128x128/project.png and /dev/null differ diff --git a/ico/128x128/terminalstrip.png b/ico/128x128/terminalstrip.png deleted file mode 100644 index d950de7a0..000000000 Binary files a/ico/128x128/terminalstrip.png and /dev/null differ diff --git a/ico/16x16/arrow-left-double.png b/ico/16x16/arrow-left-double.png deleted file mode 100644 index f4fb1b827..000000000 Binary files a/ico/16x16/arrow-left-double.png and /dev/null differ diff --git a/ico/16x16/arrow-right-double.png b/ico/16x16/arrow-right-double.png deleted file mode 100644 index ced4a0922..000000000 Binary files a/ico/16x16/arrow-right-double.png and /dev/null differ diff --git a/ico/16x16/conductor-edit.png b/ico/16x16/conductor-edit.png deleted file mode 100644 index fa8eea246..000000000 Binary files a/ico/16x16/conductor-edit.png and /dev/null differ diff --git a/ico/16x16/conductor-reset.png b/ico/16x16/conductor-reset.png deleted file mode 100644 index 2a7458d8c..000000000 Binary files a/ico/16x16/conductor-reset.png and /dev/null differ diff --git a/ico/16x16/configure-toolbars.png b/ico/16x16/configure-toolbars.png deleted file mode 100644 index 083d286b1..000000000 Binary files a/ico/16x16/configure-toolbars.png and /dev/null differ diff --git a/ico/16x16/east.png b/ico/16x16/east.png deleted file mode 100644 index 9a9708f51..000000000 Binary files a/ico/16x16/east.png and /dev/null differ diff --git a/ico/16x16/element-delete.png b/ico/16x16/element-delete.png deleted file mode 100644 index 800bc84ec..000000000 Binary files a/ico/16x16/element-delete.png and /dev/null differ diff --git a/ico/16x16/element-edit.png b/ico/16x16/element-edit.png deleted file mode 100644 index 34770a772..000000000 Binary files a/ico/16x16/element-edit.png and /dev/null differ diff --git a/ico/16x16/element-master.png b/ico/16x16/element-master.png deleted file mode 100644 index 669081a6b..000000000 Binary files a/ico/16x16/element-master.png and /dev/null differ diff --git a/ico/16x16/element-new.png b/ico/16x16/element-new.png deleted file mode 100644 index 325718abe..000000000 Binary files a/ico/16x16/element-new.png and /dev/null differ diff --git a/ico/16x16/element-slave.png b/ico/16x16/element-slave.png deleted file mode 100644 index 9b32fb38c..000000000 Binary files a/ico/16x16/element-slave.png and /dev/null differ diff --git a/ico/16x16/endline-circle.png b/ico/16x16/endline-circle.png deleted file mode 100644 index 7d14eb75e..000000000 Binary files a/ico/16x16/endline-circle.png and /dev/null differ diff --git a/ico/16x16/endline-diamond.png b/ico/16x16/endline-diamond.png deleted file mode 100644 index c65b4cd02..000000000 Binary files a/ico/16x16/endline-diamond.png and /dev/null differ diff --git a/ico/16x16/endline-none.png b/ico/16x16/endline-none.png deleted file mode 100644 index 2d8ec6c52..000000000 Binary files a/ico/16x16/endline-none.png and /dev/null differ diff --git a/ico/16x16/endline-simple.png b/ico/16x16/endline-simple.png deleted file mode 100644 index b713087da..000000000 Binary files a/ico/16x16/endline-simple.png and /dev/null differ diff --git a/ico/16x16/endline-triangle.png b/ico/16x16/endline-triangle.png deleted file mode 100644 index 5dd78c1fa..000000000 Binary files a/ico/16x16/endline-triangle.png and /dev/null differ diff --git a/ico/16x16/export-csv.png b/ico/16x16/export-csv.png deleted file mode 100644 index 2459a7316..000000000 Binary files a/ico/16x16/export-csv.png and /dev/null differ diff --git a/ico/16x16/folder-delete.png b/ico/16x16/folder-delete.png deleted file mode 100644 index d84800baf..000000000 Binary files a/ico/16x16/folder-delete.png and /dev/null differ diff --git a/ico/16x16/folder-edit.png b/ico/16x16/folder-edit.png deleted file mode 100644 index 3a71427a1..000000000 Binary files a/ico/16x16/folder-edit.png and /dev/null differ diff --git a/ico/16x16/folder-only-this.png b/ico/16x16/folder-only-this.png deleted file mode 100644 index 0927f3b08..000000000 Binary files a/ico/16x16/folder-only-this.png and /dev/null differ diff --git a/ico/16x16/folder-show-all.png b/ico/16x16/folder-show-all.png deleted file mode 100644 index 9651020c8..000000000 Binary files a/ico/16x16/folder-show-all.png and /dev/null differ diff --git a/ico/16x16/folio-ref-coming.png b/ico/16x16/folio-ref-coming.png deleted file mode 100644 index b5faf3af8..000000000 Binary files a/ico/16x16/folio-ref-coming.png and /dev/null differ diff --git a/ico/16x16/go-company.png b/ico/16x16/go-company.png deleted file mode 100644 index 815d2a1cb..000000000 Binary files a/ico/16x16/go-company.png and /dev/null differ diff --git a/ico/16x16/ground.png b/ico/16x16/ground.png deleted file mode 100644 index 047c49727..000000000 Binary files a/ico/16x16/ground.png and /dev/null differ diff --git a/ico/16x16/neutral.png b/ico/16x16/neutral.png deleted file mode 100644 index c4ba41497..000000000 Binary files a/ico/16x16/neutral.png and /dev/null differ diff --git a/ico/16x16/north.png b/ico/16x16/north.png deleted file mode 100644 index c848ba743..000000000 Binary files a/ico/16x16/north.png and /dev/null differ diff --git a/ico/16x16/orientations.png b/ico/16x16/orientations.png deleted file mode 100644 index 715410ac3..000000000 Binary files a/ico/16x16/orientations.png and /dev/null differ diff --git a/ico/16x16/phase.png b/ico/16x16/phase.png deleted file mode 100644 index e6fd0edf5..000000000 Binary files a/ico/16x16/phase.png and /dev/null differ diff --git a/ico/16x16/project-close.png b/ico/16x16/project-close.png deleted file mode 100644 index a5c253618..000000000 Binary files a/ico/16x16/project-close.png and /dev/null differ diff --git a/ico/16x16/project-new.png b/ico/16x16/project-new.png deleted file mode 100644 index b29ef1587..000000000 Binary files a/ico/16x16/project-new.png and /dev/null differ diff --git a/ico/16x16/project-properties.png b/ico/16x16/project-properties.png deleted file mode 100644 index 6c30705ef..000000000 Binary files a/ico/16x16/project-properties.png and /dev/null differ diff --git a/ico/16x16/project.png b/ico/16x16/project.png deleted file mode 100644 index a7dd1bc62..000000000 Binary files a/ico/16x16/project.png and /dev/null differ diff --git a/ico/16x16/run-dxf.png b/ico/16x16/run-dxf.png deleted file mode 100644 index 7de50c177..000000000 Binary files a/ico/16x16/run-dxf.png and /dev/null differ diff --git a/ico/16x16/south.png b/ico/16x16/south.png deleted file mode 100644 index e59310657..000000000 Binary files a/ico/16x16/south.png and /dev/null differ diff --git a/ico/16x16/terminal.png b/ico/16x16/terminal.png deleted file mode 100644 index 8ce60b5e9..000000000 Binary files a/ico/16x16/terminal.png and /dev/null differ diff --git a/ico/16x16/terminalstrip.png b/ico/16x16/terminalstrip.png deleted file mode 100644 index 7d826295b..000000000 Binary files a/ico/16x16/terminalstrip.png and /dev/null differ diff --git a/ico/16x16/text-xml.png b/ico/16x16/text-xml.png deleted file mode 100644 index 035c3a600..000000000 Binary files a/ico/16x16/text-xml.png and /dev/null differ diff --git a/ico/16x16/west.png b/ico/16x16/west.png deleted file mode 100644 index 07ca1392f..000000000 Binary files a/ico/16x16/west.png and /dev/null differ diff --git a/ico/16x16/zoom-fit-best.png b/ico/16x16/zoom-fit-best.png deleted file mode 100644 index b3abd3709..000000000 Binary files a/ico/16x16/zoom-fit-best.png and /dev/null differ diff --git a/ico/16x16/zoom-original.png b/ico/16x16/zoom-original.png deleted file mode 100644 index 2bd3bbeed..000000000 Binary files a/ico/16x16/zoom-original.png and /dev/null differ diff --git a/ico/22x22/all_pages.png b/ico/22x22/all_pages.png deleted file mode 100644 index 4db85e944..000000000 Binary files a/ico/22x22/all_pages.png and /dev/null differ diff --git a/ico/22x22/arrow-left-double.png b/ico/22x22/arrow-left-double.png deleted file mode 100644 index c100828d6..000000000 Binary files a/ico/22x22/arrow-left-double.png and /dev/null differ diff --git a/ico/22x22/arrow-right-double.png b/ico/22x22/arrow-right-double.png deleted file mode 100644 index fd7f206c7..000000000 Binary files a/ico/22x22/arrow-right-double.png and /dev/null differ diff --git a/ico/22x22/conductor2.png b/ico/22x22/conductor2.png deleted file mode 100644 index d93637dac..000000000 Binary files a/ico/22x22/conductor2.png and /dev/null differ diff --git a/ico/22x22/configure-toolbars.png b/ico/22x22/configure-toolbars.png deleted file mode 100644 index 84712182a..000000000 Binary files a/ico/22x22/configure-toolbars.png and /dev/null differ diff --git a/ico/22x22/diagram_bg.png b/ico/22x22/diagram_bg.png deleted file mode 100644 index 510329bfc..000000000 Binary files a/ico/22x22/diagram_bg.png and /dev/null differ diff --git a/ico/22x22/element-delete.png b/ico/22x22/element-delete.png deleted file mode 100644 index d12ab2145..000000000 Binary files a/ico/22x22/element-delete.png and /dev/null differ diff --git a/ico/22x22/element-edit.png b/ico/22x22/element-edit.png deleted file mode 100644 index 20a480b39..000000000 Binary files a/ico/22x22/element-edit.png and /dev/null differ diff --git a/ico/22x22/element-new.png b/ico/22x22/element-new.png deleted file mode 100644 index 12fd2b725..000000000 Binary files a/ico/22x22/element-new.png and /dev/null differ diff --git a/ico/22x22/export-csv.png b/ico/22x22/export-csv.png deleted file mode 100644 index ab4676b19..000000000 Binary files a/ico/22x22/export-csv.png and /dev/null differ diff --git a/ico/22x22/folder-delete.png b/ico/22x22/folder-delete.png deleted file mode 100644 index 79ce16c5a..000000000 Binary files a/ico/22x22/folder-delete.png and /dev/null differ diff --git a/ico/22x22/folder-edit.png b/ico/22x22/folder-edit.png deleted file mode 100644 index fd61602ac..000000000 Binary files a/ico/22x22/folder-edit.png and /dev/null differ diff --git a/ico/22x22/go-company.png b/ico/22x22/go-company.png deleted file mode 100644 index e43b56dec..000000000 Binary files a/ico/22x22/go-company.png and /dev/null differ diff --git a/ico/22x22/guides.png b/ico/22x22/guides.png deleted file mode 100644 index d6d8a1e69..000000000 Binary files a/ico/22x22/guides.png and /dev/null differ diff --git a/ico/22x22/hotspot.png b/ico/22x22/hotspot.png deleted file mode 100644 index f44009583..000000000 Binary files a/ico/22x22/hotspot.png and /dev/null differ diff --git a/ico/22x22/landscape.png b/ico/22x22/landscape.png deleted file mode 100644 index 6285947af..000000000 Binary files a/ico/22x22/landscape.png and /dev/null differ diff --git a/ico/22x22/lower.png b/ico/22x22/lower.png deleted file mode 100644 index 6e664617e..000000000 Binary files a/ico/22x22/lower.png and /dev/null differ diff --git a/ico/22x22/names.png b/ico/22x22/names.png deleted file mode 100644 index f15508110..000000000 Binary files a/ico/22x22/names.png and /dev/null differ diff --git a/ico/22x22/portrait.png b/ico/22x22/portrait.png deleted file mode 100644 index 7cdb682e2..000000000 Binary files a/ico/22x22/portrait.png and /dev/null differ diff --git a/ico/22x22/project-close.png b/ico/22x22/project-close.png deleted file mode 100644 index cadb8926c..000000000 Binary files a/ico/22x22/project-close.png and /dev/null differ diff --git a/ico/22x22/project-new.png b/ico/22x22/project-new.png deleted file mode 100644 index 4fc3f1ebc..000000000 Binary files a/ico/22x22/project-new.png and /dev/null differ diff --git a/ico/22x22/project.png b/ico/22x22/project.png deleted file mode 100644 index 594737c23..000000000 Binary files a/ico/22x22/project.png and /dev/null differ diff --git a/ico/22x22/raise.png b/ico/22x22/raise.png deleted file mode 100644 index ef14d5b87..000000000 Binary files a/ico/22x22/raise.png and /dev/null differ diff --git a/ico/22x22/send_backward.png b/ico/22x22/send_backward.png deleted file mode 100644 index 64ca260c7..000000000 Binary files a/ico/22x22/send_backward.png and /dev/null differ diff --git a/ico/22x22/terminal.png b/ico/22x22/terminal.png deleted file mode 100644 index 181f11605..000000000 Binary files a/ico/22x22/terminal.png and /dev/null differ diff --git a/ico/22x22/terminalstrip.png b/ico/22x22/terminalstrip.png deleted file mode 100644 index cea742781..000000000 Binary files a/ico/22x22/terminalstrip.png and /dev/null differ diff --git a/ico/22x22/text-xml.png b/ico/22x22/text-xml.png deleted file mode 100644 index e5a91aa54..000000000 Binary files a/ico/22x22/text-xml.png and /dev/null differ diff --git a/ico/22x22/textfield.png b/ico/22x22/textfield.png deleted file mode 100644 index 9f833570e..000000000 Binary files a/ico/22x22/textfield.png and /dev/null differ diff --git a/ico/22x22/titleblock-bottom.png b/ico/22x22/titleblock-bottom.png deleted file mode 100644 index 15eef6898..000000000 Binary files a/ico/22x22/titleblock-bottom.png and /dev/null differ diff --git a/ico/22x22/titleblock-right.png b/ico/22x22/titleblock-right.png deleted file mode 100644 index 60dfdd648..000000000 Binary files a/ico/22x22/titleblock-right.png and /dev/null differ diff --git a/ico/22x22/zoom-fit-best.png b/ico/22x22/zoom-fit-best.png deleted file mode 100644 index 557a5e970..000000000 Binary files a/ico/22x22/zoom-fit-best.png and /dev/null differ diff --git a/ico/22x22/zoom-original.png b/ico/22x22/zoom-original.png deleted file mode 100644 index 04ef3a814..000000000 Binary files a/ico/22x22/zoom-original.png and /dev/null differ diff --git a/ico/32x32/application-pdf.png b/ico/32x32/application-pdf.png deleted file mode 100644 index ea6ff445b..000000000 Binary files a/ico/32x32/application-pdf.png and /dev/null differ diff --git a/ico/32x32/simplifyrichtext.png b/ico/32x32/simplifyrichtext.png deleted file mode 100644 index f29b5d167..000000000 Binary files a/ico/32x32/simplifyrichtext.png and /dev/null differ diff --git a/ico/32x32/text-xml.png b/ico/32x32/text-xml.png deleted file mode 100644 index 178a7abd5..000000000 Binary files a/ico/32x32/text-xml.png and /dev/null differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 34b77ad37..9f72e5274 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -5,13 +5,10 @@ ico/128x128/document-export.png ico/128x128/printer.png ico/16x16/application-exit.png - ico/16x16/arrow-left-double.png ico/16x16/arrow-left.png - ico/16x16/arrow-right-double.png ico/16x16/arrow-right.png ico/16x16/circle.png ico/16x16/configure.png - ico/16x16/configure-toolbars.png ico/16x16/dialog-cancel.png ico/16x16/dialog-ok.png ico/16x16/document-close.png @@ -25,7 +22,6 @@ ico/16x16/document-save-all.png ico/16x16/document-save-as.png ico/16x16/document-save.png - ico/16x16/east.png ico/16x16/edit-clear-locationbar-ltr.png ico/16x16/edit-clear.png ico/16x16/edit-copy.png @@ -44,55 +40,34 @@ ico/16x16/edit-table-cell-split.png ico/16x16/edit-table-cell-merge.png ico/16x16/edit-undo.png - ico/16x16/endline-circle.png - ico/16x16/endline-diamond.png - ico/16x16/endline-none.png - ico/16x16/endline-simple.png - ico/16x16/endline-triangle.png ico/16x16/flip.png ico/16x16/folder-new.png ico/16x16/folder.png - ico/16x16/go-company.png ico/16x16/go-down.png ico/16x16/go-home.png ico/16x16/go-up.png - ico/16x16/ground.png ico/16x16/label.png ico/16x16/list-add.png ico/16x16/list-remove.png ico/16x16/masquer.png ico/16x16/mirror.png - ico/16x16/neutral.png - ico/16x16/north.png - ico/16x16/orientations.png - ico/16x16/phase.png ico/16x16/preferences-desktop-user.png ico/16x16/qet.png - ico/16x16/south.png - ico/16x16/text-xml.png ico/16x16/user-busy.png ico/16x16/user-online.png ico/16x16/view-fullscreen.png ico/16x16/view-refresh.png ico/16x16/view-restore.png - ico/16x16/west.png ico/16x16/window-new.png ico/16x16/zoom-draw.png - ico/16x16/zoom-fit-best.png ico/16x16/zoom-in.png - ico/16x16/zoom-original.png ico/16x16/zoom-out.png - ico/22x22/all_pages.png ico/22x22/application-exit.png ico/22x22/arc.png - ico/22x22/arrow-left-double.png ico/22x22/arrow-left.png - ico/22x22/arrow-right-double.png ico/22x22/arrow-right.png ico/22x22/bring_forward.png - ico/22x22/conductor2.png ico/22x22/configure.png - ico/22x22/configure-toolbars.png ico/22x22/dialog-cancel.png ico/22x22/dialog-ok.png ico/22x22/document-close.png @@ -124,43 +99,27 @@ ico/22x22/edit-table-cell-split.png ico/22x22/edit-table-cell-merge.png ico/22x22/edit-undo.png - ico/22x22/element-delete.png - ico/22x22/element-edit.png - ico/22x22/element-new.png ico/22x22/ellipse.png - ico/22x22/folder-delete.png - ico/22x22/folder-edit.png ico/22x22/folder-new.png - ico/22x22/go-company.png ico/22x22/go-down.png ico/22x22/go-home.png ico/22x22/go-up.png - ico/22x22/hotspot.png ico/22x22/insert-image.png - ico/22x22/landscape.png ico/22x22/line.png ico/22x22/list-add.png ico/22x22/list-remove.png - ico/22x22/lower.png ico/22x22/move.png - ico/22x22/names.png ico/22x22/object-locked.png ico/22x22/object-rotate-right.png ico/22x22/object-unlocked.png ico/22x22/polygon.png - ico/22x22/portrait.png ico/22x22/preferences-desktop-user.png - ico/22x22/raise.png ico/22x22/rectangle.png ico/22x22/restaurer.png ico/22x22/select.png - ico/22x22/send_backward.png ico/22x22/single_page.png ico/22x22/start.png - ico/22x22/terminal.png - ico/22x22/textfield.png ico/22x22/text.png - ico/22x22/text-xml.png ico/22x22/transform-scale.png ico/22x22/two_pages.png ico/22x22/view_fit_width.png @@ -169,16 +128,12 @@ ico/22x22/view-restore.png ico/22x22/window-new.png ico/22x22/zoom-draw.png - ico/22x22/zoom-fit-best.png ico/22x22/zoom-in.png - ico/22x22/zoom-original.png ico/22x22/zoom-out.png ico/256x256/qelectrotech.png ico/256x256/qet.png - ico/32x32/application-pdf.png ico/32x32/image-x-eps.png ico/32x32/printer.png - ico/32x32/text-xml.png ico/32x32/qt.png ico/diagram.png ico/splash.png @@ -206,24 +161,17 @@ ico/22x22/applications-development-translation.png ico/48x48/view-pim-journal.png ico/24x16/nl.png - ico/32x32/simplifyrichtext.png ico/24x16/nl_BE.png - ico/128x128/plasmagik.png ico/22x22/autoconnect.png - ico/128x128/project.png ico/16x16/folio-new.png ico/48x48/document-print-frame.png ico/22x22/Actions-player-time-icon.png - ico/22x22/diagram_bg.png ico/24x16/dk.png ico/24x16/br.png ico/22x22/grid.png - ico/22x22/guides.png - ico/22x22/terminalstrip.png ico/16x16/diagram.png ico/16x16/edit-clear-locationbar-rtl.png ico/16x16/edit-download.png - ico/16x16/export-csv.png ico/16x16/help-contents.png ico/16x16/help-donate.png ico/16x16/item-cancel.png @@ -231,20 +179,12 @@ ico/16x16/item-move.png ico/16x16/kdenlive-show-video.png ico/16x16/object-rotate-right.png - ico/16x16/project-close.png ico/16x16/project-delete.png - ico/16x16/project-new.png - ico/16x16/project.png ico/16x16/qt.png - ico/16x16/terminalstrip.png ico/22x22/edit-clear-locationbar-rtl.png - ico/22x22/export-csv.png ico/22x22/format-text-subscript.png ico/22x22/format-text-superscript.png - ico/22x22/project-close.png ico/22x22/project-delete.png - ico/22x22/project-new.png - ico/22x22/project.png ico/22x22/view-fit-window.png ico/24x16/ad.png ico/24x16/ae.png @@ -562,42 +502,25 @@ ico/windows_icon/qelectrotech.ico ico/windows_icon/qelectrotech.rc ico/copyright - ico/16x16/folder-only-this.png - ico/16x16/folder-show-all.png ico/16x16/folio-delete.png - ico/16x16/project-properties.png ico/16x16/table-of-content.png ico/16x16/folio-properties.png ico/16x16/select.png ico/16x16/grid.png ico/16x16/move.png - ico/22x22/titleblock-bottom.png - ico/22x22/titleblock-right.png ico/16x16/element.png - ico/16x16/element-new.png - ico/16x16/element-delete.png - ico/16x16/element-edit.png - ico/16x16/folder-delete.png - ico/16x16/folder-edit.png ico/16x16/folder-open.png ico/16x16/folder-properties.png ico/16x16/go-up-double.png ico/16x16/go-down-double.png ico/16x16/go-top.png ico/16x16/go-bottom.png - ico/16x16/run-dxf.png ico/22x22/folder-open.png - ico/16x16/conductor-reset.png - ico/16x16/conductor-edit.png ico/16x16/edit-select-invert.png ico/16x16/edit-select-none.png ico/16x16/transform-rotate.png ico/16x16/window-close.svg ico/16x16/conductor.png - ico/16x16/element-master.png - ico/16x16/element-slave.png - ico/16x16/folio-ref-coming.png - ico/16x16/terminal.png ico/22x22/color/color-brown.png ico/22x22/color/color-gray.png ico/22x22/color/color-orange.png diff --git a/sources/ElementsCollection/elementpreviewdelegate.cpp b/sources/ElementsCollection/elementpreviewdelegate.cpp index 72ed74b6a..6f7898c5b 100644 --- a/sources/ElementsCollection/elementpreviewdelegate.cpp +++ b/sources/ElementsCollection/elementpreviewdelegate.cpp @@ -32,6 +32,13 @@ void ElementPreviewDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const { QStyledItemDelegate::initStyleOption(option, index); + + // The view's icon size is set for the element previews. A theme icon + // (a folder, a collection root) would scale up to fill it, so those + // stay at 16 px. + if (!option->icon.name().isEmpty()) + option->decorationSize = QSize(16, 16); + if (option->icon.isNull() || !QET::Palette::isDark(option->palette)) return; diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.ui b/sources/SearchAndReplace/ui/replaceconductordialog.ui index f5cefc78c..339df7bfc 100644 --- a/sources/SearchAndReplace/ui/replaceconductordialog.ui +++ b/sources/SearchAndReplace/ui/replaceconductordialog.ui @@ -370,8 +370,7 @@ phase - - :/ico/16x16/phase.png:/ico/16x16/phase.png + @@ -397,8 +396,7 @@ neutre - - :/ico/16x16/neutral.png:/ico/16x16/neutral.png + @@ -433,8 +431,7 @@ terre - - :/ico/16x16/ground.png:/ico/16x16/ground.png + diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.ui b/sources/SearchAndReplace/ui/searchandreplacewidget.ui index 597e1f439..dd45f6a26 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.ui +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.ui @@ -157,8 +157,7 @@ - - :/ico/16x16/configure-toolbars.png:/ico/16x16/configure-toolbars.png + true diff --git a/sources/editor/ui/qetelementeditor.ui b/sources/editor/ui/qetelementeditor.ui index 0ec31adc3..53c380cba 100644 --- a/sources/editor/ui/qetelementeditor.ui +++ b/sources/editor/ui/qetelementeditor.ui @@ -340,8 +340,7 @@ - - :/ico/16x16/text-xml.png:/ico/16x16/text-xml.png + Un fichier @@ -376,8 +375,7 @@ - - :/ico/22x22/names.png:/ico/22x22/names.png + Éditer le nom et les traductions de l'élément @@ -394,8 +392,7 @@ - - :/ico/22x22/element-edit.png:/ico/22x22/element-edit.png + Éditer les propriétés de l'élément @@ -421,8 +418,7 @@ - - :/ico/22x22/zoom-fit-best.png:/ico/22x22/zoom-fit-best.png + Zoom adapté @@ -430,8 +426,7 @@ - - :/ico/22x22/zoom-original.png:/ico/22x22/zoom-original.png + Pas de zoom @@ -499,8 +494,7 @@ - - :/ico/16x16/orientations.png:/ico/16x16/orientations.png + Rotation @@ -508,8 +502,7 @@ - - :/ico/16x16/orientations.png:/ico/16x16/orientations.png + Fine-Rotation @@ -535,8 +528,7 @@ - - :/ico/16x16/run-dxf.png:/ico/16x16/run-dxf.png + Importer un dxf diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp index 114394f7d..d4d318717 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -256,7 +256,7 @@ bool ElementsPanel::matchesFilter(const QTreeWidgetItem *item, void ElementsPanel::reload() { QIcon system_icon(":/ico/16x16/qet.png"); - QIcon company_icon(":/ico/16x16/go-company.png"); + QIcon company_icon = QET::Icons::Company; QIcon user_icon(":/ico/16x16/go-home.png"); // load the common title block templates collection diff --git a/sources/genericpanel.cpp b/sources/genericpanel.cpp index a1cade76f..dd4874d49 100644 --- a/sources/genericpanel.cpp +++ b/sources/genericpanel.cpp @@ -35,7 +35,7 @@ GenericPanel::GenericPanel(QWidget *parent) : first_activation_(true) { header() -> hide(); - setIconSize(QSize(50, 50)); + setIconSize(QSize(16, 16)); } /** diff --git a/sources/print/projectprintwindow.ui b/sources/print/projectprintwindow.ui index c13399fb0..beae39275 100644 --- a/sources/print/projectprintwindow.ui +++ b/sources/print/projectprintwindow.ui @@ -341,8 +341,7 @@ - - :/ico/22x22/landscape.png:/ico/22x22/landscape.png + Paysage @@ -350,8 +349,7 @@ - - :/ico/22x22/portrait.png:/ico/22x22/portrait.png + Portrait @@ -359,8 +357,7 @@ - - :/ico/16x16/arrow-left-double.png:/ico/16x16/arrow-left-double.png + Première page @@ -386,8 +383,7 @@ - - :/ico/22x22/arrow-right-double.png:/ico/22x22/arrow-right-double.png + Dernière page @@ -413,8 +409,7 @@ - - :/ico/22x22/all_pages.png:/ico/22x22/all_pages.png + Afficher un aperçu de toutes les pages diff --git a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.ui b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.ui index 28edea330..3c9751697 100644 --- a/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.ui +++ b/sources/qetgraphicsitem/ViewItem/ui/graphicstablepropertieseditor.ui @@ -104,8 +104,7 @@ - - :/ico/22x22/zoom-fit-best.png:/ico/22x22/zoom-fit-best.png + @@ -203,8 +202,7 @@ - - :/ico/22x22/all_pages.png:/ico/22x22/all_pages.png + diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index aa8b86c79..244de3a98 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -568,10 +568,11 @@ void QET::Icons::initIcons() // The elements panel shows the project root with this icon in a 50 px // slot meant for element previews. The theme name "project" also // carries the 128 px file used by the configuration dialog, and on a - // 2x display Qt's theme loader would pick it and fill the slot. Load - // the two small files directly so the item stays at 16/22 px. - ProjectFileGP.addFile(":/ico/themes/qet/16x16/project.png"); - ProjectFileGP.addFile(":/ico/themes/qet/22x22/project.png"); + // 2x display Qt's theme loader would pick it and fill the slot. Keep + // only the 16 and 22 px pixmaps so the item stays at that size. + ProjectFileGP = QIcon(); + for (int size : {16, 22}) + ProjectFileGP.addPixmap(Projects.pixmap(QSize(size, size), 1.0)); QETLogo = QIcon::fromTheme("qet"); QETManual = QIcon::fromTheme("help-contents"); QETLogo.addFile(":/ico/256x256/qet.png"); diff --git a/sources/ui/conductorpropertieswidget.ui b/sources/ui/conductorpropertieswidget.ui index 8a31d43a3..41163cfed 100644 --- a/sources/ui/conductorpropertieswidget.ui +++ b/sources/ui/conductorpropertieswidget.ui @@ -363,8 +363,7 @@ neutre - - :/ico/16x16/neutral.png:/ico/16x16/neutral.png + @@ -377,8 +376,7 @@ terre - - :/ico/16x16/ground.png:/ico/16x16/ground.png + @@ -391,8 +389,7 @@ phase - - :/ico/16x16/phase.png:/ico/16x16/phase.png + diff --git a/sources/ui/dynamicelementtextitemeditor.ui b/sources/ui/dynamicelementtextitemeditor.ui index 273637c2e..549fe9dbb 100644 --- a/sources/ui/dynamicelementtextitemeditor.ui +++ b/sources/ui/dynamicelementtextitemeditor.ui @@ -66,8 +66,7 @@ ... - - :/ico/22x22/textfield.png:/ico/22x22/textfield.png + diff --git a/sources/ui/titleblockpropertieswidget.ui b/sources/ui/titleblockpropertieswidget.ui index 0be2a3623..b1ad44d4b 100644 --- a/sources/ui/titleblockpropertieswidget.ui +++ b/sources/ui/titleblockpropertieswidget.ui @@ -94,8 +94,7 @@ - - :/ico/22x22/titleblock-bottom.png:/ico/22x22/titleblock-bottom.png + @@ -103,8 +102,7 @@ - - :/ico/22x22/titleblock-right.png:/ico/22x22/titleblock-right.png +