SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrc refactoring

Browse Source
This commit is contained in:
Бычков Андрей
2020-08-27 14:29:02 +03:00
parent 7f820c8f67
commit bd5579b8f1
17 changed files with 103 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qad/libs/application/aboutwindow.ui
View File

@@ -114,7 +114,7 @@
<string>OK</string>
</property>
<property name="icon">
<iconset resource="../widgets/qad_widgets.qrc">
<iconset resource="qad_application.qrc">
<normaloff>:/icons/dialog-ok-apply.png</normaloff>:/icons/dialog-ok-apply.png</iconset>
</property>
</widget>
@@ -131,7 +131,6 @@
</customwidget>
</customwidgets>
<resources>
<include location="../widgets/qad_widgets.qrc"/>
<include location="qad_application.qrc"/>
</resources>
<connections>

21
qad/libs/application/qad_application.qrc
View File

@@ -1,34 +1,17 @@
<RCC>
<qresource prefix="/">
<file>../../icons/application-exit.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/dialog-ok-apply.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/document-edit.png</file>
<file>../../icons/document-new.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/document-save-all.png</file>
<file>../../icons/document-save-as.png</file>
<file>../../icons/document-open.png</file>
<file>../../icons/document-open-recent.png</file>
<file>../../icons/document-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/edit-undo.png</file>
<file>../../icons/edit-redo.png</file>
<file>../../icons/border-line.png</file>
<file>../../icons/edockwidget.png</file>
<file>../../icons/historyview.png</file>
<file>../../icons/logview.png</file>
<file>../../icons/clear-history.png</file>
<file>../../icons/layer-visible-off.png</file>
<file>../../icons/layer-visible-on.png</file>
<file>../../icons/logview.png</file>
<file>../../icons/qt.png</file>
<file>../../icons/select-all.png</file>
<file>../../icons/select-none.png</file>
</qresource>
</RCC>

20
qad/libs/blockview/blockeditor.ui
View File

@@ -194,7 +194,7 @@
<string>Add</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
</property>
</widget>
@@ -205,7 +205,7 @@
<string>Clone</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/edit-copy.png</normaloff>:/icons/edit-copy.png</iconset>
</property>
</widget>
@@ -232,7 +232,7 @@
<string>Remove selected</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property>
</widget>
@@ -243,7 +243,7 @@
<string>Remove all</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property>
</widget>
@@ -346,7 +346,7 @@
<string>Save</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property>
<property name="shortcut">
@@ -376,7 +376,7 @@
<string>Save as ...</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property>
<property name="shortcut">
@@ -406,7 +406,7 @@
<string>Load ...</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
</property>
<property name="shortcut">
@@ -433,7 +433,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property>
</widget>
@@ -443,7 +443,7 @@
</layout>
<action name="actionRemove_items">
<property name="icon">
<iconset resource="../utils/qad_utils.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/edit-delete.png</normaloff>:/icons/edit-delete.png</iconset>
</property>
<property name="text">
@@ -467,8 +467,6 @@
</customwidget>
</customwidgets>
<resources>
<include location="../utils/qad_utils.qrc"/>
<include location="../application/qad_application.qrc"/>
<include location="qad_blockview.qrc"/>
</resources>
<connections>

5
qad/libs/blockview/drawtools.ui
View File

@@ -94,7 +94,7 @@
<string>Edit text ...</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/document-edit.png</normaloff>:/icons/document-edit.png</iconset>
</property>
<property name="toolButtonStyle">
@@ -591,7 +591,7 @@
<string>Load image ...</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
</property>
</widget>
@@ -814,7 +814,6 @@
</customwidget>
</customwidgets>
<resources>
<include location="../application/qad_application.qrc"/>
<include location="qad_blockview.qrc"/>
</resources>
<connections/>

51
qad/libs/blockview/qad_blockview.qrc
View File

@@ -1,39 +1,16 @@
<RCC>
<qresource prefix="/">
<file>../../icons/draw-line.png</file>
<file>../../icons/align-hor.png</file>
<file>../../icons/align-ver.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-guides.png</file>
<file>../../icons/view-grid.png</file>
<file>../../icons/zoom-fit-best.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/item.png</file>
<file>../../icons/node-add.png</file>
<file>../../icons/node.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/expand_s_x.png</file>
<file>../../icons/expand_s_y.png</file>
<file>../../icons/expand_x.png</file>
<file>../../icons/expand_y.png</file>
<file>../../icons/border-line.png</file>
<file>../../icons/legend.png</file>
<file>../../icons/blockview.png</file>
<file>../../icons/view-fullscreen.png</file>
<file>../../icons/draw-line.png</file>
<file>../../icons/draw-ellipse.png</file>
<file>../../icons/draw-rectangle.png</file>
<file>../../icons/draw-text.png</file>
<file>../../icons/view-preview.png</file>
<file>../../icons/format-fill-color.png</file>
<file>../../icons/format-stroke-color.png</file>
<file>../../icons/document-open.png</file>
<file>../../icons/z-bottom.png</file>
<file>../../icons/z-down.png</file>
<file>../../icons/z-top.png</file>
<file>../../icons/z-up.png</file>
<file>../../icons/align-hor.png</file>
<file>../../icons/align-ver.png</file>
<file>../../icons/align-bottom-center.png</file>
<file>../../icons/align-bottom-left.png</file>
<file>../../icons/align-bottom-right.png</file>
@@ -43,9 +20,15 @@
<file>../../icons/align-top-center.png</file>
<file>../../icons/align-top-left.png</file>
<file>../../icons/align-top-right.png</file>
<file>../../icons/z-bottom.png</file>
<file>../../icons/z-down.png</file>
<file>../../icons/z-top.png</file>
<file>../../icons/z-up.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/document-open.png</file>
<file>../../icons/document-edit.png</file>
<file>../../icons/view-preview.png</file>
<file>../../icons/format-fill-color.png</file>
<file>../../icons/format-stroke-color.png</file>
</qresource>
</RCC>

24
qad/libs/graphic/graphic.ui
View File

@@ -64,7 +64,7 @@
<string>Grid</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/view-grid.png</normaloff>:/icons/view-grid.png</iconset>
</property>
<property name="checkable">
@@ -81,7 +81,7 @@
<string>Cursor axis</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/edit-guides.png</normaloff>:/icons/edit-guides.png</iconset>
</property>
<property name="checkable">
@@ -95,7 +95,7 @@
<string>Only expand Y</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/expand_s_y.png</normaloff>:/icons/expand_s_y.png</iconset>
</property>
<property name="checkable">
@@ -109,7 +109,7 @@
<string>Only expand X</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/expand_s_x.png</normaloff>:/icons/expand_s_x.png</iconset>
</property>
<property name="checkable">
@@ -123,7 +123,7 @@
<string>Fullscreen</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/view-fullscreen.png</normaloff>:/icons/view-fullscreen.png</iconset>
</property>
</widget>
@@ -134,7 +134,7 @@
<string>Border inputs</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
</property>
<property name="checkable">
@@ -151,7 +151,7 @@
<string>Legend</string>
</property>
<property name="icon">
<iconset resource="../blockview/qad_blockview.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
</property>
<property name="checkable">
@@ -182,7 +182,7 @@
<string>Configure ...</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
</property>
</widget>
@@ -193,7 +193,7 @@
<string>Save image ...</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
</property>
</widget>
@@ -220,7 +220,7 @@
<string>Clear</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
</property>
</widget>
@@ -231,7 +231,7 @@
<string>Close</string>
</property>
<property name="icon">
<iconset resource="../application/qad_application.qrc">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/dialog-close.png</normaloff>:/icons/dialog-close.png</iconset>
</property>
</widget>
@@ -458,8 +458,6 @@
</customwidget>
</customwidgets>
<resources>
<include location="../application/qad_application.qrc"/>
<include location="../blockview/qad_blockview.qrc"/>
<include location="qad_graphic.qrc"/>
</resources>
<connections/>

20
qad/libs/graphic/qad_graphic.qrc
View File

@@ -1,28 +1,22 @@
<RCC>
<qresource prefix="/">
<file>../../icons/expand_s_x.png</file>
<file>../../icons/expand_s_y.png</file>
<file>../../icons/expand_x.png</file>
<file>../../icons/expand_y.png</file>
<file>../../icons/pause-back.png</file>
<file>../../icons/pause-front.png</file>
<file>../../icons/media-playback-pause.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-guides.png</file>
<file>../../icons/view-grid.png</file>
<file>../../icons/view-autofit.png</file>
<file>../../icons/view-fullscreen.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/expand_s_x.png</file>
<file>../../icons/expand_s_y.png</file>
<file>../../icons/expand_x.png</file>
<file>../../icons/expand_y.png</file>
<file>../../icons/border-line.png</file>
<file>../../icons/legend.png</file>
<file>../../icons/graphic.png</file>
<file>../../icons/view-fullscreen.png</file>
<file>../../icons/pause-back.png</file>
<file>../../icons/pause-front.png</file>
</qresource>
</RCC>

27
qad/libs/sql_table/qad_sql_table.qrc
View File

@@ -1,26 +1,11 @@
<RCC>
<qresource prefix="/">
<file>../../icons/edit-table-insert-row-below.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-guides.png</file>
<file>../../icons/view-grid.png</file>
<file>../../icons/zoom-fit-best.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/item.png</file>
<file>../../icons/node-add.png</file>
<file>../../icons/node.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/expand_s_x.png</file>
<file>../../icons/expand_s_y.png</file>
<file>../../icons/expand_x.png</file>
<file>../../icons/expand_y.png</file>
<file>../../icons/sql_table.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/edit-table-insert-row-below.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/list-add.png</file>
</qresource>
</RCC>

17
qad/libs/utils/qad_utils.qrc
View File

@@ -1,17 +0,0 @@
<RCC>
<qresource prefix="/">
<file>../../icons/edit-clear.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/item-add.png</file>
<file>../../icons/item.png</file>
<file>../../icons/node-add.png</file>
<file>../../icons/node.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/document-open_16.png</file>
</qresource>
</RCC>

6
qad/libs/widgets/chardialog.ui
View File

@@ -14,8 +14,8 @@
<string>Choose symbol</string>
</property>
<property name="windowIcon">
<iconset resource="mbricks.qrc">
<normaloff>:/icons/icons/mbricks_128.png</normaloff>:/icons/icons/mbricks_128.png</iconset>
<iconset resource="qad_widgets.qrc">
<normaloff>:/icons/chardialog.png</normaloff>:/icons/chardialog.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
@@ -86,7 +86,7 @@
</layout>
</widget>
<resources>
<include location="mbricks.qrc"/>
<include location="qad_widgets.qrc"/>
</resources>
<connections/>
</ui>

2
qad/libs/widgets/plugin/imageviewplugin.cpp
View File

@@ -39,7 +39,7 @@ QString ImageViewPlugin::group() const {
QIcon ImageViewPlugin::icon() const {
return QIcon(/*":/icons/spinslider.png"*/);
return QIcon(":/icons/view-preview.png");
}

2
qad/libs/widgets/plugin/qpointeditplugin.cpp
View File

@@ -39,7 +39,7 @@ QString QPointEditPlugin::group() const {
QIcon QPointEditPlugin::icon() const {
return QIcon(":/icons/qpointedit.png");
return QIcon();
}

2
qad/libs/widgets/plugin/qrecteditplugin.cpp
View File

@@ -39,7 +39,7 @@ QString QRectEditPlugin::group() const {
QIcon QRectEditPlugin::icon() const {
return QIcon(":/icons/qrectedit.png");
return QIcon();
}

77
qad/libs/widgets/qad_widgets.qrc
View File

@@ -1,46 +1,35 @@
<RCC>
<qresource prefix="/">
<file>../../icons/go-next.png</file>
<file>../../icons/go-previous.png</file>
<file>../../icons/dialog-close.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/edit-guides.png</file>
<file>../../icons/view-grid.png</file>
<file>../../icons/zoom-fit-best.png</file>
<file>../../icons/configure.png</file>
<file>../../icons/alpha.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/item-add.png</file>
<file>../../icons/item.png</file>
<file>../../icons/node-add.png</file>
<file>../../icons/node.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/expand_s_x.png</file>
<file>../../icons/expand_s_y.png</file>
<file>../../icons/expand_x.png</file>
<file>../../icons/expand_y.png</file>
<file>../../icons/border-line.png</file>
<file>../../icons/legend.png</file>
<file>../../icons/chardialog.png</file>
<file>../../icons/clineedit.png</file>
<file>../../icons/colorbutton.png</file>
<file>../../icons/ecombobox.png</file>
<file>../../icons/qpiconsole.png</file>
<file>../../icons/spinslider.png</file>
<file>../../icons/etabwidget.png</file>
<file>../../icons/qcodeedit.png</file>
<file>../../icons/qvariantedit.png</file>
<file>../../icons/code-word.png</file>
<file>../../icons/f1.png</file>
<file>../../icons/dialog-ok-apply.png</file>
<file>../../icons/dialog-warning.png</file>
<file>../../icons/tools-wizard.png</file>
<file>../../icons/evalspinbox.png</file>
<file>../../icons/scroll_spin.png</file>
</qresource>
<qresource prefix="/">
<file>../../icons/edit-clear-locationbar-rtl.png</file>
<file>../../icons/edit-copy.png</file>
<file>../../icons/edit-paste.png</file>
<file>../../icons/edit-find.png</file>
<file>../../icons/edit-delete.png</file>
<file>../../icons/edit-clear.png</file>
<file>../../icons/dialog-ok-apply.png</file>
<file>../../icons/dialog-warning.png</file>
<file>../../icons/tools-wizard.png</file>
<file>../../icons/go-next.png</file>
<file>../../icons/go-previous.png</file>
<file>../../icons/item.png</file>
<file>../../icons/item-add.png</file>
<file>../../icons/node.png</file>
<file>../../icons/node-add.png</file>
<file>../../icons/list-add.png</file>
<file>../../icons/document-save.png</file>
<file>../../icons/document-open.png</file>
<file>../../icons/alpha.png</file>
<file>../../icons/chardialog.png</file>
<file>../../icons/clineedit.png</file>
<file>../../icons/colorbutton.png</file>
<file>../../icons/ecombobox.png</file>
<file>../../icons/evalspinbox.png</file>
<file>../../icons/qcodeedit.png</file>
<file>../../icons/qpiconsole.png</file>
<file>../../icons/qvariantedit.png</file>
<file>../../icons/spinslider.png</file>
<file>../../icons/code-word.png</file>
<file>../../icons/f1.png</file>
<file>../../icons/scroll_spin.png</file>
</qresource>
</RCC>

8
qad/libs/widgets/qcodeedit.ui
View File

@@ -178,7 +178,7 @@
<string>Previous</string>
</property>
<property name="icon">
<iconset resource="../../../SHS/src/designers/SH_designer/SH_designer.qrc">
<iconset resource="qad_widgets.qrc">
<normaloff>:/icons/go-previous.png</normaloff>:/icons/go-previous.png</iconset>
</property>
</widget>
@@ -195,7 +195,7 @@
<string>Next</string>
</property>
<property name="icon">
<iconset resource="../../../SHS/src/designers/SH_designer/SH_designer.qrc">
<iconset resource="qad_widgets.qrc">
<normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
</property>
</widget>
@@ -311,7 +311,9 @@
<header>ecombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="qad_widgets.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonSearchNext</sender>

4
qad/libs/widgets/scroll_spin_box.ui
View File

@@ -64,7 +64,9 @@
<header>evalspinbox.h</header>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="qad_widgets.qrc"/>
</resources>
<connections/>
<slots>
<slot>mapChanged()</slot>