diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index d7529a797..bfbe93beb 100644 --- a/src/edt/edt/EditorOptionsInst.ui +++ b/src/edt/edt/EditorOptionsInst.ui @@ -159,7 +159,7 @@ - :/find.png:/find.png + :/find_16px.png:/find_16px.png true diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 032de4114..8315c7ece 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -70,7 +70,8 @@ images/downdown_16px.png images/downdown_16px@2x.png images/execmark.png - images/find.png + images/find_16px.png + images/find_16px@2x.png images/fliph_16px.png images/fliph_16px@2x.png images/flipv_16px.png @@ -123,7 +124,8 @@ images/new_folder_16px@2x.png images/next_topic_24px.png images/next_topic_24px@2x.png - images/nextstep.png + images/nextstep_16px.png + images/nextstep_16px@2x.png images/no_flag_16px.png images/no_flag_16px@2x.png images/nophoto.png @@ -154,8 +156,10 @@ images/red_flag_16px.png images/red_flag_16px@2x.png images/rename.png - images/replace.png - images/replace_all.png + images/replace_16px.png + images/replace_16px@2x.png + images/replace_all_16px.png + images/replace_all_16px@2x.png images/right_16px.png images/right_16px@2x.png images/rotate_16px.png @@ -173,7 +177,8 @@ images/pythonmacroiconactive_16px.png images/pythonmacroiconactive_16px@2x.png images/ruler.png - images/debug.png + images/debug_16px.png + images/debug_16px@2x.png images/bug.png images/run_16px.png images/run_16px@2x.png @@ -184,7 +189,8 @@ images/select.png images/setup_16px.png images/setup_16px@2x.png - images/singlestep.png + images/singlestep_16px.png + images/singlestep_16px@2x.png images/stop_16px.png images/stop_16px@2x.png images/techs.png @@ -212,9 +218,12 @@ images/error2_16px@2x.png images/info_16px.png images/info_16px@2x.png - images/marked_24.png - images/marked_64.png - images/marked_16.png + images/marked_24px.png + images/marked_24px@2x.png + images/marked_64px.png + images/marked_64px@2x.png + images/marked_16px.png + images/marked_16px@2x.png images/folder_12px.png images/folder_12px@2x.png images/file_12px.png diff --git a/src/icons/images/debug.png b/src/icons/images/debug.png deleted file mode 100644 index d0f12c4c2..000000000 Binary files a/src/icons/images/debug.png and /dev/null differ diff --git a/src/icons/images/find.png b/src/icons/images/find.png deleted file mode 100644 index 2f2460004..000000000 Binary files a/src/icons/images/find.png and /dev/null differ diff --git a/src/icons/images/marked_16.png b/src/icons/images/marked_16.png deleted file mode 100644 index 777a625a7..000000000 Binary files a/src/icons/images/marked_16.png and /dev/null differ diff --git a/src/icons/images/marked_24.png b/src/icons/images/marked_24.png deleted file mode 100644 index b5ffcbd6b..000000000 Binary files a/src/icons/images/marked_24.png and /dev/null differ diff --git a/src/icons/images/marked_64.png b/src/icons/images/marked_64.png deleted file mode 100644 index afff90c70..000000000 Binary files a/src/icons/images/marked_64.png and /dev/null differ diff --git a/src/icons/images/nextstep.png b/src/icons/images/nextstep.png deleted file mode 100644 index f547dca5a..000000000 Binary files a/src/icons/images/nextstep.png and /dev/null differ diff --git a/src/icons/images/replace.png b/src/icons/images/replace.png deleted file mode 100644 index 6d45e8f26..000000000 Binary files a/src/icons/images/replace.png and /dev/null differ diff --git a/src/icons/images/replace_all.png b/src/icons/images/replace_all.png deleted file mode 100644 index b0530123e..000000000 Binary files a/src/icons/images/replace_all.png and /dev/null differ diff --git a/src/icons/images/singlestep.png b/src/icons/images/singlestep.png deleted file mode 100644 index 61c240352..000000000 Binary files a/src/icons/images/singlestep.png and /dev/null differ diff --git a/src/icons/svg/debug_16px.svg b/src/icons/svg/debug_16px.svg new file mode 100644 index 000000000..e02a48be9 --- /dev/null +++ b/src/icons/svg/debug_16px.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/find_16px.svg b/src/icons/svg/find_16px.svg new file mode 100644 index 000000000..e05c4c367 --- /dev/null +++ b/src/icons/svg/find_16px.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/marked_16px.svg b/src/icons/svg/marked_16px.svg new file mode 100644 index 000000000..28b30347a --- /dev/null +++ b/src/icons/svg/marked_16px.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/marked_24px.svg b/src/icons/svg/marked_24px.svg new file mode 100644 index 000000000..a335147f9 --- /dev/null +++ b/src/icons/svg/marked_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/marked_64px.svg b/src/icons/svg/marked_64px.svg new file mode 100644 index 000000000..31099572a --- /dev/null +++ b/src/icons/svg/marked_64px.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/nextstep_16px.svg b/src/icons/svg/nextstep_16px.svg new file mode 100644 index 000000000..a3051cbc7 --- /dev/null +++ b/src/icons/svg/nextstep_16px.svg @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/replace_16px.svg b/src/icons/svg/replace_16px.svg new file mode 100644 index 000000000..49541cb86 --- /dev/null +++ b/src/icons/svg/replace_16px.svg @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/replace_all_16px.svg b/src/icons/svg/replace_all_16px.svg new file mode 100644 index 000000000..db438c646 --- /dev/null +++ b/src/icons/svg/replace_all_16px.svg @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/singlestep_16px.svg b/src/icons/svg/singlestep_16px.svg new file mode 100644 index 000000000..f57c52204 --- /dev/null +++ b/src/icons/svg/singlestep_16px.svg @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lay/lay/CustomizeMenuConfigPage.ui b/src/lay/lay/CustomizeMenuConfigPage.ui index 78ee4529d..e445e2755 100644 --- a/src/lay/lay/CustomizeMenuConfigPage.ui +++ b/src/lay/lay/CustomizeMenuConfigPage.ui @@ -195,7 +195,7 @@ For special keys: - :/find.png + :/find_16px.png diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui index 0e273ab7d..4a18b2856 100644 --- a/src/lay/lay/MacroEditorDialog.ui +++ b/src/lay/lay/MacroEditorDialog.ui @@ -545,7 +545,7 @@ p, li { white-space: pre-wrap; } - :/singlestep.png:/singlestep.png + :/singlestep_16px.png:/singlestep_16px.png F11 @@ -568,7 +568,7 @@ p, li { white-space: pre-wrap; } - :/nextstep.png:/nextstep.png + :/nextstep_16px.png:/nextstep_16px.png F10 @@ -598,7 +598,7 @@ p, li { white-space: pre-wrap; } - :/debug.png:/debug.png + :/debug_16px.png:/debug_16px.png true @@ -684,7 +684,7 @@ p, li { white-space: pre-wrap; } - :/find.png:/find.png + :/find_16px.png:/find_16px.png F3 @@ -774,7 +774,7 @@ p, li { white-space: pre-wrap; } - :/replace.png:/replace.png + :/replace_16px.png:/replace_16px.png @@ -797,7 +797,7 @@ p, li { white-space: pre-wrap; } - :/replace_all.png:/replace_all.png + :/replace_all_16px.png:/replace_all_16px.png true diff --git a/src/lay/lay/SaltManagerDialog.ui b/src/lay/lay/SaltManagerDialog.ui index d82099633..eaf406944 100644 --- a/src/lay/lay/SaltManagerDialog.ui +++ b/src/lay/lay/SaltManagerDialog.ui @@ -77,7 +77,7 @@ - :/marked_16.png:/marked_16.png + :/marked_16px.png:/marked_16px.png true @@ -103,7 +103,7 @@ - :/find.png + :/find_16px.png @@ -376,7 +376,7 @@ - :/marked_16.png:/marked_16.png + :/marked_16px.png:/marked_16px.png true @@ -402,7 +402,7 @@ - :/find.png + :/find_16px.png @@ -690,7 +690,7 @@ - :/find.png + :/find_16px.png diff --git a/src/lay/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc index 4c0f84de9..2d840392f 100644 --- a/src/lay/lay/laySaltDownloadManager.cc +++ b/src/lay/lay/laySaltDownloadManager.cc @@ -114,7 +114,7 @@ ConfirmationDialog::mark_error (const std::string &name) void ConfirmationDialog::mark_success (const std::string &name) { - set_icon_for_name (name, QIcon (QString::fromUtf8 (":/marked_16.png"))); + set_icon_for_name (name, QIcon (QString::fromUtf8 (":/marked_16px.png"))); std::map::const_iterator i = m_items_by_name.find (name); if (i != m_items_by_name.end ()) { diff --git a/src/lay/lay/laySaltModel.cc b/src/lay/lay/laySaltModel.cc index e72ccae2b..520f72395 100644 --- a/src/lay/lay/laySaltModel.cc +++ b/src/lay/lay/laySaltModel.cc @@ -155,7 +155,7 @@ SaltModel::data (const QModelIndex &index, int role) const if (m_marked.find (g->name ()) != m_marked.end ()) { QPainter painter (&img); - QImage warn (":/marked_64.png"); + QImage warn (":/marked_64px.png"); painter.drawImage (0, 0, warn); } diff --git a/src/layui/layui/BrowserPanel.ui b/src/layui/layui/BrowserPanel.ui index 74e1d2aeb..c6cc0d220 100644 --- a/src/layui/layui/BrowserPanel.ui +++ b/src/layui/layui/BrowserPanel.ui @@ -224,7 +224,7 @@ - :/find.png:/find.png + :/find_16px.png:/find_16px.png true @@ -389,7 +389,7 @@ - :/find.png:/find.png + :/find_16px.png:/find_16px.png true diff --git a/src/layui/layui/CellSelectionForm.ui b/src/layui/layui/CellSelectionForm.ui index 386813c9d..56f67ab88 100644 --- a/src/layui/layui/CellSelectionForm.ui +++ b/src/layui/layui/CellSelectionForm.ui @@ -286,7 +286,7 @@ - :/find.png:/find.png + :/find_16px.png:/find_16px.png true diff --git a/src/layui/layui/LibraryCellSelectionForm.ui b/src/layui/layui/LibraryCellSelectionForm.ui index 0664aec43..278a2b57f 100644 --- a/src/layui/layui/LibraryCellSelectionForm.ui +++ b/src/layui/layui/LibraryCellSelectionForm.ui @@ -102,7 +102,7 @@ p, li { white-space: pre-wrap; } ... - :/find.png + :/find_16px.png true diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui index 627ea3381..7d88a98b4 100644 --- a/src/layui/layui/MarkerBrowserPage.ui +++ b/src/layui/layui/MarkerBrowserPage.ui @@ -188,7 +188,7 @@ - :/find.png + :/find_16px.png diff --git a/src/layui/layui/NetlistBrowserPage.ui b/src/layui/layui/NetlistBrowserPage.ui index f43cde269..6874d6910 100644 --- a/src/layui/layui/NetlistBrowserPage.ui +++ b/src/layui/layui/NetlistBrowserPage.ui @@ -190,7 +190,7 @@ - :/find.png:/find.png + :/find_16px.png:/find_16px.png true diff --git a/src/layui/layui/layHierarchyControlPanel.cc b/src/layui/layui/layHierarchyControlPanel.cc index e3ad5ce34..735e9e406 100644 --- a/src/layui/layui/layHierarchyControlPanel.cc +++ b/src/layui/layui/layHierarchyControlPanel.cc @@ -299,7 +299,7 @@ HierarchyControlPanel::HierarchyControlPanel (lay::LayoutViewBase *view, QWidget QToolButton *sf_next = new QToolButton (mp_search_frame); sf_next->setAutoRaise (true); sf_next->setToolTip (tr ("Find next")); - sf_next->setIcon (QIcon (QString::fromUtf8 (":/find.png"))); + sf_next->setIcon (QIcon (QString::fromUtf8 (":/find_16px.png"))); connect (sf_next, SIGNAL (clicked ()), this, SLOT (search_next ())); sf_ly->addWidget (sf_next); diff --git a/src/layui/layui/layLayerControlPanel.cc b/src/layui/layui/layLayerControlPanel.cc index 17ea16f53..e223ba989 100644 --- a/src/layui/layui/layLayerControlPanel.cc +++ b/src/layui/layui/layLayerControlPanel.cc @@ -288,7 +288,7 @@ LayerControlPanel::LayerControlPanel (lay::LayoutViewBase *view, db::Manager *ma QToolButton *sf_next = new QToolButton (mp_search_frame); sf_next->setAutoRaise (true); sf_next->setToolTip (tr ("Find next")); - sf_next->setIcon (QIcon (QString::fromUtf8 (":/find.png"))); + sf_next->setIcon (QIcon (QString::fromUtf8 (":/find_16px.png"))); connect (sf_next, SIGNAL (clicked ()), this, SLOT (search_next ())); sf_ly->addWidget (sf_next); diff --git a/src/layui/layui/layLibrariesView.cc b/src/layui/layui/layLibrariesView.cc index 2862fbc05..d7bdebce1 100644 --- a/src/layui/layui/layLibrariesView.cc +++ b/src/layui/layui/layLibrariesView.cc @@ -286,7 +286,7 @@ LibrariesView::LibrariesView (lay::LayoutViewBase *view, QWidget *parent, const QToolButton *sf_next = new QToolButton (mp_search_frame); sf_next->setAutoRaise (true); sf_next->setToolTip (tr ("Find next")); - sf_next->setIcon (QIcon (QString::fromUtf8 (":/find.png"))); + sf_next->setIcon (QIcon (QString::fromUtf8 (":/find_16px.png"))); connect (sf_next, SIGNAL (clicked ()), this, SLOT (search_next ())); sf_ly->addWidget (sf_next);