diff --git a/src/plugins/qmldesigner/components/edit3d/edit3d.qrc b/src/plugins/qmldesigner/components/edit3d/edit3d.qrc index 1719b8ed63a..c0456890cd5 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3d.qrc +++ b/src/plugins/qmldesigner/components/edit3d/edit3d.qrc @@ -1,34 +1,34 @@ + images/global.png + images/global@2x.png + images/local.png + images/local@2x.png images/edit_light_off.png images/edit_light_off@2x.png images/edit_light_on.png images/edit_light_on@2x.png - images/fit_active.png - images/fit_active@2x.png - images/global.png - images/global@2x.png - images/group_selection_selected.png - images/group_selection_selected@2x.png - images/item_selection_selected.png - images/item_selection_selected@2x.png - images/local.png - images/local@2x.png - images/move_active.png - images/move_active@2x.png - images/move_selected.png - images/move_selected@2x.png - images/ortho.png - images/ortho@2x.png - images/persp.png - images/persp@2x.png - images/rotate_active.png - images/rotate_active@2x.png - images/rotate_selected.png - images/rotate_selected@2x.png - images/scale_active.png - images/scale_active@2x.png - images/scale_selected.png - images/scale_selected@2x.png + images/fit_selected.png + images/fit_selected@2x.png + images/move_off.png + images/move_off@2x.png + images/move_on.png + images/move_on@2x.png + images/perspective_camera.png + images/perspective_camera@2x.png + images/rotate_off.png + images/rotate_off@2x.png + images/rotate_on.png + images/rotate_on@2x.png + images/scale_off.png + images/scale_off@2x.png + images/scale_on.png + images/scale_on@2x.png + images/select_group.png + images/select_group@2x.png + images/select_item.png + images/select_item@2x.png + images/orthographic_camera.png + images/orthographic_camera@2x.png diff --git a/src/plugins/qmldesigner/components/edit3d/images/edit_light_off.png b/src/plugins/qmldesigner/components/edit3d/images/edit_light_off.png index 73e6e92374b..81ff3ba1e61 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/edit_light_off.png and b/src/plugins/qmldesigner/components/edit3d/images/edit_light_off.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/edit_light_off@2x.png b/src/plugins/qmldesigner/components/edit3d/images/edit_light_off@2x.png index 5166264e16d..e25d6699b58 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/edit_light_off@2x.png and b/src/plugins/qmldesigner/components/edit3d/images/edit_light_off@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/edit_light_on.png b/src/plugins/qmldesigner/components/edit3d/images/edit_light_on.png index 7660c285460..e0bde1c5f74 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/edit_light_on.png and b/src/plugins/qmldesigner/components/edit3d/images/edit_light_on.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/edit_light_on@2x.png b/src/plugins/qmldesigner/components/edit3d/images/edit_light_on@2x.png index 836bd2a0d59..37e5047cd77 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/edit_light_on@2x.png and b/src/plugins/qmldesigner/components/edit3d/images/edit_light_on@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/fit_active.png b/src/plugins/qmldesigner/components/edit3d/images/fit_active.png deleted file mode 100644 index 056e9ec3c8b..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/fit_active.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/fit_active@2x.png b/src/plugins/qmldesigner/components/edit3d/images/fit_active@2x.png deleted file mode 100644 index 4b05f83d460..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/fit_active@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/fit_selected.png b/src/plugins/qmldesigner/components/edit3d/images/fit_selected.png new file mode 100644 index 00000000000..b8c7297f4e8 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/fit_selected.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/fit_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/fit_selected@2x.png new file mode 100644 index 00000000000..278e832f1ef Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/fit_selected@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/global.png b/src/plugins/qmldesigner/components/edit3d/images/global.png index 1bd09c680ac..abba1f5d277 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/global.png and b/src/plugins/qmldesigner/components/edit3d/images/global.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/global@2x.png b/src/plugins/qmldesigner/components/edit3d/images/global@2x.png index a2a857fb10c..1a2fc06ee33 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/global@2x.png and b/src/plugins/qmldesigner/components/edit3d/images/global@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected.png b/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected.png deleted file mode 100644 index bfb848aa384..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected@2x.png deleted file mode 100644 index f18895dc440..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/group_selection_selected@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected.png b/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected.png deleted file mode 100644 index 2b685d3d00a..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected@2x.png deleted file mode 100644 index eb0051a606e..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/item_selection_selected@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/local.png b/src/plugins/qmldesigner/components/edit3d/images/local.png index 0a608f6816e..94b2f97c4ce 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/local.png and b/src/plugins/qmldesigner/components/edit3d/images/local.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/local@2x.png b/src/plugins/qmldesigner/components/edit3d/images/local@2x.png index a5c931e750f..f4f95e4e3a7 100644 Binary files a/src/plugins/qmldesigner/components/edit3d/images/local@2x.png and b/src/plugins/qmldesigner/components/edit3d/images/local@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_active.png b/src/plugins/qmldesigner/components/edit3d/images/move_active.png deleted file mode 100644 index d21d290349c..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/move_active.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_active@2x.png b/src/plugins/qmldesigner/components/edit3d/images/move_active@2x.png deleted file mode 100644 index bd0827f918c..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/move_active@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_off.png b/src/plugins/qmldesigner/components/edit3d/images/move_off.png new file mode 100644 index 00000000000..1c07c7cf6d8 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/move_off.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_off@2x.png b/src/plugins/qmldesigner/components/edit3d/images/move_off@2x.png new file mode 100644 index 00000000000..ac943afe1a7 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/move_off@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_on.png b/src/plugins/qmldesigner/components/edit3d/images/move_on.png new file mode 100644 index 00000000000..c23b711b3ff Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/move_on.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_on@2x.png b/src/plugins/qmldesigner/components/edit3d/images/move_on@2x.png new file mode 100644 index 00000000000..e0065301727 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/move_on@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_selected.png b/src/plugins/qmldesigner/components/edit3d/images/move_selected.png deleted file mode 100644 index 5c8ce42a758..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/move_selected.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/move_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/move_selected@2x.png deleted file mode 100644 index fad362a3e6a..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/move_selected@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/ortho.png b/src/plugins/qmldesigner/components/edit3d/images/ortho.png deleted file mode 100644 index 35b36203fa2..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/ortho.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/ortho@2x.png b/src/plugins/qmldesigner/components/edit3d/images/ortho@2x.png deleted file mode 100644 index 443c73e444b..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/ortho@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera.png b/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera.png new file mode 100644 index 00000000000..844bf8edf77 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera@2x.png b/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera@2x.png new file mode 100644 index 00000000000..69a18a2a82f Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/orthographic_camera@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/persp.png b/src/plugins/qmldesigner/components/edit3d/images/persp.png deleted file mode 100644 index 9a48e763996..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/persp.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/persp@2x.png b/src/plugins/qmldesigner/components/edit3d/images/persp@2x.png deleted file mode 100644 index 88a4eab9c6a..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/persp@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/perspective_camera.png b/src/plugins/qmldesigner/components/edit3d/images/perspective_camera.png new file mode 100644 index 00000000000..2461d8be5e7 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/perspective_camera.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/perspective_camera@2x.png b/src/plugins/qmldesigner/components/edit3d/images/perspective_camera@2x.png new file mode 100644 index 00000000000..321dcfb5ea8 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/perspective_camera@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_active.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_active.png deleted file mode 100644 index bdabaf30285..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/rotate_active.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_active@2x.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_active@2x.png deleted file mode 100644 index 8c81f409d32..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/rotate_active@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_off.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_off.png new file mode 100644 index 00000000000..6cd93d946d0 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/rotate_off.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_off@2x.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_off@2x.png new file mode 100644 index 00000000000..105a9132143 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/rotate_off@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_on.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_on.png new file mode 100644 index 00000000000..7e680b5a85e Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/rotate_on.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_on@2x.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_on@2x.png new file mode 100644 index 00000000000..ee93a691381 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/rotate_on@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_selected.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_selected.png deleted file mode 100644 index 42dc2763ce4..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/rotate_selected.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/rotate_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/rotate_selected@2x.png deleted file mode 100644 index b6cc48c0533..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/rotate_selected@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_active.png b/src/plugins/qmldesigner/components/edit3d/images/scale_active.png deleted file mode 100644 index cd63c1d03bc..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/scale_active.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_active@2x.png b/src/plugins/qmldesigner/components/edit3d/images/scale_active@2x.png deleted file mode 100644 index 0d95e8e8913..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/scale_active@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_off.png b/src/plugins/qmldesigner/components/edit3d/images/scale_off.png new file mode 100644 index 00000000000..664cb20434b Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/scale_off.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_off@2x.png b/src/plugins/qmldesigner/components/edit3d/images/scale_off@2x.png new file mode 100644 index 00000000000..52777e16724 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/scale_off@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_on.png b/src/plugins/qmldesigner/components/edit3d/images/scale_on.png new file mode 100644 index 00000000000..6219923f9ce Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/scale_on.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_on@2x.png b/src/plugins/qmldesigner/components/edit3d/images/scale_on@2x.png new file mode 100644 index 00000000000..6dac35fb32e Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/scale_on@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_selected.png b/src/plugins/qmldesigner/components/edit3d/images/scale_selected.png deleted file mode 100644 index 4cca7726170..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/scale_selected.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/scale_selected@2x.png b/src/plugins/qmldesigner/components/edit3d/images/scale_selected@2x.png deleted file mode 100644 index 690cf5f924f..00000000000 Binary files a/src/plugins/qmldesigner/components/edit3d/images/scale_selected@2x.png and /dev/null differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/select_group.png b/src/plugins/qmldesigner/components/edit3d/images/select_group.png new file mode 100644 index 00000000000..228d8d4d9ac Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/select_group.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/select_group@2x.png b/src/plugins/qmldesigner/components/edit3d/images/select_group@2x.png new file mode 100644 index 00000000000..477853d7d5c Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/select_group@2x.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/select_item.png b/src/plugins/qmldesigner/components/edit3d/images/select_item.png new file mode 100644 index 00000000000..922a4d4f251 Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/select_item.png differ diff --git a/src/plugins/qmldesigner/components/edit3d/images/select_item@2x.png b/src/plugins/qmldesigner/components/edit3d/images/select_item@2x.png new file mode 100644 index 00000000000..571cc35ee2d Binary files /dev/null and b/src/plugins/qmldesigner/components/edit3d/images/select_item@2x.png differ diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index 840f1ea97c7..146565133d7 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -52,27 +52,27 @@ const Utils::Icon EDIT3D_LIGHT_ON({ const Utils::Icon EDIT3D_LIGHT_OFF({ {QLatin1String(":/edit3d/images/edit_light_off.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_SELECTION_MODE_ON({ - {QLatin1String(":/edit3d/images/group_selection_selected.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/select_group.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_SELECTION_MODE_OFF({ - {QLatin1String(":/edit3d/images/item_selection_selected.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/select_item.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_MOVE_TOOL_ON({ - {QLatin1String(":/edit3d/images/move_selected.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/move_on.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_MOVE_TOOL_OFF({ - {QLatin1String(":/edit3d/images/move_active.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/move_off.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_ROTATE_TOOL_ON({ - {QLatin1String(":/edit3d/images/rotate_selected.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/rotate_on.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_ROTATE_TOOL_OFF({ - {QLatin1String(":/edit3d/images/rotate_active.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/rotate_off.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_SCALE_TOOL_ON({ - {QLatin1String(":/edit3d/images/scale_selected.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/scale_on.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_SCALE_TOOL_OFF({ - {QLatin1String(":/edit3d/images/scale_active.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/scale_off.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_FIT_SELECTED_OFF({ - {QLatin1String(":/edit3d/images/fit_active.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/fit_selected.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_EDIT_CAMERA_ON({ - {QLatin1String(":/edit3d/images/persp.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/perspective_camera.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_EDIT_CAMERA_OFF({ - {QLatin1String(":/edit3d/images/ortho.png"), Utils::Theme::IconsBaseColor}}); + {QLatin1String(":/edit3d/images/orthographic_camera.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_ORIENTATION_ON({ {QLatin1String(":/edit3d/images/global.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EDIT3D_ORIENTATION_OFF({