diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc index 10416a756..8df9edfa7 100644 --- a/src/edt/edt/edtPlugin.cc +++ b/src/edt/edt/edtPlugin.cc @@ -271,7 +271,7 @@ static tl::RegisteredClass config_decl2 ( "edt::Service(Boxes)" ); static tl::RegisteredClass config_decl3 ( - new edt::PluginDeclaration (tl::to_string (tr ("Texts")), "text:edit_mode\t" + tl::to_string (tr ("Text")) + "\t<:text.png>" + tl::to_string (tr ("{Create a text object}")), &get_text_options, &get_text_editor_options_pages), + new edt::PluginDeclaration (tl::to_string (tr ("Texts")), "text:edit_mode\t" + tl::to_string (tr ("Text")) + "\t<:text_24px.png>" + tl::to_string (tr ("{Create a text object}")), &get_text_options, &get_text_editor_options_pages), 4012, "edt::Service(Texts)" ); @@ -281,7 +281,7 @@ static tl::RegisteredClass config_decl4 ( "edt::Service(Paths)" ); static tl::RegisteredClass config_decl5 ( - new edt::PluginDeclaration (tl::to_string (tr ("Instances")), "instance:edit_mode\t" + tl::to_string (tr ("Instance")) + "\t<:instance.png>" + tl::to_string (tr ("{Create a cell instance}")), &get_inst_options, &get_inst_editor_options_pages), + new edt::PluginDeclaration (tl::to_string (tr ("Instances")), "instance:edit_mode\t" + tl::to_string (tr ("Instance")) + "\t<:instance_24px.png>" + tl::to_string (tr ("{Create a cell instance}")), &get_inst_options, &get_inst_editor_options_pages), 4020, "edt::Service(CellInstances)" ); diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 5aac1741e..268b16e74 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -75,7 +75,8 @@ images/down_16px@2x.png images/downdown_16px.png images/downdown_16px@2x.png - images/execmark.png + images/execmark_16px.png + images/execmark_16px@2x.png images/find_16px.png images/find_16px@2x.png images/fliph_16px.png @@ -101,7 +102,8 @@ images/import.png images/important_16px.png images/important_16px@2x.png - images/instance.png + images/instance_24px.png + images/instance_24px@2x.png images/invert_16px.png images/invert_16px@2x.png images/lb_31px.png @@ -205,8 +207,10 @@ images/singlestep_16px@2x.png images/stop_16px.png images/stop_16px@2x.png - images/techs.png - images/text.png + images/techs_24px.png + images/techs_24px@2x.png + images/text_24px.png + images/text_24px@2x.png images/textdocumenticon_16px.png images/textdocumenticon_16px@2x.png images/unchecked_16px.png diff --git a/src/icons/images/execmark.png b/src/icons/images/execmark.png deleted file mode 100644 index 496dbf140..000000000 Binary files a/src/icons/images/execmark.png and /dev/null differ diff --git a/src/icons/images/execmark_16px.png b/src/icons/images/execmark_16px.png new file mode 100644 index 000000000..0dc438f67 Binary files /dev/null and b/src/icons/images/execmark_16px.png differ diff --git a/src/icons/images/execmark_16px@2x.png b/src/icons/images/execmark_16px@2x.png new file mode 100644 index 000000000..5db7fedfd Binary files /dev/null and b/src/icons/images/execmark_16px@2x.png differ diff --git a/src/icons/images/instance.png b/src/icons/images/instance.png deleted file mode 100644 index 289c33615..000000000 Binary files a/src/icons/images/instance.png and /dev/null differ diff --git a/src/icons/images/instance_24px.png b/src/icons/images/instance_24px.png new file mode 100644 index 000000000..820f79c65 Binary files /dev/null and b/src/icons/images/instance_24px.png differ diff --git a/src/icons/images/instance_24px@2x.png b/src/icons/images/instance_24px@2x.png new file mode 100644 index 000000000..938554b07 Binary files /dev/null and b/src/icons/images/instance_24px@2x.png differ diff --git a/src/icons/images/techs.png b/src/icons/images/techs.png deleted file mode 100644 index 6762d4469..000000000 Binary files a/src/icons/images/techs.png and /dev/null differ diff --git a/src/icons/images/techs_24px.png b/src/icons/images/techs_24px.png new file mode 100644 index 000000000..9a73ce28f Binary files /dev/null and b/src/icons/images/techs_24px.png differ diff --git a/src/icons/images/techs_24px@2x.png b/src/icons/images/techs_24px@2x.png new file mode 100644 index 000000000..84163531f Binary files /dev/null and b/src/icons/images/techs_24px@2x.png differ diff --git a/src/icons/images/text.png b/src/icons/images/text.png deleted file mode 100644 index 1ed0aef6e..000000000 Binary files a/src/icons/images/text.png and /dev/null differ diff --git a/src/icons/images/text_24px.png b/src/icons/images/text_24px.png new file mode 100644 index 000000000..199cdead4 Binary files /dev/null and b/src/icons/images/text_24px.png differ diff --git a/src/icons/images/text_24px@2x.png b/src/icons/images/text_24px@2x.png new file mode 100644 index 000000000..758e75b91 Binary files /dev/null and b/src/icons/images/text_24px@2x.png differ diff --git a/src/icons/svg/execmark_16px.svg b/src/icons/svg/execmark_16px.svg new file mode 100644 index 000000000..54ff4ca7a --- /dev/null +++ b/src/icons/svg/execmark_16px.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/instance_24px.svg b/src/icons/svg/instance_24px.svg new file mode 100644 index 000000000..fb697b4d9 --- /dev/null +++ b/src/icons/svg/instance_24px.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + C + + diff --git a/src/icons/svg/techs_24px.svg b/src/icons/svg/techs_24px.svg new file mode 100644 index 000000000..cc80812a9 --- /dev/null +++ b/src/icons/svg/techs_24px.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + T + + diff --git a/src/icons/svg/text_24px.svg b/src/icons/svg/text_24px.svg new file mode 100644 index 000000000..6586435fe --- /dev/null +++ b/src/icons/svg/text_24px.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + A + + + + + + A + + diff --git a/src/lay/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui index e54cda3d3..21db4a07c 100644 --- a/src/lay/lay/SearchReplaceDialog.ui +++ b/src/lay/lay/SearchReplaceDialog.ui @@ -1,7 +1,8 @@ - + + SearchReplaceDialog - - + + 0 0 @@ -9,65 +10,63 @@ 590 - + Search and Replace - - - 9 - - + + 6 + + 9 + - - - - 5 - 5 + + + 0 1 - + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Qt::Horizontal - - + + 3 - - + + Find - - + + 9 - + 6 - + - + Qt::Vertical - + 20 40 @@ -75,81 +74,77 @@ - - - - <html><body>You can do much more with custom queries.<br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> + + + + <html><body>You can do much more with custom queries.<br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> - + true - - - + + + With ... - - - - + + + + - - - - - 5 - 0 + + + + 1 0 - - - + + + In ... - - - - - 7 - 0 + + + + 0 0 - - - + + + Object - - - - 0 - - + + + 6 + + 0 + - + Qt::Horizontal - + 40 20 @@ -158,46 +153,45 @@ - - - - 1 - 0 + + + 0 0 - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Find all</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Find all</p></body></html> - + Find - - :/run.png + + + :/run.png:/run.png - + true - + false - + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -207,33 +201,33 @@ p, li { white-space: pre-wrap; } - - + + Delete - - + + 9 - + 6 - - - - <html><body>You can do much more with custom queries. <br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> + + + + <html><body>You can do much more with custom queries. <br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> - + true - + - + Qt::Vertical - + 311 40 @@ -241,20 +235,20 @@ p, li { white-space: pre-wrap; } - - - - 0 - - + + + 6 + + 0 + - + Qt::Horizontal - + 20 20 @@ -263,86 +257,84 @@ p, li { white-space: pre-wrap; } - - + + Delete All - - :/runthis.png + + + :/runthis.png:/runthis.png - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Find all</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Find all</p></body></html> - + Select + Delete - - :/run.png + + + :/run.png:/run.png - + true - + false - - - + + + Object - - - - - 5 - 0 + + + + 1 0 - - - + + + In ... - - - - - 7 - 0 + + + + 0 0 - + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -350,89 +342,87 @@ p, li { white-space: pre-wrap; } - - - - + + + + - - - + + + With ... - - + + Replace - - + + 9 - + 6 - - - - <html><body>You can do much more with custom queries. <br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> + + + + <html><body>You can do much more with custom queries. <br/><a href="int:/about/custom_queries.xml">Click here for details</a>.</body></html> - + true - - - - - 5 - 0 + + + + 0 0 - - - + + + In ... - - - + + + Object - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + 40 20 @@ -441,33 +431,35 @@ p, li { white-space: pre-wrap; } - - + + Replace All - - :/runthis.png + + + :/runthis.png:/runthis.png - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Execute and ask on each action</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Execute and ask on each action</p></body></html> - + Select + Replace - - :/run.png + + + :/run.png:/run.png - + true - + false @@ -475,27 +467,25 @@ p, li { white-space: pre-wrap; } - - - - - 7 - 0 + + + + 1 0 - + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -503,43 +493,41 @@ p, li { white-space: pre-wrap; } - - - + + + With ... - - - - - 5 - 5 + + + + 0 1 - - + + - - - + + + Replace ... - + - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -547,53 +535,51 @@ p, li { white-space: pre-wrap; } - - - - - 5 - 5 + + + + 0 0 - - + + - - + + Custom - - + + 9 - + 6 - - - + + + Saved - - - + + + Recent - + - + Qt::Vertical - + 20 20 @@ -601,41 +587,41 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - - - - <html><body>Query (Search/Action) - <a href="int:/about/custom_queries.xml">Click here for details</a></body></html> + + + + <html><body>Query (Search/Action) - <a href="int:/about/custom_queries.xml">Click here for details</a></body></html> - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + 40 20 @@ -644,23 +630,24 @@ p, li { white-space: pre-wrap; } - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Execute and ask on each action</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Execute and ask on each action</p></body></html> - + Execute - - :/run.png + + + :/run.png:/run.png - + true - + false @@ -668,12 +655,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 16 20 @@ -681,66 +668,63 @@ p, li { white-space: pre-wrap; } - - - - - 5 - 0 + + + + 1 0 - - - - - 13 - 5 + + + + 0 0 - + QFrame::NoFrame - + QFrame::Raised - - + + 0 - + 6 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Save current query to list</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Save current query to list</p></body></html> - + Save - - :/add_16px.png + + + :/add_16px.png:/add_16px.png - + true - + - + Qt::Vertical - + 20 20 @@ -748,72 +732,75 @@ p, li { white-space: pre-wrap; } - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Rename saved query</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Rename saved query</p></body></html> - + ... - - :/rename.png + + + :/rename.png:/rename.png - + true - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remove from list</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remove from list</p></body></html> - + ... - - :/clear_16px.png + + + :/clear_16px.png:/clear_16px.png - + true - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Replace with current query</p></body></html> +</style></head><body style=" font-family:'Liberation Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Replace with current query</p></body></html> - + ... - - :/left_16px.png + + + :/left_16px.png:/left_16px.png - + true - - + + - - - + + + Liberation Mono @@ -823,61 +810,57 @@ p, li { white-space: pre-wrap; } - - - - 5 - 5 + + + 1 0 - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - - - 7 - 5 + + + 0 0 - + Results - - + + Export - + QToolButton::InstantPopup @@ -886,118 +869,118 @@ p, li { white-space: pre-wrap; } - - + + 1 - - - - 0 - - + + + 6 + + 0 + - - + + false - + QAbstractItemView::ExtendedSelection - + false - - - - 20 - - + + + 6 + + 20 + - - + + Press 'Find' button to show results - + Qt::AlignCenter - + true - - - - 20 - - + + + 6 + + 20 + - - + + Press 'Delete All' button to delete all selected items Press 'Select+Delete' button to show items found, select some and delete them - + Qt::AlignCenter - + true - - - - 20 - - + + + 6 + + 20 + - - + + Press 'Replace All' button to delete all selected items Press 'Select+Replace' button to show items found, select some and replace them - + Qt::AlignCenter - + true - - - - 20 - - + + + 6 + + 20 + - - + + Press 'Execute' button to execute the query - + Qt::AlignCenter @@ -1007,75 +990,77 @@ Press 'Select+Replace' button to show items found, select some and replace them< - - + + QFrame::StyledPanel - + QFrame::Raised - - + + 9 - + 6 - - - + + + Apply action ... - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Delete - - :/execmark.png + + + :/execmark_16px.png:/execmark_16px.png - - + + Replace - - :/execmark.png + + + :/execmark_16px.png:/execmark_16px.png - - + + Cancel - + Qt::Horizontal - + 40 10 @@ -1097,36 +1082,36 @@ Press 'Select+Replace' button to show items found, select some and replace them< - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Configure - + false - + Qt::Horizontal - + 40 20 @@ -1135,11 +1120,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< - - + + Close - + false @@ -1178,7 +1163,7 @@ Press 'Select+Replace' button to show items found, select some and replace them< results - + @@ -1187,11 +1172,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< SearchReplaceDialog accept() - + 829 589 - + 748 671 @@ -1203,11 +1188,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< find_properties setCurrentIndex(int) - + 149 79 - + 162 249 @@ -1219,11 +1204,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< delete_properties setCurrentIndex(int) - + 176 71 - + 190 232 @@ -1235,11 +1220,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< find_replace_properties setCurrentIndex(int) - + 141 75 - + 272 245 @@ -1251,11 +1236,11 @@ Press 'Select+Replace' button to show items found, select some and replace them< replace_properties setCurrentIndex(int) - + 203 75 - + 226 357 diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index 8bd49c256..8de679cd3 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -175,6 +175,7 @@ SOURCES = \ RESOURCES = layBuildInMacros.qrc \ layMacroTemplates.qrc \ + layResources.qrc \ laySyntaxHighlighters.qrc \ laySaltTemplates.qrc \ diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc index 42bfb4e60..7f18cd9bf 100644 --- a/src/lay/lay/layMacroEditorPage.cc +++ b/src/lay/lay/layMacroEditorPage.cc @@ -323,7 +323,7 @@ MacroEditorSidePanel::MacroEditorSidePanel (QWidget *parent, MacroEditorTextWidg : QWidget (parent), mp_text (text), mp_exec_model (exec_model), m_breakpoint_pixmap (QString::fromUtf8 (":/breakpointmark_16px.png")), m_breakpoint_disabled_pixmap (QString::fromUtf8 (":/breakpointmarkdisabled_16px.png")), - m_exec_point_pixmap (QString::fromUtf8 (":/execmark.png")), + m_exec_point_pixmap (QString::fromUtf8 (":/execmark_16px.png")), m_debugging_on (true) { connect (text, SIGNAL (contentsChanged ()), this, SLOT (redraw ())); diff --git a/src/lay/lay/layTechnologyController.cc b/src/lay/lay/layTechnologyController.cc index 51b2bceca..964b40199 100644 --- a/src/lay/lay/layTechnologyController.cc +++ b/src/lay/lay/layTechnologyController.cc @@ -117,7 +117,7 @@ void TechnologyController::get_menu_entries (std::vector &menu_entries) const { lay::PluginDeclaration::get_menu_entries (menu_entries); - menu_entries.push_back (lay::menu_item ("technology_selector:apply_technology", "technology_selector:tech_selector_group", "@toolbar.end", tl::to_string (QObject::tr ("Technology<:techs.png>{Select technology (click to apply)}")))); + menu_entries.push_back (lay::menu_item ("technology_selector:apply_technology", "technology_selector:tech_selector_group", "@toolbar.end", tl::to_string (QObject::tr ("Technology<:techs_24px.png>{Select technology (click to apply)}")))); } void