diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 159c94214..82a770a3e 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -57,7 +57,8 @@ images/ct_31px@2x.png images/dark_12px.png images/dark_12px@2x.png - images/defaultmacroicon.png + images/defaultmacroicon_16px.png + images/defaultmacroicon_16px@2x.png images/del_16px.png images/del_16px@2x.png images/del_24px.png @@ -78,8 +79,10 @@ images/forward_24px@2x.png images/forward_16px.png images/forward_16px@2x.png - images/generalmacroicon.png - images/generalmacroiconactive.png + images/generalmacroicon_16px.png + images/generalmacroicon_16px@2x.png + images/generalmacroiconactive_16px.png + images/generalmacroiconactive_16px@2x.png images/green_flag_16px.png images/green_flag_16px@2x.png images/help_16px.png @@ -157,10 +160,14 @@ images/rrotate_16px@2x.png images/rt_31px.png images/rt_31px@2x.png - images/rubymacroicon.png - images/rubymacroiconactive.png - images/pythonmacroicon.png - images/pythonmacroiconactive.png + images/rubymacroicon_16px.png + images/rubymacroicon_16px@2x.png + images/rubymacroiconactive_16px.png + images/rubymacroiconactive_16px@2x.png + images/pythonmacroicon_16px.png + images/pythonmacroicon_16px@2x.png + images/pythonmacroiconactive_16px.png + images/pythonmacroiconactive_16px@2x.png images/ruler.png images/debug.png images/bug.png @@ -178,7 +185,8 @@ images/stop_16px@2x.png images/techs.png images/text.png - images/textdocumenticon.png + images/textdocumenticon_16px.png + images/textdocumenticon_16px@2x.png images/unchecked.png images/up_16px.png images/up_16px@2x.png diff --git a/src/icons/images/defaultmacroicon.png b/src/icons/images/defaultmacroicon.png deleted file mode 100644 index 5d76f4a14..000000000 Binary files a/src/icons/images/defaultmacroicon.png and /dev/null differ diff --git a/src/icons/images/defaultmacroicon_16px.png b/src/icons/images/defaultmacroicon_16px.png new file mode 100644 index 000000000..1b1728383 Binary files /dev/null and b/src/icons/images/defaultmacroicon_16px.png differ diff --git a/src/icons/images/defaultmacroicon_16px@2x.png b/src/icons/images/defaultmacroicon_16px@2x.png new file mode 100644 index 000000000..1fc1eff1c Binary files /dev/null and b/src/icons/images/defaultmacroicon_16px@2x.png differ diff --git a/src/icons/images/generalmacroicon.png b/src/icons/images/generalmacroicon.png deleted file mode 100644 index b20708aba..000000000 Binary files a/src/icons/images/generalmacroicon.png and /dev/null differ diff --git a/src/icons/images/generalmacroicon_16px.png b/src/icons/images/generalmacroicon_16px.png new file mode 100644 index 000000000..cc240f6d9 Binary files /dev/null and b/src/icons/images/generalmacroicon_16px.png differ diff --git a/src/icons/images/generalmacroicon_16px@2x.png b/src/icons/images/generalmacroicon_16px@2x.png new file mode 100644 index 000000000..175dd7e07 Binary files /dev/null and b/src/icons/images/generalmacroicon_16px@2x.png differ diff --git a/src/icons/images/generalmacroiconactive.png b/src/icons/images/generalmacroiconactive.png deleted file mode 100644 index 2d28f2bd0..000000000 Binary files a/src/icons/images/generalmacroiconactive.png and /dev/null differ diff --git a/src/icons/images/generalmacroiconactive_16px.png b/src/icons/images/generalmacroiconactive_16px.png new file mode 100644 index 000000000..0ed31a194 Binary files /dev/null and b/src/icons/images/generalmacroiconactive_16px.png differ diff --git a/src/icons/images/generalmacroiconactive_16px@2x.png b/src/icons/images/generalmacroiconactive_16px@2x.png new file mode 100644 index 000000000..6e58560be Binary files /dev/null and b/src/icons/images/generalmacroiconactive_16px@2x.png differ diff --git a/src/icons/images/pythonmacroicon.png b/src/icons/images/pythonmacroicon.png deleted file mode 100644 index 5b1bc4270..000000000 Binary files a/src/icons/images/pythonmacroicon.png and /dev/null differ diff --git a/src/icons/images/pythonmacroicon_16px.png b/src/icons/images/pythonmacroicon_16px.png new file mode 100644 index 000000000..0b891c2f7 Binary files /dev/null and b/src/icons/images/pythonmacroicon_16px.png differ diff --git a/src/icons/images/pythonmacroicon_16px@2x.png b/src/icons/images/pythonmacroicon_16px@2x.png new file mode 100644 index 000000000..dd14a0ad5 Binary files /dev/null and b/src/icons/images/pythonmacroicon_16px@2x.png differ diff --git a/src/icons/images/pythonmacroiconactive.png b/src/icons/images/pythonmacroiconactive.png deleted file mode 100644 index e89c5fda6..000000000 Binary files a/src/icons/images/pythonmacroiconactive.png and /dev/null differ diff --git a/src/icons/images/pythonmacroiconactive_16px.png b/src/icons/images/pythonmacroiconactive_16px.png new file mode 100644 index 000000000..a9d81a50f Binary files /dev/null and b/src/icons/images/pythonmacroiconactive_16px.png differ diff --git a/src/icons/images/pythonmacroiconactive_16px@2x.png b/src/icons/images/pythonmacroiconactive_16px@2x.png new file mode 100644 index 000000000..509ce5182 Binary files /dev/null and b/src/icons/images/pythonmacroiconactive_16px@2x.png differ diff --git a/src/icons/images/rubymacroicon.png b/src/icons/images/rubymacroicon.png deleted file mode 100644 index dea2a9ab0..000000000 Binary files a/src/icons/images/rubymacroicon.png and /dev/null differ diff --git a/src/icons/images/rubymacroicon_16px.png b/src/icons/images/rubymacroicon_16px.png new file mode 100644 index 000000000..8317a9695 Binary files /dev/null and b/src/icons/images/rubymacroicon_16px.png differ diff --git a/src/icons/images/rubymacroicon_16px@2x.png b/src/icons/images/rubymacroicon_16px@2x.png new file mode 100644 index 000000000..a1bf27e43 Binary files /dev/null and b/src/icons/images/rubymacroicon_16px@2x.png differ diff --git a/src/icons/images/rubymacroiconactive.png b/src/icons/images/rubymacroiconactive.png deleted file mode 100644 index 207770215..000000000 Binary files a/src/icons/images/rubymacroiconactive.png and /dev/null differ diff --git a/src/icons/images/rubymacroiconactive_16px.png b/src/icons/images/rubymacroiconactive_16px.png new file mode 100644 index 000000000..6b848ed41 Binary files /dev/null and b/src/icons/images/rubymacroiconactive_16px.png differ diff --git a/src/icons/images/rubymacroiconactive_16px@2x.png b/src/icons/images/rubymacroiconactive_16px@2x.png new file mode 100644 index 000000000..b7a069435 Binary files /dev/null and b/src/icons/images/rubymacroiconactive_16px@2x.png differ diff --git a/src/icons/images/textdocumenticon.png b/src/icons/images/textdocumenticon.png deleted file mode 100644 index 1262af379..000000000 Binary files a/src/icons/images/textdocumenticon.png and /dev/null differ diff --git a/src/icons/images/textdocumenticon_16px.png b/src/icons/images/textdocumenticon_16px.png new file mode 100644 index 000000000..5abfe4218 Binary files /dev/null and b/src/icons/images/textdocumenticon_16px.png differ diff --git a/src/icons/images/textdocumenticon_16px@2x.png b/src/icons/images/textdocumenticon_16px@2x.png new file mode 100644 index 000000000..e98d4b4a3 Binary files /dev/null and b/src/icons/images/textdocumenticon_16px@2x.png differ diff --git a/src/icons/svg/defaultmacroicon_16px.svg b/src/icons/svg/defaultmacroicon_16px.svg new file mode 100644 index 000000000..c7a32056b --- /dev/null +++ b/src/icons/svg/defaultmacroicon_16px.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/generalmacroicon_16px.svg b/src/icons/svg/generalmacroicon_16px.svg new file mode 100644 index 000000000..61890992e --- /dev/null +++ b/src/icons/svg/generalmacroicon_16px.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/generalmacroiconactive_16px.svg b/src/icons/svg/generalmacroiconactive_16px.svg new file mode 100644 index 000000000..3d365c999 --- /dev/null +++ b/src/icons/svg/generalmacroiconactive_16px.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/pythonmacroicon_16px.svg b/src/icons/svg/pythonmacroicon_16px.svg new file mode 100644 index 000000000..564eda1ae --- /dev/null +++ b/src/icons/svg/pythonmacroicon_16px.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + py + py + + diff --git a/src/icons/svg/pythonmacroiconactive_16px.svg b/src/icons/svg/pythonmacroiconactive_16px.svg new file mode 100644 index 000000000..c7f5907d8 --- /dev/null +++ b/src/icons/svg/pythonmacroiconactive_16px.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + py + py + + diff --git a/src/icons/svg/rubymacroicon_16px.svg b/src/icons/svg/rubymacroicon_16px.svg new file mode 100644 index 000000000..1adca248e --- /dev/null +++ b/src/icons/svg/rubymacroicon_16px.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rb + rb + + diff --git a/src/icons/svg/rubymacroiconactive_16px.svg b/src/icons/svg/rubymacroiconactive_16px.svg new file mode 100644 index 000000000..223250fa8 --- /dev/null +++ b/src/icons/svg/rubymacroiconactive_16px.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rb + rb + + diff --git a/src/icons/svg/textdocumenticon_16px.svg b/src/icons/svg/textdocumenticon_16px.svg new file mode 100644 index 000000000..37857ac71 --- /dev/null +++ b/src/icons/svg/textdocumenticon_16px.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ab + ab + + diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui index c14d56af0..0e273ab7d 100644 --- a/src/lay/lay/MacroEditorDialog.ui +++ b/src/lay/lay/MacroEditorDialog.ui @@ -103,7 +103,7 @@ p, li { white-space: pre-wrap; } ... - + :/new_folder_16px.png:/new_folder_16px.png @@ -130,7 +130,7 @@ p, li { white-space: pre-wrap; } ... - + :/add_16px.png:/add_16px.png @@ -150,7 +150,7 @@ p, li { white-space: pre-wrap; } ... - + :/clear_16px.png:/clear_16px.png @@ -170,7 +170,7 @@ p, li { white-space: pre-wrap; } Rename - + :/rename.png:/rename.png @@ -190,7 +190,7 @@ p, li { white-space: pre-wrap; } Import - + :/import.png:/import.png @@ -214,7 +214,7 @@ p, li { white-space: pre-wrap; } ... - + :/save_all.png:/save_all.png @@ -234,7 +234,7 @@ p, li { white-space: pre-wrap; } ... - + :/save.png:/save.png @@ -333,7 +333,7 @@ p, li { white-space: pre-wrap; } ... - + :/back_16.png:/back_16.png @@ -347,7 +347,7 @@ p, li { white-space: pre-wrap; } ... - + :/forward_16.png:/forward_16.png @@ -374,7 +374,7 @@ p, li { white-space: pre-wrap; } close - + :/del_16px.png:/del_16px.png @@ -398,7 +398,7 @@ p, li { white-space: pre-wrap; } run - + :/run_16px.png:/run_16px.png @@ -418,7 +418,7 @@ p, li { white-space: pre-wrap; } ... - + :/runthis_16px.png:/runthis_16px.png @@ -441,7 +441,7 @@ p, li { white-space: pre-wrap; } ... - + :/stop_16px.png:/stop_16px.png @@ -461,7 +461,7 @@ p, li { white-space: pre-wrap; } ... - + :/pause_16px.png:/pause_16px.png @@ -491,7 +491,7 @@ p, li { white-space: pre-wrap; } ... - + :/breakpoint_16px.png:/breakpoint_16px.png @@ -514,7 +514,7 @@ p, li { white-space: pre-wrap; } ... - + :/clearbreakpoints_16px.png:/clearbreakpoints_16px.png @@ -544,7 +544,7 @@ p, li { white-space: pre-wrap; } S - + :/singlestep.png:/singlestep.png @@ -567,7 +567,7 @@ p, li { white-space: pre-wrap; } N - + :/nextstep.png:/nextstep.png @@ -597,7 +597,7 @@ p, li { white-space: pre-wrap; } DBG - + :/debug.png:/debug.png @@ -627,7 +627,7 @@ p, li { white-space: pre-wrap; } P - + :/properties_16px.png:/properties_16px.png @@ -647,7 +647,7 @@ p, li { white-space: pre-wrap; } prop - + :/setup_16px.png:/setup_16px.png @@ -683,7 +683,7 @@ p, li { white-space: pre-wrap; } N - + :/find.png:/find.png @@ -773,7 +773,7 @@ p, li { white-space: pre-wrap; } RN - + :/replace.png:/replace.png @@ -796,7 +796,7 @@ p, li { white-space: pre-wrap; } All - + :/replace_all.png:/replace_all.png @@ -820,7 +820,7 @@ p, li { white-space: pre-wrap; } Help - + :/help_16px.png:/help_16px.png @@ -1376,7 +1376,7 @@ p, li { white-space: pre-wrap; } - + :/new_folder_16px.png:/new_folder_16px.png @@ -1385,7 +1385,7 @@ p, li { white-space: pre-wrap; } - + :/add_16px.png:/add_16px.png @@ -1394,7 +1394,7 @@ p, li { white-space: pre-wrap; } - + :/clear_16px.png:/clear_16px.png @@ -1403,7 +1403,7 @@ p, li { white-space: pre-wrap; } - + :/rename.png:/rename.png @@ -1412,7 +1412,7 @@ p, li { white-space: pre-wrap; } - + :/import.png:/import.png @@ -1421,7 +1421,7 @@ p, li { white-space: pre-wrap; } - + :/save_all.png:/save_all.png @@ -1430,7 +1430,7 @@ p, li { white-space: pre-wrap; } - + :/save.png:/save.png @@ -1527,7 +1527,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/src/lay/lay/layMacroEditorTree.cc b/src/lay/lay/layMacroEditorTree.cc index b85111f78..45c754aaf 100644 --- a/src/lay/lay/layMacroEditorTree.cc +++ b/src/lay/lay/layMacroEditorTree.cc @@ -44,37 +44,37 @@ static QIcon tree_icon_for_format (const lym::Macro *m, bool active) { // TODO: create a nice icon for the DSL interpreted scripts if (m->interpreter () == lym::Macro::Text) { - return QIcon (QString::fromUtf8 (":/textdocumenticon.png")); + return QIcon (QString::fromUtf8 (":/textdocumenticon_16px.png")); } else if (m->interpreter () == lym::Macro::Ruby) { if (m->format () == lym::Macro::PlainTextFormat || m->format () == lym::Macro::PlainTextWithHashAnnotationsFormat) { if (active) { - return QIcon (QString::fromUtf8 (":/rubymacroiconactive.png")); + return QIcon (QString::fromUtf8 (":/rubymacroiconactive_16px.png")); } else { - return QIcon (QString::fromUtf8 (":/rubymacroicon.png")); + return QIcon (QString::fromUtf8 (":/rubymacroicon_16px.png")); } } else { if (active) { - return QIcon (QString::fromUtf8 (":/generalmacroiconactive.png")); + return QIcon (QString::fromUtf8 (":/generalmacroiconactive_16px.png")); } else { - return QIcon (QString::fromUtf8 (":/generalmacroicon.png")); + return QIcon (QString::fromUtf8 (":/generalmacroicon_16px.png")); } } } else if (m->interpreter () == lym::Macro::Python) { if (m->format () == lym::Macro::PlainTextFormat || m->format () == lym::Macro::PlainTextWithHashAnnotationsFormat) { if (active) { - return QIcon (QString::fromUtf8 (":/pythonmacroiconactive.png")); + return QIcon (QString::fromUtf8 (":/pythonmacroiconactive_16px.png")); } else { - return QIcon (QString::fromUtf8 (":/pythonmacroicon.png")); + return QIcon (QString::fromUtf8 (":/pythonmacroicon_16px.png")); } } else { if (active) { - return QIcon (QString::fromUtf8 (":/generalmacroiconactive.png")); + return QIcon (QString::fromUtf8 (":/generalmacroiconactive_16px.png")); } else { - return QIcon (QString::fromUtf8 (":/generalmacroicon.png")); + return QIcon (QString::fromUtf8 (":/generalmacroicon_16px.png")); } } } else { - return QIcon (QString::fromUtf8 (":/defaultmacroicon.png")); + return QIcon (QString::fromUtf8 (":/defaultmacroicon_16px.png")); } } @@ -586,6 +586,7 @@ MacroEditorTree::MacroEditorTree (QWidget *parent, const std::string &cat) setDragEnabled (true); setAcceptDrops (true); setDropIndicatorShown (true); + setIconSize (QSize (16, 16)); } void MacroEditorTree::model_macro_renamed (lym::Macro *macro)