diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fd83a6..7740c65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0072 NEW) # FindOpenGL prefers GLVND by default project(QAD) set(QAD_MAJOR 2) -set(QAD_MINOR 31) +set(QAD_MINOR 32) set(QAD_REVISION 0) set(QAD_SUFFIX ) set(QAD_COMPANY SHS) diff --git a/icons/application-exit.png b/icons/application-exit.png index 8adbcba..2ac587f 100644 Binary files a/icons/application-exit.png and b/icons/application-exit.png differ diff --git a/icons/archive-extract.png b/icons/archive-extract.png deleted file mode 100644 index 0e64c87..0000000 Binary files a/icons/archive-extract.png and /dev/null differ diff --git a/icons/archive-insert-directory.png b/icons/archive-insert-directory.png deleted file mode 100644 index e26f51c..0000000 Binary files a/icons/archive-insert-directory.png and /dev/null differ diff --git a/icons/archive-insert.png b/icons/archive-insert.png deleted file mode 100644 index 4143a38..0000000 Binary files a/icons/archive-insert.png and /dev/null differ diff --git a/icons/arrow-down.png b/icons/arrow-down.png index 61f2f1d..7a63b02 100644 Binary files a/icons/arrow-down.png and b/icons/arrow-down.png differ diff --git a/icons/arrow-up.png b/icons/arrow-up.png index 2b1453b..041f3bc 100644 Binary files a/icons/arrow-up.png and b/icons/arrow-up.png differ diff --git a/icons/border-line.png b/icons/border-line.png deleted file mode 100644 index 4b47837..0000000 Binary files a/icons/border-line.png and /dev/null differ diff --git a/icons/clear-history.png b/icons/clear-history.png deleted file mode 100644 index 805631f..0000000 Binary files a/icons/clear-history.png and /dev/null differ diff --git a/icons/configure.png b/icons/configure.png index 2a81957..0745ce8 100644 Binary files a/icons/configure.png and b/icons/configure.png differ diff --git a/icons/configure_16.png b/icons/configure_16.png deleted file mode 100644 index 5ce478b..0000000 Binary files a/icons/configure_16.png and /dev/null differ diff --git a/icons/database.png b/icons/database.png deleted file mode 100644 index 9c773d5..0000000 Binary files a/icons/database.png and /dev/null differ diff --git a/icons/design/empty-field.png b/icons/design/empty-field.png new file mode 100644 index 0000000..c19ef3e Binary files /dev/null and b/icons/design/empty-field.png differ diff --git a/icons/design/empty-sheet.png b/icons/design/empty-sheet.png new file mode 100644 index 0000000..9292840 Binary files /dev/null and b/icons/design/empty-sheet.png differ diff --git a/icons/design/graphic.xcf b/icons/design/graphic.xcf new file mode 100644 index 0000000..1e21d64 Binary files /dev/null and b/icons/design/graphic.xcf differ diff --git a/icons/design/graphic_d.xcf b/icons/design/graphic_d.xcf new file mode 100644 index 0000000..9142dc2 Binary files /dev/null and b/icons/design/graphic_d.xcf differ diff --git a/icons/dialog-cancel.png b/icons/dialog-cancel.png index ace88ab..cbeb8cb 100644 Binary files a/icons/dialog-cancel.png and b/icons/dialog-cancel.png differ diff --git a/icons/dialog-close.png b/icons/dialog-close.png index 6072634..3a533a7 100644 Binary files a/icons/dialog-close.png and b/icons/dialog-close.png differ diff --git a/icons/dialog-information.png b/icons/dialog-information.png index dfe70b9..8ddec67 100644 Binary files a/icons/dialog-information.png and b/icons/dialog-information.png differ diff --git a/icons/dialog-ok-apply.png b/icons/dialog-ok-apply.png index 3260f60..3072efd 100644 Binary files a/icons/dialog-ok-apply.png and b/icons/dialog-ok-apply.png differ diff --git a/icons/dialog-warning.png b/icons/dialog-warning.png index c62afad..f3395b2 100644 Binary files a/icons/dialog-warning.png and b/icons/dialog-warning.png differ diff --git a/icons/document-close.png b/icons/document-close.png index 0ea563e..3218a8d 100644 Binary files a/icons/document-close.png and b/icons/document-close.png differ diff --git a/icons/document-edit.png b/icons/document-edit.png index 1ecb10c..07f9ebd 100644 Binary files a/icons/document-edit.png and b/icons/document-edit.png differ diff --git a/icons/document-new.png b/icons/document-new.png index e4d8b47..acca829 100644 Binary files a/icons/document-new.png and b/icons/document-new.png differ diff --git a/icons/document-open-recent.png b/icons/document-open-recent.png index 5dea408..6c70da1 100644 Binary files a/icons/document-open-recent.png and b/icons/document-open-recent.png differ diff --git a/icons/document-open.png b/icons/document-open.png index 63380e4..cb52cc1 100644 Binary files a/icons/document-open.png and b/icons/document-open.png differ diff --git a/icons/document-open_16.png b/icons/document-open_16.png deleted file mode 100644 index 17076a3..0000000 Binary files a/icons/document-open_16.png and /dev/null differ diff --git a/icons/document-print.png b/icons/document-print.png index 6c5e351..41e3ace 100644 Binary files a/icons/document-print.png and b/icons/document-print.png differ diff --git a/icons/document-revert.png b/icons/document-revert.png index 70202e2..5dfd2cd 100644 Binary files a/icons/document-revert.png and b/icons/document-revert.png differ diff --git a/icons/document-save-all.png b/icons/document-save-all.png index 73405f7..19af660 100644 Binary files a/icons/document-save-all.png and b/icons/document-save-all.png differ diff --git a/icons/document-save-as.png b/icons/document-save-as.png index b5da838..dc0fc41 100644 Binary files a/icons/document-save-as.png and b/icons/document-save-as.png differ diff --git a/icons/document-save.png b/icons/document-save.png index aee3e22..59c84c3 100644 Binary files a/icons/document-save.png and b/icons/document-save.png differ diff --git a/icons/draw-text.png b/icons/draw-text.png index c8efb7d..b48a109 100644 Binary files a/icons/draw-text.png and b/icons/draw-text.png differ diff --git a/icons/edit-clear-locationbar-rtl.png b/icons/edit-clear-locationbar-rtl.png index 0e6d645..6deedc0 100644 Binary files a/icons/edit-clear-locationbar-rtl.png and b/icons/edit-clear-locationbar-rtl.png differ diff --git a/icons/edit-clear.png b/icons/edit-clear.png index cae930b..f65bab7 100644 Binary files a/icons/edit-clear.png and b/icons/edit-clear.png differ diff --git a/icons/edit-copy.png b/icons/edit-copy.png index a8178ca..2e3e280 100644 Binary files a/icons/edit-copy.png and b/icons/edit-copy.png differ diff --git a/icons/edit-cut.png b/icons/edit-cut.png index 046a6a2..1b48613 100644 Binary files a/icons/edit-cut.png and b/icons/edit-cut.png differ diff --git a/icons/edit-delete-history.png b/icons/edit-delete-history.png new file mode 100644 index 0000000..61f1b0b Binary files /dev/null and b/icons/edit-delete-history.png differ diff --git a/icons/edit-delete.png b/icons/edit-delete.png index 38f11cd..89b9b25 100644 Binary files a/icons/edit-delete.png and b/icons/edit-delete.png differ diff --git a/icons/edit-find.png b/icons/edit-find.png index 140e581..2786307 100644 Binary files a/icons/edit-find.png and b/icons/edit-find.png differ diff --git a/icons/edit-find_16.png b/icons/edit-find_16.png deleted file mode 100644 index 9a462c0..0000000 Binary files a/icons/edit-find_16.png and /dev/null differ diff --git a/icons/edit-guides.png b/icons/edit-guides.png index 0065b28..4dc6d17 100644 Binary files a/icons/edit-guides.png and b/icons/edit-guides.png differ diff --git a/icons/edit-paste.png b/icons/edit-paste.png index a9aac10..818802f 100644 Binary files a/icons/edit-paste.png and b/icons/edit-paste.png differ diff --git a/icons/edit-redo.png b/icons/edit-redo.png index 353a6c0..612b373 100644 Binary files a/icons/edit-redo.png and b/icons/edit-redo.png differ diff --git a/icons/edit-rename.png b/icons/edit-rename.png new file mode 100644 index 0000000..e446fa4 Binary files /dev/null and b/icons/edit-rename.png differ diff --git a/icons/edit-undo.png b/icons/edit-undo.png index a677409..87feb54 100644 Binary files a/icons/edit-undo.png and b/icons/edit-undo.png differ diff --git a/icons/expand_s_x.png b/icons/expand_s_x.png index 185dcd9..aa9585e 100644 Binary files a/icons/expand_s_x.png and b/icons/expand_s_x.png differ diff --git a/icons/expand_s_y.png b/icons/expand_s_y.png index 9707071..cda0f27 100644 Binary files a/icons/expand_s_y.png and b/icons/expand_s_y.png differ diff --git a/icons/expand_x.png b/icons/expand_x.png index 0089290..69d792f 100644 Binary files a/icons/expand_x.png and b/icons/expand_x.png differ diff --git a/icons/expand_y.png b/icons/expand_y.png index 0e01625..9974ad3 100644 Binary files a/icons/expand_y.png and b/icons/expand_y.png differ diff --git a/icons/format-fill-color.png b/icons/format-fill-color.png index 99412e9..4df19a9 100644 Binary files a/icons/format-fill-color.png and b/icons/format-fill-color.png differ diff --git a/icons/format-stroke-color.png b/icons/format-stroke-color.png index 4c4d290..d9b97b2 100644 Binary files a/icons/format-stroke-color.png and b/icons/format-stroke-color.png differ diff --git a/icons/games-solve.png b/icons/games-solve.png index 2177b4d..b41f14e 100644 Binary files a/icons/games-solve.png and b/icons/games-solve.png differ diff --git a/icons/go-next.png b/icons/go-next.png index cacea05..ed974a5 100644 Binary files a/icons/go-next.png and b/icons/go-next.png differ diff --git a/icons/go-previous.png b/icons/go-previous.png index b4b00f5..8d6c3a5 100644 Binary files a/icons/go-previous.png and b/icons/go-previous.png differ diff --git a/icons/graphics.png b/icons/graphics.png deleted file mode 100644 index 64abcb5..0000000 Binary files a/icons/graphics.png and /dev/null differ diff --git a/icons/layer-visible-off.png b/icons/layer-visible-off.png index 35a2be4..35ffd37 100644 Binary files a/icons/layer-visible-off.png and b/icons/layer-visible-off.png differ diff --git a/icons/layer-visible-on.png b/icons/layer-visible-on.png index 11fad5e..4565908 100644 Binary files a/icons/layer-visible-on.png and b/icons/layer-visible-on.png differ diff --git a/icons/list-add.png b/icons/list-add.png index a15dd10..d77faff 100644 Binary files a/icons/list-add.png and b/icons/list-add.png differ diff --git a/icons/list-remove.png b/icons/list-remove.png index fffb248..57d2919 100644 Binary files a/icons/list-remove.png and b/icons/list-remove.png differ diff --git a/icons/log_parser.png b/icons/log_parser.png deleted file mode 100644 index cf0ca98..0000000 Binary files a/icons/log_parser.png and /dev/null differ diff --git a/icons/mail.png b/icons/mail.png deleted file mode 100644 index 81adbf9..0000000 Binary files a/icons/mail.png and /dev/null differ diff --git a/icons/media-playback-pause.png b/icons/media-playback-pause.png index db3bd3b..385a9e3 100644 Binary files a/icons/media-playback-pause.png and b/icons/media-playback-pause.png differ diff --git a/icons/media-playback-start.png b/icons/media-playback-start.png index c53ff0f..eae4432 100644 Binary files a/icons/media-playback-start.png and b/icons/media-playback-start.png differ diff --git a/icons/media-playback-stop.png b/icons/media-playback-stop.png index fef42cc..17c2e77 100644 Binary files a/icons/media-playback-stop.png and b/icons/media-playback-stop.png differ diff --git a/icons/media-record.png b/icons/media-record.png index 7adb749..5e9b0f9 100644 Binary files a/icons/media-record.png and b/icons/media-record.png differ diff --git a/icons/media-skip-forward.png b/icons/media-skip-forward.png index 3b25f45..a4312f7 100644 Binary files a/icons/media-skip-forward.png and b/icons/media-skip-forward.png differ diff --git a/icons/quickopen.png b/icons/quickopen.png index d758fff..12d8e20 100644 Binary files a/icons/quickopen.png and b/icons/quickopen.png differ diff --git a/icons/tools-wizard.png b/icons/tools-wizard.png index 0101c36..c7a677c 100644 Binary files a/icons/tools-wizard.png and b/icons/tools-wizard.png differ diff --git a/icons/transform-move.png b/icons/transform-move.png index b20fc44..028d050 100644 Binary files a/icons/transform-move.png and b/icons/transform-move.png differ diff --git a/icons/view-autofit.png b/icons/view-autofit.png deleted file mode 100644 index d8defba..0000000 Binary files a/icons/view-autofit.png and /dev/null differ diff --git a/icons/view-fullscreen.png b/icons/view-fullscreen.png index 4a7c152..f9eb08d 100644 Binary files a/icons/view-fullscreen.png and b/icons/view-fullscreen.png differ diff --git a/icons/view-grid.png b/icons/view-grid.png index 9a0a458..0420697 100644 Binary files a/icons/view-grid.png and b/icons/view-grid.png differ diff --git a/icons/view-preview.png b/icons/view-preview.png index ac3cd37..e3b9206 100644 Binary files a/icons/view-preview.png and b/icons/view-preview.png differ diff --git a/icons/view-refresh.png b/icons/view-refresh.png index 66f0ceb..e25fa9c 100644 Binary files a/icons/view-refresh.png and b/icons/view-refresh.png differ diff --git a/icons/blockview.png b/icons/widgets/blockview.png similarity index 100% rename from icons/blockview.png rename to icons/widgets/blockview.png diff --git a/icons/blockview.xcf b/icons/widgets/blockview.xcf similarity index 100% rename from icons/blockview.xcf rename to icons/widgets/blockview.xcf diff --git a/icons/widgets/busy-icon.png b/icons/widgets/busy-icon.png new file mode 100644 index 0000000..f796edf Binary files /dev/null and b/icons/widgets/busy-icon.png differ diff --git a/icons/button.png b/icons/widgets/button.png similarity index 100% rename from icons/button.png rename to icons/widgets/button.png diff --git a/icons/chardialog.png b/icons/widgets/chardialog.png similarity index 100% rename from icons/chardialog.png rename to icons/widgets/chardialog.png diff --git a/icons/circle-indicator.png b/icons/widgets/circle-indicator.png similarity index 100% rename from icons/circle-indicator.png rename to icons/widgets/circle-indicator.png diff --git a/icons/clineedit.png b/icons/widgets/clineedit.png similarity index 100% rename from icons/clineedit.png rename to icons/widgets/clineedit.png diff --git a/icons/colorbutton.png b/icons/widgets/colorbutton.png similarity index 100% rename from icons/colorbutton.png rename to icons/widgets/colorbutton.png diff --git a/icons/ecombobox.png b/icons/widgets/ecombobox.png similarity index 100% rename from icons/ecombobox.png rename to icons/widgets/ecombobox.png diff --git a/icons/edockwidget.png b/icons/widgets/edockwidget.png similarity index 100% rename from icons/edockwidget.png rename to icons/widgets/edockwidget.png diff --git a/icons/etabwidget.png b/icons/widgets/etabwidget.png similarity index 100% rename from icons/etabwidget.png rename to icons/widgets/etabwidget.png diff --git a/icons/evalspinbox.png b/icons/widgets/evalspinbox.png similarity index 100% rename from icons/evalspinbox.png rename to icons/widgets/evalspinbox.png diff --git a/icons/graphic.png b/icons/widgets/graphic.png similarity index 100% rename from icons/graphic.png rename to icons/widgets/graphic.png diff --git a/icons/historyview.png b/icons/widgets/historyview.png similarity index 100% rename from icons/historyview.png rename to icons/widgets/historyview.png diff --git a/icons/widgets/iconed-label.png b/icons/widgets/iconed-label.png new file mode 100644 index 0000000..d640b5b Binary files /dev/null and b/icons/widgets/iconed-label.png differ diff --git a/icons/icons.xcf b/icons/widgets/icons.xcf similarity index 100% rename from icons/icons.xcf rename to icons/widgets/icons.xcf diff --git a/icons/widgets/image-view.png b/icons/widgets/image-view.png new file mode 100644 index 0000000..e3b9206 Binary files /dev/null and b/icons/widgets/image-view.png differ diff --git a/icons/logview.png b/icons/widgets/logview.png similarity index 100% rename from icons/logview.png rename to icons/widgets/logview.png diff --git a/icons/maps.png b/icons/widgets/maps.png similarity index 100% rename from icons/maps.png rename to icons/widgets/maps.png diff --git a/icons/pivariantedit.png b/icons/widgets/pivariantedit.png similarity index 100% rename from icons/pivariantedit.png rename to icons/widgets/pivariantedit.png diff --git a/icons/qcodeedit.png b/icons/widgets/qcodeedit.png similarity index 100% rename from icons/qcodeedit.png rename to icons/widgets/qcodeedit.png diff --git a/icons/qpiconsole.png b/icons/widgets/qpiconsole.png similarity index 100% rename from icons/qpiconsole.png rename to icons/widgets/qpiconsole.png diff --git a/icons/qvariantedit.png b/icons/widgets/qvariantedit.png similarity index 100% rename from icons/qvariantedit.png rename to icons/widgets/qvariantedit.png diff --git a/icons/scroll_spin.png b/icons/widgets/scrollspin.png similarity index 100% rename from icons/scroll_spin.png rename to icons/widgets/scrollspin.png diff --git a/icons/spinslider.png b/icons/widgets/spinslider.png similarity index 100% rename from icons/spinslider.png rename to icons/widgets/spinslider.png diff --git a/icons/sql_table.png b/icons/widgets/sql-table.png similarity index 100% rename from icons/sql_table.png rename to icons/widgets/sql-table.png diff --git a/icons/widgets/status-icon.png b/icons/widgets/status-icon.png new file mode 100644 index 0000000..fe2b87e Binary files /dev/null and b/icons/widgets/status-icon.png differ diff --git a/icons/touchbuttframe.png b/icons/widgets/touchbuttframe.png similarity index 100% rename from icons/touchbuttframe.png rename to icons/widgets/touchbuttframe.png diff --git a/icons/touchbutton.png b/icons/widgets/touchbutton.png similarity index 100% rename from icons/touchbutton.png rename to icons/widgets/touchbutton.png diff --git a/icons/touchslider.png b/icons/widgets/touchslider.png similarity index 100% rename from icons/touchslider.png rename to icons/widgets/touchslider.png diff --git a/icons/valuetreeeditor.png b/icons/widgets/valuetreeeditor.png similarity index 100% rename from icons/valuetreeeditor.png rename to icons/widgets/valuetreeeditor.png diff --git a/icons/virtual_keyboard.png b/icons/widgets/virtual-keyboard.png similarity index 100% rename from icons/virtual_keyboard.png rename to icons/widgets/virtual-keyboard.png diff --git a/icons/zoom-fit-best.png b/icons/zoom-fit-best.png index a1395b4..3f55513 100644 Binary files a/icons/zoom-fit-best.png and b/icons/zoom-fit-best.png differ diff --git a/libs/application/historyview.cpp b/libs/application/historyview.cpp index 99aa189..ab73c6b 100644 --- a/libs/application/historyview.cpp +++ b/libs/application/historyview.cpp @@ -16,7 +16,7 @@ HistoryView::HistoryView(QWidget * parent): QListWidget(parent) { setHistoryColor(palette().color(QPalette::Highlight)); connect(this, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(itemClicked(QListWidgetItem *))); connect(this, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged())); - registerAction(-1, tr("History cleared"), QImage(":/icons/clear-history.png")); + registerAction(-1, tr("History cleared"), QImage(":/icons/edit-delete-history.png")); } diff --git a/libs/application/plugin/edockwidgetplugin.cpp b/libs/application/plugin/edockwidgetplugin.cpp index 522d230..f58951c 100644 --- a/libs/application/plugin/edockwidgetplugin.cpp +++ b/libs/application/plugin/edockwidgetplugin.cpp @@ -40,7 +40,7 @@ QString EDockWidgetPlugin::group() const { QIcon EDockWidgetPlugin::icon() const { - return QIcon(":/icons/edockwidget.png"); + return QIcon(":/icons/widgets/edockwidget.png"); } diff --git a/libs/application/plugin/historyviewplugin.cpp b/libs/application/plugin/historyviewplugin.cpp index b95dd9f..53c4255 100644 --- a/libs/application/plugin/historyviewplugin.cpp +++ b/libs/application/plugin/historyviewplugin.cpp @@ -40,7 +40,7 @@ QString HistoryViewPlugin::group() const { QIcon HistoryViewPlugin::icon() const { - return QIcon(":/icons/historyview.png"); + return QIcon(":/icons/widgets/historyview.png"); } diff --git a/libs/application/plugin/logviewplugin.cpp b/libs/application/plugin/logviewplugin.cpp index 7d503f4..12e5ca7 100644 --- a/libs/application/plugin/logviewplugin.cpp +++ b/libs/application/plugin/logviewplugin.cpp @@ -40,7 +40,7 @@ QString LogViewPlugin::group() const { QIcon LogViewPlugin::icon() const { - return QIcon(":/icons/logview.png"); + return QIcon(":/icons/widgets/logview.png"); } diff --git a/libs/application/qad_application.qrc b/libs/application/qad_application.qrc index a9ad1dc..b60af68 100644 --- a/libs/application/qad_application.qrc +++ b/libs/application/qad_application.qrc @@ -1,17 +1,17 @@ - - ../../icons/dialog-ok-apply.png - ../../icons/configure.png - ../../icons/edit-clear.png - ../../icons/edit-find.png - ../../icons/edit-copy.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/qt.png - ../../icons/select-all.png - + + ../../icons/dialog-ok-apply.png + ../../icons/configure.png + ../../icons/edit-clear.png + ../../icons/edit-find.png + ../../icons/edit-copy.png + ../../icons/widgets/edockwidget.png + ../../icons/widgets/historyview.png + ../../icons/widgets/logview.png + ../../icons/edit-delete-history.png + ../../icons/layer-visible-off.png + ../../icons/layer-visible-on.png + ../../icons/qt.png + ../../icons/select-all.png + diff --git a/libs/blockview/drawtools.ui b/libs/blockview/drawtools.ui index 0924e50..be91aac 100644 --- a/libs/blockview/drawtools.ui +++ b/libs/blockview/drawtools.ui @@ -29,7 +29,7 @@ - 0 + 2 diff --git a/libs/blockview/plugin/blockviewplugin.cpp b/libs/blockview/plugin/blockviewplugin.cpp index 5113c0c..87f138b 100644 --- a/libs/blockview/plugin/blockviewplugin.cpp +++ b/libs/blockview/plugin/blockviewplugin.cpp @@ -40,7 +40,7 @@ QString BlockViewPlugin::group() const { QIcon BlockViewPlugin::icon() const { - return QIcon(":/icons/blockview.png"); + return QIcon(":/icons/widgets/blockview.png"); } diff --git a/libs/blockview/qad_blockview.qrc b/libs/blockview/qad_blockview.qrc index 155b00d..c140273 100644 --- a/libs/blockview/qad_blockview.qrc +++ b/libs/blockview/qad_blockview.qrc @@ -1,6 +1,6 @@ - ../../icons/blockview.png + ../../icons/widgets/blockview.png ../../icons/draw-line.png ../../icons/draw-ellipse.png ../../icons/draw-rectangle.png diff --git a/libs/graphic/graphic.ui b/libs/graphic/graphic.ui index e8cc62e..48df16e 100644 --- a/libs/graphic/graphic.ui +++ b/libs/graphic/graphic.ui @@ -255,7 +255,7 @@ - :/icons/view-autofit.png:/icons/view-autofit.png + :/icons/zoom-original.png:/icons/zoom-original.png @@ -291,7 +291,7 @@ - :/icons/border-line.png:/icons/border-line.png + :/icons/edit-rename.png:/icons/edit-rename.png true diff --git a/libs/graphic/plugin/graphicplugin.cpp b/libs/graphic/plugin/graphicplugin.cpp index e6b1dee..c1075dd 100644 --- a/libs/graphic/plugin/graphicplugin.cpp +++ b/libs/graphic/plugin/graphicplugin.cpp @@ -40,7 +40,7 @@ QString GraphicPlugin::group() const { QIcon GraphicPlugin::icon() const { - return QIcon(":/icons/graphic.png"); + return QIcon(":/icons/widgets/graphic.png"); } diff --git a/libs/graphic/qad_graphic.qrc b/libs/graphic/qad_graphic.qrc index 6b638e1..003c525 100644 --- a/libs/graphic/qad_graphic.qrc +++ b/libs/graphic/qad_graphic.qrc @@ -12,14 +12,14 @@ ../../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/border-line.png + ../../icons/edit-rename.png ../../icons/legend.png - ../../icons/graphic.png - ../../icons/layer-visible-off.png - ../../icons/layer-visible-on.png + ../../icons/widgets/graphic.png + ../../icons/layer-visible-off.png + ../../icons/layer-visible-on.png + ../../icons/zoom-original.png diff --git a/libs/graphic_analysis/plugin/graphic_analysis_plugin.cpp b/libs/graphic_analysis/plugin/graphic_analysis_plugin.cpp index a1bc9e8..755c262 100644 --- a/libs/graphic_analysis/plugin/graphic_analysis_plugin.cpp +++ b/libs/graphic_analysis/plugin/graphic_analysis_plugin.cpp @@ -42,7 +42,7 @@ QString GraphicAnalysisPlugin::group() const { QIcon GraphicAnalysisPlugin::icon() const { - return QIcon(":/icons/graphic.png"); + return QIcon(":/icons/widgets/graphic.png"); } diff --git a/libs/graphic_analysis/qad_graphic_analysis.qrc b/libs/graphic_analysis/qad_graphic_analysis.qrc index a21df69..2ac042d 100644 --- a/libs/graphic_analysis/qad_graphic_analysis.qrc +++ b/libs/graphic_analysis/qad_graphic_analysis.qrc @@ -1,7 +1,7 @@ - ../../icons/axis_x.png - ../../icons/graphic.png - ../../icons/dialog-information.png + ../../icons/axis_x.png + ../../icons/widgets/graphic.png + ../../icons/dialog-information.png diff --git a/libs/map/pivariant_geoposition.ui b/libs/map/pivariant_geoposition.ui index 2f450a8..15ba201 100644 --- a/libs/map/pivariant_geoposition.ui +++ b/libs/map/pivariant_geoposition.ui @@ -59,7 +59,7 @@ - :/icons/border-line.png:/icons/border-line.png + :/icons/edit-rename.png:/icons/edit-rename.png Rename ... diff --git a/libs/map/pivariant_geoposition_map.ui b/libs/map/pivariant_geoposition_map.ui index b5cfad8..deec676 100644 --- a/libs/map/pivariant_geoposition_map.ui +++ b/libs/map/pivariant_geoposition_map.ui @@ -66,7 +66,7 @@ - :/icons/border-line.png:/icons/border-line.png + :/icons/edit-rename.png:/icons/edit-rename.png Rename ... diff --git a/libs/map/plugin/mapplugin.cpp b/libs/map/plugin/mapplugin.cpp index 6da93f5..b05cb1c 100644 --- a/libs/map/plugin/mapplugin.cpp +++ b/libs/map/plugin/mapplugin.cpp @@ -41,7 +41,7 @@ QString MapPlugin::group() const { QIcon MapPlugin::icon() const { - return QIcon("://icons/maps.png"); + return QIcon(":/icons/widgets/maps.png"); } diff --git a/libs/map/qad_map.qrc b/libs/map/qad_map.qrc index 3a986a6..971e70e 100644 --- a/libs/map/qad_map.qrc +++ b/libs/map/qad_map.qrc @@ -1,6 +1,6 @@ - - ../../icons/maps.png - ../../icons/location.png - + + ../../icons/widgets/maps.png + ../../icons/location.png + diff --git a/libs/piqt_utils/pivaluetree_edit_parameters.ui b/libs/piqt_utils/pivaluetree_edit_parameters.ui index ea82f91..33cb711 100644 --- a/libs/piqt_utils/pivaluetree_edit_parameters.ui +++ b/libs/piqt_utils/pivaluetree_edit_parameters.ui @@ -135,7 +135,7 @@ - :/icons/border-line.png:/icons/border-line.png + :/icons/edit-rename.png:/icons/edit-rename.png Rename ... diff --git a/libs/piqt_utils/plugin/pivariantedit_plugin.cpp b/libs/piqt_utils/plugin/pivariantedit_plugin.cpp index 8d87880..0ff271b 100644 --- a/libs/piqt_utils/plugin/pivariantedit_plugin.cpp +++ b/libs/piqt_utils/plugin/pivariantedit_plugin.cpp @@ -41,7 +41,7 @@ QString PIVariantEditPlugin::group() const { QIcon PIVariantEditPlugin::icon() const { - return QIcon(":/icons/pivariantedit.png"); + return QIcon(":/icons/widgets/pivariantedit.png"); } diff --git a/libs/piqt_utils/qad_piqt_widgets.qrc b/libs/piqt_utils/qad_piqt_widgets.qrc index 0138933..fe97517 100644 --- a/libs/piqt_utils/qad_piqt_widgets.qrc +++ b/libs/piqt_utils/qad_piqt_widgets.qrc @@ -1,19 +1,19 @@ - - ../../icons/edit-cut.png - ../../icons/configure.png - ../../icons/border-line.png - ../../icons/list-add.png - ../../icons/list-remove.png - ../../icons/code-variable.png - ../../icons/code-struct.png - ../../icons/code-union.png - ../../icons/legend.png - ../../icons/document-open.png - ../../icons/document-edit.png - ../../icons/layer-visible-off.png - ../../icons/layer-visible-on.png - ../../icons/valuetreeeditor.png - ../../icons/pivariantedit.png - + + ../../icons/edit-cut.png + ../../icons/configure.png + ../../icons/edit-rename.png + ../../icons/list-add.png + ../../icons/list-remove.png + ../../icons/code-variable.png + ../../icons/code-struct.png + ../../icons/code-union.png + ../../icons/legend.png + ../../icons/document-open.png + ../../icons/document-edit.png + ../../icons/layer-visible-off.png + ../../icons/layer-visible-on.png + ../../icons/widgets/valuetreeeditor.png + ../../icons/widgets/pivariantedit.png + diff --git a/libs/qglview/plugin/qglviewplugin.cpp b/libs/qglview/plugin/qglviewplugin.cpp index 1ae35fd..374223f 100644 --- a/libs/qglview/plugin/qglviewplugin.cpp +++ b/libs/qglview/plugin/qglviewplugin.cpp @@ -69,7 +69,7 @@ QString QGLViewPlugin::group() const { QIcon QGLViewPlugin::icon() const { - return QIcon("://icons/qglview.png"); + return QIcon(":/icons/qglview.png"); } diff --git a/libs/sql_table/plugin/sql_record_plugin.cpp b/libs/sql_table/plugin/sql_record_plugin.cpp index bb25b8a..5008dca 100644 --- a/libs/sql_table/plugin/sql_record_plugin.cpp +++ b/libs/sql_table/plugin/sql_record_plugin.cpp @@ -40,7 +40,7 @@ QString SQLRecordPlugin::group() const { QIcon SQLRecordPlugin::icon() const { - return QIcon(":/icons/sql_table.png"); + return QIcon(":/icons/widgets/sql-table.png"); } diff --git a/libs/sql_table/plugin/sql_table_plugin.cpp b/libs/sql_table/plugin/sql_table_plugin.cpp index b5613bd..9492298 100644 --- a/libs/sql_table/plugin/sql_table_plugin.cpp +++ b/libs/sql_table/plugin/sql_table_plugin.cpp @@ -40,7 +40,7 @@ QString SQLTablePlugin::group() const { QIcon SQLTablePlugin::icon() const { - return QIcon(":/icons/sql_table.png"); + return QIcon(":/icons/widgets/sql-table.png"); } diff --git a/libs/sql_table/qad_sql_table.qrc b/libs/sql_table/qad_sql_table.qrc index 437d5ad..fadb6a9 100644 --- a/libs/sql_table/qad_sql_table.qrc +++ b/libs/sql_table/qad_sql_table.qrc @@ -1,11 +1,11 @@ - - ../../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 - + + ../../icons/widgets/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/libs/touch_widgets/plugin/touchbuttframeplugin.cpp b/libs/touch_widgets/plugin/touchbuttframeplugin.cpp index 26ca562..e7b494f 100644 --- a/libs/touch_widgets/plugin/touchbuttframeplugin.cpp +++ b/libs/touch_widgets/plugin/touchbuttframeplugin.cpp @@ -41,7 +41,7 @@ QString TouchButtFramePlugin::group() const { } QIcon TouchButtFramePlugin::icon() const { - return QIcon(":/icons/touchbuttframe.png"); + return QIcon(":/icons/widgets/touchbuttframe.png"); } QString TouchButtFramePlugin::toolTip() const { diff --git a/libs/touch_widgets/plugin/touchbuttonplugin.cpp b/libs/touch_widgets/plugin/touchbuttonplugin.cpp index 0ddd401..71b017a 100644 --- a/libs/touch_widgets/plugin/touchbuttonplugin.cpp +++ b/libs/touch_widgets/plugin/touchbuttonplugin.cpp @@ -36,7 +36,7 @@ QString TouchButtonPlugin::group() const { } QIcon TouchButtonPlugin::icon() const { - return QIcon(":/icons/touchbutton.png"); + return QIcon(":/icons/widgets/touchbutton.png"); } QString TouchButtonPlugin::toolTip() const { diff --git a/libs/touch_widgets/plugin/touchsliderplugin.cpp b/libs/touch_widgets/plugin/touchsliderplugin.cpp index 805de43..10ce39c 100644 --- a/libs/touch_widgets/plugin/touchsliderplugin.cpp +++ b/libs/touch_widgets/plugin/touchsliderplugin.cpp @@ -43,7 +43,7 @@ QString TouchSliderPlugin::group() const { } QIcon TouchSliderPlugin::icon() const { - return QIcon(":/icons/touchslider.png"); + return QIcon(":/icons/widgets/touchslider.png"); } QString TouchSliderPlugin::toolTip() const { diff --git a/libs/touch_widgets/touch_widgets.qrc b/libs/touch_widgets/touch_widgets.qrc index ff1d228..89a8181 100644 --- a/libs/touch_widgets/touch_widgets.qrc +++ b/libs/touch_widgets/touch_widgets.qrc @@ -1,7 +1,7 @@ - - ../../icons/touchbuttframe.png - ../../icons/touchbutton.png - ../../icons/touchslider.png + + ../../icons/widgets/touchbuttframe.png + ../../icons/widgets/touchbutton.png + ../../icons/widgets/touchslider.png diff --git a/libs/utils/qad_utils.qrc b/libs/utils/qad_utils.qrc index 4df8988..16d39a8 100644 --- a/libs/utils/qad_utils.qrc +++ b/libs/utils/qad_utils.qrc @@ -1,17 +1,16 @@ - - ../../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 + + ../../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 diff --git a/libs/virtual_keyboard/plugin/virtual_keyboard_plugin.cpp b/libs/virtual_keyboard/plugin/virtual_keyboard_plugin.cpp index 711763b..66e23fe 100644 --- a/libs/virtual_keyboard/plugin/virtual_keyboard_plugin.cpp +++ b/libs/virtual_keyboard/plugin/virtual_keyboard_plugin.cpp @@ -38,7 +38,7 @@ QString VirtualKeyboardPlugin::group() const { } QIcon VirtualKeyboardPlugin::icon() const { - return QIcon(":/icons/virtual_keyboard.png"); + return QIcon(":/icons/widgets/virtual-keyboard.png"); } QString VirtualKeyboardPlugin::toolTip() const { diff --git a/libs/virtual_keyboard/virtual_keyboard.qrc b/libs/virtual_keyboard/virtual_keyboard.qrc index 8e68908..3efde6a 100644 --- a/libs/virtual_keyboard/virtual_keyboard.qrc +++ b/libs/virtual_keyboard/virtual_keyboard.qrc @@ -1,8 +1,8 @@ - - ../../icons/virtual_keyboard.png - - - default.json - + + ../../icons/widgets/virtual-keyboard.png + + + default.json + diff --git a/libs/widgets/busy_icon.cpp b/libs/widgets/busy_icon.cpp new file mode 100644 index 0000000..e3bd93f --- /dev/null +++ b/libs/widgets/busy_icon.cpp @@ -0,0 +1,114 @@ +#include "busy_icon.h" + +#include "qad_types.h" + +#include +#include +#include + + +BusyIcon::BusyIcon(QWidget * parent): QWidget(parent) {} + + +BusyIcon::~BusyIcon() {} + + +void BusyIcon::start() { + stop(); + ang = 0; + timer = startTimer(25); +} + + +void BusyIcon::stop() { + if (timer == 0) return; + killTimer(timer); + timer = 0; +} + + +QIcon BusyIcon::icon() { + return icon_; +} + + +void BusyIcon::setIcon(QIcon i) { + icon_ = i; + image = i.pixmap(512, 512).toImage(); +} + + +void BusyIcon::setIconSize(qreal s) { + icon_size = s; + updateGeometry(); + update(); +} + + +void BusyIcon::setIconScale(qreal s) { + icon_scale = s; + updateGeometry(); + update(); +} + + +void BusyIcon::setCircleWidth(qreal s) { + circle_width = s; + updateGeometry(); + update(); +} + + +QSize BusyIcon::sizeHint() const { + return preferredIconSize(icon_size, this); +} + + +void BusyIcon::timerEvent(QTimerEvent *) { + if (!isVisible()) return; + ang += 1; + update(); +} + + +QPointF point(qreal r, qreal a) { + return QPointF(-r * sin(a), -r * cos(a)); +} +qreal frag(qreal a, qreal f) { + int i = (int)(a / f); + return a - (i * f); +} +qreal angle(int a) { + return (cos(frag(a / 15., M_PI)) - 1) * M_PI; +} + +void BusyIcon::paintEvent(QPaintEvent *) { + QPainter p(this); + if (rect().isEmpty()) return; + qreal w = width(), h = height(); + p.translate(w / 2., h / 2.); + p.scale(qMin(w, h), qMin(w, h)); + + float imgsz = icon_scale / 100.f, ioff = circle_width / 200.f; + p.setRenderHint(QPainter::SmoothPixmapTransform); + p.setRenderHint(QPainter::Antialiasing); + p.drawImage(QRectF(-imgsz / 2., -imgsz / 2., imgsz, imgsz), image); + p.setPen(Qt::NoPen); + p.setBrush(palette().brush(QPalette::Active, QPalette::Highlight)); + p.setRenderHint(QPainter::Antialiasing); + + qreal sa = angle(ang), ea = angle(ang + 10); + if (ea > sa) ea -= M_PI * 2.; + qreal rs = 0.5 - ioff, rb = 0.5; + int steps = qMin(128, qRound(qAbs(ea - sa) / 0.025)); + QPolygonF pol; + for (int i = 0; i <= steps; ++i) { + qreal c = i / (qreal)steps; + pol << point(rs, sa * c + ea * (1. - c)); + } + for (int i = 0; i <= steps; ++i) { + qreal c = i / (qreal)steps; + pol << point(rb, ea * c + sa * (1. - c)); + } + p.drawPolygon(pol); +} diff --git a/libs/widgets/busy_icon.h b/libs/widgets/busy_icon.h new file mode 100644 index 0000000..bb61deb --- /dev/null +++ b/libs/widgets/busy_icon.h @@ -0,0 +1,56 @@ +#ifndef busy_icon_H +#define busy_icon_H + +#include "qad_widgets_export.h" + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QAD_WIDGETS_EXPORT BusyIcon: public QWidget { + Q_OBJECT + Q_PROPERTY(QIcon icon READ icon WRITE setIcon) + Q_PROPERTY(qreal iconSize READ iconSize WRITE setIconSize) + Q_PROPERTY(qreal iconScale READ iconScale WRITE setIconScale) + Q_PROPERTY(qreal circleWidth READ circleWidth WRITE setCircleWidth) + +public: + explicit BusyIcon(QWidget * parent = 0); + ~BusyIcon(); + + QIcon icon(); + void setIcon(QIcon i); + + qreal iconSize() { return icon_size; } + void setIconSize(qreal s); + + qreal iconScale() { return icon_scale; } + void setIconScale(qreal s); + + qreal circleWidth() { return circle_width; } + void setCircleWidth(qreal s); + +private: + QSize sizeHint() const; + void timerEvent(QTimerEvent *); + void paintEvent(QPaintEvent *); + + QIcon icon_; + QImage image; + qreal icon_size = 5.f, icon_scale = 75.f, circle_width = 20.f; + int timer = 0, ang = 0; + +private slots: + +public slots: + void start(); + void stop(); + +signals: +}; + +QT_END_NAMESPACE + +#endif diff --git a/libs/widgets/plugin/busy_iconplugin.cpp b/libs/widgets/plugin/busy_iconplugin.cpp new file mode 100644 index 0000000..6bc7bb8 --- /dev/null +++ b/libs/widgets/plugin/busy_iconplugin.cpp @@ -0,0 +1,66 @@ +#include "busy_iconplugin.h" + +#include "busy_icon.h" + +#include + + +BusyIconPlugin::BusyIconPlugin(QObject * parent): QObject(parent) { + m_initialized = false; +} + + +void BusyIconPlugin::initialize(QDesignerFormEditorInterface * /* core */) { + if (m_initialized) return; + m_initialized = true; +} + + +bool BusyIconPlugin::isInitialized() const { + return m_initialized; +} + + +QWidget * BusyIconPlugin::createWidget(QWidget * parent) { + return new BusyIcon(parent); +} + + +QString BusyIconPlugin::name() const { + return QLatin1String("BusyIcon"); +} + + +QString BusyIconPlugin::group() const { + return QLatin1String("Display Widgets"); +} + + +QIcon BusyIconPlugin::icon() const { + return QIcon(":/icons/widgets/busy-icon.png"); +} + + +QString BusyIconPlugin::toolTip() const { + return QLatin1String("Busy indicator"); +} + + +QString BusyIconPlugin::whatsThis() const { + return QLatin1String("Busy indicator"); +} + + +bool BusyIconPlugin::isContainer() const { + return false; +} + + +QString BusyIconPlugin::domXml() const { + return QLatin1String("\n\n"); +} + + +QString BusyIconPlugin::includeFile() const { + return QLatin1String("busy_icon.h"); +} diff --git a/libs/widgets/plugin/busy_iconplugin.h b/libs/widgets/plugin/busy_iconplugin.h new file mode 100644 index 0000000..282f293 --- /dev/null +++ b/libs/widgets/plugin/busy_iconplugin.h @@ -0,0 +1,36 @@ +#ifndef busy_iconplugin_H +#define busy_iconplugin_H + +#include +#if QT_VERSION >= 0x050000 +# include +#else +# include +#endif + +class BusyIconPlugin + : public QObject + , public QDesignerCustomWidgetInterface { + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) + +public: + BusyIconPlugin(QObject * parent = 0); + + bool isContainer() const; + bool isInitialized() const; + QIcon icon() const; + QString domXml() const; + QString group() const; + QString includeFile() const; + QString name() const; + QString toolTip() const; + QString whatsThis() const; + QWidget * createWidget(QWidget * parent); + void initialize(QDesignerFormEditorInterface * core); + +private: + bool m_initialized; +}; + +#endif diff --git a/libs/widgets/plugin/circleindicatorplugin.cpp b/libs/widgets/plugin/circleindicatorplugin.cpp index 2c2c2dc..f87c42e 100644 --- a/libs/widgets/plugin/circleindicatorplugin.cpp +++ b/libs/widgets/plugin/circleindicatorplugin.cpp @@ -40,7 +40,7 @@ QString CircleIndicatorPlugin::group() const { QIcon CircleIndicatorPlugin::icon() const { - return QIcon(":/icons/circle-indicator.png"); + return QIcon(":/icons/widgets/circle-indicator.png"); } diff --git a/libs/widgets/plugin/clineeditplugin.cpp b/libs/widgets/plugin/clineeditplugin.cpp index 303e1d3..3ea3b3a 100644 --- a/libs/widgets/plugin/clineeditplugin.cpp +++ b/libs/widgets/plugin/clineeditplugin.cpp @@ -40,7 +40,7 @@ QString CLineEditPlugin::group() const { QIcon CLineEditPlugin::icon() const { - return QIcon(":/icons/clineedit.png"); + return QIcon(":/icons/widgets/clineedit.png"); } diff --git a/libs/widgets/plugin/colorbuttonplugin.cpp b/libs/widgets/plugin/colorbuttonplugin.cpp index 3dca00b..a04bdbd 100644 --- a/libs/widgets/plugin/colorbuttonplugin.cpp +++ b/libs/widgets/plugin/colorbuttonplugin.cpp @@ -40,7 +40,7 @@ QString ColorButtonPlugin::group() const { QIcon ColorButtonPlugin::icon() const { - return QIcon(":/icons/colorbutton.png"); + return QIcon(":/icons/widgets/colorbutton.png"); } diff --git a/libs/widgets/plugin/ecomboboxplugin.cpp b/libs/widgets/plugin/ecomboboxplugin.cpp index ddd8c34..044d52f 100644 --- a/libs/widgets/plugin/ecomboboxplugin.cpp +++ b/libs/widgets/plugin/ecomboboxplugin.cpp @@ -40,7 +40,7 @@ QString EComboBoxPlugin::group() const { QIcon EComboBoxPlugin::icon() const { - return QIcon(":/icons/ecombobox.png"); + return QIcon(":/icons/widgets/ecombobox.png"); } diff --git a/libs/widgets/plugin/evalspinboxplugin.cpp b/libs/widgets/plugin/evalspinboxplugin.cpp index 0e57164..c862af5 100644 --- a/libs/widgets/plugin/evalspinboxplugin.cpp +++ b/libs/widgets/plugin/evalspinboxplugin.cpp @@ -40,7 +40,7 @@ QString EvalSpinBoxPlugin::group() const { QIcon EvalSpinBoxPlugin::icon() const { - return QIcon(":/icons/evalspinbox.png"); + return QIcon(":/icons/widgets/evalspinbox.png"); } diff --git a/libs/widgets/plugin/imageviewplugin.cpp b/libs/widgets/plugin/imageviewplugin.cpp index 433ea89..6f794f2 100644 --- a/libs/widgets/plugin/imageviewplugin.cpp +++ b/libs/widgets/plugin/imageviewplugin.cpp @@ -40,7 +40,7 @@ QString ImageViewPlugin::group() const { QIcon ImageViewPlugin::icon() const { - return QIcon(":/icons/view-preview.png"); + return QIcon(":/icons/widgets/image-view.png"); } diff --git a/libs/widgets/plugin/lconedlabelplugin.cpp b/libs/widgets/plugin/lconedlabelplugin.cpp index e07a983..051434f 100644 --- a/libs/widgets/plugin/lconedlabelplugin.cpp +++ b/libs/widgets/plugin/lconedlabelplugin.cpp @@ -39,7 +39,7 @@ QString IconedLabelPlugin::group() const { QIcon IconedLabelPlugin::icon() const { - return QIcon(); + return QIcon(":/icons/widgets/iconed-label.png"); } diff --git a/libs/widgets/plugin/qad_widgets.cpp b/libs/widgets/plugin/qad_widgets.cpp index bddb279..68df68d 100644 --- a/libs/widgets/plugin/qad_widgets.cpp +++ b/libs/widgets/plugin/qad_widgets.cpp @@ -1,5 +1,6 @@ #include "qad_widgets.h" +#include "busy_iconplugin.h" #include "circleindicatorplugin.h" #include "clineeditplugin.h" #include "colorbuttonplugin.h" @@ -42,7 +43,9 @@ QADWidgets::QADWidgets(QObject * parent): QObject(parent) { << new ScrollSpinBoxPlugin(this) << new RangeSliderPlugin(this) << new StateIconPlugin(this) - << new CircleIndicatorPlugin(this); + << new CircleIndicatorPlugin(this) + << new BusyIconPlugin(this) + ; // clang-format on } diff --git a/libs/widgets/plugin/qcodeeditplugin.cpp b/libs/widgets/plugin/qcodeeditplugin.cpp index 7f8b145..bb1d38f 100644 --- a/libs/widgets/plugin/qcodeeditplugin.cpp +++ b/libs/widgets/plugin/qcodeeditplugin.cpp @@ -40,7 +40,7 @@ QString QCodeEditPlugin::group() const { QIcon QCodeEditPlugin::icon() const { - return QIcon(":/icons/qcodeedit.png"); + return QIcon(":/icons/widgets/qcodeedit.png"); } diff --git a/libs/widgets/plugin/qpiconsoleplugin.cpp b/libs/widgets/plugin/qpiconsoleplugin.cpp index c158070..c2d8270 100644 --- a/libs/widgets/plugin/qpiconsoleplugin.cpp +++ b/libs/widgets/plugin/qpiconsoleplugin.cpp @@ -40,7 +40,7 @@ QString QPIConsolePlugin::group() const { QIcon QPIConsolePlugin::icon() const { - return QIcon(":/icons/qpiconsole.png"); + return QIcon(":/icons/widgets/qpiconsole.png"); } diff --git a/libs/widgets/plugin/qvarianteditplugin.cpp b/libs/widgets/plugin/qvarianteditplugin.cpp index 4792eee..9876ddc 100644 --- a/libs/widgets/plugin/qvarianteditplugin.cpp +++ b/libs/widgets/plugin/qvarianteditplugin.cpp @@ -40,7 +40,7 @@ QString QVariantEditPlugin::group() const { QIcon QVariantEditPlugin::icon() const { - return QIcon(":/icons/qvariantedit.png"); + return QIcon(":/icons/widgets/qvariantedit.png"); } diff --git a/libs/widgets/plugin/scroll_spin_boxplugin.cpp b/libs/widgets/plugin/scroll_spin_boxplugin.cpp index 07cbe6d..99f6366 100644 --- a/libs/widgets/plugin/scroll_spin_boxplugin.cpp +++ b/libs/widgets/plugin/scroll_spin_boxplugin.cpp @@ -40,7 +40,7 @@ QString ScrollSpinBoxPlugin::group() const { QIcon ScrollSpinBoxPlugin::icon() const { - return QIcon(":/icons/scroll_spin.png"); + return QIcon(":/icons/widgets/scrollspin.png"); } diff --git a/libs/widgets/plugin/spinsliderplugin.cpp b/libs/widgets/plugin/spinsliderplugin.cpp index b28e554..624d0ed 100644 --- a/libs/widgets/plugin/spinsliderplugin.cpp +++ b/libs/widgets/plugin/spinsliderplugin.cpp @@ -40,7 +40,7 @@ QString SpinSliderPlugin::group() const { QIcon SpinSliderPlugin::icon() const { - return QIcon(":/icons/spinslider.png"); + return QIcon(":/icons/widgets/spinslider.png"); } diff --git a/libs/widgets/plugin/stateiconplugin.cpp b/libs/widgets/plugin/stateiconplugin.cpp index a74b236..410a33f 100644 --- a/libs/widgets/plugin/stateiconplugin.cpp +++ b/libs/widgets/plugin/stateiconplugin.cpp @@ -156,7 +156,7 @@ QString StateIconPlugin::group() const { QIcon StateIconPlugin::icon() const { - return QIcon(":/icons/led_on.png"); + return QIcon(":/icons/widgets/status-icon.png"); } diff --git a/libs/widgets/qad_widgets.qrc b/libs/widgets/qad_widgets.qrc index 3dee7f3..30e7ed4 100644 --- a/libs/widgets/qad_widgets.qrc +++ b/libs/widgets/qad_widgets.qrc @@ -1,46 +1,49 @@ - -../../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/list-remove.png -../../icons/list-edit-apply.png -../../icons/document-new.png -../../icons/document-edit.png -../../icons/document-close.png -../../icons/document-save.png -../../icons/document-save-as.png -../../icons/document-save-all.png -../../icons/document-revert.png -../../icons/document-open.png -../../icons/document-open-recent.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 -../../icons/led_on.png -../../icons/circle-indicator.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/list-remove.png + ../../icons/list-edit-apply.png + ../../icons/document-new.png + ../../icons/document-edit.png + ../../icons/document-close.png + ../../icons/document-save.png + ../../icons/document-save-as.png + ../../icons/document-save-all.png + ../../icons/document-revert.png + ../../icons/document-open.png + ../../icons/document-open-recent.png + ../../icons/alpha.png + ../../icons/code-word.png + ../../icons/f1.png + ../../icons/widgets/chardialog.png + ../../icons/widgets/clineedit.png + ../../icons/widgets/colorbutton.png + ../../icons/widgets/ecombobox.png + ../../icons/widgets/evalspinbox.png + ../../icons/widgets/qcodeedit.png + ../../icons/widgets/qpiconsole.png + ../../icons/widgets/qvariantedit.png + ../../icons/widgets/spinslider.png + ../../icons/widgets/scrollspin.png + ../../icons/widgets/circle-indicator.png + ../../icons/widgets/status-icon.png + ../../icons/widgets/image-view.png + ../../icons/widgets/busy-icon.png + ../../icons/widgets/iconed-label.png +