diff --git a/src/ant/ant/RulerConfigPage4.ui b/src/ant/ant/RulerConfigPage4.ui index 9e3f13904..384f15c4c 100644 --- a/src/ant/ant/RulerConfigPage4.ui +++ b/src/ant/ant/RulerConfigPage4.ui @@ -104,7 +104,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png @@ -118,7 +118,7 @@ - :/del.png:/del.png + :/del_16px.png:/del_16px.png diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index c020690d8..80edd91ad 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -1,6 +1,9 @@ - images/add.png + images/add_16px.png + images/add_16px@2x.png + images/add_24px.png + images/add_24px@2x.png images/edit.png images/align_bottom.png images/align_hcenter.png @@ -23,7 +26,10 @@ images/cb.png images/cc.png images/checked.png - images/clear.png + images/clear_16px.png + images/clear_16px@2x.png + images/clear_24px.png + images/clear_24px@2x.png images/clear_edit.png images/clearbreakpoints.png images/close.png @@ -35,7 +41,10 @@ images/ct.png images/dark.png images/defaultmacroicon.png - images/del.png + images/del_16px.png + images/del_16px@2x.png + images/del_24px.png + images/del_24px@2x.png images/down.png images/downdown.png images/execmark.png diff --git a/src/icons/images/add_16px.png b/src/icons/images/add_16px.png new file mode 100644 index 000000000..6332c7981 Binary files /dev/null and b/src/icons/images/add_16px.png differ diff --git a/src/icons/images/add_16px@2x.png b/src/icons/images/add_16px@2x.png new file mode 100644 index 000000000..f659e088c Binary files /dev/null and b/src/icons/images/add_16px@2x.png differ diff --git a/src/icons/images/add_24px.png b/src/icons/images/add_24px.png new file mode 100644 index 000000000..dd8397489 Binary files /dev/null and b/src/icons/images/add_24px.png differ diff --git a/src/icons/images/add_24px@2x.png b/src/icons/images/add_24px@2x.png new file mode 100644 index 000000000..5d555ecb6 Binary files /dev/null and b/src/icons/images/add_24px@2x.png differ diff --git a/src/icons/images/clear_16px.png b/src/icons/images/clear_16px.png new file mode 100644 index 000000000..1e090d405 Binary files /dev/null and b/src/icons/images/clear_16px.png differ diff --git a/src/icons/images/clear_16px@2x.png b/src/icons/images/clear_16px@2x.png new file mode 100644 index 000000000..35eaf23fc Binary files /dev/null and b/src/icons/images/clear_16px@2x.png differ diff --git a/src/icons/images/clear_24px.png b/src/icons/images/clear_24px.png new file mode 100644 index 000000000..bd360bdbc Binary files /dev/null and b/src/icons/images/clear_24px.png differ diff --git a/src/icons/images/clear_24px@2x.png b/src/icons/images/clear_24px@2x.png new file mode 100644 index 000000000..d72e1fa04 Binary files /dev/null and b/src/icons/images/clear_24px@2x.png differ diff --git a/src/icons/images/del_16px.png b/src/icons/images/del_16px.png new file mode 100644 index 000000000..b3d3e6914 Binary files /dev/null and b/src/icons/images/del_16px.png differ diff --git a/src/icons/images/del_16px@2x.png b/src/icons/images/del_16px@2x.png new file mode 100644 index 000000000..1fd064682 Binary files /dev/null and b/src/icons/images/del_16px@2x.png differ diff --git a/src/icons/images/del_24px.png b/src/icons/images/del_24px.png new file mode 100644 index 000000000..9dac877ff Binary files /dev/null and b/src/icons/images/del_24px.png differ diff --git a/src/icons/images/del_24px@2x.png b/src/icons/images/del_24px@2x.png new file mode 100644 index 000000000..a3d85fa5b Binary files /dev/null and b/src/icons/images/del_24px@2x.png differ diff --git a/src/icons/svg/add_16px.svg b/src/icons/svg/add_16px.svg new file mode 100644 index 000000000..aac4ce108 --- /dev/null +++ b/src/icons/svg/add_16px.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/add_24px.svg b/src/icons/svg/add_24px.svg new file mode 100644 index 000000000..de08d6d4e --- /dev/null +++ b/src/icons/svg/add_24px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/clear_16px.svg b/src/icons/svg/clear_16px.svg new file mode 100644 index 000000000..baa04f017 --- /dev/null +++ b/src/icons/svg/clear_16px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/clear_24px.svg b/src/icons/svg/clear_24px.svg new file mode 100644 index 000000000..5739b075c --- /dev/null +++ b/src/icons/svg/clear_24px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/del_16px.svg b/src/icons/svg/del_16px.svg new file mode 100644 index 000000000..2bc4f2ea3 --- /dev/null +++ b/src/icons/svg/del_16px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/del_24px.svg b/src/icons/svg/del_24px.svg new file mode 100644 index 000000000..808fdb486 --- /dev/null +++ b/src/icons/svg/del_24px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/make_png.sh b/src/icons/svg/make_png.sh index 32f5d777c..32f9ad885 100755 --- a/src/icons/svg/make_png.sh +++ b/src/icons/svg/make_png.sh @@ -7,11 +7,15 @@ for svg_file in *.svg; do png_file=${output}/${svg_file/.svg/.png} png_file_2x=${output}/${svg_file/.svg/@2x.png} - echo "Converting $svg_file to $png_file .." - inkscape -o ${png_file} ${svg_file} -d 96 -C + if ! [ -e ${png_file} ] || [ ${svg_file} -nt ${png_file} ]; then + echo "Converting $svg_file to $png_file .." + inkscape -o ${png_file} ${svg_file} -d 96 -C + fi - echo "Converting $svg_file to $png_file_2x .." - inkscape -o ${png_file_2x} ${svg_file} -d 192 -C + if ! [ -e ${png_file_2x} ] || [ ${svg_file} -nt ${png_file_2x} ]; then + echo "Converting $svg_file to $png_file_2x .." + inkscape -o ${png_file_2x} ${svg_file} -d 192 -C + fi done diff --git a/src/img/img/ImageLandmarksDialog.ui b/src/img/img/ImageLandmarksDialog.ui index f4dea304b..b6e3bb660 100644 --- a/src/img/img/ImageLandmarksDialog.ui +++ b/src/img/img/ImageLandmarksDialog.ui @@ -106,7 +106,7 @@ Add - :/add.png + :/add_16px.png true @@ -136,7 +136,7 @@ Delete - :/clear.png + :/clear_16px.png true diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui index 22b5dd627..01c5917c0 100644 --- a/src/lay/lay/MacroEditorDialog.ui +++ b/src/lay/lay/MacroEditorDialog.ui @@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; } - :/add.png:/add.png + :/add_16px.png:/add_16px.png true @@ -151,7 +151,7 @@ p, li { white-space: pre-wrap; } - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png true @@ -375,7 +375,7 @@ p, li { white-space: pre-wrap; } - :/del.png:/del.png + :/del_16px.png:/del_16px.png true @@ -1386,7 +1386,7 @@ p, li { white-space: pre-wrap; } - :/add.png:/add.png + :/add_16px.png:/add_16px.png New @@ -1395,7 +1395,7 @@ p, li { white-space: pre-wrap; } - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png Delete diff --git a/src/lay/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui index 67551b8e7..2ff5a7cb3 100644 --- a/src/lay/lay/SaltGrainPropertiesDialog.ui +++ b/src/lay/lay/SaltGrainPropertiesDialog.ui @@ -179,7 +179,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png true @@ -196,7 +196,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png true @@ -390,7 +390,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png diff --git a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui index 65406eb88..c5baf1b4c 100644 --- a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui +++ b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui @@ -156,7 +156,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png New @@ -168,7 +168,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png Delete diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui index b37c0c65e..856193f5c 100644 --- a/src/lay/lay/SaltManagerDialog.ui +++ b/src/lay/lay/SaltManagerDialog.ui @@ -871,7 +871,7 @@ <table> <tr><td>The "Install New Packages" tab to install a package<br/>from an external repository</td></tr> <tr></tr> - <tr><td>The <a href=":add"><img src=":/add.png"></a> button to create a new package</td></tr> + <tr><td>The <a href=":add"><img src=":/add_16px.png"></a> button to create a new package</td></tr> </table> </body></html> @@ -1013,7 +1013,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png @@ -1037,7 +1037,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png false @@ -1062,7 +1062,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png New @@ -1074,7 +1074,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png Remove Package @@ -1134,7 +1134,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png Create (edit) package diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui index 87c932dd4..1aec709fe 100644 --- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui +++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui @@ -336,7 +336,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png New @@ -348,7 +348,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png Delete diff --git a/src/lay/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui index 67a89a6ca..4c26a1cb5 100644 --- a/src/lay/lay/SearchReplaceDialog.ui +++ b/src/lay/lay/SearchReplaceDialog.ui @@ -728,7 +728,7 @@ p, li { white-space: pre-wrap; } Save - :/add.png + :/add_16px.png true @@ -779,7 +779,7 @@ p, li { white-space: pre-wrap; } ... - :/clear.png + :/clear_16px.png true diff --git a/src/lay/lay/TechSetupDialog.ui b/src/lay/lay/TechSetupDialog.ui index 56a85c4d9..818fc0b07 100644 --- a/src/lay/lay/TechSetupDialog.ui +++ b/src/lay/lay/TechSetupDialog.ui @@ -113,7 +113,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png true @@ -127,7 +127,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png true diff --git a/src/lay/lay/laySaltGrainPropertiesDialog.cc b/src/lay/lay/laySaltGrainPropertiesDialog.cc index ee31b2dae..64899c07a 100644 --- a/src/lay/lay/laySaltGrainPropertiesDialog.cc +++ b/src/lay/lay/laySaltGrainPropertiesDialog.cc @@ -208,7 +208,7 @@ void SaltGrainPropertiesDialog::update_screenshot () { if (m_grain.screenshot ().isNull ()) { - screenshot_config_button->setIcon (QIcon (":/add.png")); + screenshot_config_button->setIcon (QIcon (":/add_16px.png")); } else { QImage img = m_grain.screenshot (); if (img.width () == screenshot_config_button->iconSize ().width ()) { diff --git a/src/layui/layui/EditLineStylesForm.ui b/src/layui/layui/EditLineStylesForm.ui index 49b6d48e9..35c34c084 100644 --- a/src/layui/layui/EditLineStylesForm.ui +++ b/src/layui/layui/EditLineStylesForm.ui @@ -392,7 +392,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png diff --git a/src/layui/layui/EditStipplesForm.ui b/src/layui/layui/EditStipplesForm.ui index 2f8b473ba..3b6219dd3 100644 --- a/src/layui/layui/EditStipplesForm.ui +++ b/src/layui/layui/EditStipplesForm.ui @@ -377,7 +377,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png diff --git a/src/layui/layui/LayerMappingWidget.ui b/src/layui/layui/LayerMappingWidget.ui index 03855fa9a..6e87d18da 100644 --- a/src/layui/layui/LayerMappingWidget.ui +++ b/src/layui/layui/LayerMappingWidget.ui @@ -103,7 +103,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png @@ -117,7 +117,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png diff --git a/src/layui/layui/UserPropertiesForm.ui b/src/layui/layui/UserPropertiesForm.ui index 6e78a8964..d6c767157 100644 --- a/src/layui/layui/UserPropertiesForm.ui +++ b/src/layui/layui/UserPropertiesForm.ui @@ -123,7 +123,7 @@ - :/del.png:/del.png + :/del_16px.png:/del_16px.png @@ -134,7 +134,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui index 7e3482704..448c7a7b1 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui @@ -191,7 +191,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png @@ -205,7 +205,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index de17b4e9a..9bb3c9f6e 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -251,7 +251,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png @@ -265,7 +265,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png @@ -341,7 +341,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png @@ -355,7 +355,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png diff --git a/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui b/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui index d2fbf099b..efc870079 100644 --- a/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui +++ b/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui @@ -148,7 +148,7 @@ - :/clear.png:/clear.png + :/clear_16px.png:/clear_16px.png @@ -176,7 +176,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png diff --git a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui index f47f3ff1d..d1a85bc2b 100644 --- a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui +++ b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui @@ -261,7 +261,7 @@ surface. ... - :/clear.png + :/clear_16px.png Del @@ -277,7 +277,7 @@ surface. ... - :/add.png + :/add_16px.png Return @@ -602,7 +602,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/add.png + :/add_16px.png Return @@ -634,7 +634,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/clear.png + :/clear_16px.png Del @@ -736,7 +736,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/clear.png + :/clear_16px.png Del @@ -752,7 +752,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/add.png + :/add_16px.png Return @@ -791,7 +791,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/clear.png + :/clear_16px.png Del diff --git a/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui b/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui index 2fc2aa3ef..adfc6057c 100644 --- a/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui +++ b/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui @@ -107,7 +107,7 @@ ... - :/del.png + :/del_16px.png Del @@ -139,7 +139,7 @@ ... - :/add.png + :/add_16px.png Return @@ -257,7 +257,7 @@ ... - :/del.png + :/del_16px.png Del @@ -288,7 +288,7 @@ ... - :/add.png + :/add_16px.png Return