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

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