From 84061b8362320178e9cbf07d0c761bf6031b15ec Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 17 Sep 2022 16:53:05 +0200 Subject: [PATCH] More icons turned into SVG --- src/icons/icons.qrc | 6 +- src/icons/images/import.png | Bin 344 -> 0 bytes src/icons/images/import_16px.png | Bin 0 -> 406 bytes src/icons/images/import_16px@2x.png | Bin 0 -> 729 bytes src/icons/images/rename.png | Bin 489 -> 0 bytes src/icons/images/rename_16px.png | Bin 0 -> 646 bytes src/icons/images/rename_16px@2x.png | Bin 0 -> 1231 bytes src/icons/svg/import_16px.svg | 122 ++++++++++++++ src/icons/svg/rename_16px.svg | 150 ++++++++++++++++++ src/lay/lay/CrashMessage.ui | 4 +- src/lay/lay/CustomizeMenuConfigPage.ui | 4 +- src/lay/lay/HelpAboutDialog.ui | 4 +- src/lay/lay/LogViewerDialog.ui | 4 +- src/lay/lay/MacroEditorDialog.ui | 8 +- src/lay/lay/MainConfigPage6.ui | 49 +++--- src/lay/lay/SaltGrainPropertiesDialog.ui | 34 ++-- .../lay/SaltGrainTemplateSelectionDialog.ui | 15 +- src/lay/lay/SaltManagerDialog.ui | 38 ++--- .../SaltManagerInstallConfirmationDialog.ui | 12 +- src/lay/lay/SearchReplaceDialog.ui | 2 +- src/lay/lay/TechSetupDialog.ui | 6 +- src/lay/lay/lay.pro | 1 - src/layui/layui/MarkerBrowserPage.ui | 4 +- 23 files changed, 359 insertions(+), 104 deletions(-) delete mode 100644 src/icons/images/import.png create mode 100644 src/icons/images/import_16px.png create mode 100644 src/icons/images/import_16px@2x.png delete mode 100644 src/icons/images/rename.png create mode 100644 src/icons/images/rename_16px.png create mode 100644 src/icons/images/rename_16px@2x.png create mode 100644 src/icons/svg/import_16px.svg create mode 100644 src/icons/svg/rename_16px.svg diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 5180e1704..5c2a0307c 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -99,7 +99,8 @@ images/help_16px@2x.png images/home_24px.png images/home_24px@2x.png - images/import.png + images/import_16px.png + images/import_16px@2x.png images/important_16px.png images/important_16px@2x.png images/instance_24px.png @@ -169,7 +170,8 @@ images/rc_31px@2x.png images/red_flag_16px.png images/red_flag_16px@2x.png - images/rename.png + images/rename_16px.png + images/rename_16px@2x.png images/replace_16px.png images/replace_16px@2x.png images/replace_all_16px.png diff --git a/src/icons/images/import.png b/src/icons/images/import.png deleted file mode 100644 index d89416fe2222135a2c10fe9e2170885dd99ad7bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rl| z>|jWX*)47c6yYrJh%9Dc;N}Nm#z{Y!mjVUZOFVsD*>7`ki^|KfsC0J$g=9-yBTAg} zb8}PkN*J7rQWHy3QxwWGOEMHfGEx=XJ$(b-r>N!u6|VPmaSX9IeRQ%d*C7Xi*8QCG zJl^O|?q2aA_st*8JuR&}oejh{1PN^M;rpOdCf;=H$eLFEw!2B+&Ym&X`J?f9xzas` z2`$}A?lE{=4q3~#@z;JwX2<PfUmxx7b75KbpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10V7F7 zK~y-6rIRgB!%!H7pG&6(OZYUfk^TY%rVVBVIn#u|sKOwzcu)j^BgiEL5X=BSfY2^Y zmMMP2pR=Lz4x&!3*c1JD{zk_&v6{3 zDGWm`EzT>vI?-%tT7UqRW{Mw@9x_i5$1!{LUG6T9@z$2wOWZ`GXMR~pHp-Bnz4um9smFU07*qoM6N<$f(rDf ADgXcg literal 0 HcmV?d00001 diff --git a/src/icons/images/import_16px@2x.png b/src/icons/images/import_16px@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9faa8eaf0318abc4520458f65d2126e5e6b16d0f GIT binary patch literal 729 zcmV;~0w(>5P) zK~z|U?Uz4j6LA#BKQTdQ@DEh(=pbkztr6~^U?4Z76>_0N3oSSZE|S5`*-=!)#i^5B zgoYM%a4O{{b5Sn}89Im;P-~%!P;#*yG$c?8KZpDwX?lqymj=Nv{NVBa{NCfeckkT~ zh72Eo5aQv9IP>}1`~>QRrfClb={%RqJvxqmYLHI<27#lDTrTIS15ML9%7>nT{{aj< zfQ5wx{C>ZyysZhn#>~u2NBKZ9;5ZJENQCL>X#gUTh^wyW8E_m2UDwIy^9^1w7(AH( zip3&{M54uc6K)A1uGQ!gU;-)6O5ivS@pv5DwoyVCyQ!Z67J(#CT}IJpR79gu(F+QN zf>0Di0799#Bnt1A1>kyARoxRpYzQG<_ML&|nk$pzn5oCeqvwcCguoMGf*rR(RCf$wh2#+^Y-;K#-!2ihDXqI z0Q2+n)rPxzh4<^Lj7b-Iy64~B1%_dusw(*}-?+Ybn_cJU$p#=v5~gXQsw!We00000 LNkvXXu0mjf(ilsx literal 0 HcmV?d00001 diff --git a/src/icons/images/rename.png b/src/icons/images/rename.png deleted file mode 100644 index 71b798b6f268e2df8f61b7a43cc5c36e76e4f731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmVPx#24YJ`L;(K)xBzBcyB9V9000SaNLh0L01FQQ01FQRlKBIr00007bV*G`2ipn@ z6(1$FFJi6$0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0003% zNkl+4G1=tieT*%SnrD9^+{5s@FnsDsRSz@z``QISS<*tEOsA2 z5wehwbjB1mdQuqm`j>17IWXKAxO12@bKs9KU$0X9If=_nA{}!WV}6|A!Y$%BCI|xJ zIR3o^NmMEoa=9F{*^JR>w3)!9A<}d@6`mY1mnaSuMxaOFi$XzHl0p~BuS{(>v*0=Hk&>6 zfs4lVExbQr8tv^VOQjNF7*Z@23B&L_!C)|08(`P0d_GU1P@q<;;rl+;+VAgs-~*ik fAd}Lu;=k|-HUGr7;FRe@00000NkvXXu0mjfqSwV- diff --git a/src/icons/images/rename_16px.png b/src/icons/images/rename_16px.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf59003928da06187d18cc28621a144afb5a0dd GIT binary patch literal 646 zcmV;10(t$3P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10uxC@ zK~y-6jgwDElVKdkKacO!ckW$|nX=(Ui>^|E2fJ+g(q#}G?2k9GMnxA7N|zGPi_t;E zTZd5~bTY3h(Vp$fz4N2kuGVnZ)L?S^Vk-+mj1_lO*$79PI8yjnqdOBr5 zqtRe%Ym1$o9j2zH2nK_MLLsWv?>$c*rSHe%@o$oz8)MWqgKRb{+qPA&*A=-C79c?V z;lAdpXS2;KmoNR=+uM75CILV?ou*ta^W*0sdjAld7&tM56Qf)`v>(jPWh8Y0Ur*>O z0id$5urS%WaDf-?vT8P){Yy(rYqeU9iHQk@hlg=pcQVjgluB!yi%uxmFt=X^0Q#Li zEkC`>$IoBP)oa%QI5;?9etw?y_4U(jB!wm2lQb*oC7{^Q;2+QPWQ*D|{^G&J}-_vY;<-}i4yVsUX1-}jlGo~FCIyIrQIXl_YL<#IUz zs#dEyIy#bNS;}NGrwQ87gp=K?*kBxMvv3&%yC?f<1jNb!|v`bmSwTBvcl-- g=y9X-#OHnYzmUxLEue^{iU0rr07*qoM6N<$f?>rb6951J literal 0 HcmV?d00001 diff --git a/src/icons/images/rename_16px@2x.png b/src/icons/images/rename_16px@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1e21ecdcea98618c37784e4a95b2916054c8a5b6 GIT binary patch literal 1231 zcmV;=1Tg!FP)h)7#n&Pt`_w_F*~3%A?dnu=p}b@kS|uUe$CUTPh)+LA3w%svtck8aJ$``3ZNzH)ODTt`FSiB3r3@n zU@(Zs+JxD2)(_%0NCwzDl01!0165U06rIyP7(Qd zBLE3&U}R*3nVA^?Dl01q1Ofnzjg2ueF#&+ZVxhdeyd)F~?RfCufk{NZQ%d>L0Z5pE z==5*hx|NcW5)K?V5Pjp=EM#V8GBh-l@UZ#Bi4&gymqa8#Re-n@1OfpD2L}O&L?RRy7jx#!8B8YA60N3D zT3Qgwtk7#JWs zI~%jvjNNXhwzii1{1kSoh}+2I; z*JWKrkcj+JR#x_MEr{qg)HF@5U%xIbEiIyyk|$4|h=|C-!h)PWeL7};>(;F}fK>~U ze|5v_^(w%$azH8d8NgQ;I#^s3T3au1@Zdqtojb?U?p>0mX;`gRZr;2ZyI-y~0hCfh zKx2}bxf8vfotvkjp&`)J)MV`H>LLgjXHMh7#SHE`2BunXJ>(>N~)%&=IsDXPfr7oo14q_?b|6VETp!!mfgE| t|9=2hs})_>Q}Riza#=<1^5=HL`Ul@R6_d#7F-QOa002ovPDHLkV1groOgR7m literal 0 HcmV?d00001 diff --git a/src/icons/svg/import_16px.svg b/src/icons/svg/import_16px.svg new file mode 100644 index 000000000..d56df57f0 --- /dev/null +++ b/src/icons/svg/import_16px.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rename_16px.svg b/src/icons/svg/rename_16px.svg new file mode 100644 index 000000000..2be41e288 --- /dev/null +++ b/src/icons/svg/rename_16px.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + A + B + + + + diff --git a/src/lay/lay/CrashMessage.ui b/src/lay/lay/CrashMessage.ui index 9ac5c81d1..267fe5aef 100644 --- a/src/lay/lay/CrashMessage.ui +++ b/src/lay/lay/CrashMessage.ui @@ -67,7 +67,7 @@ - :/bug.png + :/bug.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -126,7 +126,7 @@ buttonBox - + diff --git a/src/lay/lay/CustomizeMenuConfigPage.ui b/src/lay/lay/CustomizeMenuConfigPage.ui index e445e2755..698768e18 100644 --- a/src/lay/lay/CustomizeMenuConfigPage.ui +++ b/src/lay/lay/CustomizeMenuConfigPage.ui @@ -195,7 +195,7 @@ For special keys: - :/find_16px.png + :/find_16px.png @@ -223,7 +223,7 @@ For special keys: - + diff --git a/src/lay/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui index 1d04a3545..07b329094 100644 --- a/src/lay/lay/HelpAboutDialog.ui +++ b/src/lay/lay/HelpAboutDialog.ui @@ -137,7 +137,7 @@ - :/logo.png + :/logo.png @@ -226,7 +226,7 @@ - + diff --git a/src/lay/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui index d625b0d06..7d252850d 100644 --- a/src/lay/lay/LogViewerDialog.ui +++ b/src/lay/lay/LogViewerDialog.ui @@ -169,7 +169,7 @@ - :/warn_16px.png + :/warn_16px.png @@ -206,7 +206,7 @@ log_view - + diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui index 3080ac48a..95b142033 100644 --- a/src/lay/lay/MacroEditorDialog.ui +++ b/src/lay/lay/MacroEditorDialog.ui @@ -171,7 +171,7 @@ p, li { white-space: pre-wrap; } - :/rename.png:/rename.png + :/rename_16px.png:/rename_16px.png true @@ -191,7 +191,7 @@ p, li { white-space: pre-wrap; } - :/import.png:/import.png + :/import_16px.png:/import_16px.png true @@ -1404,7 +1404,7 @@ p, li { white-space: pre-wrap; } - :/rename.png:/rename.png + :/rename_16px.png:/rename_16px.png Rename @@ -1413,7 +1413,7 @@ p, li { white-space: pre-wrap; } - :/import.png:/import.png + :/import_16px.png:/import_16px.png Import diff --git a/src/lay/lay/MainConfigPage6.ui b/src/lay/lay/MainConfigPage6.ui index 198060873..b3b01f052 100644 --- a/src/lay/lay/MainConfigPage6.ui +++ b/src/lay/lay/MainConfigPage6.ui @@ -1,7 +1,8 @@ - + + MainConfigPage6 - - + + 0 0 @@ -9,44 +10,44 @@ 130 - + Application Settings - - - 9 - - + + 6 + + 9 + - - + + Circle Resolution - - - 9 - - + + 6 + + 9 + - - + + Number of points per full circle - + - + Qt::Horizontal - + 40 20 @@ -59,9 +60,7 @@ - - - - + + diff --git a/src/lay/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui index 58d1e9411..ebdd65a58 100644 --- a/src/lay/lay/SaltGrainPropertiesDialog.ui +++ b/src/lay/lay/SaltGrainPropertiesDialog.ui @@ -48,7 +48,6 @@ - 75 true @@ -85,7 +84,6 @@ - 75 true @@ -178,7 +176,7 @@ ... - + :/clear_16px.png:/clear_16px.png @@ -195,7 +193,7 @@ ... - + :/add_16px.png:/add_16px.png @@ -243,7 +241,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -258,7 +256,6 @@ - 75 true @@ -274,7 +271,6 @@ - 75 true @@ -290,7 +286,6 @@ - 75 true @@ -344,7 +339,7 @@ ... - + :/clear_edit_16px.png:/clear_edit_16px.png @@ -369,7 +364,7 @@ ... - + :/salt_icon.png:/salt_icon.png @@ -389,7 +384,7 @@ ... - + :/add_16px.png:/add_16px.png @@ -451,7 +446,7 @@ ... - + :/clear_edit_16px.png:/clear_edit_16px.png @@ -516,7 +511,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -543,7 +538,6 @@ - 75 true @@ -559,7 +553,6 @@ - 75 true @@ -617,7 +610,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -660,7 +653,6 @@ - 75 true @@ -676,7 +668,6 @@ - 75 true @@ -731,7 +722,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -772,7 +763,6 @@ - 75 true @@ -823,7 +813,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -882,7 +872,7 @@ remove_dependency - + diff --git a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui index 4bdeab7d3..7ab454058 100644 --- a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui +++ b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui @@ -18,7 +18,6 @@ - 75 true @@ -75,7 +74,6 @@ - 75 true @@ -117,7 +115,7 @@ ... - + :/warn_16px.png:/warn_16px.png @@ -132,7 +130,6 @@ - 50 true false @@ -155,7 +152,7 @@ - + :/add_16px.png:/add_16px.png @@ -167,7 +164,7 @@ - + :/clear_16px.png:/clear_16px.png @@ -179,8 +176,8 @@ - - :/import.png:/import.png + + :/import_16px.png:/import_16px.png Import @@ -198,7 +195,7 @@ - + diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui index eaf406944..4afd2a16c 100644 --- a/src/lay/lay/SaltManagerDialog.ui +++ b/src/lay/lay/SaltManagerDialog.ui @@ -76,7 +76,7 @@ Mark - + :/marked_16px.png:/marked_16px.png @@ -103,7 +103,7 @@ - :/find_16px.png + :/find_16px.png @@ -219,7 +219,6 @@ - 75 true @@ -237,7 +236,7 @@ ... - + :/empty_16px.png:/empty_16px.png @@ -375,7 +374,7 @@ Mark - + :/marked_16px.png:/marked_16px.png @@ -402,7 +401,7 @@ - :/find_16px.png + :/find_16px.png @@ -518,7 +517,6 @@ - 75 true @@ -536,7 +534,7 @@ ... - + :/empty_16px.png:/empty_16px.png @@ -690,7 +688,7 @@ - :/find_16px.png + :/find_16px.png @@ -804,8 +802,8 @@ 0 0 - 537 - 284 + 334 + 213 @@ -828,7 +826,7 @@ - :/salt.png + :/salt.png @@ -843,7 +841,6 @@ 9 - 50 false @@ -942,7 +939,6 @@ - 75 true @@ -960,7 +956,7 @@ Edit - + :/edit_16px.png:/edit_16px.png @@ -1012,7 +1008,7 @@ Remove Package - + :/clear_16px.png:/clear_16px.png @@ -1036,7 +1032,7 @@ Create (Edit) Package - + :/add_16px.png:/add_16px.png @@ -1061,7 +1057,7 @@ - + :/add_16px.png:/add_16px.png @@ -1073,7 +1069,7 @@ - + :/clear_16px.png:/clear_16px.png @@ -1133,7 +1129,7 @@ - + :/add_16px.png:/add_16px.png @@ -1178,7 +1174,7 @@ scrollArea - + diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui index eb032592d..ef18920d2 100644 --- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui +++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui @@ -260,7 +260,7 @@ - :/warn_16px.png + :/warn_16px.png @@ -335,7 +335,7 @@ - + :/add_16px.png:/add_16px.png @@ -347,7 +347,7 @@ - + :/clear_16px.png:/clear_16px.png @@ -359,8 +359,8 @@ - - :/import.png:/import.png + + :/import_16px.png:/import_16px.png Import @@ -371,7 +371,7 @@ - + diff --git a/src/lay/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui index 21db4a07c..9c24eb188 100644 --- a/src/lay/lay/SearchReplaceDialog.ui +++ b/src/lay/lay/SearchReplaceDialog.ui @@ -745,7 +745,7 @@ p, li { white-space: pre-wrap; } - :/rename.png:/rename.png + :/rename_16px.png:/rename_16px.png true diff --git a/src/lay/lay/TechSetupDialog.ui b/src/lay/lay/TechSetupDialog.ui index 818fc0b07..71b39a402 100644 --- a/src/lay/lay/TechSetupDialog.ui +++ b/src/lay/lay/TechSetupDialog.ui @@ -112,7 +112,7 @@ ... - + :/add_16px.png:/add_16px.png @@ -126,7 +126,7 @@ ... - + :/clear_16px.png:/clear_16px.png @@ -303,7 +303,7 @@ buttonBox - + diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 8de679cd3..8bd49c256 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -175,7 +175,6 @@ SOURCES = \ RESOURCES = layBuildInMacros.qrc \ layMacroTemplates.qrc \ - layResources.qrc \ laySyntaxHighlighters.qrc \ laySaltTemplates.qrc \ diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui index a5651d155..00e834dce 100644 --- a/src/layui/layui/MarkerBrowserPage.ui +++ b/src/layui/layui/MarkerBrowserPage.ui @@ -498,7 +498,7 @@ - :/photo.png:/photo.png + :/photo_16px.png:/photo_16px.png @@ -563,7 +563,7 @@ p, li { white-space: pre-wrap; } - :/nophoto.png:/nophoto.png + :/nophoto_16px.png:/nophoto_16px.png