From bd5579b8f17e1242277f76bfbee5cd8b337dc484 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 27 Aug 2020 14:29:02 +0300 Subject: [PATCH] qrc refactoring --- pip | 2 +- qad/libs/application/aboutwindow.ui | 3 +- qad/libs/application/qad_application.qrc | 21 +----- qad/libs/blockview/blockeditor.ui | 20 +++-- qad/libs/blockview/drawtools.ui | 5 +- qad/libs/blockview/qad_blockview.qrc | 51 +++++-------- qad/libs/graphic/graphic.ui | 24 +++--- qad/libs/graphic/qad_graphic.qrc | 20 ++--- qad/libs/sql_table/qad_sql_table.qrc | 27 ++----- qad/libs/utils/qad_utils.qrc | 17 ----- qad/libs/widgets/chardialog.ui | 6 +- qad/libs/widgets/plugin/imageviewplugin.cpp | 2 +- qad/libs/widgets/plugin/qpointeditplugin.cpp | 2 +- qad/libs/widgets/plugin/qrecteditplugin.cpp | 2 +- qad/libs/widgets/qad_widgets.qrc | 77 +++++++++----------- qad/libs/widgets/qcodeedit.ui | 8 +- qad/libs/widgets/scroll_spin_box.ui | 4 +- 17 files changed, 103 insertions(+), 188 deletions(-) delete mode 100644 qad/libs/utils/qad_utils.qrc diff --git a/pip b/pip index f033119..e1f2c90 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f033119a8bf82633146c458d1165377661df1c9f +Subproject commit e1f2c90790b473c2d0a8049c982498101d7d68b2 diff --git a/qad/libs/application/aboutwindow.ui b/qad/libs/application/aboutwindow.ui index b6a1606..8c6fb0d 100644 --- a/qad/libs/application/aboutwindow.ui +++ b/qad/libs/application/aboutwindow.ui @@ -114,7 +114,7 @@ OK - + :/icons/dialog-ok-apply.png:/icons/dialog-ok-apply.png @@ -131,7 +131,6 @@ - diff --git a/qad/libs/application/qad_application.qrc b/qad/libs/application/qad_application.qrc index ad3f2fd..a9ad1dc 100644 --- a/qad/libs/application/qad_application.qrc +++ b/qad/libs/application/qad_application.qrc @@ -1,34 +1,17 @@ - ../../icons/application-exit.png - ../../icons/dialog-close.png + ../../icons/dialog-ok-apply.png ../../icons/configure.png - ../../icons/document-edit.png - ../../icons/document-new.png - ../../icons/document-save.png - ../../icons/document-save-all.png - ../../icons/document-save-as.png - ../../icons/document-open.png - ../../icons/document-open-recent.png - ../../icons/document-close.png ../../icons/edit-clear.png - ../../icons/edit-clear-locationbar-rtl.png ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/edit-undo.png - ../../icons/edit-redo.png - ../../icons/border-line.png ../../icons/edockwidget.png ../../icons/historyview.png + ../../icons/logview.png ../../icons/clear-history.png ../../icons/layer-visible-off.png ../../icons/layer-visible-on.png - ../../icons/logview.png ../../icons/qt.png ../../icons/select-all.png - ../../icons/select-none.png diff --git a/qad/libs/blockview/blockeditor.ui b/qad/libs/blockview/blockeditor.ui index 81e4169..0d9dad6 100644 --- a/qad/libs/blockview/blockeditor.ui +++ b/qad/libs/blockview/blockeditor.ui @@ -194,7 +194,7 @@ Add - + :/icons/list-add.png:/icons/list-add.png @@ -205,7 +205,7 @@ Clone - + :/icons/edit-copy.png:/icons/edit-copy.png @@ -232,7 +232,7 @@ Remove selected - + :/icons/edit-delete.png:/icons/edit-delete.png @@ -243,7 +243,7 @@ Remove all - + :/icons/edit-clear.png:/icons/edit-clear.png @@ -346,7 +346,7 @@ Save - + :/icons/document-save.png:/icons/document-save.png @@ -376,7 +376,7 @@ Save as ... - + :/icons/document-save.png:/icons/document-save.png @@ -406,7 +406,7 @@ Load ... - + :/icons/document-open.png:/icons/document-open.png @@ -433,7 +433,7 @@ Clear - + :/icons/edit-clear.png:/icons/edit-clear.png @@ -443,7 +443,7 @@ - + :/icons/edit-delete.png:/icons/edit-delete.png @@ -467,8 +467,6 @@ - - diff --git a/qad/libs/blockview/drawtools.ui b/qad/libs/blockview/drawtools.ui index 849f997..1977dcb 100644 --- a/qad/libs/blockview/drawtools.ui +++ b/qad/libs/blockview/drawtools.ui @@ -94,7 +94,7 @@ Edit text ... - + :/icons/document-edit.png:/icons/document-edit.png @@ -591,7 +591,7 @@ Load image ... - + :/icons/document-open.png:/icons/document-open.png @@ -814,7 +814,6 @@ - diff --git a/qad/libs/blockview/qad_blockview.qrc b/qad/libs/blockview/qad_blockview.qrc index fd87c3d..155b00d 100644 --- a/qad/libs/blockview/qad_blockview.qrc +++ b/qad/libs/blockview/qad_blockview.qrc @@ -1,39 +1,16 @@ - ../../icons/draw-line.png - ../../icons/align-hor.png - ../../icons/align-ver.png - ../../icons/dialog-close.png - ../../icons/edit-clear.png - ../../icons/edit-guides.png - ../../icons/view-grid.png - ../../icons/zoom-fit-best.png - ../../icons/configure.png - ../../icons/document-save.png - ../../icons/edit-clear-locationbar-rtl.png - ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png - ../../icons/item.png - ../../icons/node-add.png - ../../icons/node.png - ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/expand_s_x.png - ../../icons/expand_s_y.png - ../../icons/expand_x.png - ../../icons/expand_y.png - ../../icons/border-line.png - ../../icons/legend.png ../../icons/blockview.png - ../../icons/view-fullscreen.png + ../../icons/draw-line.png ../../icons/draw-ellipse.png ../../icons/draw-rectangle.png ../../icons/draw-text.png - ../../icons/view-preview.png - ../../icons/format-fill-color.png - ../../icons/format-stroke-color.png - ../../icons/document-open.png + ../../icons/z-bottom.png + ../../icons/z-down.png + ../../icons/z-top.png + ../../icons/z-up.png + ../../icons/align-hor.png + ../../icons/align-ver.png ../../icons/align-bottom-center.png ../../icons/align-bottom-left.png ../../icons/align-bottom-right.png @@ -43,9 +20,15 @@ ../../icons/align-top-center.png ../../icons/align-top-left.png ../../icons/align-top-right.png - ../../icons/z-bottom.png - ../../icons/z-down.png - ../../icons/z-top.png - ../../icons/z-up.png + ../../icons/dialog-close.png + ../../icons/edit-clear.png + ../../icons/edit-delete.png + ../../icons/edit-copy.png + ../../icons/document-save.png + ../../icons/document-open.png + ../../icons/document-edit.png + ../../icons/view-preview.png + ../../icons/format-fill-color.png + ../../icons/format-stroke-color.png diff --git a/qad/libs/graphic/graphic.ui b/qad/libs/graphic/graphic.ui index e2c2f4b..3fd5dc1 100644 --- a/qad/libs/graphic/graphic.ui +++ b/qad/libs/graphic/graphic.ui @@ -64,7 +64,7 @@ Grid - + :/icons/view-grid.png:/icons/view-grid.png @@ -81,7 +81,7 @@ Cursor axis - + :/icons/edit-guides.png:/icons/edit-guides.png @@ -95,7 +95,7 @@ Only expand Y - + :/icons/expand_s_y.png:/icons/expand_s_y.png @@ -109,7 +109,7 @@ Only expand X - + :/icons/expand_s_x.png:/icons/expand_s_x.png @@ -123,7 +123,7 @@ Fullscreen - + :/icons/view-fullscreen.png:/icons/view-fullscreen.png @@ -134,7 +134,7 @@ Border inputs - + :/icons/border-line.png:/icons/border-line.png @@ -151,7 +151,7 @@ Legend - + :/icons/legend.png:/icons/legend.png @@ -182,7 +182,7 @@ Configure ... - + :/icons/configure.png:/icons/configure.png @@ -193,7 +193,7 @@ Save image ... - + :/icons/document-save.png:/icons/document-save.png @@ -220,7 +220,7 @@ Clear - + :/icons/edit-clear.png:/icons/edit-clear.png @@ -231,7 +231,7 @@ Close - + :/icons/dialog-close.png:/icons/dialog-close.png @@ -458,8 +458,6 @@ - - diff --git a/qad/libs/graphic/qad_graphic.qrc b/qad/libs/graphic/qad_graphic.qrc index 437c9e3..800334a 100644 --- a/qad/libs/graphic/qad_graphic.qrc +++ b/qad/libs/graphic/qad_graphic.qrc @@ -1,28 +1,22 @@ + ../../icons/expand_s_x.png + ../../icons/expand_s_y.png + ../../icons/expand_x.png + ../../icons/expand_y.png + ../../icons/pause-back.png + ../../icons/pause-front.png ../../icons/media-playback-pause.png ../../icons/dialog-close.png ../../icons/edit-clear.png ../../icons/edit-guides.png ../../icons/view-grid.png ../../icons/view-autofit.png + ../../icons/view-fullscreen.png ../../icons/configure.png ../../icons/document-save.png - ../../icons/edit-clear-locationbar-rtl.png - ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png - ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/expand_s_x.png - ../../icons/expand_s_y.png - ../../icons/expand_x.png - ../../icons/expand_y.png ../../icons/border-line.png ../../icons/legend.png ../../icons/graphic.png - ../../icons/view-fullscreen.png - ../../icons/pause-back.png - ../../icons/pause-front.png diff --git a/qad/libs/sql_table/qad_sql_table.qrc b/qad/libs/sql_table/qad_sql_table.qrc index 4673462..437d5ad 100644 --- a/qad/libs/sql_table/qad_sql_table.qrc +++ b/qad/libs/sql_table/qad_sql_table.qrc @@ -1,26 +1,11 @@ - ../../icons/edit-table-insert-row-below.png - ../../icons/dialog-close.png - ../../icons/edit-clear.png - ../../icons/edit-guides.png - ../../icons/view-grid.png - ../../icons/zoom-fit-best.png - ../../icons/configure.png - ../../icons/document-save.png - ../../icons/edit-clear-locationbar-rtl.png - ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png - ../../icons/item.png - ../../icons/node-add.png - ../../icons/node.png - ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/expand_s_x.png - ../../icons/expand_s_y.png - ../../icons/expand_x.png - ../../icons/expand_y.png ../../icons/sql_table.png + ../../icons/configure.png + ../../icons/edit-delete.png + ../../icons/edit-table-insert-row-below.png + ../../icons/edit-find.png + ../../icons/edit-clear.png + ../../icons/list-add.png diff --git a/qad/libs/utils/qad_utils.qrc b/qad/libs/utils/qad_utils.qrc deleted file mode 100644 index 4df8988..0000000 --- a/qad/libs/utils/qad_utils.qrc +++ /dev/null @@ -1,17 +0,0 @@ - - - ../../icons/edit-clear.png - ../../icons/document-save.png - ../../icons/edit-clear-locationbar-rtl.png - ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png - ../../icons/item-add.png - ../../icons/item.png - ../../icons/node-add.png - ../../icons/node.png - ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/document-open_16.png - - diff --git a/qad/libs/widgets/chardialog.ui b/qad/libs/widgets/chardialog.ui index 7548b62..09cbfbd 100644 --- a/qad/libs/widgets/chardialog.ui +++ b/qad/libs/widgets/chardialog.ui @@ -14,8 +14,8 @@ Choose symbol - - :/icons/icons/mbricks_128.png:/icons/icons/mbricks_128.png + + :/icons/chardialog.png:/icons/chardialog.png @@ -86,7 +86,7 @@ - + diff --git a/qad/libs/widgets/plugin/imageviewplugin.cpp b/qad/libs/widgets/plugin/imageviewplugin.cpp index f20adc9..e4d0b26 100644 --- a/qad/libs/widgets/plugin/imageviewplugin.cpp +++ b/qad/libs/widgets/plugin/imageviewplugin.cpp @@ -39,7 +39,7 @@ QString ImageViewPlugin::group() const { QIcon ImageViewPlugin::icon() const { - return QIcon(/*":/icons/spinslider.png"*/); + return QIcon(":/icons/view-preview.png"); } diff --git a/qad/libs/widgets/plugin/qpointeditplugin.cpp b/qad/libs/widgets/plugin/qpointeditplugin.cpp index 622c78e..fb4cf8d 100644 --- a/qad/libs/widgets/plugin/qpointeditplugin.cpp +++ b/qad/libs/widgets/plugin/qpointeditplugin.cpp @@ -39,7 +39,7 @@ QString QPointEditPlugin::group() const { QIcon QPointEditPlugin::icon() const { - return QIcon(":/icons/qpointedit.png"); + return QIcon(); } diff --git a/qad/libs/widgets/plugin/qrecteditplugin.cpp b/qad/libs/widgets/plugin/qrecteditplugin.cpp index f64f30c..1ed5a2c 100644 --- a/qad/libs/widgets/plugin/qrecteditplugin.cpp +++ b/qad/libs/widgets/plugin/qrecteditplugin.cpp @@ -39,7 +39,7 @@ QString QRectEditPlugin::group() const { QIcon QRectEditPlugin::icon() const { - return QIcon(":/icons/qrectedit.png"); + return QIcon(); } diff --git a/qad/libs/widgets/qad_widgets.qrc b/qad/libs/widgets/qad_widgets.qrc index 50d5263..1c19139 100644 --- a/qad/libs/widgets/qad_widgets.qrc +++ b/qad/libs/widgets/qad_widgets.qrc @@ -1,46 +1,35 @@ - - ../../icons/go-next.png - ../../icons/go-previous.png - ../../icons/dialog-close.png - ../../icons/edit-clear.png - ../../icons/edit-guides.png - ../../icons/view-grid.png - ../../icons/zoom-fit-best.png - ../../icons/configure.png - ../../icons/alpha.png - ../../icons/document-save.png - ../../icons/edit-clear-locationbar-rtl.png - ../../icons/edit-find.png - ../../icons/list-add.png - ../../icons/edit-delete.png - ../../icons/item-add.png - ../../icons/item.png - ../../icons/node-add.png - ../../icons/node.png - ../../icons/edit-copy.png - ../../icons/edit-paste.png - ../../icons/expand_s_x.png - ../../icons/expand_s_y.png - ../../icons/expand_x.png - ../../icons/expand_y.png - ../../icons/border-line.png - ../../icons/legend.png - ../../icons/chardialog.png - ../../icons/clineedit.png - ../../icons/colorbutton.png - ../../icons/ecombobox.png - ../../icons/qpiconsole.png - ../../icons/spinslider.png - ../../icons/etabwidget.png - ../../icons/qcodeedit.png - ../../icons/qvariantedit.png - ../../icons/code-word.png - ../../icons/f1.png - ../../icons/dialog-ok-apply.png - ../../icons/dialog-warning.png - ../../icons/tools-wizard.png - ../../icons/evalspinbox.png - ../../icons/scroll_spin.png - + + ../../icons/edit-clear-locationbar-rtl.png + ../../icons/edit-copy.png + ../../icons/edit-paste.png + ../../icons/edit-find.png + ../../icons/edit-delete.png + ../../icons/edit-clear.png + ../../icons/dialog-ok-apply.png + ../../icons/dialog-warning.png + ../../icons/tools-wizard.png + ../../icons/go-next.png + ../../icons/go-previous.png + ../../icons/item.png + ../../icons/item-add.png + ../../icons/node.png + ../../icons/node-add.png + ../../icons/list-add.png + ../../icons/document-save.png + ../../icons/document-open.png + ../../icons/alpha.png + ../../icons/chardialog.png + ../../icons/clineedit.png + ../../icons/colorbutton.png + ../../icons/ecombobox.png + ../../icons/evalspinbox.png + ../../icons/qcodeedit.png + ../../icons/qpiconsole.png + ../../icons/qvariantedit.png + ../../icons/spinslider.png + ../../icons/code-word.png + ../../icons/f1.png + ../../icons/scroll_spin.png + diff --git a/qad/libs/widgets/qcodeedit.ui b/qad/libs/widgets/qcodeedit.ui index 8874863..1a53c84 100644 --- a/qad/libs/widgets/qcodeedit.ui +++ b/qad/libs/widgets/qcodeedit.ui @@ -178,7 +178,7 @@ Previous - + :/icons/go-previous.png:/icons/go-previous.png @@ -195,7 +195,7 @@ Next - + :/icons/go-next.png:/icons/go-next.png @@ -311,7 +311,9 @@
ecombobox.h
- + + + buttonSearchNext diff --git a/qad/libs/widgets/scroll_spin_box.ui b/qad/libs/widgets/scroll_spin_box.ui index c398780..89fc077 100644 --- a/qad/libs/widgets/scroll_spin_box.ui +++ b/qad/libs/widgets/scroll_spin_box.ui @@ -64,7 +64,9 @@
evalspinbox.h
- + + + mapChanged()