SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

qrc fixed, graphic FloatingAxisType, qpicalculator moved to PIEvaluator

Browse Source
This commit is contained in:
Пелипенко Иван
2020-08-27 17:23:18 +03:00
parent b92a1fa558
commit 05874e9d7e
20 changed files with 240 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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
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
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>