diff --git a/src/edt/edt/TextPropertiesPage.ui b/src/edt/edt/TextPropertiesPage.ui index 7d7dadab7..1ac85ca2d 100644 --- a/src/edt/edt/TextPropertiesPage.ui +++ b/src/edt/edt/TextPropertiesPage.ui @@ -278,7 +278,7 @@ to show text objects scaled and rotated (r0) - :/r0.png + :/r0_24px.png @@ -286,7 +286,7 @@ to show text objects scaled and rotated (r90) - :/r90.png + :/r90_24px.png @@ -294,7 +294,7 @@ to show text objects scaled and rotated (r180) - :/r180.png + :/r180_24px.png @@ -302,7 +302,7 @@ to show text objects scaled and rotated (r270) - :/r270.png + :/r270_24px.png @@ -310,7 +310,7 @@ to show text objects scaled and rotated (m0) - :/m0.png + :/m0_24px.png @@ -318,7 +318,7 @@ to show text objects scaled and rotated (m45) - :/m45.png + :/m45_24px.png @@ -326,7 +326,7 @@ to show text objects scaled and rotated (m90) - :/m90.png + :/m90_24px.png @@ -334,7 +334,7 @@ to show text objects scaled and rotated (m135) - :/m135.png + :/m135_24px.png diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 885abe798..90d9448a5 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -92,10 +92,14 @@ images/logo.png images/lt_31px.png images/lt_31px@2x.png - images/m0.png - images/m135.png - images/m45.png - images/m90.png + images/m0_24px.png + images/m0_24px@2x.png + images/m135_24px.png + images/m135_24px@2x.png + images/m45_24px.png + images/m45_24px@2x.png + images/m90_24px.png + images/m90_24px@2x.png images/move.png images/move_simple.png images/neutral.png @@ -116,10 +120,14 @@ images/prev_topic_24px@2x.png images/properties_16px.png images/properties_16px@2x.png - images/r0.png - images/r180.png - images/r270.png - images/r90.png + images/r0_24px.png + images/r0_24px@2x.png + images/r180_24px.png + images/r180_24px@2x.png + images/r270_24px.png + images/r270_24px@2x.png + images/r90_24px.png + images/r90_24px@2x.png images/rb_31px.png images/rb_31px@2x.png images/rc_31px.png diff --git a/src/icons/images/m0.png b/src/icons/images/m0.png deleted file mode 100644 index 01cb343ca..000000000 Binary files a/src/icons/images/m0.png and /dev/null differ diff --git a/src/icons/images/m0_24px.png b/src/icons/images/m0_24px.png new file mode 100644 index 000000000..c81ad042c Binary files /dev/null and b/src/icons/images/m0_24px.png differ diff --git a/src/icons/images/m0_24px@2x.png b/src/icons/images/m0_24px@2x.png new file mode 100644 index 000000000..c0f057adc Binary files /dev/null and b/src/icons/images/m0_24px@2x.png differ diff --git a/src/icons/images/m135.png b/src/icons/images/m135.png deleted file mode 100644 index 1bf117274..000000000 Binary files a/src/icons/images/m135.png and /dev/null differ diff --git a/src/icons/images/m135_24px.png b/src/icons/images/m135_24px.png new file mode 100644 index 000000000..892e30af8 Binary files /dev/null and b/src/icons/images/m135_24px.png differ diff --git a/src/icons/images/m135_24px@2x.png b/src/icons/images/m135_24px@2x.png new file mode 100644 index 000000000..96165edbf Binary files /dev/null and b/src/icons/images/m135_24px@2x.png differ diff --git a/src/icons/images/m45.png b/src/icons/images/m45.png deleted file mode 100644 index 34d169cc8..000000000 Binary files a/src/icons/images/m45.png and /dev/null differ diff --git a/src/icons/images/m45_24px.png b/src/icons/images/m45_24px.png new file mode 100644 index 000000000..faec5e6a2 Binary files /dev/null and b/src/icons/images/m45_24px.png differ diff --git a/src/icons/images/m45_24px@2x.png b/src/icons/images/m45_24px@2x.png new file mode 100644 index 000000000..c3782bd7c Binary files /dev/null and b/src/icons/images/m45_24px@2x.png differ diff --git a/src/icons/images/m90.png b/src/icons/images/m90.png deleted file mode 100644 index 66adc2321..000000000 Binary files a/src/icons/images/m90.png and /dev/null differ diff --git a/src/icons/images/m90_24px.png b/src/icons/images/m90_24px.png new file mode 100644 index 000000000..3937f0520 Binary files /dev/null and b/src/icons/images/m90_24px.png differ diff --git a/src/icons/images/m90_24px@2x.png b/src/icons/images/m90_24px@2x.png new file mode 100644 index 000000000..f873646a3 Binary files /dev/null and b/src/icons/images/m90_24px@2x.png differ diff --git a/src/icons/images/r0.png b/src/icons/images/r0.png deleted file mode 100644 index a75c3bb28..000000000 Binary files a/src/icons/images/r0.png and /dev/null differ diff --git a/src/icons/images/r0_24px.png b/src/icons/images/r0_24px.png new file mode 100644 index 000000000..70cfc6750 Binary files /dev/null and b/src/icons/images/r0_24px.png differ diff --git a/src/icons/images/r0_24px@2x.png b/src/icons/images/r0_24px@2x.png new file mode 100644 index 000000000..57c055b9d Binary files /dev/null and b/src/icons/images/r0_24px@2x.png differ diff --git a/src/icons/images/r180.png b/src/icons/images/r180.png deleted file mode 100644 index af3198bf0..000000000 Binary files a/src/icons/images/r180.png and /dev/null differ diff --git a/src/icons/images/r180_24px.png b/src/icons/images/r180_24px.png new file mode 100644 index 000000000..bd0589654 Binary files /dev/null and b/src/icons/images/r180_24px.png differ diff --git a/src/icons/images/r180_24px@2x.png b/src/icons/images/r180_24px@2x.png new file mode 100644 index 000000000..c66937edf Binary files /dev/null and b/src/icons/images/r180_24px@2x.png differ diff --git a/src/icons/images/r270.png b/src/icons/images/r270.png deleted file mode 100644 index fc1f67185..000000000 Binary files a/src/icons/images/r270.png and /dev/null differ diff --git a/src/icons/images/r270_24px.png b/src/icons/images/r270_24px.png new file mode 100644 index 000000000..d91ecf759 Binary files /dev/null and b/src/icons/images/r270_24px.png differ diff --git a/src/icons/images/r270_24px@2x.png b/src/icons/images/r270_24px@2x.png new file mode 100644 index 000000000..d89aaac05 Binary files /dev/null and b/src/icons/images/r270_24px@2x.png differ diff --git a/src/icons/images/r90.png b/src/icons/images/r90.png deleted file mode 100644 index f34bc5b11..000000000 Binary files a/src/icons/images/r90.png and /dev/null differ diff --git a/src/icons/images/r90_24px.png b/src/icons/images/r90_24px.png new file mode 100644 index 000000000..790252cee Binary files /dev/null and b/src/icons/images/r90_24px.png differ diff --git a/src/icons/images/r90_24px@2x.png b/src/icons/images/r90_24px@2x.png new file mode 100644 index 000000000..6a761ec80 Binary files /dev/null and b/src/icons/images/r90_24px@2x.png differ diff --git a/src/icons/svg/m0_24px.svg b/src/icons/svg/m0_24px.svg new file mode 100644 index 000000000..055fac169 --- /dev/null +++ b/src/icons/svg/m0_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m135_24px.svg b/src/icons/svg/m135_24px.svg new file mode 100644 index 000000000..7850093c6 --- /dev/null +++ b/src/icons/svg/m135_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m45_24px.svg b/src/icons/svg/m45_24px.svg new file mode 100644 index 000000000..09853ce66 --- /dev/null +++ b/src/icons/svg/m45_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m90_24px.svg b/src/icons/svg/m90_24px.svg new file mode 100644 index 000000000..bdea03687 --- /dev/null +++ b/src/icons/svg/m90_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r0_24px.svg b/src/icons/svg/r0_24px.svg new file mode 100644 index 000000000..4c18deeaf --- /dev/null +++ b/src/icons/svg/r0_24px.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r180_24px.svg b/src/icons/svg/r180_24px.svg new file mode 100644 index 000000000..60dc26edb --- /dev/null +++ b/src/icons/svg/r180_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r270_24px.svg b/src/icons/svg/r270_24px.svg new file mode 100644 index 000000000..d38946495 --- /dev/null +++ b/src/icons/svg/r270_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r90_24px.svg b/src/icons/svg/r90_24px.svg new file mode 100644 index 000000000..89b40f041 --- /dev/null +++ b/src/icons/svg/r90_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lay/lay/ReplacePropertiesText.ui b/src/lay/lay/ReplacePropertiesText.ui index 031476ae1..5b56da4ca 100644 --- a/src/lay/lay/ReplacePropertiesText.ui +++ b/src/lay/lay/ReplacePropertiesText.ui @@ -31,7 +31,7 @@ R0 - :/r0.png + :/r0_24px.png @@ -39,7 +39,7 @@ R90 - :/r90.png + :/r90_24px.png @@ -47,7 +47,7 @@ R180 - :/r180.png + :/r180_24px.png @@ -55,7 +55,7 @@ R270 - :/r270.png + :/r270_24px.png @@ -63,7 +63,7 @@ M0 - :/m0.png + :/m0_24px.png @@ -71,7 +71,7 @@ M45 - :/m45.png + :/m45_24px.png @@ -79,7 +79,7 @@ M90 - :/m90.png + :/m90_24px.png @@ -87,7 +87,7 @@ M135 - :/m135.png + :/m135_24px.png diff --git a/src/lay/lay/SearchPropertiesText.ui b/src/lay/lay/SearchPropertiesText.ui index c6e5783ed..7631b1aa4 100644 --- a/src/lay/lay/SearchPropertiesText.ui +++ b/src/lay/lay/SearchPropertiesText.ui @@ -68,7 +68,7 @@ R0 - :/r0.png + :/r0_24px.png @@ -76,7 +76,7 @@ R90 - :/r90.png + :/r90_24px.png @@ -84,7 +84,7 @@ R180 - :/r180.png + :/r180_24px.png @@ -92,7 +92,7 @@ R270 - :/r270.png + :/r270_24px.png @@ -100,7 +100,7 @@ M0 - :/m0.png + :/m0_24px.png @@ -108,7 +108,7 @@ M45 - :/m45.png + :/m45_24px.png @@ -116,7 +116,7 @@ M90 - :/m90.png + :/m90_24px.png @@ -124,7 +124,7 @@ M135 - :/m135.png + :/m135_24px.png diff --git a/src/layui/layui/LayoutViewConfigPage7.ui b/src/layui/layui/LayoutViewConfigPage7.ui index fc794d04d..f19d1d18c 100644 --- a/src/layui/layui/LayoutViewConfigPage7.ui +++ b/src/layui/layui/LayoutViewConfigPage7.ui @@ -201,7 +201,7 @@ - :/r0.png:/r0.png + :/r0_24px.png:/r0_24px.png @@ -210,7 +210,7 @@ - :/r90.png:/r90.png + :/r90_24px.png:/r90_24px.png @@ -219,7 +219,7 @@ - :/r180.png:/r180.png + :/r180_24px.png:/r180_24px.png @@ -228,7 +228,7 @@ - :/r270.png:/r270.png + :/r270_24px.png:/r270_24px.png @@ -237,7 +237,7 @@ - :/m0.png:/m0.png + :/m0_24px.png:/m0_24px.png @@ -246,7 +246,7 @@ - :/m45.png:/m45.png + :/m45_24px.png:/m45_24px.png @@ -255,7 +255,7 @@ - :/m90.png:/m90.png + :/m90_24px.png:/m90_24px.png @@ -264,7 +264,7 @@ - :/m135.png:/m135.png + :/m135_24px.png:/m135_24px.png diff --git a/src/layui/layui/layLayoutViewFunctions.cc b/src/layui/layui/layLayoutViewFunctions.cc index a321eb15a..81464f704 100644 --- a/src/layui/layui/layLayoutViewFunctions.cc +++ b/src/layui/layui/layLayoutViewFunctions.cc @@ -2190,14 +2190,14 @@ public: menu_entries.push_back (lay::submenu ("global_trans", at, tl::to_string (tr ("Global Transformation")))); { std::string at = "zoom_menu.global_trans.end"; - menu_entries.push_back (lay::config_menu_item ("r0", at, tl::to_string (tr ("\\(r0\\)<:/r0.png>")), cfg_global_trans, "?r0 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r90", at, tl::to_string (tr ("\\(r90\\)<:/r90.png>")), cfg_global_trans, "?r90 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r180", at, tl::to_string (tr ("\\(r180\\)<:/r180.png>")), cfg_global_trans, "?r180 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r270", at, tl::to_string (tr ("\\(r270\\)<:/r270.png>")), cfg_global_trans, "?r270 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m0", at, tl::to_string (tr ("\\(m0\\)<:/m0.png>")), cfg_global_trans, "?m0 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m45", at, tl::to_string (tr ("\\(m45\\)<:/m45.png>")), cfg_global_trans, "?m45 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m90", at, tl::to_string (tr ("\\(m90\\)<:/m90.png>")), cfg_global_trans, "?m90 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m135", at, tl::to_string (tr ("\\(m135\\)<:/m135.png>")), cfg_global_trans, "?m135 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r0", at, tl::to_string (tr ("\\(r0\\)<:/r0_24px.png>")), cfg_global_trans, "?r0 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r90", at, tl::to_string (tr ("\\(r90\\)<:/r90_24px.png>")), cfg_global_trans, "?r90 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r180", at, tl::to_string (tr ("\\(r180\\)<:/r180_24px.png>")), cfg_global_trans, "?r180 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r270", at, tl::to_string (tr ("\\(r270\\)<:/r270_24px.png>")), cfg_global_trans, "?r270 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m0", at, tl::to_string (tr ("\\(m0\\)<:/m0_24px.png>")), cfg_global_trans, "?m0 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m45", at, tl::to_string (tr ("\\(m45\\)<:/m45_24px.png>")), cfg_global_trans, "?m45 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m90", at, tl::to_string (tr ("\\(m90\\)<:/m90_24px.png>")), cfg_global_trans, "?m90 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m135", at, tl::to_string (tr ("\\(m135\\)<:/m135_24px.png>")), cfg_global_trans, "?m135 *1 0,0")); } menu_entries.push_back (lay::separator ("hier_group", at));