diff --git a/scripts/compile_glyphs.rb b/scripts/compile_glyphs.rb index ff8d23576..f9e185c4b 100755 --- a/scripts/compile_glyphs.rb +++ b/scripts/compile_glyphs.rb @@ -1,5 +1,12 @@ #!/usr/bin/ruby +# Synopsis: +# +# compile_glyphs.rb +# +# This script generates the src/db/db/glyphs.cc text generator's font definitions +# from the GDS files placed inside the src/db/db/glyphs folder. + files = [] glyph_dir = File.join(File.dirname($0), "..", "src", "db", "db", "glyphs") diff --git a/scripts/create_drc_samples.rb b/scripts/drc_lvs_doc/create_drc_samples.rb similarity index 99% rename from scripts/create_drc_samples.rb rename to scripts/drc_lvs_doc/create_drc_samples.rb index fb35b1a5a..5594555be 100644 --- a/scripts/create_drc_samples.rb +++ b/scripts/drc_lvs_doc/create_drc_samples.rb @@ -5,7 +5,7 @@ class QRCGenerator def res_path - "src/lay/lay" + "src/doc" end def img_path @@ -13,7 +13,7 @@ class QRCGenerator end def initialize - @path = res_path + "/" + "layDRCLVSHelpResources.qrc" + @path = res_path + "/" + "docDRCLVSResources.qrc" @file = File.open(@path, "w") @file.puts("") @file.puts(" ") diff --git a/scripts/extract_doc.rb b/scripts/drc_lvs_doc/extract_doc.rb similarity index 99% rename from scripts/extract_doc.rb rename to scripts/drc_lvs_doc/extract_doc.rb index f5338b5ac..cbbc4f42f 100755 --- a/scripts/extract_doc.rb +++ b/scripts/drc_lvs_doc/extract_doc.rb @@ -5,7 +5,7 @@ $script_call = $0 + " " + ARGV.join(" ") $indirs = [ "src/drc/drc/built-in-macros", "src/lvs/lvs/built-in-macros" ] $loc = "about" -$outfiles = "src/lay/lay/doc" +$outfiles = "src/doc/doc" def create_ref(mod, s) if s =~ /(.*)::(.*)#(.*)/ diff --git a/scripts/klayoutrc_drc_samples b/scripts/drc_lvs_doc/klayoutrc_drc_samples similarity index 100% rename from scripts/klayoutrc_drc_samples rename to scripts/drc_lvs_doc/klayoutrc_drc_samples diff --git a/scripts/make_drc_lvs_doc.sh b/scripts/make_drc_lvs_doc.sh index c03fcc593..5394d476e 100755 --- a/scripts/make_drc_lvs_doc.sh +++ b/scripts/make_drc_lvs_doc.sh @@ -1,14 +1,27 @@ -#!/bin/sh -e +#!/bin/bash -e inst=$(realpath $(dirname $0)) +scripts=${inst}/drc_lvs_doc ld=$(realpath .) bin="$ld/klayout" export LD_LIBRARY_PATH=$ld +export KLAYOUT_HOME=/dev/null + +doc_src=../src/doc/doc +if ! [ -e $doc_src ]; then + echo "*** ERROR: missing doc sources ($doc_src) - did you run the script from the build folder below the source tree?" + exit 1 +fi + +if ! [ -e $bin ]; then + echo "*** ERROR: missing klayout binary ($bin) - did you run the script from the build folder?" + exit 1 +fi cd $inst/.. -$bin -z -r $inst/create_drc_samples.rb -t -c $inst/klayoutrc_drc_samples -$inst/extract_doc.rb +$bin -z -r ${scripts}/create_drc_samples.rb -t -c ${scripts}/klayoutrc_drc_samples +${scripts}/extract_doc.rb diff --git a/src/ant/ant/RulerConfigPage4.ui b/src/ant/ant/RulerConfigPage4.ui index 9e3f13904..ac380684e 100644 --- a/src/ant/ant/RulerConfigPage4.ui +++ b/src/ant/ant/RulerConfigPage4.ui @@ -90,7 +90,7 @@ - :/up.png:/up.png + :/up_16px.png:/up_16px.png @@ -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 @@ -132,7 +132,7 @@ - :/down.png:/down.png + :/down_16px.png:/down_16px.png diff --git a/src/ant/ant/antPlugin.cc b/src/ant/ant/antPlugin.cc index aa942aeac..fda6d5b8a 100644 --- a/src/ant/ant/antPlugin.cc +++ b/src/ant/ant/antPlugin.cc @@ -151,7 +151,7 @@ PluginDeclaration::implements_editable (std::string &title) const bool PluginDeclaration::implements_mouse_mode (std::string &title) const { - title = "ruler:ruler_mode_group:ruler_templates_group\t" + tl::to_string (tr ("Ruler{Add rulers and annotations}")) + "<:ruler.png>"; + title = "ruler:ruler_mode_group:ruler_templates_group\t" + tl::to_string (tr ("Ruler{Add rulers and annotations}")) + "<:ruler_24px.png>"; return true; } diff --git a/src/doc/doc.pro b/src/doc/doc.pro new file mode 100644 index 000000000..c1caf249f --- /dev/null +++ b/src/doc/doc.pro @@ -0,0 +1,19 @@ + +DESTDIR = $$OUT_PWD/.. +TARGET = klayout_doc + +include($$PWD/../lib.pri) + +DEFINES += MAKE_DOC_LIBRARY + +HEADERS = \ + +FORMS = \ + +SOURCES = \ + docForceLink.cc \ + +RESOURCES = \ + docResources.qrc \ + docDRCLVSResources.qrc \ + diff --git a/src/lay/lay/doc/about/25d_screenshot.png b/src/doc/doc/about/25d_screenshot.png similarity index 100% rename from src/lay/lay/doc/about/25d_screenshot.png rename to src/doc/doc/about/25d_screenshot.png diff --git a/src/lay/lay/doc/about/25d_screenshot2.png b/src/doc/doc/about/25d_screenshot2.png similarity index 100% rename from src/lay/lay/doc/about/25d_screenshot2.png rename to src/doc/doc/about/25d_screenshot2.png diff --git a/src/lay/lay/doc/about/25d_view.xml b/src/doc/doc/about/25d_view.xml similarity index 100% rename from src/lay/lay/doc/about/25d_view.xml rename to src/doc/doc/about/25d_view.xml diff --git a/src/lay/lay/doc/about/about_libraries.xml b/src/doc/doc/about/about_libraries.xml similarity index 100% rename from src/lay/lay/doc/about/about_libraries.xml rename to src/doc/doc/about/about_libraries.xml diff --git a/src/lay/lay/doc/about/about_pcells.xml b/src/doc/doc/about/about_pcells.xml similarity index 100% rename from src/lay/lay/doc/about/about_pcells.xml rename to src/doc/doc/about/about_pcells.xml diff --git a/src/lay/lay/doc/about/basic_lib.xml b/src/doc/doc/about/basic_lib.xml similarity index 100% rename from src/lay/lay/doc/about/basic_lib.xml rename to src/doc/doc/about/basic_lib.xml diff --git a/src/lay/lay/doc/about/basic_text.png b/src/doc/doc/about/basic_text.png similarity index 100% rename from src/lay/lay/doc/about/basic_text.png rename to src/doc/doc/about/basic_text.png diff --git a/src/lay/lay/doc/about/connectivity.xml b/src/doc/doc/about/connectivity.xml similarity index 100% rename from src/lay/lay/doc/about/connectivity.xml rename to src/doc/doc/about/connectivity.xml diff --git a/src/lay/lay/doc/about/custom_queries.xml b/src/doc/doc/about/custom_queries.xml similarity index 100% rename from src/lay/lay/doc/about/custom_queries.xml rename to src/doc/doc/about/custom_queries.xml diff --git a/src/lay/lay/doc/about/def_import_snapshot.png b/src/doc/doc/about/def_import_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/def_import_snapshot.png rename to src/doc/doc/about/def_import_snapshot.png diff --git a/src/lay/lay/doc/about/drc_ref.xml b/src/doc/doc/about/drc_ref.xml similarity index 82% rename from src/lay/lay/doc/about/drc_ref.xml rename to src/doc/doc/about/drc_ref.xml index b4a6a02d6..203941a1d 100644 --- a/src/lay/lay/doc/about/drc_ref.xml +++ b/src/doc/doc/about/drc_ref.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/drc_ref_drc.xml b/src/doc/doc/about/drc_ref_drc.xml similarity index 99% rename from src/lay/lay/doc/about/drc_ref_drc.xml rename to src/doc/doc/about/drc_ref_drc.xml index 2e6814365..add2a025c 100644 --- a/src/lay/lay/doc/about/drc_ref_drc.xml +++ b/src/doc/doc/about/drc_ref_drc.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/drc_ref_expressions.xml b/src/doc/doc/about/drc_ref_expressions.xml similarity index 100% rename from src/lay/lay/doc/about/drc_ref_expressions.xml rename to src/doc/doc/about/drc_ref_expressions.xml diff --git a/src/lay/lay/doc/about/drc_ref_global.xml b/src/doc/doc/about/drc_ref_global.xml similarity index 99% rename from src/lay/lay/doc/about/drc_ref_global.xml rename to src/doc/doc/about/drc_ref_global.xml index 277db525d..33d2ca14b 100644 --- a/src/lay/lay/doc/about/drc_ref_global.xml +++ b/src/doc/doc/about/drc_ref_global.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/drc_ref_layer.xml b/src/doc/doc/about/drc_ref_layer.xml similarity index 99% rename from src/lay/lay/doc/about/drc_ref_layer.xml rename to src/doc/doc/about/drc_ref_layer.xml index 741a93ef4..6d105b8ea 100644 --- a/src/lay/lay/doc/about/drc_ref_layer.xml +++ b/src/doc/doc/about/drc_ref_layer.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/drc_ref_netter.xml b/src/doc/doc/about/drc_ref_netter.xml similarity index 99% rename from src/lay/lay/doc/about/drc_ref_netter.xml rename to src/doc/doc/about/drc_ref_netter.xml index 2b317dcc1..7f4302dae 100644 --- a/src/lay/lay/doc/about/drc_ref_netter.xml +++ b/src/doc/doc/about/drc_ref_netter.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/drc_ref_source.xml b/src/doc/doc/about/drc_ref_source.xml similarity index 99% rename from src/lay/lay/doc/about/drc_ref_source.xml rename to src/doc/doc/about/drc_ref_source.xml index 37bcc2458..b7947707b 100644 --- a/src/lay/lay/doc/about/drc_ref_source.xml +++ b/src/doc/doc/about/drc_ref_source.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/expressions.xml b/src/doc/doc/about/expressions.xml similarity index 100% rename from src/lay/lay/doc/about/expressions.xml rename to src/doc/doc/about/expressions.xml diff --git a/src/lay/lay/doc/about/ide_browser_toolbar.png b/src/doc/doc/about/ide_browser_toolbar.png similarity index 100% rename from src/lay/lay/doc/about/ide_browser_toolbar.png rename to src/doc/doc/about/ide_browser_toolbar.png diff --git a/src/lay/lay/doc/about/ide_console.png b/src/doc/doc/about/ide_console.png similarity index 100% rename from src/lay/lay/doc/about/ide_console.png rename to src/doc/doc/about/ide_console.png diff --git a/src/lay/lay/doc/about/ide_debugging_snapshot.png b/src/doc/doc/about/ide_debugging_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/ide_debugging_snapshot.png rename to src/doc/doc/about/ide_debugging_snapshot.png diff --git a/src/lay/lay/doc/about/ide_editor_toolbar.png b/src/doc/doc/about/ide_editor_toolbar.png similarity index 100% rename from src/lay/lay/doc/about/ide_editor_toolbar.png rename to src/doc/doc/about/ide_editor_toolbar.png diff --git a/src/lay/lay/doc/about/ide_py_debugging_snapshot.png b/src/doc/doc/about/ide_py_debugging_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/ide_py_debugging_snapshot.png rename to src/doc/doc/about/ide_py_debugging_snapshot.png diff --git a/src/lay/lay/doc/about/ide_snapshot.png b/src/doc/doc/about/ide_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/ide_snapshot.png rename to src/doc/doc/about/ide_snapshot.png diff --git a/src/lay/lay/doc/about/index.xml b/src/doc/doc/about/index.xml similarity index 100% rename from src/lay/lay/doc/about/index.xml rename to src/doc/doc/about/index.xml diff --git a/src/lay/lay/doc/about/layer_mapping.xml b/src/doc/doc/about/layer_mapping.xml similarity index 100% rename from src/lay/lay/doc/about/layer_mapping.xml rename to src/doc/doc/about/layer_mapping.xml diff --git a/src/lay/lay/doc/about/layer_sources.xml b/src/doc/doc/about/layer_sources.xml similarity index 100% rename from src/lay/lay/doc/about/layer_sources.xml rename to src/doc/doc/about/layer_sources.xml diff --git a/src/lay/lay/doc/about/layer_specs.xml b/src/doc/doc/about/layer_specs.xml similarity index 100% rename from src/lay/lay/doc/about/layer_specs.xml rename to src/doc/doc/about/layer_specs.xml diff --git a/src/lay/lay/doc/about/lef_def_import.xml b/src/doc/doc/about/lef_def_import.xml similarity index 100% rename from src/lay/lay/doc/about/lef_def_import.xml rename to src/doc/doc/about/lef_def_import.xml diff --git a/src/lay/lay/doc/about/lef_import_snapshot.png b/src/doc/doc/about/lef_import_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/lef_import_snapshot.png rename to src/doc/doc/about/lef_import_snapshot.png diff --git a/src/lay/lay/doc/about/lefdef_options_snapshot.png b/src/doc/doc/about/lefdef_options_snapshot.png similarity index 100% rename from src/lay/lay/doc/about/lefdef_options_snapshot.png rename to src/doc/doc/about/lefdef_options_snapshot.png diff --git a/src/lay/lay/doc/about/lvs_ref.xml b/src/doc/doc/about/lvs_ref.xml similarity index 76% rename from src/lay/lay/doc/about/lvs_ref.xml rename to src/doc/doc/about/lvs_ref.xml index 9a5817a14..58168f012 100644 --- a/src/lay/lay/doc/about/lvs_ref.xml +++ b/src/doc/doc/about/lvs_ref.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/lvs_ref_global.xml b/src/doc/doc/about/lvs_ref_global.xml similarity index 99% rename from src/lay/lay/doc/about/lvs_ref_global.xml rename to src/doc/doc/about/lvs_ref_global.xml index b3a5434c6..c1d2ad914 100644 --- a/src/lay/lay/doc/about/lvs_ref_global.xml +++ b/src/doc/doc/about/lvs_ref_global.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/lvs_ref_netter.xml b/src/doc/doc/about/lvs_ref_netter.xml similarity index 99% rename from src/lay/lay/doc/about/lvs_ref_netter.xml rename to src/doc/doc/about/lvs_ref_netter.xml index 3c47a7163..9feef786f 100644 --- a/src/lay/lay/doc/about/lvs_ref_netter.xml +++ b/src/doc/doc/about/lvs_ref_netter.xml @@ -1,7 +1,7 @@ - + diff --git a/src/lay/lay/doc/about/macro_editor.xml b/src/doc/doc/about/macro_editor.xml similarity index 100% rename from src/lay/lay/doc/about/macro_editor.xml rename to src/doc/doc/about/macro_editor.xml diff --git a/src/lay/lay/doc/about/macro_in_menu.xml b/src/doc/doc/about/macro_in_menu.xml similarity index 100% rename from src/lay/lay/doc/about/macro_in_menu.xml rename to src/doc/doc/about/macro_in_menu.xml diff --git a/src/lay/lay/doc/about/packages.xml b/src/doc/doc/about/packages.xml similarity index 100% rename from src/lay/lay/doc/about/packages.xml rename to src/doc/doc/about/packages.xml diff --git a/src/lay/lay/doc/about/pie_arc.png b/src/doc/doc/about/pie_arc.png similarity index 100% rename from src/lay/lay/doc/about/pie_arc.png rename to src/doc/doc/about/pie_arc.png diff --git a/src/lay/lay/doc/about/rba_notation.xml b/src/doc/doc/about/rba_notation.xml similarity index 100% rename from src/lay/lay/doc/about/rba_notation.xml rename to src/doc/doc/about/rba_notation.xml diff --git a/src/lay/lay/doc/about/round_path.png b/src/doc/doc/about/round_path.png similarity index 100% rename from src/lay/lay/doc/about/round_path.png rename to src/doc/doc/about/round_path.png diff --git a/src/lay/lay/doc/about/round_polygon.png b/src/doc/doc/about/round_polygon.png similarity index 100% rename from src/lay/lay/doc/about/round_polygon.png rename to src/doc/doc/about/round_polygon.png diff --git a/src/lay/lay/doc/about/stroked_polygon.png b/src/doc/doc/about/stroked_polygon.png similarity index 100% rename from src/lay/lay/doc/about/stroked_polygon.png rename to src/doc/doc/about/stroked_polygon.png diff --git a/src/lay/lay/doc/about/symbolic_layers.xml b/src/doc/doc/about/symbolic_layers.xml similarity index 100% rename from src/lay/lay/doc/about/symbolic_layers.xml rename to src/doc/doc/about/symbolic_layers.xml diff --git a/src/lay/lay/doc/about/technology_manager.xml b/src/doc/doc/about/technology_manager.xml similarity index 100% rename from src/lay/lay/doc/about/technology_manager.xml rename to src/doc/doc/about/technology_manager.xml diff --git a/src/lay/lay/doc/about/transformation_basic.png b/src/doc/doc/about/transformation_basic.png similarity index 100% rename from src/lay/lay/doc/about/transformation_basic.png rename to src/doc/doc/about/transformation_basic.png diff --git a/src/lay/lay/doc/about/transformation_overview.png b/src/doc/doc/about/transformation_overview.png similarity index 100% rename from src/lay/lay/doc/about/transformation_overview.png rename to src/doc/doc/about/transformation_overview.png diff --git a/src/lay/lay/doc/about/transformations.xml b/src/doc/doc/about/transformations.xml similarity index 100% rename from src/lay/lay/doc/about/transformations.xml rename to src/doc/doc/about/transformations.xml diff --git a/src/lay/lay/doc/about/variant_notation.xml b/src/doc/doc/about/variant_notation.xml similarity index 100% rename from src/lay/lay/doc/about/variant_notation.xml rename to src/doc/doc/about/variant_notation.xml diff --git a/src/lay/lay/doc/help_format.css b/src/doc/doc/help_format.css similarity index 100% rename from src/lay/lay/doc/help_format.css rename to src/doc/doc/help_format.css diff --git a/src/lay/lay/doc/images/drc_and1.png b/src/doc/doc/images/drc_and1.png similarity index 100% rename from src/lay/lay/doc/images/drc_and1.png rename to src/doc/doc/images/drc_and1.png diff --git a/src/lay/lay/doc/images/drc_and2.png b/src/doc/doc/images/drc_and2.png similarity index 100% rename from src/lay/lay/doc/images/drc_and2.png rename to src/doc/doc/images/drc_and2.png diff --git a/src/lay/lay/doc/images/drc_and3.png b/src/doc/doc/images/drc_and3.png similarity index 100% rename from src/lay/lay/doc/images/drc_and3.png rename to src/doc/doc/images/drc_and3.png diff --git a/src/lay/lay/doc/images/drc_centers1.png b/src/doc/doc/images/drc_centers1.png similarity index 100% rename from src/lay/lay/doc/images/drc_centers1.png rename to src/doc/doc/images/drc_centers1.png diff --git a/src/lay/lay/doc/images/drc_centers2.png b/src/doc/doc/images/drc_centers2.png similarity index 100% rename from src/lay/lay/doc/images/drc_centers2.png rename to src/doc/doc/images/drc_centers2.png diff --git a/src/lay/lay/doc/images/drc_corners1.png b/src/doc/doc/images/drc_corners1.png similarity index 100% rename from src/lay/lay/doc/images/drc_corners1.png rename to src/doc/doc/images/drc_corners1.png diff --git a/src/lay/lay/doc/images/drc_corners2.png b/src/doc/doc/images/drc_corners2.png similarity index 100% rename from src/lay/lay/doc/images/drc_corners2.png rename to src/doc/doc/images/drc_corners2.png diff --git a/src/lay/lay/doc/images/drc_corners3.png b/src/doc/doc/images/drc_corners3.png similarity index 100% rename from src/lay/lay/doc/images/drc_corners3.png rename to src/doc/doc/images/drc_corners3.png diff --git a/src/lay/lay/doc/images/drc_covering.png b/src/doc/doc/images/drc_covering.png similarity index 100% rename from src/lay/lay/doc/images/drc_covering.png rename to src/doc/doc/images/drc_covering.png diff --git a/src/lay/lay/doc/images/drc_enc1.png b/src/doc/doc/images/drc_enc1.png similarity index 100% rename from src/lay/lay/doc/images/drc_enc1.png rename to src/doc/doc/images/drc_enc1.png diff --git a/src/lay/lay/doc/images/drc_enc1u.png b/src/doc/doc/images/drc_enc1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_enc1u.png rename to src/doc/doc/images/drc_enc1u.png diff --git a/src/lay/lay/doc/images/drc_enc2.png b/src/doc/doc/images/drc_enc2.png similarity index 100% rename from src/lay/lay/doc/images/drc_enc2.png rename to src/doc/doc/images/drc_enc2.png diff --git a/src/lay/lay/doc/images/drc_enc2u.png b/src/doc/doc/images/drc_enc2u.png similarity index 100% rename from src/lay/lay/doc/images/drc_enc2u.png rename to src/doc/doc/images/drc_enc2u.png diff --git a/src/lay/lay/doc/images/drc_encd1.png b/src/doc/doc/images/drc_encd1.png similarity index 100% rename from src/lay/lay/doc/images/drc_encd1.png rename to src/doc/doc/images/drc_encd1.png diff --git a/src/lay/lay/doc/images/drc_encd1u.png b/src/doc/doc/images/drc_encd1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_encd1u.png rename to src/doc/doc/images/drc_encd1u.png diff --git a/src/lay/lay/doc/images/drc_encd2.png b/src/doc/doc/images/drc_encd2.png similarity index 100% rename from src/lay/lay/doc/images/drc_encd2.png rename to src/doc/doc/images/drc_encd2.png diff --git a/src/lay/lay/doc/images/drc_encd2u.png b/src/doc/doc/images/drc_encd2u.png similarity index 100% rename from src/lay/lay/doc/images/drc_encd2u.png rename to src/doc/doc/images/drc_encd2u.png diff --git a/src/lay/lay/doc/images/drc_end_segments1.png b/src/doc/doc/images/drc_end_segments1.png similarity index 100% rename from src/lay/lay/doc/images/drc_end_segments1.png rename to src/doc/doc/images/drc_end_segments1.png diff --git a/src/lay/lay/doc/images/drc_end_segments2.png b/src/doc/doc/images/drc_end_segments2.png similarity index 100% rename from src/lay/lay/doc/images/drc_end_segments2.png rename to src/doc/doc/images/drc_end_segments2.png diff --git a/src/lay/lay/doc/images/drc_extended1.png b/src/doc/doc/images/drc_extended1.png similarity index 100% rename from src/lay/lay/doc/images/drc_extended1.png rename to src/doc/doc/images/drc_extended1.png diff --git a/src/lay/lay/doc/images/drc_extended2.png b/src/doc/doc/images/drc_extended2.png similarity index 100% rename from src/lay/lay/doc/images/drc_extended2.png rename to src/doc/doc/images/drc_extended2.png diff --git a/src/lay/lay/doc/images/drc_extended3.png b/src/doc/doc/images/drc_extended3.png similarity index 100% rename from src/lay/lay/doc/images/drc_extended3.png rename to src/doc/doc/images/drc_extended3.png diff --git a/src/lay/lay/doc/images/drc_extended4.png b/src/doc/doc/images/drc_extended4.png similarity index 100% rename from src/lay/lay/doc/images/drc_extended4.png rename to src/doc/doc/images/drc_extended4.png diff --git a/src/lay/lay/doc/images/drc_extent_refs1.png b/src/doc/doc/images/drc_extent_refs1.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs1.png rename to src/doc/doc/images/drc_extent_refs1.png diff --git a/src/lay/lay/doc/images/drc_extent_refs10.png b/src/doc/doc/images/drc_extent_refs10.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs10.png rename to src/doc/doc/images/drc_extent_refs10.png diff --git a/src/lay/lay/doc/images/drc_extent_refs11.png b/src/doc/doc/images/drc_extent_refs11.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs11.png rename to src/doc/doc/images/drc_extent_refs11.png diff --git a/src/lay/lay/doc/images/drc_extent_refs12.png b/src/doc/doc/images/drc_extent_refs12.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs12.png rename to src/doc/doc/images/drc_extent_refs12.png diff --git a/src/lay/lay/doc/images/drc_extent_refs13.png b/src/doc/doc/images/drc_extent_refs13.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs13.png rename to src/doc/doc/images/drc_extent_refs13.png diff --git a/src/lay/lay/doc/images/drc_extent_refs20.png b/src/doc/doc/images/drc_extent_refs20.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs20.png rename to src/doc/doc/images/drc_extent_refs20.png diff --git a/src/lay/lay/doc/images/drc_extent_refs21.png b/src/doc/doc/images/drc_extent_refs21.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs21.png rename to src/doc/doc/images/drc_extent_refs21.png diff --git a/src/lay/lay/doc/images/drc_extent_refs22.png b/src/doc/doc/images/drc_extent_refs22.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs22.png rename to src/doc/doc/images/drc_extent_refs22.png diff --git a/src/lay/lay/doc/images/drc_extent_refs23.png b/src/doc/doc/images/drc_extent_refs23.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs23.png rename to src/doc/doc/images/drc_extent_refs23.png diff --git a/src/lay/lay/doc/images/drc_extent_refs24.png b/src/doc/doc/images/drc_extent_refs24.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs24.png rename to src/doc/doc/images/drc_extent_refs24.png diff --git a/src/lay/lay/doc/images/drc_extent_refs25.png b/src/doc/doc/images/drc_extent_refs25.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs25.png rename to src/doc/doc/images/drc_extent_refs25.png diff --git a/src/lay/lay/doc/images/drc_extent_refs26.png b/src/doc/doc/images/drc_extent_refs26.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs26.png rename to src/doc/doc/images/drc_extent_refs26.png diff --git a/src/lay/lay/doc/images/drc_extent_refs27.png b/src/doc/doc/images/drc_extent_refs27.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs27.png rename to src/doc/doc/images/drc_extent_refs27.png diff --git a/src/lay/lay/doc/images/drc_extent_refs30.png b/src/doc/doc/images/drc_extent_refs30.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs30.png rename to src/doc/doc/images/drc_extent_refs30.png diff --git a/src/lay/lay/doc/images/drc_extent_refs31.png b/src/doc/doc/images/drc_extent_refs31.png similarity index 100% rename from src/lay/lay/doc/images/drc_extent_refs31.png rename to src/doc/doc/images/drc_extent_refs31.png diff --git a/src/lay/lay/doc/images/drc_extents1.png b/src/doc/doc/images/drc_extents1.png similarity index 100% rename from src/lay/lay/doc/images/drc_extents1.png rename to src/doc/doc/images/drc_extents1.png diff --git a/src/lay/lay/doc/images/drc_extents2.png b/src/doc/doc/images/drc_extents2.png similarity index 100% rename from src/lay/lay/doc/images/drc_extents2.png rename to src/doc/doc/images/drc_extents2.png diff --git a/src/lay/lay/doc/images/drc_holes.png b/src/doc/doc/images/drc_holes.png similarity index 100% rename from src/lay/lay/doc/images/drc_holes.png rename to src/doc/doc/images/drc_holes.png diff --git a/src/lay/lay/doc/images/drc_hulls.png b/src/doc/doc/images/drc_hulls.png similarity index 100% rename from src/lay/lay/doc/images/drc_hulls.png rename to src/doc/doc/images/drc_hulls.png diff --git a/src/lay/lay/doc/images/drc_in.png b/src/doc/doc/images/drc_in.png similarity index 100% rename from src/lay/lay/doc/images/drc_in.png rename to src/doc/doc/images/drc_in.png diff --git a/src/lay/lay/doc/images/drc_inside.png b/src/doc/doc/images/drc_inside.png similarity index 100% rename from src/lay/lay/doc/images/drc_inside.png rename to src/doc/doc/images/drc_inside.png diff --git a/src/lay/lay/doc/images/drc_inside_ee.png b/src/doc/doc/images/drc_inside_ee.png similarity index 100% rename from src/lay/lay/doc/images/drc_inside_ee.png rename to src/doc/doc/images/drc_inside_ee.png diff --git a/src/lay/lay/doc/images/drc_inside_ep.png b/src/doc/doc/images/drc_inside_ep.png similarity index 100% rename from src/lay/lay/doc/images/drc_inside_ep.png rename to src/doc/doc/images/drc_inside_ep.png diff --git a/src/lay/lay/doc/images/drc_inside_part.png b/src/doc/doc/images/drc_inside_part.png similarity index 100% rename from src/lay/lay/doc/images/drc_inside_part.png rename to src/doc/doc/images/drc_inside_part.png diff --git a/src/lay/lay/doc/images/drc_interacting.png b/src/doc/doc/images/drc_interacting.png similarity index 100% rename from src/lay/lay/doc/images/drc_interacting.png rename to src/doc/doc/images/drc_interacting.png diff --git a/src/lay/lay/doc/images/drc_interacting2.png b/src/doc/doc/images/drc_interacting2.png similarity index 100% rename from src/lay/lay/doc/images/drc_interacting2.png rename to src/doc/doc/images/drc_interacting2.png diff --git a/src/lay/lay/doc/images/drc_interacting3.png b/src/doc/doc/images/drc_interacting3.png similarity index 100% rename from src/lay/lay/doc/images/drc_interacting3.png rename to src/doc/doc/images/drc_interacting3.png diff --git a/src/lay/lay/doc/images/drc_interacting4.png b/src/doc/doc/images/drc_interacting4.png similarity index 100% rename from src/lay/lay/doc/images/drc_interacting4.png rename to src/doc/doc/images/drc_interacting4.png diff --git a/src/lay/lay/doc/images/drc_interacting5.png b/src/doc/doc/images/drc_interacting5.png similarity index 100% rename from src/lay/lay/doc/images/drc_interacting5.png rename to src/doc/doc/images/drc_interacting5.png diff --git a/src/lay/lay/doc/images/drc_join1.png b/src/doc/doc/images/drc_join1.png similarity index 100% rename from src/lay/lay/doc/images/drc_join1.png rename to src/doc/doc/images/drc_join1.png diff --git a/src/lay/lay/doc/images/drc_join2.png b/src/doc/doc/images/drc_join2.png similarity index 100% rename from src/lay/lay/doc/images/drc_join2.png rename to src/doc/doc/images/drc_join2.png diff --git a/src/lay/lay/doc/images/drc_merged1.png b/src/doc/doc/images/drc_merged1.png similarity index 100% rename from src/lay/lay/doc/images/drc_merged1.png rename to src/doc/doc/images/drc_merged1.png diff --git a/src/lay/lay/doc/images/drc_merged2.png b/src/doc/doc/images/drc_merged2.png similarity index 100% rename from src/lay/lay/doc/images/drc_merged2.png rename to src/doc/doc/images/drc_merged2.png diff --git a/src/lay/lay/doc/images/drc_merged3.png b/src/doc/doc/images/drc_merged3.png similarity index 100% rename from src/lay/lay/doc/images/drc_merged3.png rename to src/doc/doc/images/drc_merged3.png diff --git a/src/lay/lay/doc/images/drc_merged4.png b/src/doc/doc/images/drc_merged4.png similarity index 100% rename from src/lay/lay/doc/images/drc_merged4.png rename to src/doc/doc/images/drc_merged4.png diff --git a/src/lay/lay/doc/images/drc_middle1.png b/src/doc/doc/images/drc_middle1.png similarity index 100% rename from src/lay/lay/doc/images/drc_middle1.png rename to src/doc/doc/images/drc_middle1.png diff --git a/src/lay/lay/doc/images/drc_moved1.png b/src/doc/doc/images/drc_moved1.png similarity index 100% rename from src/lay/lay/doc/images/drc_moved1.png rename to src/doc/doc/images/drc_moved1.png diff --git a/src/lay/lay/doc/images/drc_not1.png b/src/doc/doc/images/drc_not1.png similarity index 100% rename from src/lay/lay/doc/images/drc_not1.png rename to src/doc/doc/images/drc_not1.png diff --git a/src/lay/lay/doc/images/drc_not2.png b/src/doc/doc/images/drc_not2.png similarity index 100% rename from src/lay/lay/doc/images/drc_not2.png rename to src/doc/doc/images/drc_not2.png diff --git a/src/lay/lay/doc/images/drc_not3.png b/src/doc/doc/images/drc_not3.png similarity index 100% rename from src/lay/lay/doc/images/drc_not3.png rename to src/doc/doc/images/drc_not3.png diff --git a/src/lay/lay/doc/images/drc_not_covering.png b/src/doc/doc/images/drc_not_covering.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_covering.png rename to src/doc/doc/images/drc_not_covering.png diff --git a/src/lay/lay/doc/images/drc_not_in.png b/src/doc/doc/images/drc_not_in.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_in.png rename to src/doc/doc/images/drc_not_in.png diff --git a/src/lay/lay/doc/images/drc_not_inside.png b/src/doc/doc/images/drc_not_inside.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_inside.png rename to src/doc/doc/images/drc_not_inside.png diff --git a/src/lay/lay/doc/images/drc_not_inside_ee.png b/src/doc/doc/images/drc_not_inside_ee.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_inside_ee.png rename to src/doc/doc/images/drc_not_inside_ee.png diff --git a/src/lay/lay/doc/images/drc_not_inside_ep.png b/src/doc/doc/images/drc_not_inside_ep.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_inside_ep.png rename to src/doc/doc/images/drc_not_inside_ep.png diff --git a/src/lay/lay/doc/images/drc_not_interacting.png b/src/doc/doc/images/drc_not_interacting.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_interacting.png rename to src/doc/doc/images/drc_not_interacting.png diff --git a/src/lay/lay/doc/images/drc_not_interacting2.png b/src/doc/doc/images/drc_not_interacting2.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_interacting2.png rename to src/doc/doc/images/drc_not_interacting2.png diff --git a/src/lay/lay/doc/images/drc_not_interacting3.png b/src/doc/doc/images/drc_not_interacting3.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_interacting3.png rename to src/doc/doc/images/drc_not_interacting3.png diff --git a/src/lay/lay/doc/images/drc_not_interacting4.png b/src/doc/doc/images/drc_not_interacting4.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_interacting4.png rename to src/doc/doc/images/drc_not_interacting4.png diff --git a/src/lay/lay/doc/images/drc_not_interacting5.png b/src/doc/doc/images/drc_not_interacting5.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_interacting5.png rename to src/doc/doc/images/drc_not_interacting5.png diff --git a/src/lay/lay/doc/images/drc_not_outside.png b/src/doc/doc/images/drc_not_outside.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_outside.png rename to src/doc/doc/images/drc_not_outside.png diff --git a/src/lay/lay/doc/images/drc_not_outside_ee.png b/src/doc/doc/images/drc_not_outside_ee.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_outside_ee.png rename to src/doc/doc/images/drc_not_outside_ee.png diff --git a/src/lay/lay/doc/images/drc_not_outside_ep.png b/src/doc/doc/images/drc_not_outside_ep.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_outside_ep.png rename to src/doc/doc/images/drc_not_outside_ep.png diff --git a/src/lay/lay/doc/images/drc_not_overlapping.png b/src/doc/doc/images/drc_not_overlapping.png similarity index 100% rename from src/lay/lay/doc/images/drc_not_overlapping.png rename to src/doc/doc/images/drc_not_overlapping.png diff --git a/src/lay/lay/doc/images/drc_or1.png b/src/doc/doc/images/drc_or1.png similarity index 100% rename from src/lay/lay/doc/images/drc_or1.png rename to src/doc/doc/images/drc_or1.png diff --git a/src/lay/lay/doc/images/drc_or2.png b/src/doc/doc/images/drc_or2.png similarity index 100% rename from src/lay/lay/doc/images/drc_or2.png rename to src/doc/doc/images/drc_or2.png diff --git a/src/lay/lay/doc/images/drc_outside.png b/src/doc/doc/images/drc_outside.png similarity index 100% rename from src/lay/lay/doc/images/drc_outside.png rename to src/doc/doc/images/drc_outside.png diff --git a/src/lay/lay/doc/images/drc_outside_ee.png b/src/doc/doc/images/drc_outside_ee.png similarity index 100% rename from src/lay/lay/doc/images/drc_outside_ee.png rename to src/doc/doc/images/drc_outside_ee.png diff --git a/src/lay/lay/doc/images/drc_outside_ep.png b/src/doc/doc/images/drc_outside_ep.png similarity index 100% rename from src/lay/lay/doc/images/drc_outside_ep.png rename to src/doc/doc/images/drc_outside_ep.png diff --git a/src/lay/lay/doc/images/drc_outside_part.png b/src/doc/doc/images/drc_outside_part.png similarity index 100% rename from src/lay/lay/doc/images/drc_outside_part.png rename to src/doc/doc/images/drc_outside_part.png diff --git a/src/lay/lay/doc/images/drc_overlap1.png b/src/doc/doc/images/drc_overlap1.png similarity index 100% rename from src/lay/lay/doc/images/drc_overlap1.png rename to src/doc/doc/images/drc_overlap1.png diff --git a/src/lay/lay/doc/images/drc_overlap1u.png b/src/doc/doc/images/drc_overlap1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_overlap1u.png rename to src/doc/doc/images/drc_overlap1u.png diff --git a/src/lay/lay/doc/images/drc_overlap2.png b/src/doc/doc/images/drc_overlap2.png similarity index 100% rename from src/lay/lay/doc/images/drc_overlap2.png rename to src/doc/doc/images/drc_overlap2.png diff --git a/src/lay/lay/doc/images/drc_overlap2u.png b/src/doc/doc/images/drc_overlap2u.png similarity index 100% rename from src/lay/lay/doc/images/drc_overlap2u.png rename to src/doc/doc/images/drc_overlap2u.png diff --git a/src/lay/lay/doc/images/drc_overlapping.png b/src/doc/doc/images/drc_overlapping.png similarity index 100% rename from src/lay/lay/doc/images/drc_overlapping.png rename to src/doc/doc/images/drc_overlapping.png diff --git a/src/lay/lay/doc/images/drc_raw1.png b/src/doc/doc/images/drc_raw1.png similarity index 100% rename from src/lay/lay/doc/images/drc_raw1.png rename to src/doc/doc/images/drc_raw1.png diff --git a/src/lay/lay/doc/images/drc_raw2.png b/src/doc/doc/images/drc_raw2.png similarity index 100% rename from src/lay/lay/doc/images/drc_raw2.png rename to src/doc/doc/images/drc_raw2.png diff --git a/src/lay/lay/doc/images/drc_raw3.png b/src/doc/doc/images/drc_raw3.png similarity index 100% rename from src/lay/lay/doc/images/drc_raw3.png rename to src/doc/doc/images/drc_raw3.png diff --git a/src/lay/lay/doc/images/drc_rotated1.png b/src/doc/doc/images/drc_rotated1.png similarity index 100% rename from src/lay/lay/doc/images/drc_rotated1.png rename to src/doc/doc/images/drc_rotated1.png diff --git a/src/lay/lay/doc/images/drc_rounded_corners.png b/src/doc/doc/images/drc_rounded_corners.png similarity index 100% rename from src/lay/lay/doc/images/drc_rounded_corners.png rename to src/doc/doc/images/drc_rounded_corners.png diff --git a/src/lay/lay/doc/images/drc_scaled1.png b/src/doc/doc/images/drc_scaled1.png similarity index 100% rename from src/lay/lay/doc/images/drc_scaled1.png rename to src/doc/doc/images/drc_scaled1.png diff --git a/src/lay/lay/doc/images/drc_separation1.png b/src/doc/doc/images/drc_separation1.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation1.png rename to src/doc/doc/images/drc_separation1.png diff --git a/src/lay/lay/doc/images/drc_separation10.png b/src/doc/doc/images/drc_separation10.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation10.png rename to src/doc/doc/images/drc_separation10.png diff --git a/src/lay/lay/doc/images/drc_separation11.png b/src/doc/doc/images/drc_separation11.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation11.png rename to src/doc/doc/images/drc_separation11.png diff --git a/src/lay/lay/doc/images/drc_separation1u.png b/src/doc/doc/images/drc_separation1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation1u.png rename to src/doc/doc/images/drc_separation1u.png diff --git a/src/lay/lay/doc/images/drc_separation1un.png b/src/doc/doc/images/drc_separation1un.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation1un.png rename to src/doc/doc/images/drc_separation1un.png diff --git a/src/lay/lay/doc/images/drc_separation2.png b/src/doc/doc/images/drc_separation2.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation2.png rename to src/doc/doc/images/drc_separation2.png diff --git a/src/lay/lay/doc/images/drc_separation3.png b/src/doc/doc/images/drc_separation3.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation3.png rename to src/doc/doc/images/drc_separation3.png diff --git a/src/lay/lay/doc/images/drc_separation4.png b/src/doc/doc/images/drc_separation4.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation4.png rename to src/doc/doc/images/drc_separation4.png diff --git a/src/lay/lay/doc/images/drc_separation5.png b/src/doc/doc/images/drc_separation5.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation5.png rename to src/doc/doc/images/drc_separation5.png diff --git a/src/lay/lay/doc/images/drc_separation6.png b/src/doc/doc/images/drc_separation6.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation6.png rename to src/doc/doc/images/drc_separation6.png diff --git a/src/lay/lay/doc/images/drc_separation7.png b/src/doc/doc/images/drc_separation7.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation7.png rename to src/doc/doc/images/drc_separation7.png diff --git a/src/lay/lay/doc/images/drc_separation8.png b/src/doc/doc/images/drc_separation8.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation8.png rename to src/doc/doc/images/drc_separation8.png diff --git a/src/lay/lay/doc/images/drc_separation9.png b/src/doc/doc/images/drc_separation9.png similarity index 100% rename from src/lay/lay/doc/images/drc_separation9.png rename to src/doc/doc/images/drc_separation9.png diff --git a/src/lay/lay/doc/images/drc_shielded1.png b/src/doc/doc/images/drc_shielded1.png similarity index 100% rename from src/lay/lay/doc/images/drc_shielded1.png rename to src/doc/doc/images/drc_shielded1.png diff --git a/src/lay/lay/doc/images/drc_shielded2.png b/src/doc/doc/images/drc_shielded2.png similarity index 100% rename from src/lay/lay/doc/images/drc_shielded2.png rename to src/doc/doc/images/drc_shielded2.png diff --git a/src/lay/lay/doc/images/drc_shielded3.png b/src/doc/doc/images/drc_shielded3.png similarity index 100% rename from src/lay/lay/doc/images/drc_shielded3.png rename to src/doc/doc/images/drc_shielded3.png diff --git a/src/lay/lay/doc/images/drc_shielded4.png b/src/doc/doc/images/drc_shielded4.png similarity index 100% rename from src/lay/lay/doc/images/drc_shielded4.png rename to src/doc/doc/images/drc_shielded4.png diff --git a/src/lay/lay/doc/images/drc_sized1.png b/src/doc/doc/images/drc_sized1.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized1.png rename to src/doc/doc/images/drc_sized1.png diff --git a/src/lay/lay/doc/images/drc_sized2.png b/src/doc/doc/images/drc_sized2.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized2.png rename to src/doc/doc/images/drc_sized2.png diff --git a/src/lay/lay/doc/images/drc_sized3.png b/src/doc/doc/images/drc_sized3.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized3.png rename to src/doc/doc/images/drc_sized3.png diff --git a/src/lay/lay/doc/images/drc_sized4.png b/src/doc/doc/images/drc_sized4.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized4.png rename to src/doc/doc/images/drc_sized4.png diff --git a/src/lay/lay/doc/images/drc_sized5.png b/src/doc/doc/images/drc_sized5.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized5.png rename to src/doc/doc/images/drc_sized5.png diff --git a/src/lay/lay/doc/images/drc_sized6.png b/src/doc/doc/images/drc_sized6.png similarity index 100% rename from src/lay/lay/doc/images/drc_sized6.png rename to src/doc/doc/images/drc_sized6.png diff --git a/src/lay/lay/doc/images/drc_space1.png b/src/doc/doc/images/drc_space1.png similarity index 100% rename from src/lay/lay/doc/images/drc_space1.png rename to src/doc/doc/images/drc_space1.png diff --git a/src/lay/lay/doc/images/drc_space1u.png b/src/doc/doc/images/drc_space1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_space1u.png rename to src/doc/doc/images/drc_space1u.png diff --git a/src/lay/lay/doc/images/drc_space2.png b/src/doc/doc/images/drc_space2.png similarity index 100% rename from src/lay/lay/doc/images/drc_space2.png rename to src/doc/doc/images/drc_space2.png diff --git a/src/lay/lay/doc/images/drc_space2u.png b/src/doc/doc/images/drc_space2u.png similarity index 100% rename from src/lay/lay/doc/images/drc_space2u.png rename to src/doc/doc/images/drc_space2u.png diff --git a/src/lay/lay/doc/images/drc_space3.png b/src/doc/doc/images/drc_space3.png similarity index 100% rename from src/lay/lay/doc/images/drc_space3.png rename to src/doc/doc/images/drc_space3.png diff --git a/src/lay/lay/doc/images/drc_space3u.png b/src/doc/doc/images/drc_space3u.png similarity index 100% rename from src/lay/lay/doc/images/drc_space3u.png rename to src/doc/doc/images/drc_space3u.png diff --git a/src/lay/lay/doc/images/drc_start_segments1.png b/src/doc/doc/images/drc_start_segments1.png similarity index 100% rename from src/lay/lay/doc/images/drc_start_segments1.png rename to src/doc/doc/images/drc_start_segments1.png diff --git a/src/lay/lay/doc/images/drc_start_segments2.png b/src/doc/doc/images/drc_start_segments2.png similarity index 100% rename from src/lay/lay/doc/images/drc_start_segments2.png rename to src/doc/doc/images/drc_start_segments2.png diff --git a/src/lay/lay/doc/images/drc_textpoly1.png b/src/doc/doc/images/drc_textpoly1.png similarity index 100% rename from src/lay/lay/doc/images/drc_textpoly1.png rename to src/doc/doc/images/drc_textpoly1.png diff --git a/src/lay/lay/doc/images/drc_textpoly2.png b/src/doc/doc/images/drc_textpoly2.png similarity index 100% rename from src/lay/lay/doc/images/drc_textpoly2.png rename to src/doc/doc/images/drc_textpoly2.png diff --git a/src/lay/lay/doc/images/drc_texts1.png b/src/doc/doc/images/drc_texts1.png similarity index 100% rename from src/lay/lay/doc/images/drc_texts1.png rename to src/doc/doc/images/drc_texts1.png diff --git a/src/lay/lay/doc/images/drc_texts2.png b/src/doc/doc/images/drc_texts2.png similarity index 100% rename from src/lay/lay/doc/images/drc_texts2.png rename to src/doc/doc/images/drc_texts2.png diff --git a/src/lay/lay/doc/images/drc_transformed1.png b/src/doc/doc/images/drc_transformed1.png similarity index 100% rename from src/lay/lay/doc/images/drc_transformed1.png rename to src/doc/doc/images/drc_transformed1.png diff --git a/src/lay/lay/doc/images/drc_width1.png b/src/doc/doc/images/drc_width1.png similarity index 100% rename from src/lay/lay/doc/images/drc_width1.png rename to src/doc/doc/images/drc_width1.png diff --git a/src/lay/lay/doc/images/drc_width1u.png b/src/doc/doc/images/drc_width1u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width1u.png rename to src/doc/doc/images/drc_width1u.png diff --git a/src/lay/lay/doc/images/drc_width2.png b/src/doc/doc/images/drc_width2.png similarity index 100% rename from src/lay/lay/doc/images/drc_width2.png rename to src/doc/doc/images/drc_width2.png diff --git a/src/lay/lay/doc/images/drc_width2u.png b/src/doc/doc/images/drc_width2u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width2u.png rename to src/doc/doc/images/drc_width2u.png diff --git a/src/lay/lay/doc/images/drc_width3.png b/src/doc/doc/images/drc_width3.png similarity index 100% rename from src/lay/lay/doc/images/drc_width3.png rename to src/doc/doc/images/drc_width3.png diff --git a/src/lay/lay/doc/images/drc_width3u.png b/src/doc/doc/images/drc_width3u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width3u.png rename to src/doc/doc/images/drc_width3u.png diff --git a/src/lay/lay/doc/images/drc_width4.png b/src/doc/doc/images/drc_width4.png similarity index 100% rename from src/lay/lay/doc/images/drc_width4.png rename to src/doc/doc/images/drc_width4.png diff --git a/src/lay/lay/doc/images/drc_width4u.png b/src/doc/doc/images/drc_width4u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width4u.png rename to src/doc/doc/images/drc_width4u.png diff --git a/src/lay/lay/doc/images/drc_width5u.png b/src/doc/doc/images/drc_width5u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width5u.png rename to src/doc/doc/images/drc_width5u.png diff --git a/src/lay/lay/doc/images/drc_width6u.png b/src/doc/doc/images/drc_width6u.png similarity index 100% rename from src/lay/lay/doc/images/drc_width6u.png rename to src/doc/doc/images/drc_width6u.png diff --git a/src/lay/lay/doc/images/drc_with_angle1.png b/src/doc/doc/images/drc_with_angle1.png similarity index 100% rename from src/lay/lay/doc/images/drc_with_angle1.png rename to src/doc/doc/images/drc_with_angle1.png diff --git a/src/lay/lay/doc/images/drc_with_angle2.png b/src/doc/doc/images/drc_with_angle2.png similarity index 100% rename from src/lay/lay/doc/images/drc_with_angle2.png rename to src/doc/doc/images/drc_with_angle2.png diff --git a/src/lay/lay/doc/images/drc_with_angle3.png b/src/doc/doc/images/drc_with_angle3.png similarity index 100% rename from src/lay/lay/doc/images/drc_with_angle3.png rename to src/doc/doc/images/drc_with_angle3.png diff --git a/src/lay/lay/doc/images/drc_with_angle4.png b/src/doc/doc/images/drc_with_angle4.png similarity index 100% rename from src/lay/lay/doc/images/drc_with_angle4.png rename to src/doc/doc/images/drc_with_angle4.png diff --git a/src/lay/lay/doc/images/drc_xor1.png b/src/doc/doc/images/drc_xor1.png similarity index 100% rename from src/lay/lay/doc/images/drc_xor1.png rename to src/doc/doc/images/drc_xor1.png diff --git a/src/lay/lay/doc/images/drc_xor2.png b/src/doc/doc/images/drc_xor2.png similarity index 100% rename from src/lay/lay/doc/images/drc_xor2.png rename to src/doc/doc/images/drc_xor2.png diff --git a/src/lay/lay/doc/manual/adjust_origin.xml b/src/doc/doc/manual/adjust_origin.xml similarity index 100% rename from src/lay/lay/doc/manual/adjust_origin.xml rename to src/doc/doc/manual/adjust_origin.xml diff --git a/src/lay/lay/doc/manual/advanced.xml b/src/doc/doc/manual/advanced.xml similarity index 100% rename from src/lay/lay/doc/manual/advanced.xml rename to src/doc/doc/manual/advanced.xml diff --git a/src/lay/lay/doc/manual/background_combination_modes.png b/src/doc/doc/manual/background_combination_modes.png similarity index 100% rename from src/lay/lay/doc/manual/background_combination_modes.png rename to src/doc/doc/manual/background_combination_modes.png diff --git a/src/lay/lay/doc/manual/background_modes.xml b/src/doc/doc/manual/background_modes.xml similarity index 100% rename from src/lay/lay/doc/manual/background_modes.xml rename to src/doc/doc/manual/background_modes.xml diff --git a/src/lay/lay/doc/manual/basic.xml b/src/doc/doc/manual/basic.xml similarity index 100% rename from src/lay/lay/doc/manual/basic.xml rename to src/doc/doc/manual/basic.xml diff --git a/src/lay/lay/doc/manual/bjt3_schematic.png b/src/doc/doc/manual/bjt3_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/bjt3_schematic.png rename to src/doc/doc/manual/bjt3_schematic.png diff --git a/src/lay/lay/doc/manual/bjt4_schematic.png b/src/doc/doc/manual/bjt4_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/bjt4_schematic.png rename to src/doc/doc/manual/bjt4_schematic.png diff --git a/src/lay/lay/doc/manual/bjt_ex_layout.png b/src/doc/doc/manual/bjt_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_ex_layout.png rename to src/doc/doc/manual/bjt_ex_layout.png diff --git a/src/lay/lay/doc/manual/bjt_ex_tb.png b/src/doc/doc/manual/bjt_ex_tb.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_ex_tb.png rename to src/doc/doc/manual/bjt_ex_tb.png diff --git a/src/lay/lay/doc/manual/bjt_ex_tc.png b/src/doc/doc/manual/bjt_ex_tc.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_ex_tc.png rename to src/doc/doc/manual/bjt_ex_tc.png diff --git a/src/lay/lay/doc/manual/bjt_ex_te.png b/src/doc/doc/manual/bjt_ex_te.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_ex_te.png rename to src/doc/doc/manual/bjt_ex_te.png diff --git a/src/lay/lay/doc/manual/bjt_ex_ts.png b/src/doc/doc/manual/bjt_ex_ts.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_ex_ts.png rename to src/doc/doc/manual/bjt_ex_ts.png diff --git a/src/lay/lay/doc/manual/bjt_lateral.png b/src/doc/doc/manual/bjt_lateral.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_lateral.png rename to src/doc/doc/manual/bjt_lateral.png diff --git a/src/lay/lay/doc/manual/bjt_vertical.png b/src/doc/doc/manual/bjt_vertical.png similarity index 100% rename from src/lay/lay/doc/manual/bjt_vertical.png rename to src/doc/doc/manual/bjt_vertical.png diff --git a/src/lay/lay/doc/manual/bjtlat_ex_layout.png b/src/doc/doc/manual/bjtlat_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/bjtlat_ex_layout.png rename to src/doc/doc/manual/bjtlat_ex_layout.png diff --git a/src/lay/lay/doc/manual/bjtlat_ex_tb.png b/src/doc/doc/manual/bjtlat_ex_tb.png similarity index 100% rename from src/lay/lay/doc/manual/bjtlat_ex_tb.png rename to src/doc/doc/manual/bjtlat_ex_tb.png diff --git a/src/lay/lay/doc/manual/bjtlat_ex_tc.png b/src/doc/doc/manual/bjtlat_ex_tc.png similarity index 100% rename from src/lay/lay/doc/manual/bjtlat_ex_tc.png rename to src/doc/doc/manual/bjtlat_ex_tc.png diff --git a/src/lay/lay/doc/manual/bjtlat_ex_te.png b/src/doc/doc/manual/bjtlat_ex_te.png similarity index 100% rename from src/lay/lay/doc/manual/bjtlat_ex_te.png rename to src/doc/doc/manual/bjtlat_ex_te.png diff --git a/src/lay/lay/doc/manual/bjtlat_ex_ts.png b/src/doc/doc/manual/bjtlat_ex_ts.png similarity index 100% rename from src/lay/lay/doc/manual/bjtlat_ex_ts.png rename to src/doc/doc/manual/bjtlat_ex_ts.png diff --git a/src/lay/lay/doc/manual/bookmarks.xml b/src/doc/doc/manual/bookmarks.xml similarity index 100% rename from src/lay/lay/doc/manual/bookmarks.xml rename to src/doc/doc/manual/bookmarks.xml diff --git a/src/lay/lay/doc/manual/browse_instances.xml b/src/doc/doc/manual/browse_instances.xml similarity index 100% rename from src/lay/lay/doc/manual/browse_instances.xml rename to src/doc/doc/manual/browse_instances.xml diff --git a/src/lay/lay/doc/manual/browse_shapes.xml b/src/doc/doc/manual/browse_shapes.xml similarity index 100% rename from src/lay/lay/doc/manual/browse_shapes.xml rename to src/doc/doc/manual/browse_shapes.xml diff --git a/src/lay/lay/doc/manual/cap_ex_layout.png b/src/doc/doc/manual/cap_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/cap_ex_layout.png rename to src/doc/doc/manual/cap_ex_layout.png diff --git a/src/lay/lay/doc/manual/cap_ex_ta.png b/src/doc/doc/manual/cap_ex_ta.png similarity index 100% rename from src/lay/lay/doc/manual/cap_ex_ta.png rename to src/doc/doc/manual/cap_ex_ta.png diff --git a/src/lay/lay/doc/manual/cap_ex_tb.png b/src/doc/doc/manual/cap_ex_tb.png similarity index 100% rename from src/lay/lay/doc/manual/cap_ex_tb.png rename to src/doc/doc/manual/cap_ex_tb.png diff --git a/src/lay/lay/doc/manual/cap_ex_tw.png b/src/doc/doc/manual/cap_ex_tw.png similarity index 100% rename from src/lay/lay/doc/manual/cap_ex_tw.png rename to src/doc/doc/manual/cap_ex_tw.png diff --git a/src/lay/lay/doc/manual/cap_schematic.png b/src/doc/doc/manual/cap_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/cap_schematic.png rename to src/doc/doc/manual/cap_schematic.png diff --git a/src/lay/lay/doc/manual/cap_with_bulk_schematic.png b/src/doc/doc/manual/cap_with_bulk_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/cap_with_bulk_schematic.png rename to src/doc/doc/manual/cap_with_bulk_schematic.png diff --git a/src/lay/lay/doc/manual/cell.xml b/src/doc/doc/manual/cell.xml similarity index 100% rename from src/lay/lay/doc/manual/cell.xml rename to src/doc/doc/manual/cell.xml diff --git a/src/lay/lay/doc/manual/cell_list.xml b/src/doc/doc/manual/cell_list.xml similarity index 100% rename from src/lay/lay/doc/manual/cell_list.xml rename to src/doc/doc/manual/cell_list.xml diff --git a/src/lay/lay/doc/manual/clip.xml b/src/doc/doc/manual/clip.xml similarity index 100% rename from src/lay/lay/doc/manual/clip.xml rename to src/doc/doc/manual/clip.xml diff --git a/src/lay/lay/doc/manual/copypaste_cell.xml b/src/doc/doc/manual/copypaste_cell.xml similarity index 100% rename from src/lay/lay/doc/manual/copypaste_cell.xml rename to src/doc/doc/manual/copypaste_cell.xml diff --git a/src/lay/lay/doc/manual/copypaste_sel.xml b/src/doc/doc/manual/copypaste_sel.xml similarity index 100% rename from src/lay/lay/doc/manual/copypaste_sel.xml rename to src/doc/doc/manual/copypaste_sel.xml diff --git a/src/lay/lay/doc/manual/create_box.xml b/src/doc/doc/manual/create_box.xml similarity index 100% rename from src/lay/lay/doc/manual/create_box.xml rename to src/doc/doc/manual/create_box.xml diff --git a/src/lay/lay/doc/manual/create_cells.xml b/src/doc/doc/manual/create_cells.xml similarity index 100% rename from src/lay/lay/doc/manual/create_cells.xml rename to src/doc/doc/manual/create_cells.xml diff --git a/src/lay/lay/doc/manual/create_cv1.png b/src/doc/doc/manual/create_cv1.png similarity index 100% rename from src/lay/lay/doc/manual/create_cv1.png rename to src/doc/doc/manual/create_cv1.png diff --git a/src/lay/lay/doc/manual/create_cv2.png b/src/doc/doc/manual/create_cv2.png similarity index 100% rename from src/lay/lay/doc/manual/create_cv2.png rename to src/doc/doc/manual/create_cv2.png diff --git a/src/lay/lay/doc/manual/create_cv3.png b/src/doc/doc/manual/create_cv3.png similarity index 100% rename from src/lay/lay/doc/manual/create_cv3.png rename to src/doc/doc/manual/create_cv3.png diff --git a/src/lay/lay/doc/manual/create_cv4.png b/src/doc/doc/manual/create_cv4.png similarity index 100% rename from src/lay/lay/doc/manual/create_cv4.png rename to src/doc/doc/manual/create_cv4.png diff --git a/src/lay/lay/doc/manual/create_from_scratch.xml b/src/doc/doc/manual/create_from_scratch.xml similarity index 100% rename from src/lay/lay/doc/manual/create_from_scratch.xml rename to src/doc/doc/manual/create_from_scratch.xml diff --git a/src/lay/lay/doc/manual/create_instance.xml b/src/doc/doc/manual/create_instance.xml similarity index 100% rename from src/lay/lay/doc/manual/create_instance.xml rename to src/doc/doc/manual/create_instance.xml diff --git a/src/lay/lay/doc/manual/create_layers.xml b/src/doc/doc/manual/create_layers.xml similarity index 100% rename from src/lay/lay/doc/manual/create_layers.xml rename to src/doc/doc/manual/create_layers.xml diff --git a/src/lay/lay/doc/manual/create_path.xml b/src/doc/doc/manual/create_path.xml similarity index 100% rename from src/lay/lay/doc/manual/create_path.xml rename to src/doc/doc/manual/create_path.xml diff --git a/src/lay/lay/doc/manual/create_polygon.xml b/src/doc/doc/manual/create_polygon.xml similarity index 100% rename from src/lay/lay/doc/manual/create_polygon.xml rename to src/doc/doc/manual/create_polygon.xml diff --git a/src/lay/lay/doc/manual/create_text.xml b/src/doc/doc/manual/create_text.xml similarity index 100% rename from src/lay/lay/doc/manual/create_text.xml rename to src/doc/doc/manual/create_text.xml diff --git a/src/lay/lay/doc/manual/create_variants.xml b/src/doc/doc/manual/create_variants.xml similarity index 100% rename from src/lay/lay/doc/manual/create_variants.xml rename to src/doc/doc/manual/create_variants.xml diff --git a/src/lay/lay/doc/manual/del_cell.xml b/src/doc/doc/manual/del_cell.xml similarity index 100% rename from src/lay/lay/doc/manual/del_cell.xml rename to src/doc/doc/manual/del_cell.xml diff --git a/src/lay/lay/doc/manual/descend.xml b/src/doc/doc/manual/descend.xml similarity index 100% rename from src/lay/lay/doc/manual/descend.xml rename to src/doc/doc/manual/descend.xml diff --git a/src/lay/lay/doc/manual/diff.xml b/src/doc/doc/manual/diff.xml similarity index 100% rename from src/lay/lay/doc/manual/diff.xml rename to src/doc/doc/manual/diff.xml diff --git a/src/lay/lay/doc/manual/diode_ex_layout.png b/src/doc/doc/manual/diode_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/diode_ex_layout.png rename to src/doc/doc/manual/diode_ex_layout.png diff --git a/src/lay/lay/doc/manual/diode_ex_ta.png b/src/doc/doc/manual/diode_ex_ta.png similarity index 100% rename from src/lay/lay/doc/manual/diode_ex_ta.png rename to src/doc/doc/manual/diode_ex_ta.png diff --git a/src/lay/lay/doc/manual/diode_ex_tc.png b/src/doc/doc/manual/diode_ex_tc.png similarity index 100% rename from src/lay/lay/doc/manual/diode_ex_tc.png rename to src/doc/doc/manual/diode_ex_tc.png diff --git a/src/lay/lay/doc/manual/diode_schematic.png b/src/doc/doc/manual/diode_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/diode_schematic.png rename to src/doc/doc/manual/diode_schematic.png diff --git a/src/lay/lay/doc/manual/drc.xml b/src/doc/doc/manual/drc.xml similarity index 100% rename from src/lay/lay/doc/manual/drc.xml rename to src/doc/doc/manual/drc.xml diff --git a/src/lay/lay/doc/manual/drc_basic.xml b/src/doc/doc/manual/drc_basic.xml similarity index 100% rename from src/lay/lay/doc/manual/drc_basic.xml rename to src/doc/doc/manual/drc_basic.xml diff --git a/src/lay/lay/doc/manual/drc_runsets.xml b/src/doc/doc/manual/drc_runsets.xml similarity index 100% rename from src/lay/lay/doc/manual/drc_runsets.xml rename to src/doc/doc/manual/drc_runsets.xml diff --git a/src/lay/lay/doc/manual/edit_mode.xml b/src/doc/doc/manual/edit_mode.xml similarity index 100% rename from src/lay/lay/doc/manual/edit_mode.xml rename to src/doc/doc/manual/edit_mode.xml diff --git a/src/lay/lay/doc/manual/editor.xml b/src/doc/doc/manual/editor.xml similarity index 100% rename from src/lay/lay/doc/manual/editor.xml rename to src/doc/doc/manual/editor.xml diff --git a/src/lay/lay/doc/manual/editor_advanced.xml b/src/doc/doc/manual/editor_advanced.xml similarity index 100% rename from src/lay/lay/doc/manual/editor_advanced.xml rename to src/doc/doc/manual/editor_advanced.xml diff --git a/src/lay/lay/doc/manual/editor_basics.xml b/src/doc/doc/manual/editor_basics.xml similarity index 100% rename from src/lay/lay/doc/manual/editor_basics.xml rename to src/doc/doc/manual/editor_basics.xml diff --git a/src/lay/lay/doc/manual/editor_operations.xml b/src/doc/doc/manual/editor_operations.xml similarity index 100% rename from src/lay/lay/doc/manual/editor_operations.xml rename to src/doc/doc/manual/editor_operations.xml diff --git a/src/lay/lay/doc/manual/editor_options.xml b/src/doc/doc/manual/editor_options.xml similarity index 100% rename from src/lay/lay/doc/manual/editor_options.xml rename to src/doc/doc/manual/editor_options.xml diff --git a/src/lay/lay/doc/manual/editor_selection.xml b/src/doc/doc/manual/editor_selection.xml similarity index 100% rename from src/lay/lay/doc/manual/editor_selection.xml rename to src/doc/doc/manual/editor_selection.xml diff --git a/src/lay/lay/doc/manual/explicit_hier_levels.xml b/src/doc/doc/manual/explicit_hier_levels.xml similarity index 100% rename from src/lay/lay/doc/manual/explicit_hier_levels.xml rename to src/doc/doc/manual/explicit_hier_levels.xml diff --git a/src/lay/lay/doc/manual/fill_default.png b/src/doc/doc/manual/fill_default.png similarity index 100% rename from src/lay/lay/doc/manual/fill_default.png rename to src/doc/doc/manual/fill_default.png diff --git a/src/lay/lay/doc/manual/fill_enhanced.png b/src/doc/doc/manual/fill_enhanced.png similarity index 100% rename from src/lay/lay/doc/manual/fill_enhanced.png rename to src/doc/doc/manual/fill_enhanced.png diff --git a/src/lay/lay/doc/manual/fill_second_order.png b/src/doc/doc/manual/fill_second_order.png similarity index 100% rename from src/lay/lay/doc/manual/fill_second_order.png rename to src/doc/doc/manual/fill_second_order.png diff --git a/src/lay/lay/doc/manual/flatten.xml b/src/doc/doc/manual/flatten.xml similarity index 100% rename from src/lay/lay/doc/manual/flatten.xml rename to src/doc/doc/manual/flatten.xml diff --git a/src/lay/lay/doc/manual/global_trans.xml b/src/doc/doc/manual/global_trans.xml similarity index 100% rename from src/lay/lay/doc/manual/global_trans.xml rename to src/doc/doc/manual/global_trans.xml diff --git a/src/lay/lay/doc/manual/hiding.xml b/src/doc/doc/manual/hiding.xml similarity index 100% rename from src/lay/lay/doc/manual/hiding.xml rename to src/doc/doc/manual/hiding.xml diff --git a/src/lay/lay/doc/manual/hier.xml b/src/doc/doc/manual/hier.xml similarity index 100% rename from src/lay/lay/doc/manual/hier.xml rename to src/doc/doc/manual/hier.xml diff --git a/src/lay/lay/doc/manual/hier_ops.xml b/src/doc/doc/manual/hier_ops.xml similarity index 100% rename from src/lay/lay/doc/manual/hier_ops.xml rename to src/doc/doc/manual/hier_ops.xml diff --git a/src/lay/lay/doc/manual/hierarchy_panel.png b/src/doc/doc/manual/hierarchy_panel.png similarity index 100% rename from src/lay/lay/doc/manual/hierarchy_panel.png rename to src/doc/doc/manual/hierarchy_panel.png diff --git a/src/lay/lay/doc/manual/images.xml b/src/doc/doc/manual/images.xml similarity index 100% rename from src/lay/lay/doc/manual/images.xml rename to src/doc/doc/manual/images.xml diff --git a/src/lay/lay/doc/manual/import_gerber.xml b/src/doc/doc/manual/import_gerber.xml similarity index 100% rename from src/lay/lay/doc/manual/import_gerber.xml rename to src/doc/doc/manual/import_gerber.xml diff --git a/src/lay/lay/doc/manual/import_layout.xml b/src/doc/doc/manual/import_layout.xml similarity index 100% rename from src/lay/lay/doc/manual/import_layout.xml rename to src/doc/doc/manual/import_layout.xml diff --git a/src/lay/lay/doc/manual/index.xml b/src/doc/doc/manual/index.xml similarity index 100% rename from src/lay/lay/doc/manual/index.xml rename to src/doc/doc/manual/index.xml diff --git a/src/lay/lay/doc/manual/inv.png b/src/doc/doc/manual/inv.png similarity index 100% rename from src/lay/lay/doc/manual/inv.png rename to src/doc/doc/manual/inv.png diff --git a/src/lay/lay/doc/manual/inv_explicit.png b/src/doc/doc/manual/inv_explicit.png similarity index 100% rename from src/lay/lay/doc/manual/inv_explicit.png rename to src/doc/doc/manual/inv_explicit.png diff --git a/src/lay/lay/doc/manual/inv_no_transistors.png b/src/doc/doc/manual/inv_no_transistors.png similarity index 100% rename from src/lay/lay/doc/manual/inv_no_transistors.png rename to src/doc/doc/manual/inv_no_transistors.png diff --git a/src/lay/lay/doc/manual/inv_schematic.png b/src/doc/doc/manual/inv_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/inv_schematic.png rename to src/doc/doc/manual/inv_schematic.png diff --git a/src/lay/lay/doc/manual/inv_schematic2.png b/src/doc/doc/manual/inv_schematic2.png similarity index 100% rename from src/lay/lay/doc/manual/inv_schematic2.png rename to src/doc/doc/manual/inv_schematic2.png diff --git a/src/lay/lay/doc/manual/inv_transistors.png b/src/doc/doc/manual/inv_transistors.png similarity index 100% rename from src/lay/lay/doc/manual/inv_transistors.png rename to src/doc/doc/manual/inv_transistors.png diff --git a/src/lay/lay/doc/manual/inv_with_diodes.png b/src/doc/doc/manual/inv_with_diodes.png similarity index 100% rename from src/lay/lay/doc/manual/inv_with_diodes.png rename to src/doc/doc/manual/inv_with_diodes.png diff --git a/src/lay/lay/doc/manual/landmarks.xml b/src/doc/doc/manual/landmarks.xml similarity index 100% rename from src/lay/lay/doc/manual/landmarks.xml rename to src/doc/doc/manual/landmarks.xml diff --git a/src/lay/lay/doc/manual/layer_animation.xml b/src/doc/doc/manual/layer_animation.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_animation.xml rename to src/doc/doc/manual/layer_animation.xml diff --git a/src/lay/lay/doc/manual/layer_boolean.xml b/src/doc/doc/manual/layer_boolean.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_boolean.xml rename to src/doc/doc/manual/layer_boolean.xml diff --git a/src/lay/lay/doc/manual/layer_color.xml b/src/doc/doc/manual/layer_color.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_color.xml rename to src/doc/doc/manual/layer_color.xml diff --git a/src/lay/lay/doc/manual/layer_content.xml b/src/doc/doc/manual/layer_content.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_content.xml rename to src/doc/doc/manual/layer_content.xml diff --git a/src/lay/lay/doc/manual/layer_fill.xml b/src/doc/doc/manual/layer_fill.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_fill.xml rename to src/doc/doc/manual/layer_fill.xml diff --git a/src/lay/lay/doc/manual/layer_hier.xml b/src/doc/doc/manual/layer_hier.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_hier.xml rename to src/doc/doc/manual/layer_hier.xml diff --git a/src/lay/lay/doc/manual/layer_ops.xml b/src/doc/doc/manual/layer_ops.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_ops.xml rename to src/doc/doc/manual/layer_ops.xml diff --git a/src/lay/lay/doc/manual/layer_order.xml b/src/doc/doc/manual/layer_order.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_order.xml rename to src/doc/doc/manual/layer_order.xml diff --git a/src/lay/lay/doc/manual/layer_size.xml b/src/doc/doc/manual/layer_size.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_size.xml rename to src/doc/doc/manual/layer_size.xml diff --git a/src/lay/lay/doc/manual/layer_source.xml b/src/doc/doc/manual/layer_source.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_source.xml rename to src/doc/doc/manual/layer_source.xml diff --git a/src/lay/lay/doc/manual/layer_source_expert.xml b/src/doc/doc/manual/layer_source_expert.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_source_expert.xml rename to src/doc/doc/manual/layer_source_expert.xml diff --git a/src/lay/lay/doc/manual/layer_style.xml b/src/doc/doc/manual/layer_style.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_style.xml rename to src/doc/doc/manual/layer_style.xml diff --git a/src/lay/lay/doc/manual/layer_tabs.xml b/src/doc/doc/manual/layer_tabs.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_tabs.xml rename to src/doc/doc/manual/layer_tabs.xml diff --git a/src/lay/lay/doc/manual/layer_validity.xml b/src/doc/doc/manual/layer_validity.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_validity.xml rename to src/doc/doc/manual/layer_validity.xml diff --git a/src/lay/lay/doc/manual/layer_views.xml b/src/doc/doc/manual/layer_views.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_views.xml rename to src/doc/doc/manual/layer_views.xml diff --git a/src/lay/lay/doc/manual/layer_visibility.xml b/src/doc/doc/manual/layer_visibility.xml similarity index 100% rename from src/lay/lay/doc/manual/layer_visibility.xml rename to src/doc/doc/manual/layer_visibility.xml diff --git a/src/lay/lay/doc/manual/layout_transforms.xml b/src/doc/doc/manual/layout_transforms.xml similarity index 100% rename from src/lay/lay/doc/manual/layout_transforms.xml rename to src/doc/doc/manual/layout_transforms.xml diff --git a/src/lay/lay/doc/manual/library_view.png b/src/doc/doc/manual/library_view.png similarity index 100% rename from src/lay/lay/doc/manual/library_view.png rename to src/doc/doc/manual/library_view.png diff --git a/src/lay/lay/doc/manual/library_view.xml b/src/doc/doc/manual/library_view.xml similarity index 100% rename from src/lay/lay/doc/manual/library_view.xml rename to src/doc/doc/manual/library_view.xml diff --git a/src/lay/lay/doc/manual/line_style.xml b/src/doc/doc/manual/line_style.xml similarity index 100% rename from src/lay/lay/doc/manual/line_style.xml rename to src/doc/doc/manual/line_style.xml diff --git a/src/lay/lay/doc/manual/load_save_layers.xml b/src/doc/doc/manual/load_save_layers.xml similarity index 100% rename from src/lay/lay/doc/manual/load_save_layers.xml rename to src/doc/doc/manual/load_save_layers.xml diff --git a/src/lay/lay/doc/manual/loading.xml b/src/doc/doc/manual/loading.xml similarity index 100% rename from src/lay/lay/doc/manual/loading.xml rename to src/doc/doc/manual/loading.xml diff --git a/src/lay/lay/doc/manual/lvs.xml b/src/doc/doc/manual/lvs.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs.xml rename to src/doc/doc/manual/lvs.xml diff --git a/src/lay/lay/doc/manual/lvs_browser.png b/src/doc/doc/manual/lvs_browser.png similarity index 100% rename from src/lay/lay/doc/manual/lvs_browser.png rename to src/doc/doc/manual/lvs_browser.png diff --git a/src/lay/lay/doc/manual/lvs_compare.xml b/src/doc/doc/manual/lvs_compare.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_compare.xml rename to src/doc/doc/manual/lvs_compare.xml diff --git a/src/lay/lay/doc/manual/lvs_connect.xml b/src/doc/doc/manual/lvs_connect.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_connect.xml rename to src/doc/doc/manual/lvs_connect.xml diff --git a/src/lay/lay/doc/manual/lvs_device_classes.xml b/src/doc/doc/manual/lvs_device_classes.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_device_classes.xml rename to src/doc/doc/manual/lvs_device_classes.xml diff --git a/src/lay/lay/doc/manual/lvs_device_extractors.xml b/src/doc/doc/manual/lvs_device_extractors.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_device_extractors.xml rename to src/doc/doc/manual/lvs_device_extractors.xml diff --git a/src/lay/lay/doc/manual/lvs_devices.xml b/src/doc/doc/manual/lvs_devices.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_devices.xml rename to src/doc/doc/manual/lvs_devices.xml diff --git a/src/lay/lay/doc/manual/lvs_intro.xml b/src/doc/doc/manual/lvs_intro.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_intro.xml rename to src/doc/doc/manual/lvs_intro.xml diff --git a/src/lay/lay/doc/manual/lvs_io.xml b/src/doc/doc/manual/lvs_io.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_io.xml rename to src/doc/doc/manual/lvs_io.xml diff --git a/src/lay/lay/doc/manual/lvs_overview.xml b/src/doc/doc/manual/lvs_overview.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_overview.xml rename to src/doc/doc/manual/lvs_overview.xml diff --git a/src/lay/lay/doc/manual/lvs_symm_nodes.png b/src/doc/doc/manual/lvs_symm_nodes.png similarity index 100% rename from src/lay/lay/doc/manual/lvs_symm_nodes.png rename to src/doc/doc/manual/lvs_symm_nodes.png diff --git a/src/lay/lay/doc/manual/lvs_tweaks.xml b/src/doc/doc/manual/lvs_tweaks.xml similarity index 100% rename from src/lay/lay/doc/manual/lvs_tweaks.xml rename to src/doc/doc/manual/lvs_tweaks.xml diff --git a/src/lay/lay/doc/manual/main_window.png b/src/doc/doc/manual/main_window.png similarity index 100% rename from src/lay/lay/doc/manual/main_window.png rename to src/doc/doc/manual/main_window.png diff --git a/src/lay/lay/doc/manual/main_window.xml b/src/doc/doc/manual/main_window.xml similarity index 100% rename from src/lay/lay/doc/manual/main_window.xml rename to src/doc/doc/manual/main_window.xml diff --git a/src/lay/lay/doc/manual/main_window_org.png b/src/doc/doc/manual/main_window_org.png similarity index 100% rename from src/lay/lay/doc/manual/main_window_org.png rename to src/doc/doc/manual/main_window_org.png diff --git a/src/lay/lay/doc/manual/marker_browser.xml b/src/doc/doc/manual/marker_browser.xml similarity index 100% rename from src/lay/lay/doc/manual/marker_browser.xml rename to src/doc/doc/manual/marker_browser.xml diff --git a/src/lay/lay/doc/manual/max_coherence.png b/src/doc/doc/manual/max_coherence.png similarity index 100% rename from src/lay/lay/doc/manual/max_coherence.png rename to src/doc/doc/manual/max_coherence.png diff --git a/src/lay/lay/doc/manual/measure.xml b/src/doc/doc/manual/measure.xml similarity index 100% rename from src/lay/lay/doc/manual/measure.xml rename to src/doc/doc/manual/measure.xml diff --git a/src/lay/lay/doc/manual/metal_connections.png b/src/doc/doc/manual/metal_connections.png similarity index 100% rename from src/lay/lay/doc/manual/metal_connections.png rename to src/doc/doc/manual/metal_connections.png diff --git a/src/lay/lay/doc/manual/min_coherence.png b/src/doc/doc/manual/min_coherence.png similarity index 100% rename from src/lay/lay/doc/manual/min_coherence.png rename to src/doc/doc/manual/min_coherence.png diff --git a/src/lay/lay/doc/manual/mos3_schematic.png b/src/doc/doc/manual/mos3_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/mos3_schematic.png rename to src/doc/doc/manual/mos3_schematic.png diff --git a/src/lay/lay/doc/manual/mos4_schematic.png b/src/doc/doc/manual/mos4_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/mos4_schematic.png rename to src/doc/doc/manual/mos4_schematic.png diff --git a/src/lay/lay/doc/manual/mos_ex_layout.png b/src/doc/doc/manual/mos_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/mos_ex_layout.png rename to src/doc/doc/manual/mos_ex_layout.png diff --git a/src/lay/lay/doc/manual/mos_ex_tb.png b/src/doc/doc/manual/mos_ex_tb.png similarity index 100% rename from src/lay/lay/doc/manual/mos_ex_tb.png rename to src/doc/doc/manual/mos_ex_tb.png diff --git a/src/lay/lay/doc/manual/mos_ex_td.png b/src/doc/doc/manual/mos_ex_td.png similarity index 100% rename from src/lay/lay/doc/manual/mos_ex_td.png rename to src/doc/doc/manual/mos_ex_td.png diff --git a/src/lay/lay/doc/manual/mos_ex_tg.png b/src/doc/doc/manual/mos_ex_tg.png similarity index 100% rename from src/lay/lay/doc/manual/mos_ex_tg.png rename to src/doc/doc/manual/mos_ex_tg.png diff --git a/src/lay/lay/doc/manual/mos_ex_ts.png b/src/doc/doc/manual/mos_ex_ts.png similarity index 100% rename from src/lay/lay/doc/manual/mos_ex_ts.png rename to src/doc/doc/manual/mos_ex_ts.png diff --git a/src/lay/lay/doc/manual/move_layer_sel.xml b/src/doc/doc/manual/move_layer_sel.xml similarity index 100% rename from src/lay/lay/doc/manual/move_layer_sel.xml rename to src/doc/doc/manual/move_layer_sel.xml diff --git a/src/lay/lay/doc/manual/move_sel.xml b/src/doc/doc/manual/move_sel.xml similarity index 100% rename from src/lay/lay/doc/manual/move_sel.xml rename to src/doc/doc/manual/move_sel.xml diff --git a/src/lay/lay/doc/manual/navigator.png b/src/doc/doc/manual/navigator.png similarity index 100% rename from src/lay/lay/doc/manual/navigator.png rename to src/doc/doc/manual/navigator.png diff --git a/src/lay/lay/doc/manual/net_graph.png b/src/doc/doc/manual/net_graph.png similarity index 100% rename from src/lay/lay/doc/manual/net_graph.png rename to src/doc/doc/manual/net_graph.png diff --git a/src/lay/lay/doc/manual/net_tracing.xml b/src/doc/doc/manual/net_tracing.xml similarity index 100% rename from src/lay/lay/doc/manual/net_tracing.xml rename to src/doc/doc/manual/net_tracing.xml diff --git a/src/lay/lay/doc/manual/object_align.xml b/src/doc/doc/manual/object_align.xml similarity index 100% rename from src/lay/lay/doc/manual/object_align.xml rename to src/doc/doc/manual/object_align.xml diff --git a/src/lay/lay/doc/manual/panels.xml b/src/doc/doc/manual/panels.xml similarity index 100% rename from src/lay/lay/doc/manual/panels.xml rename to src/doc/doc/manual/panels.xml diff --git a/src/lay/lay/doc/manual/partial.xml b/src/doc/doc/manual/partial.xml similarity index 100% rename from src/lay/lay/doc/manual/partial.xml rename to src/doc/doc/manual/partial.xml diff --git a/src/lay/lay/doc/manual/partial_vs_full.xml b/src/doc/doc/manual/partial_vs_full.xml similarity index 100% rename from src/lay/lay/doc/manual/partial_vs_full.xml rename to src/doc/doc/manual/partial_vs_full.xml diff --git a/src/lay/lay/doc/manual/pcb_1x.png b/src/doc/doc/manual/pcb_1x.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_1x.png rename to src/doc/doc/manual/pcb_1x.png diff --git a/src/lay/lay/doc/manual/pcb_2x.png b/src/doc/doc/manual/pcb_2x.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_2x.png rename to src/doc/doc/manual/pcb_2x.png diff --git a/src/lay/lay/doc/manual/pcb_3x.png b/src/doc/doc/manual/pcb_3x.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_3x.png rename to src/doc/doc/manual/pcb_3x.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_1.png b/src/doc/doc/manual/pcb_import_free_flow_1.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_1.png rename to src/doc/doc/manual/pcb_import_free_flow_1.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_2.png b/src/doc/doc/manual/pcb_import_free_flow_2.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_2.png rename to src/doc/doc/manual/pcb_import_free_flow_2.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_3.png b/src/doc/doc/manual/pcb_import_free_flow_3.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_3.png rename to src/doc/doc/manual/pcb_import_free_flow_3.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_4.png b/src/doc/doc/manual/pcb_import_free_flow_4.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_4.png rename to src/doc/doc/manual/pcb_import_free_flow_4.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_5.png b/src/doc/doc/manual/pcb_import_free_flow_5.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_5.png rename to src/doc/doc/manual/pcb_import_free_flow_5.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_6.png b/src/doc/doc/manual/pcb_import_free_flow_6.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_6.png rename to src/doc/doc/manual/pcb_import_free_flow_6.png diff --git a/src/lay/lay/doc/manual/pcb_import_free_flow_7.png b/src/doc/doc/manual/pcb_import_free_flow_7.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_free_flow_7.png rename to src/doc/doc/manual/pcb_import_free_flow_7.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_1.png b/src/doc/doc/manual/pcb_import_stack_flow_1.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_1.png rename to src/doc/doc/manual/pcb_import_stack_flow_1.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_2.png b/src/doc/doc/manual/pcb_import_stack_flow_2.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_2.png rename to src/doc/doc/manual/pcb_import_stack_flow_2.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_3.png b/src/doc/doc/manual/pcb_import_stack_flow_3.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_3.png rename to src/doc/doc/manual/pcb_import_stack_flow_3.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_4.png b/src/doc/doc/manual/pcb_import_stack_flow_4.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_4.png rename to src/doc/doc/manual/pcb_import_stack_flow_4.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_5.png b/src/doc/doc/manual/pcb_import_stack_flow_5.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_5.png rename to src/doc/doc/manual/pcb_import_stack_flow_5.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_6.png b/src/doc/doc/manual/pcb_import_stack_flow_6.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_6.png rename to src/doc/doc/manual/pcb_import_stack_flow_6.png diff --git a/src/lay/lay/doc/manual/pcb_import_stack_flow_7.png b/src/doc/doc/manual/pcb_import_stack_flow_7.png similarity index 100% rename from src/lay/lay/doc/manual/pcb_import_stack_flow_7.png rename to src/doc/doc/manual/pcb_import_stack_flow_7.png diff --git a/src/lay/lay/doc/manual/pcell_operations.xml b/src/doc/doc/manual/pcell_operations.xml similarity index 100% rename from src/lay/lay/doc/manual/pcell_operations.xml rename to src/doc/doc/manual/pcell_operations.xml diff --git a/src/lay/lay/doc/manual/pick_and_drop.xml b/src/doc/doc/manual/pick_and_drop.xml similarity index 100% rename from src/lay/lay/doc/manual/pick_and_drop.xml rename to src/doc/doc/manual/pick_and_drop.xml diff --git a/src/lay/lay/doc/manual/rename_cell.xml b/src/doc/doc/manual/rename_cell.xml similarity index 100% rename from src/lay/lay/doc/manual/rename_cell.xml rename to src/doc/doc/manual/rename_cell.xml diff --git a/src/lay/lay/doc/manual/res_ex_layout.png b/src/doc/doc/manual/res_ex_layout.png similarity index 100% rename from src/lay/lay/doc/manual/res_ex_layout.png rename to src/doc/doc/manual/res_ex_layout.png diff --git a/src/lay/lay/doc/manual/res_ex_ta.png b/src/doc/doc/manual/res_ex_ta.png similarity index 100% rename from src/lay/lay/doc/manual/res_ex_ta.png rename to src/doc/doc/manual/res_ex_ta.png diff --git a/src/lay/lay/doc/manual/res_ex_tb.png b/src/doc/doc/manual/res_ex_tb.png similarity index 100% rename from src/lay/lay/doc/manual/res_ex_tb.png rename to src/doc/doc/manual/res_ex_tb.png diff --git a/src/lay/lay/doc/manual/res_ex_tw.png b/src/doc/doc/manual/res_ex_tw.png similarity index 100% rename from src/lay/lay/doc/manual/res_ex_tw.png rename to src/doc/doc/manual/res_ex_tw.png diff --git a/src/lay/lay/doc/manual/res_schematic.png b/src/doc/doc/manual/res_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/res_schematic.png rename to src/doc/doc/manual/res_schematic.png diff --git a/src/lay/lay/doc/manual/res_with_bulk_schematic.png b/src/doc/doc/manual/res_with_bulk_schematic.png similarity index 100% rename from src/lay/lay/doc/manual/res_with_bulk_schematic.png rename to src/doc/doc/manual/res_with_bulk_schematic.png diff --git a/src/lay/lay/doc/manual/resolve_arrays.xml b/src/doc/doc/manual/resolve_arrays.xml similarity index 100% rename from src/lay/lay/doc/manual/resolve_arrays.xml rename to src/doc/doc/manual/resolve_arrays.xml diff --git a/src/lay/lay/doc/manual/round_corners.png b/src/doc/doc/manual/round_corners.png similarity index 100% rename from src/lay/lay/doc/manual/round_corners.png rename to src/doc/doc/manual/round_corners.png diff --git a/src/lay/lay/doc/manual/round_corners.xml b/src/doc/doc/manual/round_corners.xml similarity index 100% rename from src/lay/lay/doc/manual/round_corners.xml rename to src/doc/doc/manual/round_corners.xml diff --git a/src/lay/lay/doc/manual/ruler_properties.xml b/src/doc/doc/manual/ruler_properties.xml similarity index 100% rename from src/lay/lay/doc/manual/ruler_properties.xml rename to src/doc/doc/manual/ruler_properties.xml diff --git a/src/lay/lay/doc/manual/save.xml b/src/doc/doc/manual/save.xml similarity index 100% rename from src/lay/lay/doc/manual/save.xml rename to src/doc/doc/manual/save.xml diff --git a/src/lay/lay/doc/manual/screenshots.xml b/src/doc/doc/manual/screenshots.xml similarity index 100% rename from src/lay/lay/doc/manual/screenshots.xml rename to src/doc/doc/manual/screenshots.xml diff --git a/src/lay/lay/doc/manual/search_replace.xml b/src/doc/doc/manual/search_replace.xml similarity index 100% rename from src/lay/lay/doc/manual/search_replace.xml rename to src/doc/doc/manual/search_replace.xml diff --git a/src/lay/lay/doc/manual/selecting.xml b/src/doc/doc/manual/selecting.xml similarity index 100% rename from src/lay/lay/doc/manual/selecting.xml rename to src/doc/doc/manual/selecting.xml diff --git a/src/lay/lay/doc/manual/session.xml b/src/doc/doc/manual/session.xml similarity index 100% rename from src/lay/lay/doc/manual/session.xml rename to src/doc/doc/manual/session.xml diff --git a/src/lay/lay/doc/manual/setup.xml b/src/doc/doc/manual/setup.xml similarity index 100% rename from src/lay/lay/doc/manual/setup.xml rename to src/doc/doc/manual/setup.xml diff --git a/src/lay/lay/doc/manual/shape_boolean.xml b/src/doc/doc/manual/shape_boolean.xml similarity index 100% rename from src/lay/lay/doc/manual/shape_boolean.xml rename to src/doc/doc/manual/shape_boolean.xml diff --git a/src/lay/lay/doc/manual/shape_size.xml b/src/doc/doc/manual/shape_size.xml similarity index 100% rename from src/lay/lay/doc/manual/shape_size.xml rename to src/doc/doc/manual/shape_size.xml diff --git a/src/lay/lay/doc/manual/size_modes.png b/src/doc/doc/manual/size_modes.png similarity index 100% rename from src/lay/lay/doc/manual/size_modes.png rename to src/doc/doc/manual/size_modes.png diff --git a/src/lay/lay/doc/manual/substrate_connections.png b/src/doc/doc/manual/substrate_connections.png similarity index 100% rename from src/lay/lay/doc/manual/substrate_connections.png rename to src/doc/doc/manual/substrate_connections.png diff --git a/src/lay/lay/doc/manual/symm_nodes.png b/src/doc/doc/manual/symm_nodes.png similarity index 100% rename from src/lay/lay/doc/manual/symm_nodes.png rename to src/doc/doc/manual/symm_nodes.png diff --git a/src/lay/lay/doc/manual/technology_manager.xml b/src/doc/doc/manual/technology_manager.xml similarity index 100% rename from src/lay/lay/doc/manual/technology_manager.xml rename to src/doc/doc/manual/technology_manager.xml diff --git a/src/lay/lay/doc/manual/tiling.xml b/src/doc/doc/manual/tiling.xml similarity index 100% rename from src/lay/lay/doc/manual/tiling.xml rename to src/doc/doc/manual/tiling.xml diff --git a/src/lay/lay/doc/manual/trans_sel.xml b/src/doc/doc/manual/trans_sel.xml similarity index 100% rename from src/lay/lay/doc/manual/trans_sel.xml rename to src/doc/doc/manual/trans_sel.xml diff --git a/src/lay/lay/doc/manual/undo_redo.xml b/src/doc/doc/manual/undo_redo.xml similarity index 100% rename from src/lay/lay/doc/manual/undo_redo.xml rename to src/doc/doc/manual/undo_redo.xml diff --git a/src/lay/lay/doc/manual/view_options.xml b/src/doc/doc/manual/view_options.xml similarity index 100% rename from src/lay/lay/doc/manual/view_options.xml rename to src/doc/doc/manual/view_options.xml diff --git a/src/lay/lay/doc/manual/view_state.xml b/src/doc/doc/manual/view_state.xml similarity index 100% rename from src/lay/lay/doc/manual/view_state.xml rename to src/doc/doc/manual/view_state.xml diff --git a/src/lay/lay/doc/manual/xor.xml b/src/doc/doc/manual/xor.xml similarity index 100% rename from src/lay/lay/doc/manual/xor.xml rename to src/doc/doc/manual/xor.xml diff --git a/src/lay/lay/doc/manual/zoom.xml b/src/doc/doc/manual/zoom.xml similarity index 100% rename from src/lay/lay/doc/manual/zoom.xml rename to src/doc/doc/manual/zoom.xml diff --git a/src/lay/lay/doc/programming/application_api.xml b/src/doc/doc/programming/application_api.xml similarity index 100% rename from src/lay/lay/doc/programming/application_api.xml rename to src/doc/doc/programming/application_api.xml diff --git a/src/lay/lay/doc/programming/box.png b/src/doc/doc/programming/box.png similarity index 100% rename from src/lay/lay/doc/programming/box.png rename to src/doc/doc/programming/box.png diff --git a/src/lay/lay/doc/programming/database_api.xml b/src/doc/doc/programming/database_api.xml similarity index 100% rename from src/lay/lay/doc/programming/database_api.xml rename to src/doc/doc/programming/database_api.xml diff --git a/src/lay/lay/doc/programming/edge_relations.png b/src/doc/doc/programming/edge_relations.png similarity index 100% rename from src/lay/lay/doc/programming/edge_relations.png rename to src/doc/doc/programming/edge_relations.png diff --git a/src/lay/lay/doc/programming/events.xml b/src/doc/doc/programming/events.xml similarity index 100% rename from src/lay/lay/doc/programming/events.xml rename to src/doc/doc/programming/events.xml diff --git a/src/lay/lay/doc/programming/geometry_api.xml b/src/doc/doc/programming/geometry_api.xml similarity index 100% rename from src/lay/lay/doc/programming/geometry_api.xml rename to src/doc/doc/programming/geometry_api.xml diff --git a/src/lay/lay/doc/programming/index.xml b/src/doc/doc/programming/index.xml similarity index 100% rename from src/lay/lay/doc/programming/index.xml rename to src/doc/doc/programming/index.xml diff --git a/src/lay/lay/doc/programming/introduction.xml b/src/doc/doc/programming/introduction.xml similarity index 100% rename from src/lay/lay/doc/programming/introduction.xml rename to src/doc/doc/programming/introduction.xml diff --git a/src/lay/lay/doc/programming/path.png b/src/doc/doc/programming/path.png similarity index 100% rename from src/lay/lay/doc/programming/path.png rename to src/doc/doc/programming/path.png diff --git a/src/lay/lay/doc/programming/polygon.png b/src/doc/doc/programming/polygon.png similarity index 100% rename from src/lay/lay/doc/programming/polygon.png rename to src/doc/doc/programming/polygon.png diff --git a/src/lay/lay/doc/programming/python.xml b/src/doc/doc/programming/python.xml similarity index 100% rename from src/lay/lay/doc/programming/python.xml rename to src/doc/doc/programming/python.xml diff --git a/src/lay/lay/doc/programming/qt_binding.xml b/src/doc/doc/programming/qt_binding.xml similarity index 100% rename from src/lay/lay/doc/programming/qt_binding.xml rename to src/doc/doc/programming/qt_binding.xml diff --git a/src/lay/lay/doc/programming/round_ended_path.png b/src/doc/doc/programming/round_ended_path.png similarity index 100% rename from src/lay/lay/doc/programming/round_ended_path.png rename to src/doc/doc/programming/round_ended_path.png diff --git a/src/lay/lay/doc/programming/ruby_binding.xml b/src/doc/doc/programming/ruby_binding.xml similarity index 100% rename from src/lay/lay/doc/programming/ruby_binding.xml rename to src/doc/doc/programming/ruby_binding.xml diff --git a/src/lay/lay/doc/programming/ruby_binding_basic.png b/src/doc/doc/programming/ruby_binding_basic.png similarity index 100% rename from src/lay/lay/doc/programming/ruby_binding_basic.png rename to src/doc/doc/programming/ruby_binding_basic.png diff --git a/src/lay/lay/doc/programming/ruby_binding_callback.png b/src/doc/doc/programming/ruby_binding_callback.png similarity index 100% rename from src/lay/lay/doc/programming/ruby_binding_callback.png rename to src/doc/doc/programming/ruby_binding_callback.png diff --git a/src/lay/lay/doc/programming/ruby_pcells.xml b/src/doc/doc/programming/ruby_pcells.xml similarity index 100% rename from src/lay/lay/doc/programming/ruby_pcells.xml rename to src/doc/doc/programming/ruby_pcells.xml diff --git a/src/lay/lay/doc/programming/simple_polygon.png b/src/doc/doc/programming/simple_polygon.png similarity index 100% rename from src/lay/lay/doc/programming/simple_polygon.png rename to src/doc/doc/programming/simple_polygon.png diff --git a/src/doc/docCommon.h b/src/doc/docCommon.h new file mode 100644 index 000000000..3d5edfd11 --- /dev/null +++ b/src/doc/docCommon.h @@ -0,0 +1,51 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#if !defined(HDR_docCommon_h) +# define HDR_docCommon_h + +# if defined _WIN32 || defined __CYGWIN__ + +# ifdef MAKE_DOC_LIBRARY +# define DOC_PUBLIC __declspec(dllexport) +# else +# define DOC_PUBLIC __declspec(dllimport) +# endif +# define DOC_LOCAL +# define DOC_PUBLIC_TEMPLATE + +# else + +# if __GNUC__ >= 4 || defined(__clang__) +# define DOC_PUBLIC __attribute__ ((visibility ("default"))) +# define DOC_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) +# define DOC_LOCAL __attribute__ ((visibility ("hidden"))) +# else +# define DOC_PUBLIC +# define DOC_PUBLIC_TEMPLATE +# define DOC_LOCAL +# endif + +# endif + +#endif diff --git a/src/lay/lay/layDRCLVSHelpResources.qrc b/src/doc/docDRCLVSResources.qrc similarity index 100% rename from src/lay/lay/layDRCLVSHelpResources.qrc rename to src/doc/docDRCLVSResources.qrc diff --git a/src/doc/docForceLink.cc b/src/doc/docForceLink.cc new file mode 100644 index 000000000..b8711e3eb --- /dev/null +++ b/src/doc/docForceLink.cc @@ -0,0 +1,32 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include "docForceLink.h" + +namespace doc +{ + int _force_link_f () + { + return 0; + } +} + diff --git a/src/doc/docForceLink.h b/src/doc/docForceLink.h new file mode 100644 index 000000000..f2020fb69 --- /dev/null +++ b/src/doc/docForceLink.h @@ -0,0 +1,40 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#ifndef HDR_docForceLink +#define HDR_docForceLink + +#include "docCommon.h" + +/** + * @file Include this function to force linking of the doc module + */ + +namespace doc +{ + DOC_PUBLIC int _force_link_f (); + static int _force_link_target = _force_link_f (); +} + +#endif + diff --git a/src/lay/lay/layHelpResources.qrc b/src/doc/docResources.qrc similarity index 100% rename from src/lay/lay/layHelpResources.qrc rename to src/doc/docResources.qrc diff --git a/src/edt/edt/AlignOptionsDialog.ui b/src/edt/edt/AlignOptionsDialog.ui index c2002f0db..c6e21d7da 100644 --- a/src/edt/edt/AlignOptionsDialog.ui +++ b/src/edt/edt/AlignOptionsDialog.ui @@ -27,7 +27,7 @@ - :/align_none.png:/align_none.png + :/align_none_32px.png:/align_none_32px.png @@ -44,7 +44,7 @@ - :/align_left.png:/align_left.png + :/align_left_32px.png:/align_left_32px.png @@ -61,7 +61,7 @@ - :/align_hcenter.png:/align_hcenter.png + :/align_hcenter_32px.png:/align_hcenter_32px.png @@ -78,7 +78,7 @@ - :/align_right.png:/align_right.png + :/align_right_32px.png:/align_right_32px.png @@ -205,7 +205,7 @@ - :/align_none.png:/align_none.png + :/align_none_32px.png:/align_none_32px.png @@ -222,7 +222,7 @@ - :/align_top.png:/align_top.png + :/align_top_32px.png:/align_top_32px.png @@ -239,7 +239,7 @@ - :/align_vcenter.png:/align_vcenter.png + :/align_vcenter_32px.png:/align_vcenter_32px.png @@ -309,7 +309,7 @@ - :/align_bottom.png:/align_bottom.png + :/align_bottom_32px.png:/align_bottom_32px.png diff --git a/src/edt/edt/DistributeOptionsDialog.ui b/src/edt/edt/DistributeOptionsDialog.ui index 74929ebe1..900a68f5f 100644 --- a/src/edt/edt/DistributeOptionsDialog.ui +++ b/src/edt/edt/DistributeOptionsDialog.ui @@ -279,7 +279,7 @@ - :/align_none.png:/align_none.png + :/align_none_32px.png:/align_none_32px.png @@ -312,7 +312,7 @@ - :/align_left.png:/align_left.png + :/align_left_32px.png:/align_left_32px.png @@ -345,7 +345,7 @@ - :/align_hcenter.png:/align_hcenter.png + :/align_hcenter_32px.png:/align_hcenter_32px.png @@ -378,7 +378,7 @@ - :/align_right.png:/align_right.png + :/align_right_32px.png:/align_right_32px.png @@ -457,7 +457,7 @@ - :/align_none.png:/align_none.png + :/align_none_32px.png:/align_none_32px.png @@ -490,7 +490,7 @@ - :/align_top.png:/align_top.png + :/align_top_32px.png:/align_top_32px.png @@ -523,7 +523,7 @@ - :/align_vcenter.png:/align_vcenter.png + :/align_vcenter_32px.png:/align_vcenter_32px.png @@ -556,7 +556,7 @@ - :/align_bottom.png:/align_bottom.png + :/align_bottom_32px.png:/align_bottom_32px.png 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/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index 94d2f3e4a..e022a1cd4 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -731,7 +731,7 @@ - :/warn.png + :/warn_16px@2x.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/edt/edt/MakeCellOptionsDialog.ui b/src/edt/edt/MakeCellOptionsDialog.ui index 9f9d2ba33..9fae1b2bc 100644 --- a/src/edt/edt/MakeCellOptionsDialog.ui +++ b/src/edt/edt/MakeCellOptionsDialog.ui @@ -145,7 +145,7 @@ - :/ct.png:/ct.png + :/ct_31px.png:/ct_31px.png @@ -165,7 +165,7 @@ - :/lt.png:/lt.png + :/lt_31px.png:/lt_31px.png @@ -185,7 +185,7 @@ - :/rt.png:/rt.png + :/rt_31px.png:/rt_31px.png @@ -205,7 +205,7 @@ - :/lc.png:/lc.png + :/lc_31px.png:/lc_31px.png @@ -225,7 +225,7 @@ - :/cc.png:/cc.png + :/cc_31px.png:/cc_31px.png @@ -245,7 +245,7 @@ - :/rc.png:/rc.png + :/rc_31px.png:/rc_31px.png @@ -265,7 +265,7 @@ - :/lb.png:/lb.png + :/lb_31px.png:/lb_31px.png @@ -285,7 +285,7 @@ - :/cb.png:/cb.png + :/cb_31px.png:/cb_31px.png @@ -305,7 +305,7 @@ - :/rb.png:/rb.png + :/rb_31px.png:/rb_31px.png diff --git a/src/edt/edt/TextPropertiesPage.ui b/src/edt/edt/TextPropertiesPage.ui index 7d7dadab7..1ac85ca2d 100644 --- a/src/edt/edt/TextPropertiesPage.ui +++ b/src/edt/edt/TextPropertiesPage.ui @@ -278,7 +278,7 @@ to show text objects scaled and rotated (r0) - :/r0.png + :/r0_24px.png @@ -286,7 +286,7 @@ to show text objects scaled and rotated (r90) - :/r90.png + :/r90_24px.png @@ -294,7 +294,7 @@ to show text objects scaled and rotated (r180) - :/r180.png + :/r180_24px.png @@ -302,7 +302,7 @@ to show text objects scaled and rotated (r270) - :/r270.png + :/r270_24px.png @@ -310,7 +310,7 @@ to show text objects scaled and rotated (m0) - :/m0.png + :/m0_24px.png @@ -318,7 +318,7 @@ to show text objects scaled and rotated (m45) - :/m45.png + :/m45_24px.png @@ -326,7 +326,7 @@ to show text objects scaled and rotated (m90) - :/m90.png + :/m90_24px.png @@ -334,7 +334,7 @@ to show text objects scaled and rotated (m135) - :/m135.png + :/m135_24px.png diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc index 1ea0436cf..f2a91af17 100644 --- a/src/edt/edt/edtMainService.cc +++ b/src/edt/edt/edtMainService.cc @@ -2204,6 +2204,12 @@ MainService::cm_tap () #if defined(HAVE_QT) // TODO: what to do here in Qt-less case? Store results in configuration so they can be retrieved externally? +#if QT_VERSION >= 0x050000 + double dpr = view_widget->devicePixelRatio (); +#else + double dpr = 1.0; +#endif + std::unique_ptr menu (new QMenu (view_widget)); menu->show (); @@ -2213,7 +2219,7 @@ MainService::cm_tap () QPoint mp = view ()->canvas ()->widget ()->mapToGlobal (QPoint (mp_local.x (), mp_local.y ())); for (std::vector::const_iterator l = tapped_layers.begin (); l != tapped_layers.end (); ++l) { - QAction *a = menu->addAction (lay::LayerTreeModel::icon_for_layer (*l, view (), icon_size, icon_size, 0, true), tl::to_qstring ((*l)->display_string (view (), true, true /*with source*/))); + QAction *a = menu->addAction (lay::LayerTreeModel::icon_for_layer (*l, view (), icon_size, icon_size, dpr, 0, true), tl::to_qstring ((*l)->display_string (view (), true, true /*with source*/))); a->setData (int (l - tapped_layers.begin ())); } diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc index 4edab8ab7..ed28773cf 100644 --- a/src/edt/edt/edtPCellParametersPage.cc +++ b/src/edt/edt/edtPCellParametersPage.cc @@ -183,7 +183,7 @@ PCellParametersPage::init () } mp_changed_icon = new QLabel (mp_update_frame); - mp_changed_icon->setPixmap (QPixmap (":/warn.png")); + mp_changed_icon->setPixmap (QPixmap (":/warn_16px@2x.png")); update_frame_layout->addWidget (mp_changed_icon, 0, 0, 1, 1); mp_update_button = new QToolButton (mp_update_frame); @@ -210,7 +210,7 @@ PCellParametersPage::init () } mp_error_icon = new QLabel (mp_update_frame); - mp_error_icon->setPixmap (QPixmap (":/warn.png")); + mp_error_icon->setPixmap (QPixmap (":/warn_16px@2x.png")); error_frame_layout->addWidget (mp_error_icon, 1, 0, 1, 1); mp_error_label = new QLabel (mp_update_frame); diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc index 5da6ed90a..8df9edfa7 100644 --- a/src/edt/edt/edtPlugin.cc +++ b/src/edt/edt/edtPlugin.cc @@ -261,27 +261,27 @@ private: }; static tl::RegisteredClass config_decl1 ( - new edt::PluginDeclaration (tl::to_string (tr ("Polygons")), "polygon:edit_mode\t" + tl::to_string (tr ("Polygon")) + "<:polygon.png>" + tl::to_string (tr ("{Create a polygon}")), 0, &get_shape_editor_options_pages), + new edt::PluginDeclaration (tl::to_string (tr ("Polygons")), "polygon:edit_mode\t" + tl::to_string (tr ("Polygon")) + "<:polygon_24px.png>" + tl::to_string (tr ("{Create a polygon}")), 0, &get_shape_editor_options_pages), 4010, "edt::Service(Polygons)" ); static tl::RegisteredClass config_decl2 ( - new edt::PluginDeclaration (tl::to_string (tr ("Boxes")), "box:edit_mode\t" + tl::to_string (tr ("Box")) + "\t<:box.png>" + tl::to_string (tr ("{Create a box}")), 0, &get_shape_editor_options_pages), + new edt::PluginDeclaration (tl::to_string (tr ("Boxes")), "box:edit_mode\t" + tl::to_string (tr ("Box")) + "\t<:box_24px.png>" + tl::to_string (tr ("{Create a box}")), 0, &get_shape_editor_options_pages), 4011, "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)" ); static tl::RegisteredClass config_decl4 ( - new edt::PluginDeclaration (tl::to_string (tr ("Paths")), "path:edit_mode\t" + tl::to_string (tr ("Path")) + "\t<:path.png>" + tl::to_string (tr ("{Create a path}")), &get_path_options, &get_path_editor_options_pages), + new edt::PluginDeclaration (tl::to_string (tr ("Paths")), "path:edit_mode\t" + tl::to_string (tr ("Path")) + "\t<:path_24px.png>" + tl::to_string (tr ("{Create a path}")), &get_path_options, &get_path_editor_options_pages), 4013, "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)" ); @@ -414,19 +414,19 @@ public: if (cm == CM_Add) { combine_menu->set_title (tl::to_string (tr ("Add"))); - combine_menu->set_icon (":/cm_add.png"); + combine_menu->set_icon (":/cm_add_24px.png"); } else if (cm == CM_Merge) { combine_menu->set_title (tl::to_string (tr ("Merge"))); - combine_menu->set_icon (":/cm_merge.png"); + combine_menu->set_icon (":/cm_merge_24px.png"); } else if (cm == CM_Erase) { combine_menu->set_title (tl::to_string (tr ("Erase"))); - combine_menu->set_icon (":/cm_erase.png"); + combine_menu->set_icon (":/cm_erase_24px.png"); } else if (cm == CM_Mask) { combine_menu->set_title (tl::to_string (tr ("Mask"))); - combine_menu->set_icon (":/cm_mask.png"); + combine_menu->set_icon (":/cm_mask_24px.png"); } else if (cm == CM_Diff) { combine_menu->set_title (tl::to_string (tr ("Diff"))); - combine_menu->set_icon (":/cm_diff.png"); + combine_menu->set_icon (":/cm_diff_24px.png"); } #endif } @@ -528,7 +528,7 @@ private: }; static tl::RegisteredClass config_decl30 ( - new edt::PartialPluginDeclaration (tl::to_string (tr ("Partial shapes")), "partial:edit_mode\t" + tl::to_string (tr ("Partial{Edit points and edges of shapes}")) + "<:partial.png>"), + new edt::PartialPluginDeclaration (tl::to_string (tr ("Partial shapes")), "partial:edit_mode\t" + tl::to_string (tr ("Partial{Edit points and edges of shapes}")) + "<:partial_24px.png>"), 4030, "edt::PartialService" ); diff --git a/src/edt/edt/edtRecentConfigurationPage.cc b/src/edt/edt/edtRecentConfigurationPage.cc index 191ddbb5c..84f831c8d 100644 --- a/src/edt/edt/edtRecentConfigurationPage.cc +++ b/src/edt/edt/edtRecentConfigurationPage.cc @@ -161,6 +161,12 @@ lp_iter_from_string (lay::LayoutViewBase *view, const std::string &s) void RecentConfigurationPage::render_to (QTreeWidgetItem *item, int column, const std::vector &values, RecentConfigurationPage::ConfigurationRendering rendering) { +#if QT_VERSION >= 0x050000 + double dpr = devicePixelRatio (); +#else + double dpr = 1.0; +#endif + // store original value item->setData (column, Qt::UserRole, tl::to_qstring (values [column])); @@ -190,7 +196,7 @@ RecentConfigurationPage::render_to (QTreeWidgetItem *item, int column, const std tl::error << tl::to_string (tr ("Configuration error (Layer): ")) << ex.msg (); } if (! l.is_null () && ! l.at_end ()) { - item->setIcon (column, lay::LayerTreeModel::icon_for_layer (l, view (), icon_size, icon_size, 0, true)); + item->setIcon (column, lay::LayerTreeModel::icon_for_layer (l, view (), icon_size, icon_size, dpr, 0, true)); item->setText (column, tl::to_qstring (values [column])); } else { item->setIcon (column, QIcon ()); diff --git a/src/icons/icons.pro b/src/icons/icons.pro new file mode 100644 index 000000000..7a6ebd3c0 --- /dev/null +++ b/src/icons/icons.pro @@ -0,0 +1,17 @@ + +DESTDIR = $$OUT_PWD/.. +TARGET = klayout_icons + +include($$PWD/../lib.pri) + +DEFINES += MAKE_ICONS_LIBRARY + +HEADERS = \ + +FORMS = \ + +SOURCES = \ + iconsForceLink.cc \ + +RESOURCES = \ + icons.qrc \ diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc new file mode 100644 index 000000000..1ff153d1a --- /dev/null +++ b/src/icons/icons.qrc @@ -0,0 +1,281 @@ + + + images/add_16px.png + images/add_16px@2x.png + images/add_24px.png + images/add_24px@2x.png + images/edit_16px.png + images/edit_16px@2x.png + images/align_bottom_32px.png + images/align_bottom_32px@2x.png + images/align_hcenter_32px.png + images/align_hcenter_32px@2x.png + images/align_left_32px.png + images/align_left_32px@2x.png + images/align_none_32px.png + images/align_none_32px@2x.png + images/align_right_32px.png + images/align_right_32px@2x.png + images/align_top_32px.png + images/align_top_32px@2x.png + images/align_vcenter_32px.png + images/align_vcenter_32px@2x.png + images/back_24px.png + images/back_24px@2x.png + images/back_16px.png + images/back_16px@2x.png + images/blue_flag_16px.png + images/blue_flag_16px@2x.png + images/box_24px.png + images/box_24px@2x.png + images/breakpoint_16px.png + images/breakpoint_16px@2x.png + images/breakpointmark_16px.png + images/breakpointmark_16px@2x.png + images/breakpointmarkdisabled_16px.png + images/breakpointmarkdisabled_16px@2x.png + images/bright_12px.png + images/bright_12px@2x.png + images/bulb.png + images/bulb@2x.png + images/cb_31px.png + images/cb_31px@2x.png + images/cc_31px.png + images/cc_31px@2x.png + images/checked_16px.png + images/checked_16px@2x.png + images/clear_16px.png + images/clear_16px@2x.png + images/clear_24px.png + images/clear_24px@2x.png + images/clear_edit_16px.png + images/clear_edit_16px@2x.png + images/clearbreakpoints_16px.png + images/clearbreakpoints_16px@2x.png + images/cm_add_24px.png + images/cm_add_24px@2x.png + images/cm_diff_24px.png + images/cm_diff_24px@2x.png + images/cm_erase_24px.png + images/cm_erase_24px@2x.png + images/cm_mask_24px.png + images/cm_mask_24px@2x.png + images/cm_merge_24px.png + images/cm_merge_24px@2x.png + images/ct_31px.png + images/ct_31px@2x.png + images/dark_12px.png + images/dark_12px@2x.png + images/defaultmacroicon_16px.png + images/defaultmacroicon_16px@2x.png + images/del_16px.png + images/del_16px@2x.png + images/del_24px.png + images/del_24px@2x.png + images/down_16px.png + images/down_16px@2x.png + images/downdown_16px.png + images/downdown_16px@2x.png + images/execmark_16px.png + images/execmark_16px@2x.png + images/find_16px.png + images/find_16px@2x.png + images/fliph_16px.png + images/fliph_16px@2x.png + images/flipv_16px.png + images/flipv_16px@2x.png + images/folder_16px.png + images/folder_16px@2x.png + images/forward_24px.png + images/forward_24px@2x.png + images/forward_16px.png + images/forward_16px@2x.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 + images/help_16px@2x.png + images/home_24px.png + images/home_24px@2x.png + images/import_16px.png + images/import_16px@2x.png + images/important_16px.png + images/important_16px@2x.png + images/instance_24px.png + images/instance_24px@2x.png + images/invert_16px.png + images/invert_16px@2x.png + images/lb_31px.png + images/lb_31px@2x.png + images/lc_31px.png + images/lc_31px@2x.png + images/left_16px.png + images/left_16px@2x.png + images/logo.png + images/lt_31px.png + images/lt_31px@2x.png + images/m0_24px.png + images/m0_24px@2x.png + images/m135_24px.png + images/m135_24px@2x.png + images/m45_24px.png + images/m45_24px@2x.png + images/m90_24px.png + images/m90_24px@2x.png + images/move_24px.png + images/move_24px@2x.png + images/move_simple_16px.png + images/move_simple_16px@2x.png + images/neutral_12px.png + images/neutral_12px@2x.png + images/new_folder_16px.png + images/new_folder_16px@2x.png + images/next_topic_24px.png + images/next_topic_24px@2x.png + images/nextstep_16px.png + images/nextstep_16px@2x.png + images/no_flag_16px.png + images/no_flag_16px@2x.png + images/nophoto_16px.png + images/nophoto_16px@2x.png + images/options_edit_16px.png + images/options_edit_16px@2x.png + images/partial_24px.png + images/partial_24px@2x.png + images/path_24px.png + images/path_24px@2x.png + images/pause_16px.png + images/pause_16px@2x.png + images/photo_16px.png + images/photo_16px@2x.png + images/polygon_24px.png + images/polygon_24px@2x.png + images/prev_topic_24px.png + images/prev_topic_24px@2x.png + images/properties_16px.png + images/properties_16px@2x.png + images/r0_24px.png + images/r0_24px@2x.png + images/r180_24px.png + images/r180_24px@2x.png + images/r270_24px.png + images/r270_24px@2x.png + images/r90_24px.png + images/r90_24px@2x.png + images/rb_31px.png + images/rb_31px@2x.png + images/rc_31px.png + images/rc_31px@2x.png + images/red_flag_16px.png + images/red_flag_16px@2x.png + images/rename_16px.png + images/rename_16px@2x.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 + images/rotate_16px@2x.png + images/rrotate_16px.png + images/rrotate_16px@2x.png + images/rt_31px.png + images/rt_31px@2x.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_24px.png + images/ruler_24px@2x.png + images/debug_16px.png + images/debug_16px@2x.png + images/bug.png + images/bug@2x.png + images/run_16px.png + images/run_16px@2x.png + images/runthis_16px.png + images/runthis_16px@2x.png + images/save_16px.png + images/save_16px@2x.png + images/save_all_16px.png + images/save_all_16px@2x.png + images/select_24px.png + images/select_24px@2x.png + images/setup_16px.png + images/setup_16px@2x.png + images/singlestep_16px.png + images/singlestep_16px@2x.png + images/stop_16px.png + images/stop_16px@2x.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 + images/unchecked_16px@2x.png + images/up_16px.png + images/up_16px@2x.png + images/upup_16px.png + images/upup_16px@2x.png + images/waived_16px.png + images/waived_16px@2x.png + images/yellow_flag_16px.png + images/yellow_flag_16px@2x.png + images/salt.png + images/salt@2x.png + images/salt_icon.png + images/salt_icon@2x.png + images/warn_16px.png + images/warn_16px@2x.png + images/empty_16px.png + images/empty_16px@2x.png + images/error_16px.png + images/error_16px@2x.png + images/error2_16px.png + images/error2_16px@2x.png + images/info_16px.png + images/info_16px@2x.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 + images/file_12px@2x.png + images/empty_12px.png + images/empty_12px@2x.png + images/fit_front_24px.png + images/fit_front_24px@2x.png + images/fit_back_24px.png + images/fit_back_24px@2x.png + images/fit_left_24px.png + images/fit_left_24px@2x.png + images/fit_right_24px.png + images/fit_right_24px@2x.png + images/fit_top_24px.png + images/fit_top_24px@2x.png + images/fit_bottom_24px.png + images/fit_bottom_24px@2x.png + images/unlocked_16px.png + images/unlocked_16px@2x.png + images/locked_16px.png + images/locked_16px@2x.png + images/bookmark_16px.png + images/bookmark_16px@2x.png + images/bookmark_24px.png + images/bookmark_24px@2x.png + + diff --git a/src/icons/iconsCommon.h b/src/icons/iconsCommon.h new file mode 100644 index 000000000..c1ba58602 --- /dev/null +++ b/src/icons/iconsCommon.h @@ -0,0 +1,51 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#if !defined(HDR_iconsCommon_h) +# define HDR_iconsCommon_h + +# if defined _WIN32 || defined __CYGWIN__ + +# ifdef MAKE_ICONS_LIBRARY +# define ICONS_PUBLIC __declspec(dllexport) +# else +# define ICONS_PUBLIC __declspec(dllimport) +# endif +# define ICONS_LOCAL +# define ICONS_PUBLIC_TEMPLATE + +# else + +# if __GNUC__ >= 4 || defined(__clang__) +# define ICONS_PUBLIC __attribute__ ((visibility ("default"))) +# define ICONS_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) +# define ICONS_LOCAL __attribute__ ((visibility ("hidden"))) +# else +# define ICONS_PUBLIC +# define ICONS_PUBLIC_TEMPLATE +# define ICONS_LOCAL +# endif + +# endif + +#endif diff --git a/src/icons/iconsForceLink.cc b/src/icons/iconsForceLink.cc new file mode 100644 index 000000000..66d1a720d --- /dev/null +++ b/src/icons/iconsForceLink.cc @@ -0,0 +1,32 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +#include "iconsForceLink.h" + +namespace icons +{ + int _force_link_f () + { + return 0; + } +} + diff --git a/src/icons/iconsForceLink.h b/src/icons/iconsForceLink.h new file mode 100644 index 000000000..63569d665 --- /dev/null +++ b/src/icons/iconsForceLink.h @@ -0,0 +1,40 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2022 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#ifndef HDR_iconsForceLink +#define HDR_iconsForceLink + +#include "iconsCommon.h" + +/** + * @file Include this function to force linking of the icons module + */ + +namespace icons +{ + ICONS_PUBLIC int _force_link_f (); + static int _force_link_target = _force_link_f (); +} + +#endif + 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/align_bottom_32px.png b/src/icons/images/align_bottom_32px.png new file mode 100644 index 000000000..3851767d4 Binary files /dev/null and b/src/icons/images/align_bottom_32px.png differ diff --git a/src/icons/images/align_bottom_32px@2x.png b/src/icons/images/align_bottom_32px@2x.png new file mode 100644 index 000000000..b325c56cb Binary files /dev/null and b/src/icons/images/align_bottom_32px@2x.png differ diff --git a/src/icons/images/align_hcenter_32px.png b/src/icons/images/align_hcenter_32px.png new file mode 100644 index 000000000..252857cb9 Binary files /dev/null and b/src/icons/images/align_hcenter_32px.png differ diff --git a/src/icons/images/align_hcenter_32px@2x.png b/src/icons/images/align_hcenter_32px@2x.png new file mode 100644 index 000000000..22d81ade2 Binary files /dev/null and b/src/icons/images/align_hcenter_32px@2x.png differ diff --git a/src/icons/images/align_left_32px.png b/src/icons/images/align_left_32px.png new file mode 100644 index 000000000..64ba57fad Binary files /dev/null and b/src/icons/images/align_left_32px.png differ diff --git a/src/icons/images/align_left_32px@2x.png b/src/icons/images/align_left_32px@2x.png new file mode 100644 index 000000000..4ac1dc3bc Binary files /dev/null and b/src/icons/images/align_left_32px@2x.png differ diff --git a/src/icons/images/align_none_32px.png b/src/icons/images/align_none_32px.png new file mode 100644 index 000000000..e82d5fd9c Binary files /dev/null and b/src/icons/images/align_none_32px.png differ diff --git a/src/icons/images/align_none_32px@2x.png b/src/icons/images/align_none_32px@2x.png new file mode 100644 index 000000000..681d3e28e Binary files /dev/null and b/src/icons/images/align_none_32px@2x.png differ diff --git a/src/icons/images/align_right_32px.png b/src/icons/images/align_right_32px.png new file mode 100644 index 000000000..ffcfa69ff Binary files /dev/null and b/src/icons/images/align_right_32px.png differ diff --git a/src/icons/images/align_right_32px@2x.png b/src/icons/images/align_right_32px@2x.png new file mode 100644 index 000000000..0af9758c5 Binary files /dev/null and b/src/icons/images/align_right_32px@2x.png differ diff --git a/src/icons/images/align_top_32px.png b/src/icons/images/align_top_32px.png new file mode 100644 index 000000000..3bb2fc8ea Binary files /dev/null and b/src/icons/images/align_top_32px.png differ diff --git a/src/icons/images/align_top_32px@2x.png b/src/icons/images/align_top_32px@2x.png new file mode 100644 index 000000000..ca23e903b Binary files /dev/null and b/src/icons/images/align_top_32px@2x.png differ diff --git a/src/icons/images/align_vcenter_32px.png b/src/icons/images/align_vcenter_32px.png new file mode 100644 index 000000000..21fba60a4 Binary files /dev/null and b/src/icons/images/align_vcenter_32px.png differ diff --git a/src/icons/images/align_vcenter_32px@2x.png b/src/icons/images/align_vcenter_32px@2x.png new file mode 100644 index 000000000..65a4c1a7c Binary files /dev/null and b/src/icons/images/align_vcenter_32px@2x.png differ diff --git a/src/icons/images/back_16px.png b/src/icons/images/back_16px.png new file mode 100644 index 000000000..f3a4c71ad Binary files /dev/null and b/src/icons/images/back_16px.png differ diff --git a/src/icons/images/back_16px@2x.png b/src/icons/images/back_16px@2x.png new file mode 100644 index 000000000..1b7e3ab9c Binary files /dev/null and b/src/icons/images/back_16px@2x.png differ diff --git a/src/icons/images/back_24px.png b/src/icons/images/back_24px.png new file mode 100644 index 000000000..7ba5754cb Binary files /dev/null and b/src/icons/images/back_24px.png differ diff --git a/src/icons/images/back_24px@2x.png b/src/icons/images/back_24px@2x.png new file mode 100644 index 000000000..09ef56fe3 Binary files /dev/null and b/src/icons/images/back_24px@2x.png differ diff --git a/src/icons/images/blue_flag_16px.png b/src/icons/images/blue_flag_16px.png new file mode 100644 index 000000000..614cb07cb Binary files /dev/null and b/src/icons/images/blue_flag_16px.png differ diff --git a/src/icons/images/blue_flag_16px@2x.png b/src/icons/images/blue_flag_16px@2x.png new file mode 100644 index 000000000..ab2847238 Binary files /dev/null and b/src/icons/images/blue_flag_16px@2x.png differ diff --git a/src/icons/images/bookmark_16px.png b/src/icons/images/bookmark_16px.png new file mode 100644 index 000000000..5828f1018 Binary files /dev/null and b/src/icons/images/bookmark_16px.png differ diff --git a/src/icons/images/bookmark_16px@2x.png b/src/icons/images/bookmark_16px@2x.png new file mode 100644 index 000000000..179b552fa Binary files /dev/null and b/src/icons/images/bookmark_16px@2x.png differ diff --git a/src/lay/lay/images/bookmark.png b/src/icons/images/bookmark_24px.png similarity index 76% rename from src/lay/lay/images/bookmark.png rename to src/icons/images/bookmark_24px.png index c315058ce..50b208d0c 100644 Binary files a/src/lay/lay/images/bookmark.png and b/src/icons/images/bookmark_24px.png differ diff --git a/src/icons/images/bookmark_24px@2x.png b/src/icons/images/bookmark_24px@2x.png new file mode 100644 index 000000000..bc21b96f5 Binary files /dev/null and b/src/icons/images/bookmark_24px@2x.png differ diff --git a/src/lay/lay/images/box.png b/src/icons/images/box.png similarity index 100% rename from src/lay/lay/images/box.png rename to src/icons/images/box.png diff --git a/src/icons/images/box_24px.png b/src/icons/images/box_24px.png new file mode 100644 index 000000000..ddad5610c Binary files /dev/null and b/src/icons/images/box_24px.png differ diff --git a/src/icons/images/box_24px@2x.png b/src/icons/images/box_24px@2x.png new file mode 100644 index 000000000..44b8f1cfc Binary files /dev/null and b/src/icons/images/box_24px@2x.png differ diff --git a/src/icons/images/breakpoint_16px.png b/src/icons/images/breakpoint_16px.png new file mode 100644 index 000000000..f66861638 Binary files /dev/null and b/src/icons/images/breakpoint_16px.png differ diff --git a/src/icons/images/breakpoint_16px@2x.png b/src/icons/images/breakpoint_16px@2x.png new file mode 100644 index 000000000..102e201e5 Binary files /dev/null and b/src/icons/images/breakpoint_16px@2x.png differ diff --git a/src/icons/images/breakpointmark_16px.png b/src/icons/images/breakpointmark_16px.png new file mode 100644 index 000000000..182911cde Binary files /dev/null and b/src/icons/images/breakpointmark_16px.png differ diff --git a/src/icons/images/breakpointmark_16px@2x.png b/src/icons/images/breakpointmark_16px@2x.png new file mode 100644 index 000000000..b364ddc90 Binary files /dev/null and b/src/icons/images/breakpointmark_16px@2x.png differ diff --git a/src/icons/images/breakpointmarkdisabled_16px.png b/src/icons/images/breakpointmarkdisabled_16px.png new file mode 100644 index 000000000..a5b27f8e1 Binary files /dev/null and b/src/icons/images/breakpointmarkdisabled_16px.png differ diff --git a/src/icons/images/breakpointmarkdisabled_16px@2x.png b/src/icons/images/breakpointmarkdisabled_16px@2x.png new file mode 100644 index 000000000..3d51e719c Binary files /dev/null and b/src/icons/images/breakpointmarkdisabled_16px@2x.png differ diff --git a/src/icons/images/bright_12px.png b/src/icons/images/bright_12px.png new file mode 100644 index 000000000..9fa6c7702 Binary files /dev/null and b/src/icons/images/bright_12px.png differ diff --git a/src/icons/images/bright_12px@2x.png b/src/icons/images/bright_12px@2x.png new file mode 100644 index 000000000..89c7255c4 Binary files /dev/null and b/src/icons/images/bright_12px@2x.png differ diff --git a/src/icons/images/bug.png b/src/icons/images/bug.png new file mode 100644 index 000000000..262a79b8d Binary files /dev/null and b/src/icons/images/bug.png differ diff --git a/src/icons/images/bug@2x.png b/src/icons/images/bug@2x.png new file mode 100644 index 000000000..358d1ab8c Binary files /dev/null and b/src/icons/images/bug@2x.png differ diff --git a/src/icons/images/bulb.png b/src/icons/images/bulb.png new file mode 100644 index 000000000..eac494b91 Binary files /dev/null and b/src/icons/images/bulb.png differ diff --git a/src/icons/images/bulb@2x.png b/src/icons/images/bulb@2x.png new file mode 100644 index 000000000..bb0c1a7b3 Binary files /dev/null and b/src/icons/images/bulb@2x.png differ diff --git a/src/icons/images/cb_31px.png b/src/icons/images/cb_31px.png new file mode 100644 index 000000000..d1dff71ea Binary files /dev/null and b/src/icons/images/cb_31px.png differ diff --git a/src/icons/images/cb_31px@2x.png b/src/icons/images/cb_31px@2x.png new file mode 100644 index 000000000..4c9f4fef1 Binary files /dev/null and b/src/icons/images/cb_31px@2x.png differ diff --git a/src/icons/images/cc_31px.png b/src/icons/images/cc_31px.png new file mode 100644 index 000000000..794fe0aea Binary files /dev/null and b/src/icons/images/cc_31px.png differ diff --git a/src/icons/images/cc_31px@2x.png b/src/icons/images/cc_31px@2x.png new file mode 100644 index 000000000..a3bcb59b2 Binary files /dev/null and b/src/icons/images/cc_31px@2x.png differ diff --git a/src/icons/images/checked_16px.png b/src/icons/images/checked_16px.png new file mode 100644 index 000000000..770b617a1 Binary files /dev/null and b/src/icons/images/checked_16px.png differ diff --git a/src/icons/images/checked_16px@2x.png b/src/icons/images/checked_16px@2x.png new file mode 100644 index 000000000..ad6511425 Binary files /dev/null and b/src/icons/images/checked_16px@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/clear_edit_16px.png b/src/icons/images/clear_edit_16px.png new file mode 100644 index 000000000..89adeadf4 Binary files /dev/null and b/src/icons/images/clear_edit_16px.png differ diff --git a/src/icons/images/clear_edit_16px@2x.png b/src/icons/images/clear_edit_16px@2x.png new file mode 100644 index 000000000..fe5d3f616 Binary files /dev/null and b/src/icons/images/clear_edit_16px@2x.png differ diff --git a/src/icons/images/clearbreakpoints_16px.png b/src/icons/images/clearbreakpoints_16px.png new file mode 100644 index 000000000..4070c5855 Binary files /dev/null and b/src/icons/images/clearbreakpoints_16px.png differ diff --git a/src/icons/images/clearbreakpoints_16px@2x.png b/src/icons/images/clearbreakpoints_16px@2x.png new file mode 100644 index 000000000..3239689ef Binary files /dev/null and b/src/icons/images/clearbreakpoints_16px@2x.png differ diff --git a/src/icons/images/cm_add_24px.png b/src/icons/images/cm_add_24px.png new file mode 100644 index 000000000..94fdb6143 Binary files /dev/null and b/src/icons/images/cm_add_24px.png differ diff --git a/src/icons/images/cm_add_24px@2x.png b/src/icons/images/cm_add_24px@2x.png new file mode 100644 index 000000000..4b5170061 Binary files /dev/null and b/src/icons/images/cm_add_24px@2x.png differ diff --git a/src/icons/images/cm_diff_24px.png b/src/icons/images/cm_diff_24px.png new file mode 100644 index 000000000..2c48b683a Binary files /dev/null and b/src/icons/images/cm_diff_24px.png differ diff --git a/src/icons/images/cm_diff_24px@2x.png b/src/icons/images/cm_diff_24px@2x.png new file mode 100644 index 000000000..775abccb6 Binary files /dev/null and b/src/icons/images/cm_diff_24px@2x.png differ diff --git a/src/icons/images/cm_erase_24px.png b/src/icons/images/cm_erase_24px.png new file mode 100644 index 000000000..5f37f9d87 Binary files /dev/null and b/src/icons/images/cm_erase_24px.png differ diff --git a/src/icons/images/cm_erase_24px@2x.png b/src/icons/images/cm_erase_24px@2x.png new file mode 100644 index 000000000..731db1338 Binary files /dev/null and b/src/icons/images/cm_erase_24px@2x.png differ diff --git a/src/icons/images/cm_mask_24px.png b/src/icons/images/cm_mask_24px.png new file mode 100644 index 000000000..94c7e307a Binary files /dev/null and b/src/icons/images/cm_mask_24px.png differ diff --git a/src/icons/images/cm_mask_24px@2x.png b/src/icons/images/cm_mask_24px@2x.png new file mode 100644 index 000000000..400d44a93 Binary files /dev/null and b/src/icons/images/cm_mask_24px@2x.png differ diff --git a/src/icons/images/cm_merge_24px.png b/src/icons/images/cm_merge_24px.png new file mode 100644 index 000000000..11b8de5a0 Binary files /dev/null and b/src/icons/images/cm_merge_24px.png differ diff --git a/src/icons/images/cm_merge_24px@2x.png b/src/icons/images/cm_merge_24px@2x.png new file mode 100644 index 000000000..d100bb000 Binary files /dev/null and b/src/icons/images/cm_merge_24px@2x.png differ diff --git a/src/icons/images/ct_31px.png b/src/icons/images/ct_31px.png new file mode 100644 index 000000000..08e46f8d0 Binary files /dev/null and b/src/icons/images/ct_31px.png differ diff --git a/src/icons/images/ct_31px@2x.png b/src/icons/images/ct_31px@2x.png new file mode 100644 index 000000000..129431062 Binary files /dev/null and b/src/icons/images/ct_31px@2x.png differ diff --git a/src/icons/images/dark_12px.png b/src/icons/images/dark_12px.png new file mode 100644 index 000000000..8a23b7ace Binary files /dev/null and b/src/icons/images/dark_12px.png differ diff --git a/src/icons/images/dark_12px@2x.png b/src/icons/images/dark_12px@2x.png new file mode 100644 index 000000000..1725c0d32 Binary files /dev/null and b/src/icons/images/dark_12px@2x.png differ diff --git a/src/icons/images/debug_16px.png b/src/icons/images/debug_16px.png new file mode 100644 index 000000000..3097e1dd5 Binary files /dev/null and b/src/icons/images/debug_16px.png differ diff --git a/src/icons/images/debug_16px@2x.png b/src/icons/images/debug_16px@2x.png new file mode 100644 index 000000000..c47cb90d8 Binary files /dev/null and b/src/icons/images/debug_16px@2x.png 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/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/images/down_16px.png b/src/icons/images/down_16px.png new file mode 100644 index 000000000..3e4717082 Binary files /dev/null and b/src/icons/images/down_16px.png differ diff --git a/src/icons/images/down_16px@2x.png b/src/icons/images/down_16px@2x.png new file mode 100644 index 000000000..f66cf575e Binary files /dev/null and b/src/icons/images/down_16px@2x.png differ diff --git a/src/icons/images/downdown_16px.png b/src/icons/images/downdown_16px.png new file mode 100644 index 000000000..82f4b40ea Binary files /dev/null and b/src/icons/images/downdown_16px.png differ diff --git a/src/icons/images/downdown_16px@2x.png b/src/icons/images/downdown_16px@2x.png new file mode 100644 index 000000000..011bff1f2 Binary files /dev/null and b/src/icons/images/downdown_16px@2x.png differ diff --git a/src/icons/images/edit_16px.png b/src/icons/images/edit_16px.png new file mode 100644 index 000000000..b129280ae Binary files /dev/null and b/src/icons/images/edit_16px.png differ diff --git a/src/icons/images/edit_16px@2x.png b/src/icons/images/edit_16px@2x.png new file mode 100644 index 000000000..46901bb9a Binary files /dev/null and b/src/icons/images/edit_16px@2x.png differ diff --git a/src/icons/images/empty_12px.png b/src/icons/images/empty_12px.png new file mode 100644 index 000000000..46ef0f7b7 Binary files /dev/null and b/src/icons/images/empty_12px.png differ diff --git a/src/icons/images/empty_12px@2x.png b/src/icons/images/empty_12px@2x.png new file mode 100644 index 000000000..27bcbf6b3 Binary files /dev/null and b/src/icons/images/empty_12px@2x.png differ diff --git a/src/icons/images/empty_16px.png b/src/icons/images/empty_16px.png new file mode 100644 index 000000000..1529b3495 Binary files /dev/null and b/src/icons/images/empty_16px.png differ diff --git a/src/icons/images/empty_16px@2x.png b/src/icons/images/empty_16px@2x.png new file mode 100644 index 000000000..c560efa2d Binary files /dev/null and b/src/icons/images/empty_16px@2x.png differ diff --git a/src/icons/images/empty_24px.png b/src/icons/images/empty_24px.png new file mode 100644 index 000000000..ce5c57c6e Binary files /dev/null and b/src/icons/images/empty_24px.png differ diff --git a/src/icons/images/empty_24px@2x.png b/src/icons/images/empty_24px@2x.png new file mode 100644 index 000000000..af3e114ad Binary files /dev/null and b/src/icons/images/empty_24px@2x.png differ diff --git a/src/icons/images/empty_31px.png b/src/icons/images/empty_31px.png new file mode 100644 index 000000000..62edd4bec Binary files /dev/null and b/src/icons/images/empty_31px.png differ diff --git a/src/icons/images/empty_31px@2x.png b/src/icons/images/empty_31px@2x.png new file mode 100644 index 000000000..54a39c48c Binary files /dev/null and b/src/icons/images/empty_31px@2x.png differ diff --git a/src/icons/images/empty_32px.png b/src/icons/images/empty_32px.png new file mode 100644 index 000000000..3bb143569 Binary files /dev/null and b/src/icons/images/empty_32px.png differ diff --git a/src/icons/images/empty_32px@2x.png b/src/icons/images/empty_32px@2x.png new file mode 100644 index 000000000..aa798e7c9 Binary files /dev/null and b/src/icons/images/empty_32px@2x.png differ diff --git a/src/icons/images/error2_16px.png b/src/icons/images/error2_16px.png new file mode 100644 index 000000000..ea191969b Binary files /dev/null and b/src/icons/images/error2_16px.png differ diff --git a/src/icons/images/error2_16px@2x.png b/src/icons/images/error2_16px@2x.png new file mode 100644 index 000000000..ee2dd2eef Binary files /dev/null and b/src/icons/images/error2_16px@2x.png differ diff --git a/src/icons/images/error_16px.png b/src/icons/images/error_16px.png new file mode 100644 index 000000000..b4cba2d51 Binary files /dev/null and b/src/icons/images/error_16px.png differ diff --git a/src/icons/images/error_16px@2x.png b/src/icons/images/error_16px@2x.png new file mode 100644 index 000000000..7396d7191 Binary files /dev/null and b/src/icons/images/error_16px@2x.png 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/file_12px.png b/src/icons/images/file_12px.png new file mode 100644 index 000000000..db264cbc9 Binary files /dev/null and b/src/icons/images/file_12px.png differ diff --git a/src/icons/images/file_12px@2x.png b/src/icons/images/file_12px@2x.png new file mode 100644 index 000000000..f8a8a1afc Binary files /dev/null and b/src/icons/images/file_12px@2x.png differ diff --git a/src/icons/images/find_16px.png b/src/icons/images/find_16px.png new file mode 100644 index 000000000..bd13ec362 Binary files /dev/null and b/src/icons/images/find_16px.png differ diff --git a/src/icons/images/find_16px@2x.png b/src/icons/images/find_16px@2x.png new file mode 100644 index 000000000..ff8a10b20 Binary files /dev/null and b/src/icons/images/find_16px@2x.png differ diff --git a/src/lay/lay/images/fit_back.png b/src/icons/images/fit_back.png similarity index 100% rename from src/lay/lay/images/fit_back.png rename to src/icons/images/fit_back.png diff --git a/src/icons/images/fit_back_24px.png b/src/icons/images/fit_back_24px.png new file mode 100644 index 000000000..3e7a3d44e Binary files /dev/null and b/src/icons/images/fit_back_24px.png differ diff --git a/src/icons/images/fit_back_24px@2x.png b/src/icons/images/fit_back_24px@2x.png new file mode 100644 index 000000000..696203967 Binary files /dev/null and b/src/icons/images/fit_back_24px@2x.png differ diff --git a/src/lay/lay/images/fit_bottom.png b/src/icons/images/fit_bottom.png similarity index 100% rename from src/lay/lay/images/fit_bottom.png rename to src/icons/images/fit_bottom.png diff --git a/src/icons/images/fit_bottom_24px.png b/src/icons/images/fit_bottom_24px.png new file mode 100644 index 000000000..3f3203a4c Binary files /dev/null and b/src/icons/images/fit_bottom_24px.png differ diff --git a/src/icons/images/fit_bottom_24px@2x.png b/src/icons/images/fit_bottom_24px@2x.png new file mode 100644 index 000000000..dafcb2c1b Binary files /dev/null and b/src/icons/images/fit_bottom_24px@2x.png differ diff --git a/src/lay/lay/images/fit_front.png b/src/icons/images/fit_front.png similarity index 100% rename from src/lay/lay/images/fit_front.png rename to src/icons/images/fit_front.png diff --git a/src/icons/images/fit_front_24px.png b/src/icons/images/fit_front_24px.png new file mode 100644 index 000000000..c65d4ce2e Binary files /dev/null and b/src/icons/images/fit_front_24px.png differ diff --git a/src/icons/images/fit_front_24px@2x.png b/src/icons/images/fit_front_24px@2x.png new file mode 100644 index 000000000..3daf2f5b7 Binary files /dev/null and b/src/icons/images/fit_front_24px@2x.png differ diff --git a/src/lay/lay/images/fit_left.png b/src/icons/images/fit_left.png similarity index 100% rename from src/lay/lay/images/fit_left.png rename to src/icons/images/fit_left.png diff --git a/src/icons/images/fit_left_24px.png b/src/icons/images/fit_left_24px.png new file mode 100644 index 000000000..586aebc5b Binary files /dev/null and b/src/icons/images/fit_left_24px.png differ diff --git a/src/icons/images/fit_left_24px@2x.png b/src/icons/images/fit_left_24px@2x.png new file mode 100644 index 000000000..6002708ca Binary files /dev/null and b/src/icons/images/fit_left_24px@2x.png differ diff --git a/src/lay/lay/images/fit_right.png b/src/icons/images/fit_right.png similarity index 100% rename from src/lay/lay/images/fit_right.png rename to src/icons/images/fit_right.png diff --git a/src/icons/images/fit_right_24px.png b/src/icons/images/fit_right_24px.png new file mode 100644 index 000000000..b57ee7c93 Binary files /dev/null and b/src/icons/images/fit_right_24px.png differ diff --git a/src/icons/images/fit_right_24px@2x.png b/src/icons/images/fit_right_24px@2x.png new file mode 100644 index 000000000..a2b9c419f Binary files /dev/null and b/src/icons/images/fit_right_24px@2x.png differ diff --git a/src/lay/lay/images/fit_top.png b/src/icons/images/fit_top.png similarity index 100% rename from src/lay/lay/images/fit_top.png rename to src/icons/images/fit_top.png diff --git a/src/icons/images/fit_top_24px.png b/src/icons/images/fit_top_24px.png new file mode 100644 index 000000000..9bcff834a Binary files /dev/null and b/src/icons/images/fit_top_24px.png differ diff --git a/src/icons/images/fit_top_24px@2x.png b/src/icons/images/fit_top_24px@2x.png new file mode 100644 index 000000000..c68e7b53a Binary files /dev/null and b/src/icons/images/fit_top_24px@2x.png differ diff --git a/src/icons/images/fliph_16px.png b/src/icons/images/fliph_16px.png new file mode 100644 index 000000000..ea66e04de Binary files /dev/null and b/src/icons/images/fliph_16px.png differ diff --git a/src/icons/images/fliph_16px@2x.png b/src/icons/images/fliph_16px@2x.png new file mode 100644 index 000000000..ad2cf57f9 Binary files /dev/null and b/src/icons/images/fliph_16px@2x.png differ diff --git a/src/icons/images/flipv_16px.png b/src/icons/images/flipv_16px.png new file mode 100644 index 000000000..e3dadb933 Binary files /dev/null and b/src/icons/images/flipv_16px.png differ diff --git a/src/icons/images/flipv_16px@2x.png b/src/icons/images/flipv_16px@2x.png new file mode 100644 index 000000000..4d43ff5da Binary files /dev/null and b/src/icons/images/flipv_16px@2x.png differ diff --git a/src/icons/images/folder_12px.png b/src/icons/images/folder_12px.png new file mode 100644 index 000000000..4de4807ee Binary files /dev/null and b/src/icons/images/folder_12px.png differ diff --git a/src/icons/images/folder_12px@2x.png b/src/icons/images/folder_12px@2x.png new file mode 100644 index 000000000..cbd758fbd Binary files /dev/null and b/src/icons/images/folder_12px@2x.png differ diff --git a/src/icons/images/folder_16px.png b/src/icons/images/folder_16px.png new file mode 100644 index 000000000..99611a07a Binary files /dev/null and b/src/icons/images/folder_16px.png differ diff --git a/src/icons/images/folder_16px@2x.png b/src/icons/images/folder_16px@2x.png new file mode 100644 index 000000000..da8ff3b83 Binary files /dev/null and b/src/icons/images/folder_16px@2x.png differ diff --git a/src/icons/images/forward_16px.png b/src/icons/images/forward_16px.png new file mode 100644 index 000000000..0237fedb4 Binary files /dev/null and b/src/icons/images/forward_16px.png differ diff --git a/src/icons/images/forward_16px@2x.png b/src/icons/images/forward_16px@2x.png new file mode 100644 index 000000000..a5e6663bc Binary files /dev/null and b/src/icons/images/forward_16px@2x.png differ diff --git a/src/icons/images/forward_24px.png b/src/icons/images/forward_24px.png new file mode 100644 index 000000000..009bab19f Binary files /dev/null and b/src/icons/images/forward_24px.png differ diff --git a/src/icons/images/forward_24px@2x.png b/src/icons/images/forward_24px@2x.png new file mode 100644 index 000000000..eef5d55ee Binary files /dev/null and b/src/icons/images/forward_24px@2x.png 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_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/green_flag_16px.png b/src/icons/images/green_flag_16px.png new file mode 100644 index 000000000..ccde0b969 Binary files /dev/null and b/src/icons/images/green_flag_16px.png differ diff --git a/src/icons/images/green_flag_16px@2x.png b/src/icons/images/green_flag_16px@2x.png new file mode 100644 index 000000000..2bdbb0400 Binary files /dev/null and b/src/icons/images/green_flag_16px@2x.png differ diff --git a/src/lay/lay/images/gtf_basic.png b/src/icons/images/gtf_basic.png similarity index 100% rename from src/lay/lay/images/gtf_basic.png rename to src/icons/images/gtf_basic.png diff --git a/src/lay/lay/images/gtf_lb.png b/src/icons/images/gtf_lb.png similarity index 100% rename from src/lay/lay/images/gtf_lb.png rename to src/icons/images/gtf_lb.png diff --git a/src/lay/lay/images/gtf_mb.png b/src/icons/images/gtf_mb.png similarity index 100% rename from src/lay/lay/images/gtf_mb.png rename to src/icons/images/gtf_mb.png diff --git a/src/lay/lay/images/gtf_rb.png b/src/icons/images/gtf_rb.png similarity index 100% rename from src/lay/lay/images/gtf_rb.png rename to src/icons/images/gtf_rb.png diff --git a/src/lay/lay/images/help.png b/src/icons/images/help.png similarity index 100% rename from src/lay/lay/images/help.png rename to src/icons/images/help.png diff --git a/src/icons/images/help_16px.png b/src/icons/images/help_16px.png new file mode 100644 index 000000000..66fef9562 Binary files /dev/null and b/src/icons/images/help_16px.png differ diff --git a/src/icons/images/help_16px@2x.png b/src/icons/images/help_16px@2x.png new file mode 100644 index 000000000..b78198a61 Binary files /dev/null and b/src/icons/images/help_16px@2x.png differ diff --git a/src/lay/lay/images/home.png b/src/icons/images/home_24px.png similarity index 74% rename from src/lay/lay/images/home.png rename to src/icons/images/home_24px.png index 7cee0be19..70d8112d8 100644 Binary files a/src/lay/lay/images/home.png and b/src/icons/images/home_24px.png differ diff --git a/src/icons/images/home_24px@2x.png b/src/icons/images/home_24px@2x.png new file mode 100644 index 000000000..540e3b484 Binary files /dev/null and b/src/icons/images/home_24px@2x.png differ diff --git a/src/icons/images/import_16px.png b/src/icons/images/import_16px.png new file mode 100644 index 000000000..70bb4b4c2 Binary files /dev/null and b/src/icons/images/import_16px.png differ diff --git a/src/icons/images/import_16px@2x.png b/src/icons/images/import_16px@2x.png new file mode 100644 index 000000000..9faa8eaf0 Binary files /dev/null and b/src/icons/images/import_16px@2x.png differ diff --git a/src/icons/images/important_16px.png b/src/icons/images/important_16px.png new file mode 100644 index 000000000..89e983f1b Binary files /dev/null and b/src/icons/images/important_16px.png differ diff --git a/src/icons/images/important_16px@2x.png b/src/icons/images/important_16px@2x.png new file mode 100644 index 000000000..c4bfd8557 Binary files /dev/null and b/src/icons/images/important_16px@2x.png differ diff --git a/src/icons/images/info_16px.png b/src/icons/images/info_16px.png new file mode 100644 index 000000000..20f1821c1 Binary files /dev/null and b/src/icons/images/info_16px.png differ diff --git a/src/icons/images/info_16px@2x.png b/src/icons/images/info_16px@2x.png new file mode 100644 index 000000000..5aad21af0 Binary files /dev/null and b/src/icons/images/info_16px@2x.png 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/invert_16px.png b/src/icons/images/invert_16px.png new file mode 100644 index 000000000..5c2c36302 Binary files /dev/null and b/src/icons/images/invert_16px.png differ diff --git a/src/icons/images/invert_16px@2x.png b/src/icons/images/invert_16px@2x.png new file mode 100644 index 000000000..79c4f4626 Binary files /dev/null and b/src/icons/images/invert_16px@2x.png differ diff --git a/src/icons/images/lb_31px.png b/src/icons/images/lb_31px.png new file mode 100644 index 000000000..ee4301fbf Binary files /dev/null and b/src/icons/images/lb_31px.png differ diff --git a/src/icons/images/lb_31px@2x.png b/src/icons/images/lb_31px@2x.png new file mode 100644 index 000000000..24c6b9e94 Binary files /dev/null and b/src/icons/images/lb_31px@2x.png differ diff --git a/src/icons/images/lc_31px.png b/src/icons/images/lc_31px.png new file mode 100644 index 000000000..4f9f0f0bf Binary files /dev/null and b/src/icons/images/lc_31px.png differ diff --git a/src/icons/images/lc_31px@2x.png b/src/icons/images/lc_31px@2x.png new file mode 100644 index 000000000..fff8af27e Binary files /dev/null and b/src/icons/images/lc_31px@2x.png differ diff --git a/src/icons/images/left_16px.png b/src/icons/images/left_16px.png new file mode 100644 index 000000000..9b5a747ae Binary files /dev/null and b/src/icons/images/left_16px.png differ diff --git a/src/icons/images/left_16px@2x.png b/src/icons/images/left_16px@2x.png new file mode 100644 index 000000000..19cc8ecc0 Binary files /dev/null and b/src/icons/images/left_16px@2x.png differ diff --git a/src/icons/images/locked_16px.png b/src/icons/images/locked_16px.png new file mode 100644 index 000000000..28e8887a2 Binary files /dev/null and b/src/icons/images/locked_16px.png differ diff --git a/src/icons/images/locked_16px@2x.png b/src/icons/images/locked_16px@2x.png new file mode 100644 index 000000000..bd36a53af Binary files /dev/null and b/src/icons/images/locked_16px@2x.png differ diff --git a/src/lay/lay/images/logo.png b/src/icons/images/logo.png similarity index 100% rename from src/lay/lay/images/logo.png rename to src/icons/images/logo.png diff --git a/src/icons/images/lt_31px.png b/src/icons/images/lt_31px.png new file mode 100644 index 000000000..6c31256dc Binary files /dev/null and b/src/icons/images/lt_31px.png differ diff --git a/src/icons/images/lt_31px@2x.png b/src/icons/images/lt_31px@2x.png new file mode 100644 index 000000000..b583b2f93 Binary files /dev/null and b/src/icons/images/lt_31px@2x.png differ diff --git a/src/icons/images/m0_24px.png b/src/icons/images/m0_24px.png new file mode 100644 index 000000000..c81ad042c Binary files /dev/null and b/src/icons/images/m0_24px.png differ diff --git a/src/icons/images/m0_24px@2x.png b/src/icons/images/m0_24px@2x.png new file mode 100644 index 000000000..c0f057adc Binary files /dev/null and b/src/icons/images/m0_24px@2x.png differ diff --git a/src/icons/images/m135_24px.png b/src/icons/images/m135_24px.png new file mode 100644 index 000000000..892e30af8 Binary files /dev/null and b/src/icons/images/m135_24px.png differ diff --git a/src/icons/images/m135_24px@2x.png b/src/icons/images/m135_24px@2x.png new file mode 100644 index 000000000..96165edbf Binary files /dev/null and b/src/icons/images/m135_24px@2x.png differ diff --git a/src/icons/images/m45_24px.png b/src/icons/images/m45_24px.png new file mode 100644 index 000000000..faec5e6a2 Binary files /dev/null and b/src/icons/images/m45_24px.png differ diff --git a/src/icons/images/m45_24px@2x.png b/src/icons/images/m45_24px@2x.png new file mode 100644 index 000000000..c3782bd7c Binary files /dev/null and b/src/icons/images/m45_24px@2x.png differ diff --git a/src/icons/images/m90_24px.png b/src/icons/images/m90_24px.png new file mode 100644 index 000000000..3937f0520 Binary files /dev/null and b/src/icons/images/m90_24px.png differ diff --git a/src/icons/images/m90_24px@2x.png b/src/icons/images/m90_24px@2x.png new file mode 100644 index 000000000..f873646a3 Binary files /dev/null and b/src/icons/images/m90_24px@2x.png differ diff --git a/src/icons/images/marked_16px.png b/src/icons/images/marked_16px.png new file mode 100644 index 000000000..b7b6b3adb Binary files /dev/null and b/src/icons/images/marked_16px.png differ diff --git a/src/icons/images/marked_16px@2x.png b/src/icons/images/marked_16px@2x.png new file mode 100644 index 000000000..7288e62f6 Binary files /dev/null and b/src/icons/images/marked_16px@2x.png differ diff --git a/src/icons/images/marked_24px.png b/src/icons/images/marked_24px.png new file mode 100644 index 000000000..03944ccbc Binary files /dev/null and b/src/icons/images/marked_24px.png differ diff --git a/src/icons/images/marked_24px@2x.png b/src/icons/images/marked_24px@2x.png new file mode 100644 index 000000000..28cadfcc6 Binary files /dev/null and b/src/icons/images/marked_24px@2x.png differ diff --git a/src/icons/images/marked_64px.png b/src/icons/images/marked_64px.png new file mode 100644 index 000000000..0c1facf37 Binary files /dev/null and b/src/icons/images/marked_64px.png differ diff --git a/src/icons/images/marked_64px@2x.png b/src/icons/images/marked_64px@2x.png new file mode 100644 index 000000000..0c162fb27 Binary files /dev/null and b/src/icons/images/marked_64px@2x.png differ diff --git a/src/icons/images/move_24px.png b/src/icons/images/move_24px.png new file mode 100644 index 000000000..650d182c5 Binary files /dev/null and b/src/icons/images/move_24px.png differ diff --git a/src/icons/images/move_24px@2x.png b/src/icons/images/move_24px@2x.png new file mode 100644 index 000000000..64e7437ec Binary files /dev/null and b/src/icons/images/move_24px@2x.png differ diff --git a/src/icons/images/move_simple_16px.png b/src/icons/images/move_simple_16px.png new file mode 100644 index 000000000..12e353f8c Binary files /dev/null and b/src/icons/images/move_simple_16px.png differ diff --git a/src/icons/images/move_simple_16px@2x.png b/src/icons/images/move_simple_16px@2x.png new file mode 100644 index 000000000..e75cd0d7a Binary files /dev/null and b/src/icons/images/move_simple_16px@2x.png differ diff --git a/src/icons/images/neutral_12px.png b/src/icons/images/neutral_12px.png new file mode 100644 index 000000000..d86335b0d Binary files /dev/null and b/src/icons/images/neutral_12px.png differ diff --git a/src/icons/images/neutral_12px@2x.png b/src/icons/images/neutral_12px@2x.png new file mode 100644 index 000000000..2ea7243fb Binary files /dev/null and b/src/icons/images/neutral_12px@2x.png differ diff --git a/src/icons/images/new_folder_16px.png b/src/icons/images/new_folder_16px.png new file mode 100644 index 000000000..5e3328c80 Binary files /dev/null and b/src/icons/images/new_folder_16px.png differ diff --git a/src/icons/images/new_folder_16px@2x.png b/src/icons/images/new_folder_16px@2x.png new file mode 100644 index 000000000..f3454ad1f Binary files /dev/null and b/src/icons/images/new_folder_16px@2x.png differ diff --git a/src/icons/images/next_topic_24px.png b/src/icons/images/next_topic_24px.png new file mode 100644 index 000000000..7ee95b93d Binary files /dev/null and b/src/icons/images/next_topic_24px.png differ diff --git a/src/icons/images/next_topic_24px@2x.png b/src/icons/images/next_topic_24px@2x.png new file mode 100644 index 000000000..484db733b Binary files /dev/null and b/src/icons/images/next_topic_24px@2x.png differ diff --git a/src/icons/images/nextstep_16px.png b/src/icons/images/nextstep_16px.png new file mode 100644 index 000000000..8af3a6f27 Binary files /dev/null and b/src/icons/images/nextstep_16px.png differ diff --git a/src/icons/images/nextstep_16px@2x.png b/src/icons/images/nextstep_16px@2x.png new file mode 100644 index 000000000..4c7f7a855 Binary files /dev/null and b/src/icons/images/nextstep_16px@2x.png differ diff --git a/src/icons/images/no_flag_16px.png b/src/icons/images/no_flag_16px.png new file mode 100644 index 000000000..d7e9ec303 Binary files /dev/null and b/src/icons/images/no_flag_16px.png differ diff --git a/src/icons/images/no_flag_16px@2x.png b/src/icons/images/no_flag_16px@2x.png new file mode 100644 index 000000000..abb898c68 Binary files /dev/null and b/src/icons/images/no_flag_16px@2x.png differ diff --git a/src/icons/images/nophoto_16px.png b/src/icons/images/nophoto_16px.png new file mode 100644 index 000000000..06138ee99 Binary files /dev/null and b/src/icons/images/nophoto_16px.png differ diff --git a/src/icons/images/nophoto_16px@2x.png b/src/icons/images/nophoto_16px@2x.png new file mode 100644 index 000000000..9b661018a Binary files /dev/null and b/src/icons/images/nophoto_16px@2x.png differ diff --git a/src/icons/images/options_edit_16px.png b/src/icons/images/options_edit_16px.png new file mode 100644 index 000000000..99e3284d5 Binary files /dev/null and b/src/icons/images/options_edit_16px.png differ diff --git a/src/icons/images/options_edit_16px@2x.png b/src/icons/images/options_edit_16px@2x.png new file mode 100644 index 000000000..82e48175c Binary files /dev/null and b/src/icons/images/options_edit_16px@2x.png differ diff --git a/src/lay/lay/images/partial.png b/src/icons/images/partial.png similarity index 100% rename from src/lay/lay/images/partial.png rename to src/icons/images/partial.png diff --git a/src/icons/images/partial_24px.png b/src/icons/images/partial_24px.png new file mode 100644 index 000000000..a811b6dbe Binary files /dev/null and b/src/icons/images/partial_24px.png differ diff --git a/src/icons/images/partial_24px@2x.png b/src/icons/images/partial_24px@2x.png new file mode 100644 index 000000000..a9df0e603 Binary files /dev/null and b/src/icons/images/partial_24px@2x.png differ diff --git a/src/icons/images/path_24px.png b/src/icons/images/path_24px.png new file mode 100644 index 000000000..b439108e9 Binary files /dev/null and b/src/icons/images/path_24px.png differ diff --git a/src/icons/images/path_24px@2x.png b/src/icons/images/path_24px@2x.png new file mode 100644 index 000000000..5fadc2053 Binary files /dev/null and b/src/icons/images/path_24px@2x.png differ diff --git a/src/icons/images/pause_16px.png b/src/icons/images/pause_16px.png new file mode 100644 index 000000000..8fc1c31f2 Binary files /dev/null and b/src/icons/images/pause_16px.png differ diff --git a/src/icons/images/pause_16px@2x.png b/src/icons/images/pause_16px@2x.png new file mode 100644 index 000000000..860a4ca05 Binary files /dev/null and b/src/icons/images/pause_16px@2x.png differ diff --git a/src/icons/images/photo_16px.png b/src/icons/images/photo_16px.png new file mode 100644 index 000000000..0fcdf4e38 Binary files /dev/null and b/src/icons/images/photo_16px.png differ diff --git a/src/icons/images/photo_16px@2x.png b/src/icons/images/photo_16px@2x.png new file mode 100644 index 000000000..b69fd54e4 Binary files /dev/null and b/src/icons/images/photo_16px@2x.png differ diff --git a/src/icons/images/polygon_24px.png b/src/icons/images/polygon_24px.png new file mode 100644 index 000000000..e62f1d609 Binary files /dev/null and b/src/icons/images/polygon_24px.png differ diff --git a/src/icons/images/polygon_24px@2x.png b/src/icons/images/polygon_24px@2x.png new file mode 100644 index 000000000..e323437d2 Binary files /dev/null and b/src/icons/images/polygon_24px@2x.png differ diff --git a/src/lay/lay/images/prev_topic.png b/src/icons/images/prev_topic_24px.png similarity index 75% rename from src/lay/lay/images/prev_topic.png rename to src/icons/images/prev_topic_24px.png index 141bc71f8..0faf2b800 100644 Binary files a/src/lay/lay/images/prev_topic.png and b/src/icons/images/prev_topic_24px.png differ diff --git a/src/icons/images/prev_topic_24px@2x.png b/src/icons/images/prev_topic_24px@2x.png new file mode 100644 index 000000000..e80b3e0d7 Binary files /dev/null and b/src/icons/images/prev_topic_24px@2x.png differ diff --git a/src/icons/images/properties_16px.png b/src/icons/images/properties_16px.png new file mode 100644 index 000000000..c62c560b2 Binary files /dev/null and b/src/icons/images/properties_16px.png differ diff --git a/src/icons/images/properties_16px@2x.png b/src/icons/images/properties_16px@2x.png new file mode 100644 index 000000000..3bfe41ca1 Binary files /dev/null and b/src/icons/images/properties_16px@2x.png 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_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/r0_24px.png b/src/icons/images/r0_24px.png new file mode 100644 index 000000000..70cfc6750 Binary files /dev/null and b/src/icons/images/r0_24px.png differ diff --git a/src/icons/images/r0_24px@2x.png b/src/icons/images/r0_24px@2x.png new file mode 100644 index 000000000..57c055b9d Binary files /dev/null and b/src/icons/images/r0_24px@2x.png differ diff --git a/src/icons/images/r180_24px.png b/src/icons/images/r180_24px.png new file mode 100644 index 000000000..bd0589654 Binary files /dev/null and b/src/icons/images/r180_24px.png differ diff --git a/src/icons/images/r180_24px@2x.png b/src/icons/images/r180_24px@2x.png new file mode 100644 index 000000000..c66937edf Binary files /dev/null and b/src/icons/images/r180_24px@2x.png differ diff --git a/src/icons/images/r270_24px.png b/src/icons/images/r270_24px.png new file mode 100644 index 000000000..d91ecf759 Binary files /dev/null and b/src/icons/images/r270_24px.png differ diff --git a/src/icons/images/r270_24px@2x.png b/src/icons/images/r270_24px@2x.png new file mode 100644 index 000000000..d89aaac05 Binary files /dev/null and b/src/icons/images/r270_24px@2x.png differ diff --git a/src/icons/images/r90_24px.png b/src/icons/images/r90_24px.png new file mode 100644 index 000000000..790252cee Binary files /dev/null and b/src/icons/images/r90_24px.png differ diff --git a/src/icons/images/r90_24px@2x.png b/src/icons/images/r90_24px@2x.png new file mode 100644 index 000000000..6a761ec80 Binary files /dev/null and b/src/icons/images/r90_24px@2x.png differ diff --git a/src/icons/images/rb_31px.png b/src/icons/images/rb_31px.png new file mode 100644 index 000000000..e01b1acb0 Binary files /dev/null and b/src/icons/images/rb_31px.png differ diff --git a/src/icons/images/rb_31px@2x.png b/src/icons/images/rb_31px@2x.png new file mode 100644 index 000000000..7c30d127c Binary files /dev/null and b/src/icons/images/rb_31px@2x.png differ diff --git a/src/icons/images/rc_31px.png b/src/icons/images/rc_31px.png new file mode 100644 index 000000000..70a2c6f3d Binary files /dev/null and b/src/icons/images/rc_31px.png differ diff --git a/src/icons/images/rc_31px@2x.png b/src/icons/images/rc_31px@2x.png new file mode 100644 index 000000000..d335910b7 Binary files /dev/null and b/src/icons/images/rc_31px@2x.png differ diff --git a/src/icons/images/red_flag_16px.png b/src/icons/images/red_flag_16px.png new file mode 100644 index 000000000..e725e36fe Binary files /dev/null and b/src/icons/images/red_flag_16px.png differ diff --git a/src/icons/images/red_flag_16px@2x.png b/src/icons/images/red_flag_16px@2x.png new file mode 100644 index 000000000..8501bd1ca Binary files /dev/null and b/src/icons/images/red_flag_16px@2x.png differ diff --git a/src/icons/images/rename_16px.png b/src/icons/images/rename_16px.png new file mode 100644 index 000000000..2cf590039 Binary files /dev/null and b/src/icons/images/rename_16px.png differ diff --git a/src/icons/images/rename_16px@2x.png b/src/icons/images/rename_16px@2x.png new file mode 100644 index 000000000..1e21ecdce Binary files /dev/null and b/src/icons/images/rename_16px@2x.png differ diff --git a/src/icons/images/replace_16px.png b/src/icons/images/replace_16px.png new file mode 100644 index 000000000..b0033bc34 Binary files /dev/null and b/src/icons/images/replace_16px.png differ diff --git a/src/icons/images/replace_16px@2x.png b/src/icons/images/replace_16px@2x.png new file mode 100644 index 000000000..aa4d4c563 Binary files /dev/null and b/src/icons/images/replace_16px@2x.png differ diff --git a/src/icons/images/replace_all_16px.png b/src/icons/images/replace_all_16px.png new file mode 100644 index 000000000..646168cdd Binary files /dev/null and b/src/icons/images/replace_all_16px.png differ diff --git a/src/icons/images/replace_all_16px@2x.png b/src/icons/images/replace_all_16px@2x.png new file mode 100644 index 000000000..157d46ab3 Binary files /dev/null and b/src/icons/images/replace_all_16px@2x.png differ diff --git a/src/icons/images/right_16px.png b/src/icons/images/right_16px.png new file mode 100644 index 000000000..b38f3b7b4 Binary files /dev/null and b/src/icons/images/right_16px.png differ diff --git a/src/icons/images/right_16px@2x.png b/src/icons/images/right_16px@2x.png new file mode 100644 index 000000000..a447c73b2 Binary files /dev/null and b/src/icons/images/right_16px@2x.png differ diff --git a/src/icons/images/rotate_16px.png b/src/icons/images/rotate_16px.png new file mode 100644 index 000000000..6351d8086 Binary files /dev/null and b/src/icons/images/rotate_16px.png differ diff --git a/src/icons/images/rotate_16px@2x.png b/src/icons/images/rotate_16px@2x.png new file mode 100644 index 000000000..75f804a38 Binary files /dev/null and b/src/icons/images/rotate_16px@2x.png differ diff --git a/src/icons/images/rrotate_16px.png b/src/icons/images/rrotate_16px.png new file mode 100644 index 000000000..39a85d41d Binary files /dev/null and b/src/icons/images/rrotate_16px.png differ diff --git a/src/icons/images/rrotate_16px@2x.png b/src/icons/images/rrotate_16px@2x.png new file mode 100644 index 000000000..0e2a26474 Binary files /dev/null and b/src/icons/images/rrotate_16px@2x.png differ diff --git a/src/icons/images/rt_31px.png b/src/icons/images/rt_31px.png new file mode 100644 index 000000000..6d876a04c Binary files /dev/null and b/src/icons/images/rt_31px.png differ diff --git a/src/icons/images/rt_31px@2x.png b/src/icons/images/rt_31px@2x.png new file mode 100644 index 000000000..7a0dc4284 Binary files /dev/null and b/src/icons/images/rt_31px@2x.png 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_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/ruler_24px.png b/src/icons/images/ruler_24px.png new file mode 100644 index 000000000..72a3bacf2 Binary files /dev/null and b/src/icons/images/ruler_24px.png differ diff --git a/src/icons/images/ruler_24px@2x.png b/src/icons/images/ruler_24px@2x.png new file mode 100644 index 000000000..d4c8d050c Binary files /dev/null and b/src/icons/images/ruler_24px@2x.png differ diff --git a/src/icons/images/run_16px.png b/src/icons/images/run_16px.png new file mode 100644 index 000000000..c05088464 Binary files /dev/null and b/src/icons/images/run_16px.png differ diff --git a/src/icons/images/run_16px@2x.png b/src/icons/images/run_16px@2x.png new file mode 100644 index 000000000..410319366 Binary files /dev/null and b/src/icons/images/run_16px@2x.png differ diff --git a/src/icons/images/runthis_16px.png b/src/icons/images/runthis_16px.png new file mode 100644 index 000000000..ab19c41c3 Binary files /dev/null and b/src/icons/images/runthis_16px.png differ diff --git a/src/icons/images/runthis_16px@2x.png b/src/icons/images/runthis_16px@2x.png new file mode 100644 index 000000000..0f9035961 Binary files /dev/null and b/src/icons/images/runthis_16px@2x.png differ diff --git a/src/icons/images/salt.png b/src/icons/images/salt.png new file mode 100644 index 000000000..bcba568d0 Binary files /dev/null and b/src/icons/images/salt.png differ diff --git a/src/icons/images/salt@2x.png b/src/icons/images/salt@2x.png new file mode 100644 index 000000000..f8029c4df Binary files /dev/null and b/src/icons/images/salt@2x.png differ diff --git a/src/icons/images/salt_icon.png b/src/icons/images/salt_icon.png new file mode 100644 index 000000000..59eb5d4ea Binary files /dev/null and b/src/icons/images/salt_icon.png differ diff --git a/src/icons/images/salt_icon@2x.png b/src/icons/images/salt_icon@2x.png new file mode 100644 index 000000000..0950714b8 Binary files /dev/null and b/src/icons/images/salt_icon@2x.png differ diff --git a/src/icons/images/save_16px.png b/src/icons/images/save_16px.png new file mode 100644 index 000000000..f65bc2cfd Binary files /dev/null and b/src/icons/images/save_16px.png differ diff --git a/src/icons/images/save_16px@2x.png b/src/icons/images/save_16px@2x.png new file mode 100644 index 000000000..152fe5d66 Binary files /dev/null and b/src/icons/images/save_16px@2x.png differ diff --git a/src/icons/images/save_all_16px.png b/src/icons/images/save_all_16px.png new file mode 100644 index 000000000..914cdae76 Binary files /dev/null and b/src/icons/images/save_all_16px.png differ diff --git a/src/icons/images/save_all_16px@2x.png b/src/icons/images/save_all_16px@2x.png new file mode 100644 index 000000000..f09c308fd Binary files /dev/null and b/src/icons/images/save_all_16px@2x.png differ diff --git a/src/icons/images/select_24px.png b/src/icons/images/select_24px.png new file mode 100644 index 000000000..23065dfff Binary files /dev/null and b/src/icons/images/select_24px.png differ diff --git a/src/icons/images/select_24px@2x.png b/src/icons/images/select_24px@2x.png new file mode 100644 index 000000000..4ddd743b4 Binary files /dev/null and b/src/icons/images/select_24px@2x.png differ diff --git a/src/icons/images/setup_16px.png b/src/icons/images/setup_16px.png new file mode 100644 index 000000000..0050b88af Binary files /dev/null and b/src/icons/images/setup_16px.png differ diff --git a/src/icons/images/setup_16px@2x.png b/src/icons/images/setup_16px@2x.png new file mode 100644 index 000000000..01f3c0b22 Binary files /dev/null and b/src/icons/images/setup_16px@2x.png differ diff --git a/src/icons/images/singlestep_16px.png b/src/icons/images/singlestep_16px.png new file mode 100644 index 000000000..8bebaf89b Binary files /dev/null and b/src/icons/images/singlestep_16px.png differ diff --git a/src/icons/images/singlestep_16px@2x.png b/src/icons/images/singlestep_16px@2x.png new file mode 100644 index 000000000..767d617a4 Binary files /dev/null and b/src/icons/images/singlestep_16px@2x.png differ diff --git a/src/icons/images/stop_16px.png b/src/icons/images/stop_16px.png new file mode 100644 index 000000000..1566fdad0 Binary files /dev/null and b/src/icons/images/stop_16px.png differ diff --git a/src/icons/images/stop_16px@2x.png b/src/icons/images/stop_16px@2x.png new file mode 100644 index 000000000..a59a87dd7 Binary files /dev/null and b/src/icons/images/stop_16px@2x.png 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_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/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/images/unchecked_16px.png b/src/icons/images/unchecked_16px.png new file mode 100644 index 000000000..7bc18b265 Binary files /dev/null and b/src/icons/images/unchecked_16px.png differ diff --git a/src/icons/images/unchecked_16px@2x.png b/src/icons/images/unchecked_16px@2x.png new file mode 100644 index 000000000..62548c4a2 Binary files /dev/null and b/src/icons/images/unchecked_16px@2x.png differ diff --git a/src/icons/images/unlocked_16px.png b/src/icons/images/unlocked_16px.png new file mode 100644 index 000000000..aea7be797 Binary files /dev/null and b/src/icons/images/unlocked_16px.png differ diff --git a/src/icons/images/unlocked_16px@2x.png b/src/icons/images/unlocked_16px@2x.png new file mode 100644 index 000000000..7c709e287 Binary files /dev/null and b/src/icons/images/unlocked_16px@2x.png differ diff --git a/src/icons/images/up_16px.png b/src/icons/images/up_16px.png new file mode 100644 index 000000000..e512c04c8 Binary files /dev/null and b/src/icons/images/up_16px.png differ diff --git a/src/icons/images/up_16px@2x.png b/src/icons/images/up_16px@2x.png new file mode 100644 index 000000000..3dc17b30a Binary files /dev/null and b/src/icons/images/up_16px@2x.png differ diff --git a/src/icons/images/upup_16px.png b/src/icons/images/upup_16px.png new file mode 100644 index 000000000..05cb00a50 Binary files /dev/null and b/src/icons/images/upup_16px.png differ diff --git a/src/icons/images/upup_16px@2x.png b/src/icons/images/upup_16px@2x.png new file mode 100644 index 000000000..b8a790f76 Binary files /dev/null and b/src/icons/images/upup_16px@2x.png differ diff --git a/src/icons/images/waived_16px.png b/src/icons/images/waived_16px.png new file mode 100644 index 000000000..d6765f0de Binary files /dev/null and b/src/icons/images/waived_16px.png differ diff --git a/src/icons/images/waived_16px@2x.png b/src/icons/images/waived_16px@2x.png new file mode 100644 index 000000000..6c0d7565b Binary files /dev/null and b/src/icons/images/waived_16px@2x.png differ diff --git a/src/icons/images/warn_16px.png b/src/icons/images/warn_16px.png new file mode 100644 index 000000000..a92155bac Binary files /dev/null and b/src/icons/images/warn_16px.png differ diff --git a/src/icons/images/warn_16px@2x.png b/src/icons/images/warn_16px@2x.png new file mode 100644 index 000000000..fc9dfa5f4 Binary files /dev/null and b/src/icons/images/warn_16px@2x.png differ diff --git a/src/icons/images/yellow_flag_16px.png b/src/icons/images/yellow_flag_16px.png new file mode 100644 index 000000000..e0dfd4860 Binary files /dev/null and b/src/icons/images/yellow_flag_16px.png differ diff --git a/src/icons/images/yellow_flag_16px@2x.png b/src/icons/images/yellow_flag_16px@2x.png new file mode 100644 index 000000000..45376b2fc Binary files /dev/null and b/src/icons/images/yellow_flag_16px@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/align_bottom_32px.svg b/src/icons/svg/align_bottom_32px.svg new file mode 100644 index 000000000..3f8b95da0 --- /dev/null +++ b/src/icons/svg/align_bottom_32px.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_hcenter_32px.svg b/src/icons/svg/align_hcenter_32px.svg new file mode 100644 index 000000000..c84de77d2 --- /dev/null +++ b/src/icons/svg/align_hcenter_32px.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_left_32px.svg b/src/icons/svg/align_left_32px.svg new file mode 100644 index 000000000..894ca8aa9 --- /dev/null +++ b/src/icons/svg/align_left_32px.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_none_32px.svg b/src/icons/svg/align_none_32px.svg new file mode 100644 index 000000000..57c0acb87 --- /dev/null +++ b/src/icons/svg/align_none_32px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_right_32px.svg b/src/icons/svg/align_right_32px.svg new file mode 100644 index 000000000..0142baf4e --- /dev/null +++ b/src/icons/svg/align_right_32px.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_top_32px.svg b/src/icons/svg/align_top_32px.svg new file mode 100644 index 000000000..2ea4c522e --- /dev/null +++ b/src/icons/svg/align_top_32px.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/align_vcenter_32px.svg b/src/icons/svg/align_vcenter_32px.svg new file mode 100644 index 000000000..fdbf54d71 --- /dev/null +++ b/src/icons/svg/align_vcenter_32px.svg @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/back_16px.svg b/src/icons/svg/back_16px.svg new file mode 100644 index 000000000..a2e334502 --- /dev/null +++ b/src/icons/svg/back_16px.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/back_24px.svg b/src/icons/svg/back_24px.svg new file mode 100644 index 000000000..7ec916b19 --- /dev/null +++ b/src/icons/svg/back_24px.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/blue_flag_16px.svg b/src/icons/svg/blue_flag_16px.svg new file mode 100644 index 000000000..00d6b8247 --- /dev/null +++ b/src/icons/svg/blue_flag_16px.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/bookmark_16px.svg b/src/icons/svg/bookmark_16px.svg new file mode 100644 index 000000000..0d50e6593 --- /dev/null +++ b/src/icons/svg/bookmark_16px.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/bookmark_24px.svg b/src/icons/svg/bookmark_24px.svg new file mode 100644 index 000000000..1535bf47d --- /dev/null +++ b/src/icons/svg/bookmark_24px.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/box_24px.svg b/src/icons/svg/box_24px.svg new file mode 100644 index 000000000..53cd061ed --- /dev/null +++ b/src/icons/svg/box_24px.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/breakpoint_16px.svg b/src/icons/svg/breakpoint_16px.svg new file mode 100644 index 000000000..3109cec7d --- /dev/null +++ b/src/icons/svg/breakpoint_16px.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/breakpointmark_16px.svg b/src/icons/svg/breakpointmark_16px.svg new file mode 100644 index 000000000..bcd1a43b7 --- /dev/null +++ b/src/icons/svg/breakpointmark_16px.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/breakpointmarkdisabled_16px.svg b/src/icons/svg/breakpointmarkdisabled_16px.svg new file mode 100644 index 000000000..561437552 --- /dev/null +++ b/src/icons/svg/breakpointmarkdisabled_16px.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/bright_12px.svg b/src/icons/svg/bright_12px.svg new file mode 100644 index 000000000..d2e1c75b6 --- /dev/null +++ b/src/icons/svg/bright_12px.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/bug.svg b/src/icons/svg/bug.svg new file mode 100644 index 000000000..f9ea30a07 --- /dev/null +++ b/src/icons/svg/bug.svg @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/bulb.svg b/src/icons/svg/bulb.svg new file mode 100644 index 000000000..a3fb01ad8 --- /dev/null +++ b/src/icons/svg/bulb.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cb_31px.svg b/src/icons/svg/cb_31px.svg new file mode 100644 index 000000000..429576949 --- /dev/null +++ b/src/icons/svg/cb_31px.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cc_31px.svg b/src/icons/svg/cc_31px.svg new file mode 100644 index 000000000..88fb2fc4f --- /dev/null +++ b/src/icons/svg/cc_31px.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/checked_16px.svg b/src/icons/svg/checked_16px.svg new file mode 100644 index 000000000..6747255f8 --- /dev/null +++ b/src/icons/svg/checked_16px.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + 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/clear_edit_16px.svg b/src/icons/svg/clear_edit_16px.svg new file mode 100644 index 000000000..232bd9689 --- /dev/null +++ b/src/icons/svg/clear_edit_16px.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/clearbreakpoints_16px.svg b/src/icons/svg/clearbreakpoints_16px.svg new file mode 100644 index 000000000..e5114070c --- /dev/null +++ b/src/icons/svg/clearbreakpoints_16px.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cm_add_24px.svg b/src/icons/svg/cm_add_24px.svg new file mode 100644 index 000000000..1a6fd0a1e --- /dev/null +++ b/src/icons/svg/cm_add_24px.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cm_diff_24px.svg b/src/icons/svg/cm_diff_24px.svg new file mode 100644 index 000000000..724c3720d --- /dev/null +++ b/src/icons/svg/cm_diff_24px.svg @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cm_erase_24px.svg b/src/icons/svg/cm_erase_24px.svg new file mode 100644 index 000000000..4a0a0b4cb --- /dev/null +++ b/src/icons/svg/cm_erase_24px.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cm_mask_24px.svg b/src/icons/svg/cm_mask_24px.svg new file mode 100644 index 000000000..2b8f15859 --- /dev/null +++ b/src/icons/svg/cm_mask_24px.svg @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/cm_merge_24px.svg b/src/icons/svg/cm_merge_24px.svg new file mode 100644 index 000000000..a4c0902e3 --- /dev/null +++ b/src/icons/svg/cm_merge_24px.svg @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/ct_31px.svg b/src/icons/svg/ct_31px.svg new file mode 100644 index 000000000..3c0be3fd6 --- /dev/null +++ b/src/icons/svg/ct_31px.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/dark_12px.svg b/src/icons/svg/dark_12px.svg new file mode 100644 index 000000000..87d812f10 --- /dev/null +++ b/src/icons/svg/dark_12px.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + 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/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/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/down_16px.svg b/src/icons/svg/down_16px.svg new file mode 100644 index 000000000..243ab3c55 --- /dev/null +++ b/src/icons/svg/down_16px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/downdown_16px.svg b/src/icons/svg/downdown_16px.svg new file mode 100644 index 000000000..b8ab00b6f --- /dev/null +++ b/src/icons/svg/downdown_16px.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/edit_16px.svg b/src/icons/svg/edit_16px.svg new file mode 100644 index 000000000..aef094d1d --- /dev/null +++ b/src/icons/svg/edit_16px.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/empty_12px.svg b/src/icons/svg/empty_12px.svg new file mode 100644 index 000000000..2ecfed838 --- /dev/null +++ b/src/icons/svg/empty_12px.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/empty_16px.svg b/src/icons/svg/empty_16px.svg new file mode 100644 index 000000000..f26d37c7f --- /dev/null +++ b/src/icons/svg/empty_16px.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/empty_24px.svg b/src/icons/svg/empty_24px.svg new file mode 100644 index 000000000..d2e244e7c --- /dev/null +++ b/src/icons/svg/empty_24px.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/empty_31px.svg b/src/icons/svg/empty_31px.svg new file mode 100644 index 000000000..04c346dac --- /dev/null +++ b/src/icons/svg/empty_31px.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/empty_32px.svg b/src/icons/svg/empty_32px.svg new file mode 100644 index 000000000..572db2a9d --- /dev/null +++ b/src/icons/svg/empty_32px.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/error2_16px.svg b/src/icons/svg/error2_16px.svg new file mode 100644 index 000000000..47c402c79 --- /dev/null +++ b/src/icons/svg/error2_16px.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/error_16px.svg b/src/icons/svg/error_16px.svg new file mode 100644 index 000000000..ae5cf44df --- /dev/null +++ b/src/icons/svg/error_16px.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/file_12px.svg b/src/icons/svg/file_12px.svg new file mode 100644 index 000000000..df4864548 --- /dev/null +++ b/src/icons/svg/file_12px.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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/fit_back_24px.svg b/src/icons/svg/fit_back_24px.svg new file mode 100644 index 000000000..f17b3ea18 --- /dev/null +++ b/src/icons/svg/fit_back_24px.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fit_bottom_24px.svg b/src/icons/svg/fit_bottom_24px.svg new file mode 100644 index 000000000..12a66525a --- /dev/null +++ b/src/icons/svg/fit_bottom_24px.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fit_front_24px.svg b/src/icons/svg/fit_front_24px.svg new file mode 100644 index 000000000..274c700d5 --- /dev/null +++ b/src/icons/svg/fit_front_24px.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fit_left_24px.svg b/src/icons/svg/fit_left_24px.svg new file mode 100644 index 000000000..8ebfd5649 --- /dev/null +++ b/src/icons/svg/fit_left_24px.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fit_right_24px.svg b/src/icons/svg/fit_right_24px.svg new file mode 100644 index 000000000..d2d1107ca --- /dev/null +++ b/src/icons/svg/fit_right_24px.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fit_top_24px.svg b/src/icons/svg/fit_top_24px.svg new file mode 100644 index 000000000..f77f567f1 --- /dev/null +++ b/src/icons/svg/fit_top_24px.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/fliph_16px.svg b/src/icons/svg/fliph_16px.svg new file mode 100644 index 000000000..857404da0 --- /dev/null +++ b/src/icons/svg/fliph_16px.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/flipv_16px.svg b/src/icons/svg/flipv_16px.svg new file mode 100644 index 000000000..3f4b569b5 --- /dev/null +++ b/src/icons/svg/flipv_16px.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/folder_12px.svg b/src/icons/svg/folder_12px.svg new file mode 100644 index 000000000..fbbff0764 --- /dev/null +++ b/src/icons/svg/folder_12px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/folder_16px.svg b/src/icons/svg/folder_16px.svg new file mode 100644 index 000000000..38db9eb9a --- /dev/null +++ b/src/icons/svg/folder_16px.svg @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/forward_16px.svg b/src/icons/svg/forward_16px.svg new file mode 100644 index 000000000..4b5b9afe5 --- /dev/null +++ b/src/icons/svg/forward_16px.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/forward_24px.svg b/src/icons/svg/forward_24px.svg new file mode 100644 index 000000000..f41bb8791 --- /dev/null +++ b/src/icons/svg/forward_24px.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + 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/green_flag_16px.svg b/src/icons/svg/green_flag_16px.svg new file mode 100644 index 000000000..c136e8aa6 --- /dev/null +++ b/src/icons/svg/green_flag_16px.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/help_16px.svg b/src/icons/svg/help_16px.svg new file mode 100644 index 000000000..a6def5985 --- /dev/null +++ b/src/icons/svg/help_16px.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/home_24px.svg b/src/icons/svg/home_24px.svg new file mode 100644 index 000000000..7e4e7a398 --- /dev/null +++ b/src/icons/svg/home_24px.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + 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/important_16px.svg b/src/icons/svg/important_16px.svg new file mode 100644 index 000000000..659aedf4a --- /dev/null +++ b/src/icons/svg/important_16px.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/info_16px.svg b/src/icons/svg/info_16px.svg new file mode 100644 index 000000000..d0170eae3 --- /dev/null +++ b/src/icons/svg/info_16px.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/invert_16px.svg b/src/icons/svg/invert_16px.svg new file mode 100644 index 000000000..7f2175db7 --- /dev/null +++ b/src/icons/svg/invert_16px.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/lb_31px.svg b/src/icons/svg/lb_31px.svg new file mode 100644 index 000000000..f8ab93c6a --- /dev/null +++ b/src/icons/svg/lb_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/lc_31px.svg b/src/icons/svg/lc_31px.svg new file mode 100644 index 000000000..72edc347c --- /dev/null +++ b/src/icons/svg/lc_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/left_16px.svg b/src/icons/svg/left_16px.svg new file mode 100644 index 000000000..a007a4e6d --- /dev/null +++ b/src/icons/svg/left_16px.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/locked_16px.svg b/src/icons/svg/locked_16px.svg new file mode 100644 index 000000000..cdd51d93a --- /dev/null +++ b/src/icons/svg/locked_16px.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/lt_31px.svg b/src/icons/svg/lt_31px.svg new file mode 100644 index 000000000..f733c76ff --- /dev/null +++ b/src/icons/svg/lt_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m0_24px.svg b/src/icons/svg/m0_24px.svg new file mode 100644 index 000000000..055fac169 --- /dev/null +++ b/src/icons/svg/m0_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m135_24px.svg b/src/icons/svg/m135_24px.svg new file mode 100644 index 000000000..7850093c6 --- /dev/null +++ b/src/icons/svg/m135_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m45_24px.svg b/src/icons/svg/m45_24px.svg new file mode 100644 index 000000000..09853ce66 --- /dev/null +++ b/src/icons/svg/m45_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/m90_24px.svg b/src/icons/svg/m90_24px.svg new file mode 100644 index 000000000..bdea03687 --- /dev/null +++ b/src/icons/svg/m90_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/make_png.sh b/src/icons/svg/make_png.sh new file mode 100755 index 000000000..32f9ad885 --- /dev/null +++ b/src/icons/svg/make_png.sh @@ -0,0 +1,21 @@ +#!/bin/bash -e + +output=../images + +for svg_file in *.svg; do + + png_file=${output}/${svg_file/.svg/.png} + png_file_2x=${output}/${svg_file/.svg/@2x.png} + + 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 + + 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/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/move_24px.svg b/src/icons/svg/move_24px.svg new file mode 100644 index 000000000..ab191048e --- /dev/null +++ b/src/icons/svg/move_24px.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/move_simple_16px.svg b/src/icons/svg/move_simple_16px.svg new file mode 100644 index 000000000..a97b8302a --- /dev/null +++ b/src/icons/svg/move_simple_16px.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/neutral_12px.svg b/src/icons/svg/neutral_12px.svg new file mode 100644 index 000000000..999c2f4a2 --- /dev/null +++ b/src/icons/svg/neutral_12px.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/new_folder_16px.svg b/src/icons/svg/new_folder_16px.svg new file mode 100644 index 000000000..83bab4bc0 --- /dev/null +++ b/src/icons/svg/new_folder_16px.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/next_topic_24px.svg b/src/icons/svg/next_topic_24px.svg new file mode 100644 index 000000000..ef0371f56 --- /dev/null +++ b/src/icons/svg/next_topic_24px.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + 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/no_flag_16px.svg b/src/icons/svg/no_flag_16px.svg new file mode 100644 index 000000000..6b5179aef --- /dev/null +++ b/src/icons/svg/no_flag_16px.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/nophoto_16px.svg b/src/icons/svg/nophoto_16px.svg new file mode 100644 index 000000000..5b5e1a77c --- /dev/null +++ b/src/icons/svg/nophoto_16px.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/options_edit_16px.svg b/src/icons/svg/options_edit_16px.svg new file mode 100644 index 000000000..77faec615 --- /dev/null +++ b/src/icons/svg/options_edit_16px.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/partial_24px.svg b/src/icons/svg/partial_24px.svg new file mode 100644 index 000000000..9443b6cb1 --- /dev/null +++ b/src/icons/svg/partial_24px.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/path_24px.svg b/src/icons/svg/path_24px.svg new file mode 100644 index 000000000..7bf2f3fa6 --- /dev/null +++ b/src/icons/svg/path_24px.svg @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/pause_16px.svg b/src/icons/svg/pause_16px.svg new file mode 100644 index 000000000..02033e9fb --- /dev/null +++ b/src/icons/svg/pause_16px.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/photo_16px.svg b/src/icons/svg/photo_16px.svg new file mode 100644 index 000000000..402ce5999 --- /dev/null +++ b/src/icons/svg/photo_16px.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/polygon_24px.svg b/src/icons/svg/polygon_24px.svg new file mode 100644 index 000000000..cdae72412 --- /dev/null +++ b/src/icons/svg/polygon_24px.svg @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/prev_topic_24px.svg b/src/icons/svg/prev_topic_24px.svg new file mode 100644 index 000000000..d87904a9e --- /dev/null +++ b/src/icons/svg/prev_topic_24px.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/properties_16px.svg b/src/icons/svg/properties_16px.svg new file mode 100644 index 000000000..9e7e81da2 --- /dev/null +++ b/src/icons/svg/properties_16px.svg @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/r0_24px.svg b/src/icons/svg/r0_24px.svg new file mode 100644 index 000000000..4c18deeaf --- /dev/null +++ b/src/icons/svg/r0_24px.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r180_24px.svg b/src/icons/svg/r180_24px.svg new file mode 100644 index 000000000..60dc26edb --- /dev/null +++ b/src/icons/svg/r180_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r270_24px.svg b/src/icons/svg/r270_24px.svg new file mode 100644 index 000000000..d38946495 --- /dev/null +++ b/src/icons/svg/r270_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/r90_24px.svg b/src/icons/svg/r90_24px.svg new file mode 100644 index 000000000..89b40f041 --- /dev/null +++ b/src/icons/svg/r90_24px.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rb_31px.svg b/src/icons/svg/rb_31px.svg new file mode 100644 index 000000000..a14b5d899 --- /dev/null +++ b/src/icons/svg/rb_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rc_31px.svg b/src/icons/svg/rc_31px.svg new file mode 100644 index 000000000..7830c34cd --- /dev/null +++ b/src/icons/svg/rc_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/red_flag_16px.svg b/src/icons/svg/red_flag_16px.svg new file mode 100644 index 000000000..00d2501e8 --- /dev/null +++ b/src/icons/svg/red_flag_16px.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/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/right_16px.svg b/src/icons/svg/right_16px.svg new file mode 100644 index 000000000..7cd8ca667 --- /dev/null +++ b/src/icons/svg/right_16px.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rotate_16px.svg b/src/icons/svg/rotate_16px.svg new file mode 100644 index 000000000..2b80ffbe1 --- /dev/null +++ b/src/icons/svg/rotate_16px.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rrotate_16px.svg b/src/icons/svg/rrotate_16px.svg new file mode 100644 index 000000000..ddffc5edd --- /dev/null +++ b/src/icons/svg/rrotate_16px.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/rt_31px.svg b/src/icons/svg/rt_31px.svg new file mode 100644 index 000000000..85ff8f427 --- /dev/null +++ b/src/icons/svg/rt_31px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + 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/ruler_24px.svg b/src/icons/svg/ruler_24px.svg new file mode 100644 index 000000000..193483b08 --- /dev/null +++ b/src/icons/svg/ruler_24px.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/run_16px.svg b/src/icons/svg/run_16px.svg new file mode 100644 index 000000000..6ef8fdf9c --- /dev/null +++ b/src/icons/svg/run_16px.svg @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/runthis_16px.svg b/src/icons/svg/runthis_16px.svg new file mode 100644 index 000000000..ac1be0680 --- /dev/null +++ b/src/icons/svg/runthis_16px.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/salt.svg b/src/icons/svg/salt.svg new file mode 100644 index 000000000..cc7f29dba --- /dev/null +++ b/src/icons/svg/salt.svg @@ -0,0 +1,1518 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/salt_icon.svg b/src/icons/svg/salt_icon.svg new file mode 100644 index 000000000..b8a00edd3 --- /dev/null +++ b/src/icons/svg/salt_icon.svg @@ -0,0 +1,1518 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/save_16px.svg b/src/icons/svg/save_16px.svg new file mode 100644 index 000000000..50a820f6f --- /dev/null +++ b/src/icons/svg/save_16px.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/save_all_16px.svg b/src/icons/svg/save_all_16px.svg new file mode 100644 index 000000000..6a38da07c --- /dev/null +++ b/src/icons/svg/save_all_16px.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/select_24px.svg b/src/icons/svg/select_24px.svg new file mode 100644 index 000000000..d7a911032 --- /dev/null +++ b/src/icons/svg/select_24px.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/setup_16px.svg b/src/icons/svg/setup_16px.svg new file mode 100644 index 000000000..2aa742023 --- /dev/null +++ b/src/icons/svg/setup_16px.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/icons/svg/stop_16px.svg b/src/icons/svg/stop_16px.svg new file mode 100644 index 000000000..e8f2a50f7 --- /dev/null +++ b/src/icons/svg/stop_16px.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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/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/icons/svg/unchecked_16px.svg b/src/icons/svg/unchecked_16px.svg new file mode 100644 index 000000000..a99e11dc2 --- /dev/null +++ b/src/icons/svg/unchecked_16px.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/unlocked_16px.svg b/src/icons/svg/unlocked_16px.svg new file mode 100644 index 000000000..a2f6195c2 --- /dev/null +++ b/src/icons/svg/unlocked_16px.svg @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/up_16px.svg b/src/icons/svg/up_16px.svg new file mode 100644 index 000000000..e687768e5 --- /dev/null +++ b/src/icons/svg/up_16px.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/upup_16px.svg b/src/icons/svg/upup_16px.svg new file mode 100644 index 000000000..05dd67192 --- /dev/null +++ b/src/icons/svg/upup_16px.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/waived_16px.svg b/src/icons/svg/waived_16px.svg new file mode 100644 index 000000000..11893e73c --- /dev/null +++ b/src/icons/svg/waived_16px.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + w + + + w + + + diff --git a/src/icons/svg/warn_16px.svg b/src/icons/svg/warn_16px.svg new file mode 100644 index 000000000..846c46a50 --- /dev/null +++ b/src/icons/svg/warn_16px.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/yellow_flag_16px.svg b/src/icons/svg/yellow_flag_16px.svg new file mode 100644 index 000000000..40894dc0d --- /dev/null +++ b/src/icons/svg/yellow_flag_16px.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/img/ImageLandmarksDialog.ui b/src/img/img/ImageLandmarksDialog.ui index f4dea304b..b9d16e493 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 @@ -166,7 +166,7 @@ Move - :/move_simple.png + :/move_simple_16px.png true diff --git a/src/img/img/imgLandmarksDialog.cc b/src/img/img/imgLandmarksDialog.cc index 7d4c15ce5..b8755adb9 100644 --- a/src/img/img/imgLandmarksDialog.cc +++ b/src/img/img/imgLandmarksDialog.cc @@ -238,6 +238,7 @@ public: double l = double (search_range) / ui ()->mouse_event_trans ().mag (); db::DBox search_box = db::DBox (p, p).enlarged (db::DVector (l, l)); + m_selected = -1; int li = 0; for (std::vector::const_iterator l = mp_image->landmarks ().begin (); l != mp_image->landmarks ().end (); ++l, ++li) { if (search_box.contains (*l)) { @@ -419,7 +420,7 @@ LandmarksDialog::LandmarksDialog (QWidget *parent, img::Object &img) mp_service->updated_event.add (this, &LandmarksDialog::landmarks_updated); new_pb->setChecked (true); - update_mode (); + mp_service->set_mode (Add); landmarks_updated (); } @@ -436,11 +437,11 @@ LandmarksDialog::update_mode () { mode_t new_mode = None; - if (new_pb->isChecked ()) { + if (sender () == new_pb) { new_mode = Add; - } else if (move_pb->isChecked ()) { + } else if (sender () == move_pb) { new_mode = Move; - } else if (delete_pb->isChecked ()) { + } else if (sender () == delete_pb) { new_mode = Delete; } diff --git a/src/klayout.pri b/src/klayout.pri index 48ddb352c..042cf972f 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -15,6 +15,8 @@ LAYBASIC_INC = $$PWD/laybasic/laybasic LAYVIEW_INC = $$PWD/layview/layview LAYUI_INC = $$PWD/layui/layui LAY_INC = $$PWD/lay/lay +DOC_INC = $$PWD/doc +ICONS_INC = $$PWD/icons QTBASIC_INC = $$PWD/gsiqt/qtbasic diff --git a/src/klayout.pro b/src/klayout.pro index ff82db09e..897d5b516 100644 --- a/src/klayout.pro +++ b/src/klayout.pro @@ -31,6 +31,8 @@ equals(HAVE_RUBY, "1") { lay \ layui \ fontgen \ + doc \ + icons \ } @@ -120,3 +122,8 @@ equals(HAVE_RUBY, "1") { buddies.depends += plugins lym $$LANG_DEPENDS unit_tests.depends += plugins lym $$MAIN_DEPENDS $$LANG_DEPENDS + +# Adds an extra target for generating the doc: "update_doc" +update_doc.commands = $$PWD/../scripts/make_drc_lvs_doc.sh +update_doc.depends = klayout_main +QMAKE_EXTRA_TARGETS += update_doc diff --git a/src/klayout_main/klayout_main/klayout.cc b/src/klayout_main/klayout_main/klayout.cc index 54086adc0..40cca527b 100644 --- a/src/klayout_main/klayout_main/klayout.cc +++ b/src/klayout_main/klayout_main/klayout.cc @@ -42,6 +42,8 @@ #include "libForceLink.h" #include "antForceLink.h" #include "imgForceLink.h" +#include "docForceLink.h" +#include "iconsForceLink.h" #if defined(HAVE_RUBY) #include "drcForceLink.h" #include "lvsForceLink.h" diff --git a/src/klayout_main/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main/klayout_main.pro index ccd8932fc..45bad98c2 100644 --- a/src/klayout_main/klayout_main/klayout_main.pro +++ b/src/klayout_main/klayout_main/klayout_main.pro @@ -5,7 +5,6 @@ include($$PWD/../../klayout.pri) TARGET = klayout -include($$PWD/../../klayout.pri) include($$PWD/../../app.pri) include($$PWD/../../with_all_libs.pri) @@ -22,8 +21,10 @@ win32 { RC_FILE = $$PWD/klayout.rc } -INCLUDEPATH += $$QTBASIC_INC -DEPENDPATH += $$QTBASIC_INC +INCLUDEPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC +DEPENDPATH += $$DOC_INC $$ICONS_INC $$QTBASIC_INC + +LIBS += -lklayout_doc -lklayout_icons equals(HAVE_QTBINDINGS, "1") { diff --git a/src/lay/lay/CrashMessage.ui b/src/lay/lay/CrashMessage.ui index 9ac5c81d1..3523c40a1 100644 --- a/src/lay/lay/CrashMessage.ui +++ b/src/lay/lay/CrashMessage.ui @@ -67,7 +67,7 @@ - :/bug.png + :/bug@2x.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 78ee4529d..43877de45 100644 --- a/src/lay/lay/CustomizeMenuConfigPage.ui +++ b/src/lay/lay/CustomizeMenuConfigPage.ui @@ -195,7 +195,7 @@ For special keys: - :/find.png + :/find_16px@2x.png @@ -223,7 +223,7 @@ For special keys: - + diff --git a/src/lay/lay/HelpAboutDialog.ui b/src/lay/lay/HelpAboutDialog.ui index 1d04a3545..69753802a 100644 --- a/src/lay/lay/HelpAboutDialog.ui +++ b/src/lay/lay/HelpAboutDialog.ui @@ -137,7 +137,7 @@ - :/logo.png + :/logo@2x.png @@ -226,7 +226,7 @@ - + diff --git a/src/lay/lay/LogViewerDialog.ui b/src/lay/lay/LogViewerDialog.ui index 889342ade..011959d13 100644 --- a/src/lay/lay/LogViewerDialog.ui +++ b/src/lay/lay/LogViewerDialog.ui @@ -169,7 +169,7 @@ - :/warn_16.png + :/warn_16px@2x.png @@ -206,7 +206,7 @@ log_view - + diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui index 22b5dd627..95b142033 100644 --- a/src/lay/lay/MacroEditorDialog.ui +++ b/src/lay/lay/MacroEditorDialog.ui @@ -103,8 +103,8 @@ p, li { white-space: pre-wrap; } ... - - :/new_folder.png:/new_folder.png + + :/new_folder_16px.png:/new_folder_16px.png true @@ -130,8 +130,8 @@ p, li { white-space: pre-wrap; } ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png true @@ -150,8 +150,8 @@ p, li { white-space: pre-wrap; } ... - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png true @@ -170,8 +170,8 @@ p, li { white-space: pre-wrap; } Rename - - :/rename.png:/rename.png + + :/rename_16px.png:/rename_16px.png true @@ -190,8 +190,8 @@ p, li { white-space: pre-wrap; } Import - - :/import.png:/import.png + + :/import_16px.png:/import_16px.png true @@ -214,8 +214,8 @@ p, li { white-space: pre-wrap; } ... - - :/save_all.png:/save_all.png + + :/save_all_16px.png:/save_all_16px.png Ctrl+Shift+S @@ -234,8 +234,8 @@ p, li { white-space: pre-wrap; } ... - - :/save.png:/save.png + + :/save_16px.png:/save_16px.png Ctrl+S @@ -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,8 +374,8 @@ p, li { white-space: pre-wrap; } close - - :/del.png:/del.png + + :/del_16px.png:/del_16px.png true @@ -398,8 +398,8 @@ p, li { white-space: pre-wrap; } run - - :/run.png:/run.png + + :/run_16px.png:/run_16px.png F5 @@ -418,8 +418,8 @@ p, li { white-space: pre-wrap; } ... - - :/runthis.png:/runthis.png + + :/runthis_16px.png:/runthis_16px.png Shift+F5 @@ -441,8 +441,8 @@ p, li { white-space: pre-wrap; } ... - - :/stop.png:/stop.png + + :/stop_16px.png:/stop_16px.png true @@ -461,8 +461,8 @@ p, li { white-space: pre-wrap; } ... - - :/pause.png:/pause.png + + :/pause_16px.png:/pause_16px.png Ctrl+F5 @@ -491,8 +491,8 @@ p, li { white-space: pre-wrap; } ... - - :/breakpoint.png:/breakpoint.png + + :/breakpoint_16px.png:/breakpoint_16px.png F9 @@ -514,8 +514,8 @@ p, li { white-space: pre-wrap; } ... - - :/clearbreakpoints.png:/clearbreakpoints.png + + :/clearbreakpoints_16px.png:/clearbreakpoints_16px.png Ctrl+Shift+F9 @@ -544,8 +544,8 @@ p, li { white-space: pre-wrap; } S - - :/singlestep.png:/singlestep.png + + :/singlestep_16px.png:/singlestep_16px.png F11 @@ -567,8 +567,8 @@ p, li { white-space: pre-wrap; } N - - :/nextstep.png:/nextstep.png + + :/nextstep_16px.png:/nextstep_16px.png F10 @@ -597,8 +597,8 @@ p, li { white-space: pre-wrap; } DBG - - :/debug.png:/debug.png + + :/debug_16px.png:/debug_16px.png true @@ -627,8 +627,8 @@ p, li { white-space: pre-wrap; } P - - :/properties.png:/properties.png + + :/properties_16px.png:/properties_16px.png true @@ -647,8 +647,8 @@ p, li { white-space: pre-wrap; } prop - - :/setup.png:/setup.png + + :/setup_16px.png:/setup_16px.png true @@ -683,8 +683,8 @@ p, li { white-space: pre-wrap; } N - - :/find.png:/find.png + + :/find_16px.png:/find_16px.png F3 @@ -773,8 +773,8 @@ p, li { white-space: pre-wrap; } RN - - :/replace.png:/replace.png + + :/replace_16px.png:/replace_16px.png @@ -796,8 +796,8 @@ p, li { white-space: pre-wrap; } All - - :/replace_all.png:/replace_all.png + + :/replace_all_16px.png:/replace_all_16px.png true @@ -820,8 +820,8 @@ p, li { white-space: pre-wrap; } Help - - :/help.png:/help.png + + :/help_16px.png:/help_16px.png @@ -1376,8 +1376,8 @@ p, li { white-space: pre-wrap; } - - :/new_folder.png:/new_folder.png + + :/new_folder_16px.png:/new_folder_16px.png New Folder @@ -1385,8 +1385,8 @@ p, li { white-space: pre-wrap; } - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png New @@ -1394,8 +1394,8 @@ p, li { white-space: pre-wrap; } - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png Delete @@ -1403,8 +1403,8 @@ p, li { white-space: pre-wrap; } - - :/rename.png:/rename.png + + :/rename_16px.png:/rename_16px.png Rename @@ -1412,8 +1412,8 @@ p, li { white-space: pre-wrap; } - - :/import.png:/import.png + + :/import_16px.png:/import_16px.png Import @@ -1421,8 +1421,8 @@ p, li { white-space: pre-wrap; } - - :/save_all.png:/save_all.png + + :/save_all_16px.png:/save_all_16px.png Save All @@ -1430,8 +1430,8 @@ p, li { white-space: pre-wrap; } - - :/save.png:/save.png + + :/save_16px.png:/save_16px.png Save @@ -1527,7 +1527,7 @@ p, li { white-space: pre-wrap; } - + 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/ReplacePropertiesBox.ui b/src/lay/lay/ReplacePropertiesBox.ui index 3e0f63f5f..3a7b3ce70 100644 --- a/src/lay/lay/ReplacePropertiesBox.ui +++ b/src/lay/lay/ReplacePropertiesBox.ui @@ -48,7 +48,7 @@ - :/right.png + :/right_16px@2x.png @@ -58,7 +58,7 @@ - :/right.png + :/right_16px@2x.png @@ -78,7 +78,7 @@ - :/right.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesInstance.ui b/src/lay/lay/ReplacePropertiesInstance.ui index 1bc37cc77..e8eea4307 100644 --- a/src/lay/lay/ReplacePropertiesInstance.ui +++ b/src/lay/lay/ReplacePropertiesInstance.ui @@ -1,7 +1,8 @@ - + + ReplacePropertiesInstance - - + + 0 0 @@ -9,35 +10,35 @@ 195 - + Form - - + + 9 - + 6 - - - + + + - - :/right.png + + :/right_16px@2x.png - + - + Qt::Vertical - + QSizePolicy::Expanding - + 200 71 @@ -45,19 +46,17 @@ - - - + + + Instance cell name - - - - - 7 - 0 + + + + 1 0 @@ -66,6 +65,8 @@ - + + + diff --git a/src/lay/lay/ReplacePropertiesPath.ui b/src/lay/lay/ReplacePropertiesPath.ui index 34425759b..9be6091e7 100644 --- a/src/lay/lay/ReplacePropertiesPath.ui +++ b/src/lay/lay/ReplacePropertiesPath.ui @@ -55,7 +55,7 @@ - :/right.png + :/right_16px@2x.png @@ -68,7 +68,7 @@ - :/right.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesShape.ui b/src/lay/lay/ReplacePropertiesShape.ui index fcfab0404..0493ba1f5 100644 --- a/src/lay/lay/ReplacePropertiesShape.ui +++ b/src/lay/lay/ReplacePropertiesShape.ui @@ -25,7 +25,7 @@ - :/right.png + :/right_16px@2x.png diff --git a/src/lay/lay/ReplacePropertiesText.ui b/src/lay/lay/ReplacePropertiesText.ui index 031476ae1..a5b6da715 100644 --- a/src/lay/lay/ReplacePropertiesText.ui +++ b/src/lay/lay/ReplacePropertiesText.ui @@ -31,7 +31,7 @@ R0 - :/r0.png + :/r0_24px.png @@ -39,7 +39,7 @@ R90 - :/r90.png + :/r90_24px.png @@ -47,7 +47,7 @@ R180 - :/r180.png + :/r180_24px.png @@ -55,7 +55,7 @@ R270 - :/r270.png + :/r270_24px.png @@ -63,7 +63,7 @@ M0 - :/m0.png + :/m0_24px.png @@ -71,7 +71,7 @@ M45 - :/m45.png + :/m45_24px.png @@ -79,7 +79,7 @@ M90 - :/m90.png + :/m90_24px.png @@ -87,7 +87,7 @@ M135 - :/m135.png + :/m135_24px.png @@ -105,7 +105,7 @@ - :/right.png + :/right_16px@2x.png @@ -115,7 +115,7 @@ - :/right.png + :/right_16px@2x.png @@ -141,7 +141,7 @@ - :/right.png + :/right_16px@2x.png @@ -158,7 +158,7 @@ - :/right.png + :/right_16px@2x.png diff --git a/src/lay/lay/SaltGrainPropertiesDialog.ui b/src/lay/lay/SaltGrainPropertiesDialog.ui index 67551b8e7..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,8 +176,8 @@ ... - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png true @@ -195,8 +193,8 @@ ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png true @@ -243,8 +241,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -258,7 +256,6 @@ - 75 true @@ -274,7 +271,6 @@ - 75 true @@ -290,7 +286,6 @@ - 75 true @@ -344,8 +339,8 @@ ... - - :/clear_edit.png:/clear_edit.png + + :/clear_edit_16px.png:/clear_edit_16px.png true @@ -369,7 +364,7 @@ ... - + :/salt_icon.png:/salt_icon.png @@ -389,8 +384,8 @@ ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png @@ -451,8 +446,8 @@ ... - - :/clear_edit.png:/clear_edit.png + + :/clear_edit_16px.png:/clear_edit_16px.png true @@ -516,8 +511,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -543,7 +538,6 @@ - 75 true @@ -559,7 +553,6 @@ - 75 true @@ -617,8 +610,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -660,7 +653,6 @@ - 75 true @@ -676,7 +668,6 @@ - 75 true @@ -731,8 +722,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -772,7 +763,6 @@ - 75 true @@ -823,8 +813,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -882,7 +872,7 @@ remove_dependency - + diff --git a/src/lay/lay/SaltGrainTemplateSelectionDialog.ui b/src/lay/lay/SaltGrainTemplateSelectionDialog.ui index 65406eb88..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,8 +115,8 @@ ... - - :/warn.png:/warn.png + + :/warn_16px.png:/warn_16px.png true @@ -132,7 +130,6 @@ - 50 true false @@ -155,8 +152,8 @@ - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png New @@ -167,8 +164,8 @@ - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png Delete @@ -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 b37c0c65e..de9b8baa4 100644 --- a/src/lay/lay/SaltManagerDialog.ui +++ b/src/lay/lay/SaltManagerDialog.ui @@ -76,8 +76,8 @@ Mark - - :/marked_16.png:/marked_16.png + + :/marked_16px.png:/marked_16px.png true @@ -103,7 +103,7 @@ - :/find.png + :/find_16px@2x.png @@ -219,7 +219,6 @@ - 75 true @@ -237,8 +236,8 @@ ... - - :/empty_16.png:/empty_16.png + + :/empty_16px.png:/empty_16px.png true @@ -375,8 +374,8 @@ Mark - - :/marked_16.png:/marked_16.png + + :/marked_16px.png:/marked_16px.png true @@ -402,7 +401,7 @@ - :/find.png + :/find_16px@2x.png @@ -518,7 +517,6 @@ - 75 true @@ -536,8 +534,8 @@ ... - - :/empty_16.png:/empty_16.png + + :/empty_16px.png:/empty_16px.png true @@ -690,7 +688,7 @@ - :/find.png + :/find_16px@2x.png @@ -804,8 +802,8 @@ 0 0 - 537 - 284 + 334 + 213 @@ -828,7 +826,7 @@ - :/salt.png + :/salt@2x.png @@ -843,7 +841,6 @@ 9 - 50 false @@ -871,7 +868,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@2x.png"></a> button to create a new package</td></tr> </table> </body></html> @@ -942,7 +939,6 @@ - 75 true @@ -960,8 +956,8 @@ Edit - - :/edit.png:/edit.png + + :/edit_16px.png:/edit_16px.png true @@ -1012,8 +1008,8 @@ Remove Package - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -1036,8 +1032,8 @@ Create (Edit) Package - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png false @@ -1061,8 +1057,8 @@ - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png New @@ -1073,8 +1069,8 @@ - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png Remove Package @@ -1133,8 +1129,8 @@ - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png Create (edit) package @@ -1178,7 +1174,7 @@ scrollArea - + diff --git a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui index 87c932dd4..cc85b33f2 100644 --- a/src/lay/lay/SaltManagerInstallConfirmationDialog.ui +++ b/src/lay/lay/SaltManagerInstallConfirmationDialog.ui @@ -260,7 +260,7 @@ - :/warn_16.png + :/warn_16px@2x.png @@ -335,8 +335,8 @@ - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png New @@ -347,8 +347,8 @@ - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png Delete @@ -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/SearchPropertiesText.ui b/src/lay/lay/SearchPropertiesText.ui index c6e5783ed..7631b1aa4 100644 --- a/src/lay/lay/SearchPropertiesText.ui +++ b/src/lay/lay/SearchPropertiesText.ui @@ -68,7 +68,7 @@ R0 - :/r0.png + :/r0_24px.png @@ -76,7 +76,7 @@ R90 - :/r90.png + :/r90_24px.png @@ -84,7 +84,7 @@ R180 - :/r180.png + :/r180_24px.png @@ -92,7 +92,7 @@ R270 - :/r270.png + :/r270_24px.png @@ -100,7 +100,7 @@ M0 - :/m0.png + :/m0_24px.png @@ -108,7 +108,7 @@ M45 - :/m45.png + :/m45_24px.png @@ -116,7 +116,7 @@ M90 - :/m90.png + :/m90_24px.png @@ -124,7 +124,7 @@ M135 - :/m135.png + :/m135_24px.png diff --git a/src/lay/lay/SearchReplaceDialog.ui b/src/lay/lay/SearchReplaceDialog.ui index 67a89a6ca..9c24eb188 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.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_16px.png:/rename_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;">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.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.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/TechSetupDialog.ui b/src/lay/lay/TechSetupDialog.ui index 56a85c4d9..71b39a402 100644 --- a/src/lay/lay/TechSetupDialog.ui +++ b/src/lay/lay/TechSetupDialog.ui @@ -112,8 +112,8 @@ ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png true @@ -126,8 +126,8 @@ ... - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png true @@ -303,7 +303,7 @@ buttonBox - + diff --git a/src/lay/lay/doc/navigator_sep.png b/src/lay/lay/doc/navigator_sep.png deleted file mode 100644 index 6eeeb264a..000000000 Binary files a/src/lay/lay/doc/navigator_sep.png and /dev/null differ diff --git a/src/lay/lay/images/add.png b/src/lay/lay/images/add.png deleted file mode 100644 index 7175780cf..000000000 Binary files a/src/lay/lay/images/add.png and /dev/null differ diff --git a/src/lay/lay/images/align_bottom.png b/src/lay/lay/images/align_bottom.png deleted file mode 100644 index 6cb091161..000000000 Binary files a/src/lay/lay/images/align_bottom.png and /dev/null differ diff --git a/src/lay/lay/images/align_hcenter.png b/src/lay/lay/images/align_hcenter.png deleted file mode 100644 index 32ee4bc21..000000000 Binary files a/src/lay/lay/images/align_hcenter.png and /dev/null differ diff --git a/src/lay/lay/images/align_left.png b/src/lay/lay/images/align_left.png deleted file mode 100644 index fbaeb0d0a..000000000 Binary files a/src/lay/lay/images/align_left.png and /dev/null differ diff --git a/src/lay/lay/images/align_none.png b/src/lay/lay/images/align_none.png deleted file mode 100644 index 44673b526..000000000 Binary files a/src/lay/lay/images/align_none.png and /dev/null differ diff --git a/src/lay/lay/images/align_right.png b/src/lay/lay/images/align_right.png deleted file mode 100644 index 52510f71c..000000000 Binary files a/src/lay/lay/images/align_right.png and /dev/null differ diff --git a/src/lay/lay/images/align_top.png b/src/lay/lay/images/align_top.png deleted file mode 100644 index dfa906f4e..000000000 Binary files a/src/lay/lay/images/align_top.png and /dev/null differ diff --git a/src/lay/lay/images/align_vcenter.png b/src/lay/lay/images/align_vcenter.png deleted file mode 100644 index 41a1961be..000000000 Binary files a/src/lay/lay/images/align_vcenter.png and /dev/null differ diff --git a/src/lay/lay/images/back.png b/src/lay/lay/images/back.png deleted file mode 100644 index f106b46a5..000000000 Binary files a/src/lay/lay/images/back.png and /dev/null differ diff --git a/src/lay/lay/images/back_16.png b/src/lay/lay/images/back_16.png deleted file mode 100644 index b5c926f50..000000000 Binary files a/src/lay/lay/images/back_16.png and /dev/null differ diff --git a/src/lay/lay/images/blue_flag.png b/src/lay/lay/images/blue_flag.png deleted file mode 100644 index d3189e225..000000000 Binary files a/src/lay/lay/images/blue_flag.png and /dev/null differ diff --git a/src/lay/lay/images/bookmark_16.png b/src/lay/lay/images/bookmark_16.png deleted file mode 100644 index 59767c43a..000000000 Binary files a/src/lay/lay/images/bookmark_16.png and /dev/null differ diff --git a/src/lay/lay/images/breakpoint.png b/src/lay/lay/images/breakpoint.png deleted file mode 100644 index 6e60f94b9..000000000 Binary files a/src/lay/lay/images/breakpoint.png and /dev/null differ diff --git a/src/lay/lay/images/breakpointmark.png b/src/lay/lay/images/breakpointmark.png deleted file mode 100644 index efbd91de7..000000000 Binary files a/src/lay/lay/images/breakpointmark.png and /dev/null differ diff --git a/src/lay/lay/images/breakpointmarkdisabled.png b/src/lay/lay/images/breakpointmarkdisabled.png deleted file mode 100644 index 71e0bb1b9..000000000 Binary files a/src/lay/lay/images/breakpointmarkdisabled.png and /dev/null differ diff --git a/src/lay/lay/images/bright.png b/src/lay/lay/images/bright.png deleted file mode 100644 index df3a90a7c..000000000 Binary files a/src/lay/lay/images/bright.png and /dev/null differ diff --git a/src/lay/lay/images/bug.png b/src/lay/lay/images/bug.png deleted file mode 100644 index bd49f5666..000000000 Binary files a/src/lay/lay/images/bug.png and /dev/null differ diff --git a/src/lay/lay/images/bulb.png b/src/lay/lay/images/bulb.png deleted file mode 100644 index 03e4e3e09..000000000 Binary files a/src/lay/lay/images/bulb.png and /dev/null differ diff --git a/src/lay/lay/images/cb.png b/src/lay/lay/images/cb.png deleted file mode 100644 index 2fce471d3..000000000 Binary files a/src/lay/lay/images/cb.png and /dev/null differ diff --git a/src/lay/lay/images/cc.png b/src/lay/lay/images/cc.png deleted file mode 100644 index c6d6791ac..000000000 Binary files a/src/lay/lay/images/cc.png and /dev/null differ diff --git a/src/lay/lay/images/checked.png b/src/lay/lay/images/checked.png deleted file mode 100644 index 6e17c9efb..000000000 Binary files a/src/lay/lay/images/checked.png and /dev/null differ diff --git a/src/lay/lay/images/clear.png b/src/lay/lay/images/clear.png deleted file mode 100644 index e1a2b8e31..000000000 Binary files a/src/lay/lay/images/clear.png and /dev/null differ diff --git a/src/lay/lay/images/clear_edit.png b/src/lay/lay/images/clear_edit.png deleted file mode 100644 index 6e5e18e79..000000000 Binary files a/src/lay/lay/images/clear_edit.png and /dev/null differ diff --git a/src/lay/lay/images/clearbreakpoints.png b/src/lay/lay/images/clearbreakpoints.png deleted file mode 100644 index 88ff597c2..000000000 Binary files a/src/lay/lay/images/clearbreakpoints.png and /dev/null differ diff --git a/src/lay/lay/images/close.png b/src/lay/lay/images/close.png deleted file mode 100644 index 2600eb1a4..000000000 Binary files a/src/lay/lay/images/close.png and /dev/null differ diff --git a/src/lay/lay/images/cm_add.png b/src/lay/lay/images/cm_add.png deleted file mode 100644 index 2e8b62374..000000000 Binary files a/src/lay/lay/images/cm_add.png and /dev/null differ diff --git a/src/lay/lay/images/cm_diff.png b/src/lay/lay/images/cm_diff.png deleted file mode 100644 index 5c5ac922c..000000000 Binary files a/src/lay/lay/images/cm_diff.png and /dev/null differ diff --git a/src/lay/lay/images/cm_erase.png b/src/lay/lay/images/cm_erase.png deleted file mode 100644 index 74a6505a5..000000000 Binary files a/src/lay/lay/images/cm_erase.png and /dev/null differ diff --git a/src/lay/lay/images/cm_mask.png b/src/lay/lay/images/cm_mask.png deleted file mode 100644 index 304bb9ef0..000000000 Binary files a/src/lay/lay/images/cm_mask.png and /dev/null differ diff --git a/src/lay/lay/images/cm_merge.png b/src/lay/lay/images/cm_merge.png deleted file mode 100644 index 11dcb87cc..000000000 Binary files a/src/lay/lay/images/cm_merge.png and /dev/null differ diff --git a/src/lay/lay/images/ct.png b/src/lay/lay/images/ct.png deleted file mode 100644 index 61682544f..000000000 Binary files a/src/lay/lay/images/ct.png and /dev/null differ diff --git a/src/lay/lay/images/dark.png b/src/lay/lay/images/dark.png deleted file mode 100644 index ab8851a51..000000000 Binary files a/src/lay/lay/images/dark.png and /dev/null differ diff --git a/src/lay/lay/images/debug.png b/src/lay/lay/images/debug.png deleted file mode 100644 index d0f12c4c2..000000000 Binary files a/src/lay/lay/images/debug.png and /dev/null differ diff --git a/src/lay/lay/images/defaultmacroicon.png b/src/lay/lay/images/defaultmacroicon.png deleted file mode 100644 index 5d76f4a14..000000000 Binary files a/src/lay/lay/images/defaultmacroicon.png and /dev/null differ diff --git a/src/lay/lay/images/del.png b/src/lay/lay/images/del.png deleted file mode 100644 index f49a15d9b..000000000 Binary files a/src/lay/lay/images/del.png and /dev/null differ diff --git a/src/lay/lay/images/down.png b/src/lay/lay/images/down.png deleted file mode 100644 index bffb8b749..000000000 Binary files a/src/lay/lay/images/down.png and /dev/null differ diff --git a/src/lay/lay/images/downdown.png b/src/lay/lay/images/downdown.png deleted file mode 100644 index a47dc96e7..000000000 Binary files a/src/lay/lay/images/downdown.png and /dev/null differ diff --git a/src/lay/lay/images/edit.png b/src/lay/lay/images/edit.png deleted file mode 100644 index 9e568e149..000000000 Binary files a/src/lay/lay/images/edit.png and /dev/null differ diff --git a/src/lay/lay/images/empty_12.png b/src/lay/lay/images/empty_12.png deleted file mode 100644 index 989ee8a3f..000000000 Binary files a/src/lay/lay/images/empty_12.png and /dev/null differ diff --git a/src/lay/lay/images/empty_16.png b/src/lay/lay/images/empty_16.png deleted file mode 100644 index 10b1f1be6..000000000 Binary files a/src/lay/lay/images/empty_16.png and /dev/null differ diff --git a/src/lay/lay/images/error2_16.png b/src/lay/lay/images/error2_16.png deleted file mode 100644 index f2b7ab6ea..000000000 Binary files a/src/lay/lay/images/error2_16.png and /dev/null differ diff --git a/src/lay/lay/images/error_16.png b/src/lay/lay/images/error_16.png deleted file mode 100644 index c9dad1310..000000000 Binary files a/src/lay/lay/images/error_16.png and /dev/null differ diff --git a/src/lay/lay/images/execmark.png b/src/lay/lay/images/execmark.png deleted file mode 100644 index 496dbf140..000000000 Binary files a/src/lay/lay/images/execmark.png and /dev/null differ diff --git a/src/lay/lay/images/file_12.png b/src/lay/lay/images/file_12.png deleted file mode 100644 index 5113c3262..000000000 Binary files a/src/lay/lay/images/file_12.png and /dev/null differ diff --git a/src/lay/lay/images/find.png b/src/lay/lay/images/find.png deleted file mode 100644 index 2f2460004..000000000 Binary files a/src/lay/lay/images/find.png and /dev/null differ diff --git a/src/lay/lay/images/fliph.png b/src/lay/lay/images/fliph.png deleted file mode 100644 index a47b95fea..000000000 Binary files a/src/lay/lay/images/fliph.png and /dev/null differ diff --git a/src/lay/lay/images/flipv.png b/src/lay/lay/images/flipv.png deleted file mode 100644 index d660e9351..000000000 Binary files a/src/lay/lay/images/flipv.png and /dev/null differ diff --git a/src/lay/lay/images/folder.png b/src/lay/lay/images/folder.png deleted file mode 100644 index 3246e27e3..000000000 Binary files a/src/lay/lay/images/folder.png and /dev/null differ diff --git a/src/lay/lay/images/folder_12.png b/src/lay/lay/images/folder_12.png deleted file mode 100644 index 99459e601..000000000 Binary files a/src/lay/lay/images/folder_12.png and /dev/null differ diff --git a/src/lay/lay/images/forward.png b/src/lay/lay/images/forward.png deleted file mode 100644 index 6dbc76455..000000000 Binary files a/src/lay/lay/images/forward.png and /dev/null differ diff --git a/src/lay/lay/images/forward_16.png b/src/lay/lay/images/forward_16.png deleted file mode 100644 index fa9e7a261..000000000 Binary files a/src/lay/lay/images/forward_16.png and /dev/null differ diff --git a/src/lay/lay/images/generalmacroicon.png b/src/lay/lay/images/generalmacroicon.png deleted file mode 100644 index b20708aba..000000000 Binary files a/src/lay/lay/images/generalmacroicon.png and /dev/null differ diff --git a/src/lay/lay/images/generalmacroiconactive.png b/src/lay/lay/images/generalmacroiconactive.png deleted file mode 100644 index 2d28f2bd0..000000000 Binary files a/src/lay/lay/images/generalmacroiconactive.png and /dev/null differ diff --git a/src/lay/lay/images/green_flag.png b/src/lay/lay/images/green_flag.png deleted file mode 100644 index 5bfded202..000000000 Binary files a/src/lay/lay/images/green_flag.png and /dev/null differ diff --git a/src/lay/lay/images/import.png b/src/lay/lay/images/import.png deleted file mode 100644 index d89416fe2..000000000 Binary files a/src/lay/lay/images/import.png and /dev/null differ diff --git a/src/lay/lay/images/important.png b/src/lay/lay/images/important.png deleted file mode 100644 index 2fbd50b06..000000000 Binary files a/src/lay/lay/images/important.png and /dev/null differ diff --git a/src/lay/lay/images/info_16.png b/src/lay/lay/images/info_16.png deleted file mode 100644 index d1fa36644..000000000 Binary files a/src/lay/lay/images/info_16.png and /dev/null differ diff --git a/src/lay/lay/images/instance.png b/src/lay/lay/images/instance.png deleted file mode 100644 index 289c33615..000000000 Binary files a/src/lay/lay/images/instance.png and /dev/null differ diff --git a/src/lay/lay/images/invert.png b/src/lay/lay/images/invert.png deleted file mode 100644 index 432939c66..000000000 Binary files a/src/lay/lay/images/invert.png and /dev/null differ diff --git a/src/lay/lay/images/lb.png b/src/lay/lay/images/lb.png deleted file mode 100644 index a986c1ba4..000000000 Binary files a/src/lay/lay/images/lb.png and /dev/null differ diff --git a/src/lay/lay/images/lc.png b/src/lay/lay/images/lc.png deleted file mode 100644 index 57df93e1e..000000000 Binary files a/src/lay/lay/images/lc.png and /dev/null differ diff --git a/src/lay/lay/images/left.png b/src/lay/lay/images/left.png deleted file mode 100644 index 358437110..000000000 Binary files a/src/lay/lay/images/left.png and /dev/null differ diff --git a/src/lay/lay/images/locked_16.png b/src/lay/lay/images/locked_16.png deleted file mode 100644 index 7d29dc559..000000000 Binary files a/src/lay/lay/images/locked_16.png and /dev/null differ diff --git a/src/lay/lay/images/lt.png b/src/lay/lay/images/lt.png deleted file mode 100644 index 63af853b6..000000000 Binary files a/src/lay/lay/images/lt.png and /dev/null differ diff --git a/src/lay/lay/images/m0.png b/src/lay/lay/images/m0.png deleted file mode 100644 index 01cb343ca..000000000 Binary files a/src/lay/lay/images/m0.png and /dev/null differ diff --git a/src/lay/lay/images/m135.png b/src/lay/lay/images/m135.png deleted file mode 100644 index 1bf117274..000000000 Binary files a/src/lay/lay/images/m135.png and /dev/null differ diff --git a/src/lay/lay/images/m45.png b/src/lay/lay/images/m45.png deleted file mode 100644 index 34d169cc8..000000000 Binary files a/src/lay/lay/images/m45.png and /dev/null differ diff --git a/src/lay/lay/images/m90.png b/src/lay/lay/images/m90.png deleted file mode 100644 index 66adc2321..000000000 Binary files a/src/lay/lay/images/m90.png and /dev/null differ diff --git a/src/lay/lay/images/marked_16.png b/src/lay/lay/images/marked_16.png deleted file mode 100644 index 777a625a7..000000000 Binary files a/src/lay/lay/images/marked_16.png and /dev/null differ diff --git a/src/lay/lay/images/marked_24.png b/src/lay/lay/images/marked_24.png deleted file mode 100644 index b5ffcbd6b..000000000 Binary files a/src/lay/lay/images/marked_24.png and /dev/null differ diff --git a/src/lay/lay/images/marked_64.png b/src/lay/lay/images/marked_64.png deleted file mode 100644 index afff90c70..000000000 Binary files a/src/lay/lay/images/marked_64.png and /dev/null differ diff --git a/src/lay/lay/images/move.png b/src/lay/lay/images/move.png deleted file mode 100644 index 90e407843..000000000 Binary files a/src/lay/lay/images/move.png and /dev/null differ diff --git a/src/lay/lay/images/move_simple.png b/src/lay/lay/images/move_simple.png deleted file mode 100644 index f810ae033..000000000 Binary files a/src/lay/lay/images/move_simple.png and /dev/null differ diff --git a/src/lay/lay/images/neutral.png b/src/lay/lay/images/neutral.png deleted file mode 100644 index d98ee7442..000000000 Binary files a/src/lay/lay/images/neutral.png and /dev/null differ diff --git a/src/lay/lay/images/new_folder.png b/src/lay/lay/images/new_folder.png deleted file mode 100644 index b6816a390..000000000 Binary files a/src/lay/lay/images/new_folder.png and /dev/null differ diff --git a/src/lay/lay/images/next_topic.png b/src/lay/lay/images/next_topic.png deleted file mode 100644 index 2ba1acba3..000000000 Binary files a/src/lay/lay/images/next_topic.png and /dev/null differ diff --git a/src/lay/lay/images/nextstep.png b/src/lay/lay/images/nextstep.png deleted file mode 100644 index f547dca5a..000000000 Binary files a/src/lay/lay/images/nextstep.png and /dev/null differ diff --git a/src/lay/lay/images/no_flag.png b/src/lay/lay/images/no_flag.png deleted file mode 100644 index d6749c911..000000000 Binary files a/src/lay/lay/images/no_flag.png and /dev/null differ diff --git a/src/lay/lay/images/nophoto.png b/src/lay/lay/images/nophoto.png deleted file mode 100644 index c15fcfc44..000000000 Binary files a/src/lay/lay/images/nophoto.png and /dev/null differ diff --git a/src/lay/lay/images/options_edit.png b/src/lay/lay/images/options_edit.png deleted file mode 100644 index 08ec0456e..000000000 Binary files a/src/lay/lay/images/options_edit.png and /dev/null differ diff --git a/src/lay/lay/images/path.png b/src/lay/lay/images/path.png deleted file mode 100644 index d6759d242..000000000 Binary files a/src/lay/lay/images/path.png and /dev/null differ diff --git a/src/lay/lay/images/pause.png b/src/lay/lay/images/pause.png deleted file mode 100644 index 0d1a15b5e..000000000 Binary files a/src/lay/lay/images/pause.png and /dev/null differ diff --git a/src/lay/lay/images/photo.png b/src/lay/lay/images/photo.png deleted file mode 100644 index 5bc6781af..000000000 Binary files a/src/lay/lay/images/photo.png and /dev/null differ diff --git a/src/lay/lay/images/polygon.png b/src/lay/lay/images/polygon.png deleted file mode 100644 index 687210e56..000000000 Binary files a/src/lay/lay/images/polygon.png and /dev/null differ diff --git a/src/lay/lay/images/properties.png b/src/lay/lay/images/properties.png deleted file mode 100644 index 09a7d5c67..000000000 Binary files a/src/lay/lay/images/properties.png and /dev/null differ diff --git a/src/lay/lay/images/pythonmacroicon.png b/src/lay/lay/images/pythonmacroicon.png deleted file mode 100644 index 5b1bc4270..000000000 Binary files a/src/lay/lay/images/pythonmacroicon.png and /dev/null differ diff --git a/src/lay/lay/images/pythonmacroiconactive.png b/src/lay/lay/images/pythonmacroiconactive.png deleted file mode 100644 index e89c5fda6..000000000 Binary files a/src/lay/lay/images/pythonmacroiconactive.png and /dev/null differ diff --git a/src/lay/lay/images/r0.png b/src/lay/lay/images/r0.png deleted file mode 100644 index a75c3bb28..000000000 Binary files a/src/lay/lay/images/r0.png and /dev/null differ diff --git a/src/lay/lay/images/r180.png b/src/lay/lay/images/r180.png deleted file mode 100644 index af3198bf0..000000000 Binary files a/src/lay/lay/images/r180.png and /dev/null differ diff --git a/src/lay/lay/images/r270.png b/src/lay/lay/images/r270.png deleted file mode 100644 index fc1f67185..000000000 Binary files a/src/lay/lay/images/r270.png and /dev/null differ diff --git a/src/lay/lay/images/r90.png b/src/lay/lay/images/r90.png deleted file mode 100644 index f34bc5b11..000000000 Binary files a/src/lay/lay/images/r90.png and /dev/null differ diff --git a/src/lay/lay/images/rb.png b/src/lay/lay/images/rb.png deleted file mode 100644 index bf87b5aa0..000000000 Binary files a/src/lay/lay/images/rb.png and /dev/null differ diff --git a/src/lay/lay/images/rc.png b/src/lay/lay/images/rc.png deleted file mode 100644 index 42fd9fdd7..000000000 Binary files a/src/lay/lay/images/rc.png and /dev/null differ diff --git a/src/lay/lay/images/red_flag.png b/src/lay/lay/images/red_flag.png deleted file mode 100644 index d288cf7d8..000000000 Binary files a/src/lay/lay/images/red_flag.png and /dev/null differ diff --git a/src/lay/lay/images/rename.png b/src/lay/lay/images/rename.png deleted file mode 100644 index 71b798b6f..000000000 Binary files a/src/lay/lay/images/rename.png and /dev/null differ diff --git a/src/lay/lay/images/replace.png b/src/lay/lay/images/replace.png deleted file mode 100644 index 6d45e8f26..000000000 Binary files a/src/lay/lay/images/replace.png and /dev/null differ diff --git a/src/lay/lay/images/replace_all.png b/src/lay/lay/images/replace_all.png deleted file mode 100644 index b0530123e..000000000 Binary files a/src/lay/lay/images/replace_all.png and /dev/null differ diff --git a/src/lay/lay/images/right.png b/src/lay/lay/images/right.png deleted file mode 100644 index 74478f7f6..000000000 Binary files a/src/lay/lay/images/right.png and /dev/null differ diff --git a/src/lay/lay/images/rotate.png b/src/lay/lay/images/rotate.png deleted file mode 100644 index 165f2325d..000000000 Binary files a/src/lay/lay/images/rotate.png and /dev/null differ diff --git a/src/lay/lay/images/rt.png b/src/lay/lay/images/rt.png deleted file mode 100644 index 13b4c0f3a..000000000 Binary files a/src/lay/lay/images/rt.png and /dev/null differ diff --git a/src/lay/lay/images/rubymacroicon.png b/src/lay/lay/images/rubymacroicon.png deleted file mode 100644 index dea2a9ab0..000000000 Binary files a/src/lay/lay/images/rubymacroicon.png and /dev/null differ diff --git a/src/lay/lay/images/rubymacroiconactive.png b/src/lay/lay/images/rubymacroiconactive.png deleted file mode 100644 index 207770215..000000000 Binary files a/src/lay/lay/images/rubymacroiconactive.png and /dev/null differ diff --git a/src/lay/lay/images/ruler.png b/src/lay/lay/images/ruler.png deleted file mode 100644 index 5d6d26895..000000000 Binary files a/src/lay/lay/images/ruler.png and /dev/null differ diff --git a/src/lay/lay/images/run.png b/src/lay/lay/images/run.png deleted file mode 100644 index 84bd4b505..000000000 Binary files a/src/lay/lay/images/run.png and /dev/null differ diff --git a/src/lay/lay/images/runthis.png b/src/lay/lay/images/runthis.png deleted file mode 100644 index ca2842d93..000000000 Binary files a/src/lay/lay/images/runthis.png and /dev/null differ diff --git a/src/lay/lay/images/salt.png b/src/lay/lay/images/salt.png deleted file mode 100644 index 181409a28..000000000 Binary files a/src/lay/lay/images/salt.png and /dev/null differ diff --git a/src/lay/lay/images/salt_icon.png b/src/lay/lay/images/salt_icon.png deleted file mode 100644 index ec11c7ac0..000000000 Binary files a/src/lay/lay/images/salt_icon.png and /dev/null differ diff --git a/src/lay/lay/images/save.png b/src/lay/lay/images/save.png deleted file mode 100644 index 5a13d75ea..000000000 Binary files a/src/lay/lay/images/save.png and /dev/null differ diff --git a/src/lay/lay/images/save_all.png b/src/lay/lay/images/save_all.png deleted file mode 100644 index 0c2d44408..000000000 Binary files a/src/lay/lay/images/save_all.png and /dev/null differ diff --git a/src/lay/lay/images/select.png b/src/lay/lay/images/select.png deleted file mode 100644 index 9a5611aac..000000000 Binary files a/src/lay/lay/images/select.png and /dev/null differ diff --git a/src/lay/lay/images/setup.png b/src/lay/lay/images/setup.png deleted file mode 100644 index ff05063a7..000000000 Binary files a/src/lay/lay/images/setup.png and /dev/null differ diff --git a/src/lay/lay/images/singlestep.png b/src/lay/lay/images/singlestep.png deleted file mode 100644 index 61c240352..000000000 Binary files a/src/lay/lay/images/singlestep.png and /dev/null differ diff --git a/src/lay/lay/images/stop.png b/src/lay/lay/images/stop.png deleted file mode 100644 index 4707c4d78..000000000 Binary files a/src/lay/lay/images/stop.png and /dev/null differ diff --git a/src/lay/lay/images/techs.png b/src/lay/lay/images/techs.png deleted file mode 100644 index 6762d4469..000000000 Binary files a/src/lay/lay/images/techs.png and /dev/null differ diff --git a/src/lay/lay/images/text.png b/src/lay/lay/images/text.png deleted file mode 100644 index 1ed0aef6e..000000000 Binary files a/src/lay/lay/images/text.png and /dev/null differ diff --git a/src/lay/lay/images/textdocumenticon.png b/src/lay/lay/images/textdocumenticon.png deleted file mode 100644 index 1262af379..000000000 Binary files a/src/lay/lay/images/textdocumenticon.png and /dev/null differ diff --git a/src/lay/lay/images/unchecked.png b/src/lay/lay/images/unchecked.png deleted file mode 100644 index 52652e1bc..000000000 Binary files a/src/lay/lay/images/unchecked.png and /dev/null differ diff --git a/src/lay/lay/images/unlocked_16.png b/src/lay/lay/images/unlocked_16.png deleted file mode 100644 index 6b5b0d538..000000000 Binary files a/src/lay/lay/images/unlocked_16.png and /dev/null differ diff --git a/src/lay/lay/images/up.png b/src/lay/lay/images/up.png deleted file mode 100644 index 653de88be..000000000 Binary files a/src/lay/lay/images/up.png and /dev/null differ diff --git a/src/lay/lay/images/upup.png b/src/lay/lay/images/upup.png deleted file mode 100644 index e955e5661..000000000 Binary files a/src/lay/lay/images/upup.png and /dev/null differ diff --git a/src/lay/lay/images/waived.png b/src/lay/lay/images/waived.png deleted file mode 100644 index 1b2d47c4f..000000000 Binary files a/src/lay/lay/images/waived.png and /dev/null differ diff --git a/src/lay/lay/images/warn.png b/src/lay/lay/images/warn.png deleted file mode 100644 index adea92d4f..000000000 Binary files a/src/lay/lay/images/warn.png and /dev/null differ diff --git a/src/lay/lay/images/warn_16.png b/src/lay/lay/images/warn_16.png deleted file mode 100644 index 357216719..000000000 Binary files a/src/lay/lay/images/warn_16.png and /dev/null differ diff --git a/src/lay/lay/images/yellow_flag.png b/src/lay/lay/images/yellow_flag.png deleted file mode 100644 index d84f9f324..000000000 Binary files a/src/lay/lay/images/yellow_flag.png and /dev/null differ diff --git a/src/lay/lay/lay.pro b/src/lay/lay/lay.pro index a30887eb7..8bd49c256 100644 --- a/src/lay/lay/lay.pro +++ b/src/lay/lay/lay.pro @@ -174,11 +174,9 @@ SOURCES = \ layViewWidgetStack.cc RESOURCES = layBuildInMacros.qrc \ - layHelpResources.qrc \ layMacroTemplates.qrc \ - layResources.qrc \ + laySyntaxHighlighters.qrc \ laySaltTemplates.qrc \ - layDRCLVSHelpResources.qrc INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$LAYUI_INC $$LAYVIEW_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC diff --git a/src/lay/lay/layApplication.cc b/src/lay/lay/layApplication.cc index 1632461e0..fe517860e 100644 --- a/src/lay/lay/layApplication.cc +++ b/src/lay/lay/layApplication.cc @@ -1437,6 +1437,9 @@ GuiApplication::GuiApplication (int &argc, char **argv) #if QT_VERSION >= 0x040500 setAttribute (Qt::AA_DontShowIconsInMenus, false); #endif +#if QT_VERSION >= 0x050000 + setAttribute (Qt::AA_UseHighDpiPixmaps, true); +#endif } GuiApplication::~GuiApplication () diff --git a/src/lay/lay/layLogViewerDialog.cc b/src/lay/lay/layLogViewerDialog.cc index ef8d95319..dff6d7404 100644 --- a/src/lay/lay/layLogViewerDialog.cc +++ b/src/lay/lay/layLogViewerDialog.cc @@ -276,13 +276,13 @@ LogFile::data(const QModelIndex &index, int role) const if (index.row () < int (m_messages.size ()) && index.row () >= 0) { LogFileEntry::mode_type mode = m_messages [index.row ()].mode (); if (mode == LogFileEntry::Error) { - return QIcon (QString::fromUtf8 (":/error_16.png")); + return QIcon (QString::fromUtf8 (":/error_16px.png")); } else if (mode == LogFileEntry::Warning) { - return QIcon (QString::fromUtf8 (":/warn_16.png")); + return QIcon (QString::fromUtf8 (":/warn_16px.png")); } else if (mode == LogFileEntry::Info) { - return QIcon (QString::fromUtf8 (":/info_16.png")); + return QIcon (QString::fromUtf8 (":/info_16px.png")); } else { - return QIcon (QString::fromUtf8 (":/empty_16.png")); + return QIcon (QString::fromUtf8 (":/empty_16px.png")); } } diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc index dd1f2725f..a09fef3d6 100644 --- a/src/lay/lay/layMacroEditorDialog.cc +++ b/src/lay/lay/layMacroEditorDialog.cc @@ -3434,7 +3434,7 @@ MacroEditorDialog::do_update_ui_to_run_mode () if (t != m_tab_widgets.end ()) { int index = tabWidget->indexOf (t->second); if (index >= 0) { - tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (m_in_exec ? (m_in_breakpoint ? ":/pause.png" : ":/stop.png") : ":/run.png"))); + tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (m_in_exec ? (m_in_breakpoint ? ":/pause_16px.png" : ":/stop_16px.png") : ":/run_16px.png"))); } } } @@ -3481,7 +3481,7 @@ MacroEditorDialog::editor_for_macro (lym::Macro *macro) int index = tabWidget->addTab (editor, tl::to_qstring (macro->name ())); tabWidget->setTabToolTip (index, tl::to_qstring (macro->summary ())); if (macro == mp_run_macro) { - tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (m_in_exec ? (m_in_breakpoint ? ":/pause.png" : ":/stop.png") : ":/run.png"))); + tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (m_in_exec ? (m_in_breakpoint ? ":/pause_16px.png" : ":/stop_16px.png") : ":/run_16px.png"))); } bool f = m_add_edit_trace_enabled; @@ -3736,7 +3736,7 @@ MacroEditorDialog::set_run_macro (lym::Macro *m) if (t != m_tab_widgets.end ()) { int index = tabWidget->indexOf (t->second); if (index >= 0) { - tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (":/run.png"))); + tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (":/run_16px.png"))); } } diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc index d5929a4bb..7f18cd9bf 100644 --- a/src/lay/lay/layMacroEditorPage.cc +++ b/src/lay/lay/layMacroEditorPage.cc @@ -321,9 +321,9 @@ const int sidePanelMargin = 4; MacroEditorSidePanel::MacroEditorSidePanel (QWidget *parent, MacroEditorTextWidget *text, MacroEditorExecutionModel *exec_model) : QWidget (parent), mp_text (text), mp_exec_model (exec_model), - m_breakpoint_pixmap (QString::fromUtf8 (":/breakpointmark.png")), - m_breakpoint_disabled_pixmap (QString::fromUtf8 (":/breakpointmarkdisabled.png")), - m_exec_point_pixmap (QString::fromUtf8 (":/execmark.png")), + m_breakpoint_pixmap (QString::fromUtf8 (":/breakpointmark_16px.png")), + m_breakpoint_disabled_pixmap (QString::fromUtf8 (":/breakpointmarkdisabled_16px.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/layMacroEditorTree.cc b/src/lay/lay/layMacroEditorTree.cc index a6035d641..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")); } } @@ -363,7 +363,7 @@ QVariant MacroTreeModel::data (const QModelIndex &index, int role) const if (role == Qt::DisplayRole) { return QVariant (tl::to_qstring (mc->display_string ())); } else if (role == Qt::DecorationRole) { - return QVariant (QIcon (QString::fromUtf8 (":/folder.png"))); + return QVariant (QIcon (QString::fromUtf8 (":/folder_16px.png"))); } else if (role == Qt::ToolTipRole) { return QVariant (tl::to_qstring (mc->path ())); } else if (role == Qt::UserRole) { @@ -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) diff --git a/src/lay/lay/layMainWindow.cc b/src/lay/lay/layMainWindow.cc index 524fda937..ff2ec5db3 100644 --- a/src/lay/lay/layMainWindow.cc +++ b/src/lay/lay/layMainWindow.cc @@ -1529,6 +1529,8 @@ MainWindow::cm_print () if (current_view ()) { + int scale_factor = 3; + // choose a resolution around 300dpi double rf = floor (0.5 + 300.0 / mp_printer->resolution ()); mp_printer->setResolution (int (floor (0.5 + mp_printer->resolution () * rf))); @@ -1559,7 +1561,16 @@ MainWindow::cm_print () text_rect.setBottom (text_rect.bottom () - hh / 2); text_rect.setTop (text_rect.top () + hh / 2); - QImage img = current_view ()->get_image_with_options (page_rect.width (), page_rect.height () - 4 * hh, 1, 1, 1.0 / 3.0, Qt::white, Qt::black, Qt::black, db::DBox (), false); + QImage img = current_view ()->get_image_with_options (page_rect.width (), + page_rect.height () - 4 * hh, + scale_factor, + 1, + 1.0 / scale_factor, + tl::Color (QColor (Qt::white)), // foreground + tl::Color (QColor (Qt::black)), // background + tl::Color (QColor (Qt::black)), // active + db::DBox (), + false); painter.drawImage (QPoint (page_rect.left (), page_rect.top () + hh * 2), img); painter.setFont (header_font); @@ -4255,8 +4266,8 @@ public: menu_entries.push_back (lay::separator ("macros_group", at)); at = "@toolbar.end"; - menu_entries.push_back (lay::menu_item ("cm_prev_display_state", "prev_display_state", at, tl::to_string (QObject::tr ("Back<:/back.png>")))); - menu_entries.push_back (lay::menu_item ("cm_next_display_state", "next_display_state", at, tl::to_string (QObject::tr ("Forward<:/forward.png>")))); + menu_entries.push_back (lay::menu_item ("cm_prev_display_state", "prev_display_state", at, tl::to_string (QObject::tr ("Back<:/back_24px.png>")))); + menu_entries.push_back (lay::menu_item ("cm_next_display_state", "next_display_state", at, tl::to_string (QObject::tr ("Forward<:/forward_24px.png>")))); menu_entries.push_back (lay::separator ("toolbar_post_navigation_group", at)); } }; diff --git a/src/lay/lay/layProgressWidget.cc b/src/lay/lay/layProgressWidget.cc index 9dd1b75d8..3c9cfd3d5 100644 --- a/src/lay/lay/layProgressWidget.cc +++ b/src/lay/lay/layProgressWidget.cc @@ -172,7 +172,7 @@ ProgressWidget::ProgressWidget (ProgressReporter *pr, QWidget *parent, bool fw) attn_layout->setContentsMargins (0, 0, 0, 0); QLabel *attn_label1 = new QLabel (attn_frame); - attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16.png"))); + attn_label1->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px@2x.png"))); attn_layout->addWidget (attn_label1); QLabel *attn_label2 = new QLabel (attn_frame); diff --git a/src/lay/lay/layResources.qrc b/src/lay/lay/layResources.qrc deleted file mode 100644 index 041ac55e1..000000000 --- a/src/lay/lay/layResources.qrc +++ /dev/null @@ -1,145 +0,0 @@ - - - images/add.png - images/edit.png - images/align_bottom.png - images/align_hcenter.png - images/align_left.png - images/align_none.png - images/align_right.png - images/align_top.png - images/align_vcenter.png - images/back.png - images/back_16.png - images/blue_flag.png - images/box.png - images/breakpoint.png - images/breakpointmark.png - images/breakpointmarkdisabled.png - images/bright.png - images/bulb.png - images/cb.png - images/cc.png - images/checked.png - images/clear.png - images/clear_edit.png - images/clearbreakpoints.png - images/close.png - images/cm_add.png - images/cm_diff.png - images/cm_erase.png - images/cm_mask.png - images/cm_merge.png - images/ct.png - images/dark.png - images/defaultmacroicon.png - images/del.png - images/down.png - images/downdown.png - images/execmark.png - images/find.png - images/fliph.png - images/flipv.png - images/folder.png - images/forward.png - images/forward_16.png - images/generalmacroicon.png - images/generalmacroiconactive.png - images/green_flag.png - images/help.png - images/home.png - images/import.png - images/important.png - images/instance.png - images/invert.png - images/lb.png - images/lc.png - images/left.png - images/logo.png - images/lt.png - images/m0.png - images/m135.png - images/m45.png - images/m90.png - images/move.png - images/move_simple.png - images/neutral.png - images/new_folder.png - images/next_topic.png - images/nextstep.png - images/no_flag.png - images/nophoto.png - images/options_edit.png - images/partial.png - images/path.png - images/pause.png - images/photo.png - images/polygon.png - images/prev_topic.png - images/properties.png - images/r0.png - images/r180.png - images/r270.png - images/r90.png - images/rb.png - images/rc.png - images/red_flag.png - images/rename.png - images/replace.png - images/replace_all.png - images/right.png - images/rotate.png - images/rt.png - images/rubymacroicon.png - images/rubymacroiconactive.png - images/pythonmacroicon.png - images/pythonmacroiconactive.png - images/ruler.png - images/debug.png - images/bug.png - images/run.png - images/runthis.png - images/save.png - images/save_all.png - images/select.png - images/setup.png - images/singlestep.png - images/stop.png - images/techs.png - images/text.png - images/textdocumenticon.png - images/unchecked.png - images/up.png - images/upup.png - images/waived.png - images/yellow_flag.png - images/salt.png - images/salt_icon.png - images/warn.png - images/warn_16.png - images/empty_16.png - images/error_16.png - images/error2_16.png - images/info_16.png - images/marked_24.png - images/marked_64.png - images/marked_16.png - images/folder_12.png - images/file_12.png - images/empty_12.png - images/fit_front.png - images/fit_back.png - images/fit_left.png - images/fit_right.png - images/fit_top.png - images/fit_bottom.png - images/unlocked_16.png - images/locked_16.png - images/bookmark.png - images/bookmark_16.png - - - syntax/ruby.xml - syntax/python.xml - - diff --git a/src/lay/lay/laySaltDownloadManager.cc b/src/lay/lay/laySaltDownloadManager.cc index 8d9491926..2d840392f 100644 --- a/src/lay/lay/laySaltDownloadManager.cc +++ b/src/lay/lay/laySaltDownloadManager.cc @@ -98,7 +98,7 @@ ConfirmationDialog::mark_fetching (const std::string &name) void ConfirmationDialog::mark_error (const std::string &name) { - set_icon_for_name (name, QIcon (QString::fromUtf8 (":/error_16.png"))); + set_icon_for_name (name, QIcon (QString::fromUtf8 (":/error_16px.png"))); std::map::const_iterator i = m_items_by_name.find (name); if (i != m_items_by_name.end ()) { @@ -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/laySaltGrainDetailsTextWidget.cc b/src/lay/lay/laySaltGrainDetailsTextWidget.cc index 4d91af745..3bbda18a2 100644 --- a/src/lay/lay/laySaltGrainDetailsTextWidget.cc +++ b/src/lay/lay/laySaltGrainDetailsTextWidget.cc @@ -142,9 +142,9 @@ SaltGrainDetailsTextWidget::loadResource (int type, const QUrl &url) static void produce_listing (QTextStream &stream, QDir dir, int level) { for (int i = 0; i < level + 1; ++i) { - stream << "  "; + stream << "  "; } - stream << "  "; + stream << "  "; if (level > 0) { stream << tl::escaped_to_html (tl::to_string (dir.dirName ())).c_str (); } else { @@ -162,9 +162,9 @@ static void produce_listing (QTextStream &stream, QDir dir, int level) produce_listing (stream, QDir (fi.filePath ()), level); } else { for (int i = 0; i < level + 1; ++i) { - stream << "  "; + stream << "  "; } - stream << "  " << tl::escaped_to_html (tl::to_string (*e)).c_str () << "
\n"; + stream << "  " << tl::escaped_to_html (tl::to_string (*e)).c_str () << "
\n"; } } 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/lay/lay/laySaltManagerDialog.cc b/src/lay/lay/laySaltManagerDialog.cc index e53ec4cef..85bbf84d6 100644 --- a/src/lay/lay/laySaltManagerDialog.cc +++ b/src/lay/lay/laySaltManagerDialog.cc @@ -999,7 +999,7 @@ SaltManagerDialog::update_models () } if (has_warning) { - mode_tab->setTabIcon (1, QIcon (":/warn_16.png")); + mode_tab->setTabIcon (1, QIcon (":/warn_16px.png")); } else { mode_tab->setTabIcon (1, QIcon ()); } diff --git a/src/lay/lay/laySaltModel.cc b/src/lay/lay/laySaltModel.cc index 3f2209158..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); } @@ -163,15 +163,15 @@ SaltModel::data (const QModelIndex &index, int role) const if (m != m_messages.end ()) { if (m->second.first == Warning) { QPainter painter (&img); - QImage warn (":/warn_16.png"); + QImage warn (":/warn_16px.png"); painter.drawImage (0, 0, warn); } else if (m->second.first == Error) { QPainter painter (&img); - QImage warn (":/error_16.png"); + QImage warn (":/error_16px.png"); painter.drawImage (0, 0, warn); } else if (m->second.first == Info) { QPainter painter (&img); - QImage warn (":/info_16.png"); + QImage warn (":/info_16px.png"); painter.drawImage (0, 0, warn); } } diff --git a/src/lay/lay/laySyntaxHighlighters.qrc b/src/lay/lay/laySyntaxHighlighters.qrc new file mode 100644 index 000000000..7bcb25f0e --- /dev/null +++ b/src/lay/lay/laySyntaxHighlighters.qrc @@ -0,0 +1,6 @@ + + + syntax/ruby.xml + syntax/python.xml + + 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 diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc index b932c43e6..dc10d5ba7 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc @@ -1237,9 +1237,9 @@ LAYBASIC_PUBLIC Class decl_LayoutViewBase ("lay", "LayoutVi "@param filename The file to which to write the screenshot to.\n" "@param width The width of the image to render in pixel.\n" "@param height The height of the image to render in pixel.\n" - "@param linewidth The width of a line in pixels (usually 1) or 0 for default.\n" - "@param oversampling The oversampling factor (1..3) or 0 for default.\n" - "@param resolution The resolution (pixel size compared to a screen pixel, i.e 1/oversampling) or 0 for default.\n" + "@param linewidth The line width scale factor (usually 1) or 0 for 1/resolution.\n" + "@param oversampling The oversampling factor (1..3) or 0 for the oversampling the view was configured with.\n" + "@param resolution The resolution (pixel size compared to a screen pixel) or 0 for 1/oversampling.\n" "@param target_box The box to draw or an empty box for default.\n" "@param monochrome If true, monochrome images will be produced.\n" "\n" @@ -1248,6 +1248,31 @@ LAYBASIC_PUBLIC Class decl_LayoutViewBase ("lay", "LayoutVi "The image is drawn synchronously with the given width and height. Drawing may take some time. " "Monochrome images don't have background or annotation objects currently.\n" "\n" + "The 'linewidth' factor scales the layout style line widths.\n" + "\n" + "The 'oversampling' factor will use multiple passes passes to create a single image pixels. An " + "oversampling factor of 2 uses 2x2 virtual pixels to generate an output pixel. This results in a " + "smoother image. This however comes with a corresponding memory and run time penalty. " + "When using oversampling, you can set linewidth and resolution to 0. This way, line widths and stipple " + "pattern are scaled such that the resulting image is equivalent to the standard image.\n" + "\n" + "The 'resolution' is the pixel size used to translate font sizes and stipple pattern. A resolution of 0.5 " + "renders twice as large fonts and stipple pattern. When combining this value with an oversampling factor of 2 " + "and a line width factor of 2, the resulting image is an oversampled version of the standard image.\n" + "\n" + "Examples:\n" + "\n" + "@code\n" + "# standard image 500x500 pixels (oversampling as configured in the view)\n" + "layout_view.save_image_with_options(\"image.png\", 500, 500)\n" + "\n" + "# 2x oversampled image with 500x500 pixels\n" + "layout_view.save_image_with_options(\"image.png\", 500, 500, 0, 2, 0)\n" + "\n" + "# 2x scaled image with 1000x1000 pixels\n" + "layout_view.save_image_with_options(\"image.png\", 1000, 1000, 2, 1, 0.5)\n" + "@/code\n" + "\n" "This method has been introduced in 0.23.10.\n" ) + gsi::method_ext ("#save_as", &save_as2, gsi::arg ("index"), gsi::arg ("filename"), gsi::arg ("gzip"), gsi::arg ("options"), diff --git a/src/laybasic/laybasic/layBitmapsToImage.cc b/src/laybasic/laybasic/layBitmapsToImage.cc index 66d10b2d3..17e062233 100644 --- a/src/laybasic/laybasic/layBitmapsToImage.cc +++ b/src/laybasic/laybasic/layBitmapsToImage.cc @@ -405,8 +405,7 @@ static void create_precursor_bitmaps (const std::vector &view_ops_i } lay::Bitmap &bp = precursors.insert (std::make_pair (bm_index, lay::Bitmap (width, height, 1.0))).first->second; - LineStyleInfo ls_info = ls.style (op.line_style_index ()); - ls_info.scale_pattern (op.width ()); + const LineStyleInfo &ls_info = ls.style (op.line_style_index ()).scaled (op.width ()); for (unsigned int y = 0; y < height; y++) { render_scanline_std_edge (ls_info.pattern (), ls_info.pattern_stride (), pbitmaps_in [bm_index], y, width, height, bp.scanline (y)); @@ -426,6 +425,7 @@ bitmaps_to_image (const std::vector &view_ops_in, const std::vector &pbitmaps_in, const lay::DitherPattern &dp, const lay::LineStyles &ls, + double dpr, tl::PixelBuffer *pimage, unsigned int width, unsigned int height, bool use_bitmap_index, tl::Mutex *mutex) @@ -547,8 +547,8 @@ bitmaps_to_image (const std::vector &view_ops_in, const ViewOp &op = view_ops [i]; if (op.width () > 1 || (op.width () == 1 && (non_empty_sls [i] & ne_mask) != 0)) { - const LineStyleInfo &ls_info = ls.style (op.line_style_index ()); - const DitherPatternInfo &dp_info = dp.pattern (op.dither_index ()); + const LineStyleInfo &ls_info = ls.style (op.line_style_index ()).scaled (op.width ()); + const DitherPatternInfo &dp_info = dp.pattern (op.dither_index ()).scaled (dpr); const uint32_t *dither = dp_info.pattern () [(y + op.dither_offset ()) % dp_info.height ()]; if (dither != 0) { @@ -666,6 +666,7 @@ bitmaps_to_image (const std::vector &view_ops_in, const std::vector &pbitmaps_in, const lay::DitherPattern &dp, const lay::LineStyles &ls, + double dpr, tl::BitmapBuffer *pimage, unsigned int width, unsigned int height, bool use_bitmap_index, tl::Mutex *mutex) @@ -784,8 +785,8 @@ bitmaps_to_image (const std::vector &view_ops_in, const ViewOp &op = view_ops [i]; if (op.width () > 1 || (op.width () == 1 && (non_empty_sls [i] & ne_mask) != 0)) { - const LineStyleInfo &ls_info = ls.style (op.line_style_index ()); - const DitherPatternInfo &dp_info = dp.pattern (op.dither_index ()); + const LineStyleInfo &ls_info = ls.style (op.line_style_index ()).scaled (op.width ()); + const DitherPatternInfo &dp_info = dp.pattern (op.dither_index ()).scaled (dpr); const uint32_t *dither = dp_info.pattern () [(y + op.dither_offset ()) % dp_info.height ()]; if (dither != 0) { @@ -871,7 +872,8 @@ bitmap_to_bitmap (const lay::ViewOp &view_op, const lay::Bitmap &bitmap, unsigned char *data, unsigned int width, unsigned int height, const lay::DitherPattern &dp, - const lay::LineStyles &ls) + const lay::LineStyles &ls, + double dpr) { // quick exit, if line width is zero if (view_op.width () == 0) { @@ -885,12 +887,12 @@ bitmap_to_bitmap (const lay::ViewOp &view_op, const lay::Bitmap &bitmap, unsigned int x = 0xc0000001; unsigned char x0 = ((unsigned char *) &x) [0]; - const DitherPatternInfo &dp_info = dp.pattern (view_op.dither_index ()); - const LineStyleInfo &ls_info = ls.style (view_op.line_style_index ()); + const DitherPatternInfo &dp_info = dp.pattern (view_op.dither_index ()).scaled (dpr); + const LineStyleInfo &ls_info = ls.style (view_op.line_style_index ()).scaled (view_op.width ()); for (unsigned int y = 0; y < height; ++y) { - unsigned nbytes = ((width + 7) / 8); + unsigned int nbytes = ((width + 7) / 8); if (view_op.width () > 1 || ! bitmap.is_scanline_empty (height - 1 - y)) { @@ -917,7 +919,6 @@ bitmap_to_bitmap (const lay::ViewOp &view_op, const lay::Bitmap &bitmap, precursor = lay::Bitmap (width, height, 1.0); LineStyleInfo lsi = ls_info; - lsi.scale_pattern (view_op.width ()); for (unsigned int y = 0; y < height; y++) { render_scanline_std_edge (lsi.pattern (), lsi.pattern_stride (), bp, y, width, height, precursor.scanline (y)); diff --git a/src/laybasic/laybasic/layBitmapsToImage.h b/src/laybasic/laybasic/layBitmapsToImage.h index 000f964c1..76066a0e1 100644 --- a/src/laybasic/laybasic/layBitmapsToImage.h +++ b/src/laybasic/laybasic/layBitmapsToImage.h @@ -56,12 +56,15 @@ class Bitmap; * The "use_bitmap_index" parameter specifies whether the bitmap_index * parameter of the operators is being used to map a operator to a certain * bitmap. + * "dpr" is the device pixel ratio and will be used to scale line widths, + * stipple pattern and line styles. */ LAYBASIC_PUBLIC void bitmaps_to_image (const std::vector &view_ops, const std::vector &pbitmaps, const lay::DitherPattern &dp, const lay::LineStyles &ls, + double dpr, tl::PixelBuffer *pimage, unsigned int width, unsigned int height, bool use_bitmap_index, tl::Mutex *mutex); @@ -76,6 +79,7 @@ bitmaps_to_image (const std::vector &view_ops, const std::vector &pbitmaps, const lay::DitherPattern &dp, const lay::LineStyles &ls, + double dpr, tl::BitmapBuffer *pimage, unsigned int width, unsigned int height, bool use_bitmap_index, tl::Mutex *mutex); @@ -92,7 +96,8 @@ bitmap_to_bitmap (const lay::ViewOp &view_op, const lay::Bitmap &bitmap, unsigned char *data, unsigned int width, unsigned int height, const lay::DitherPattern &dp, - const lay::LineStyles &ls); + const lay::LineStyles &ls, + double dpr); } // namespace lay diff --git a/src/laybasic/laybasic/layDitherPattern.cc b/src/laybasic/laybasic/layDitherPattern.cc index ede9eee47..c10ac4ae2 100644 --- a/src/laybasic/laybasic/layDitherPattern.cc +++ b/src/laybasic/laybasic/layDitherPattern.cc @@ -24,6 +24,7 @@ #include "layDitherPattern.h" #include "tlAssert.h" +#include "tlThreads.h" #include #include @@ -560,7 +561,7 @@ DitherPatternInfo::operator< (const DitherPatternInfo &d) const // TODO including a scaling algorithm in this formula, or give more resolution to the dither QBitmap -DitherPatternInfo::get_bitmap (int width, int height) const +DitherPatternInfo::get_bitmap (int width, int height, int frame_width) const { if (height < 0) { height = 36; @@ -568,6 +569,7 @@ DitherPatternInfo::get_bitmap (int width, int height) const if (width < 0) { width = 34; } + unsigned int fw = frame_width < 0 ? 1 : frame_width; const uint32_t * const *p = pattern (); unsigned int stride = (width + 7) / 8; @@ -575,17 +577,14 @@ DitherPatternInfo::get_bitmap (int width, int height) const unsigned char *data = new unsigned char[stride * height]; memset (data, 0x00, size_t (stride * height)); - for (unsigned int i = 1; i < (unsigned int)(height - 1); ++i) { - for (unsigned int j = 0; j < stride; ++j) { - data [i * stride + j] = 0xff; + for (unsigned int i = 0; i < (unsigned int) height; ++i) { + uint32_t w = 0xffffffff; + if (i >= fw && i < (unsigned int) height - fw) { + w = *(p [(height - 1 - i) % m_height]); } - } - - for (unsigned int i = 0; i < (unsigned int)(height - 4); ++i) { - uint32_t w = *(p [(height - 5 - i) % m_height]); - for (unsigned int j = 0; j < (unsigned int)(width - 2); ++j) { - if (! (w & (1 << (j % m_width)))) { - data [stride * (i + 2) + (j + 1) / 8] &= ~(1 << ((j + 1) % 8)); + for (unsigned int j = 0; j < (unsigned int) width; ++j) { + if (j < fw || j >= (unsigned int) width - fw || (w & (1 << (j % m_width))) != 0) { + data [stride * i + j / 8] |= (1 << (j % 8)); } } } @@ -598,13 +597,26 @@ DitherPatternInfo::get_bitmap (int width, int height) const #endif +static tl::Mutex s_mutex; + void DitherPatternInfo::set_pattern (const uint32_t *pt, unsigned int w, unsigned int h) +{ + { + tl::MutexLocker locker (& s_mutex); + m_scaled_pattern.reset (0); + } + + set_pattern_impl (pt, w, h); +} + +void +DitherPatternInfo::set_pattern_impl (const uint32_t *pt, unsigned int w, unsigned int h) { // pattern size must be 1x1 at least if (w == 0 || h == 0) { uint32_t zero = 0; - set_pattern (&zero, 1, 1); + set_pattern_impl (&zero, 1, 1); return; } @@ -654,6 +666,194 @@ DitherPatternInfo::set_pattern (const uint32_t *pt, unsigned int w, unsigned int } } +void +DitherPatternInfo::set_pattern (const uint64_t *pt, unsigned int w, unsigned int h) +{ + { + tl::MutexLocker locker (& s_mutex); + m_scaled_pattern.reset (0); + } + + set_pattern_impl (pt, w, h); +} + +void +DitherPatternInfo::set_pattern_impl (const uint64_t *pt, unsigned int w, unsigned int h) +{ + // pattern size must be 1x1 at least + if (w == 0 || h == 0) { + uint32_t zero = 0; + set_pattern_impl (&zero, 1, 1); + return; + } + + memset (m_buffer, 0, sizeof (m_buffer)); + + if (w >= 64) { + w = 64; + } + m_width = w; + + if (h >= 64) { + h = 64; + } + m_height = h; + + // compute pattern stride + m_pattern_stride = 1; + while ((m_pattern_stride * 32) % w != 0) { + ++m_pattern_stride; + } + + uint32_t *pp = &m_buffer[0]; + + for (unsigned int j = 0; j < sizeof (m_pattern) / sizeof (m_pattern [0]); ++j) { + + m_pattern [j] = pp; + + uint64_t din = pt[j % h]; + uint64_t dd = din; + + unsigned int b = 0; + for (unsigned int i = 0; i < m_pattern_stride; ++i) { + uint32_t dout = 0; + for (uint32_t m = 1; m != 0; m <<= 1) { + if ((dd & 1) != 0) { + dout |= m; + } + dd >>= 1; + if (++b == w) { + dd = din; + b = 0; + } + } + *pp++ = dout; + } + + } +} + +const DitherPatternInfo & +DitherPatternInfo::scaled (unsigned int n) const +{ + if (n <= 1) { + return *this; + } + + tl::MutexLocker locker (& s_mutex); + + if (! m_scaled_pattern.get ()) { + m_scaled_pattern.reset (new std::map ()); + } + + auto i = m_scaled_pattern->find (n); + if (i != m_scaled_pattern->end ()) { + return i->second; + } + + DitherPatternInfo &sp = (*m_scaled_pattern) [n]; + sp = *this; + sp.scale_pattern (n); + return sp; +} + +void +DitherPatternInfo::scale_pattern (unsigned int n) +{ + // limit scale factor such that the width and height do not get larger than 64 + while (n * m_width > 64 || n * m_height > 64) { + --n; + } + + if (n <= 1) { + return; + } + + std::vector new_pattern; + new_pattern.resize (n * m_height, (uint64_t) 0); + + for (unsigned int r = 0; r < m_height; ++r) { + + const uint32_t *p = pattern () [r]; + const uint32_t *pb = pattern () [(r + m_height - 1) % m_height]; + const uint32_t *pt = pattern () [(r + 1) % m_height]; + + for (unsigned int l = 0; l < n; ++l) { + + const uint32_t *py1 = (l < n / 2) ? pb : pt; + const uint32_t *py2 = (l < n / 2) ? pt : pb; + + uint64_t d = 0; + uint64_t mm = 1; + uint32_t m = 1; + uint32_t mmax = 1 << m_width; + uint32_t ml = m_width > 1 ? (1 << (m_width - 1)) : 1; + uint32_t mr = m_width > 1 ? 2 : 1; + + for (unsigned int c = 0; c < m_width; ++c) { + for (unsigned int b = 0; b < n; ++b) { + if ((*p & m) != 0) { + d |= mm; + } else { + // Try interpolation. + // In the following cases, the center's pixel lower-right quadrant fill be filled: + // + // (A1) (A2) (A3) + // x 0 0 x 0 0 x 0 1 + // 0 0 1 0 0 1 0 0 1 + // 0 1 x 1 1 x 0 1 x + // + // (B1) (B2) + // 0 1 x 0 0 0 + // 0 0 1 1 0 1 + // 0 1 x x 1 x + // + // For easy implementation, we encode the pattern into a byte k with the following significant bits + // (for lower-right subpixel, mirrored accordingly for the other subpixels) + // + // k bits: + // 0 1 2 + // 3 - 4 + // 5 6 7 + // + uint32_t mx1 = (b < n / 2) ? ml : mr; + uint32_t mx2 = (b < n / 2) ? mr : ml; + uint8_t k = ((*py2 & mx2) != 0 ? 1 : 0) | + ((*py2 & m) != 0 ? 2 : 0) | + ((*py2 & mx1) != 0 ? 4 : 0) | + ((*p & mx2) != 0 ? 8 : 0) | + ((*p & mx1) != 0 ? 16 : 0) | + ((*py1 & mx2) != 0 ? 32 : 0) | + ((*py1 & m) != 0 ? 64 : 0) | + ((*py1 & mx1) != 0 ? 128 : 0); + if ((k & 0x7e) == 0x50 /*(A1)*/ || + (k & 0x7e) == 0x70 /*(A2)*/ || + (k & 0x7e) == 0x54 /*(A3)*/ || + (k & 0x7b) == 0x52 /*(B1)*/ || + (k & 0x5f) == 0x58 /*(B2)*/) { + d |= mm; + } + } + mm <<= 1; + } + m <<= 1; + if ((ml <<= 1) == mmax) { + ml = 1; + } + if ((mr <<= 1) == mmax) { + mr = 1; + } + } + + new_pattern [r * n + l] = d; + + } + + } + + set_pattern_impl (new_pattern.begin ().operator-> (), n * m_width, n * m_height); +} + std::string DitherPatternInfo::to_string () const { @@ -812,18 +1012,6 @@ DitherPattern::operator= (const DitherPattern &p) return *this; } -#if defined(HAVE_QT) -QBitmap -DitherPattern::get_bitmap (unsigned int i, int width, int height) const -{ - if (i < count ()) { - return m_pattern [i].get_bitmap (width, height); - } else { - return m_pattern [1].get_bitmap (width, height); - } -} -#endif - const DitherPatternInfo & DitherPattern::pattern (unsigned int i) const { @@ -874,6 +1062,14 @@ DitherPattern::add_pattern (const DitherPatternInfo &p) return index; } +void +DitherPattern::scale_pattern (unsigned int n) +{ + for (auto i = m_pattern.begin (); i != m_pattern.end (); ++i) { + i->scale_pattern (n); + } +} + namespace { struct display_order { diff --git a/src/laybasic/laybasic/layDitherPattern.h b/src/laybasic/laybasic/layDitherPattern.h index 9c86eb2e1..58b2ff76b 100644 --- a/src/laybasic/laybasic/layDitherPattern.h +++ b/src/laybasic/laybasic/layDitherPattern.h @@ -39,6 +39,7 @@ #include #include #include +#include namespace lay { @@ -134,8 +135,9 @@ public: * * @param width The desired width (-1 for default) * @param height The desired height (-1 for default) + * @param frame_width The width of the frame around the bitmap */ - QBitmap get_bitmap (int width = -1, int height = -1) const; + QBitmap get_bitmap (int width = -1, int height = -1, int frame_width = -1) const; #endif /** @@ -164,6 +166,11 @@ public: */ void set_pattern (const uint32_t *pattern, unsigned int w, unsigned int h); + /** + * @brief Replaces the dither pattern (64 bit version) + */ + void set_pattern (const uint64_t *pattern, unsigned int w, unsigned int h); + /** * @brief Gets the pattern stride * @@ -192,6 +199,19 @@ public: return m_height; } + /** + * @brief Scales the existing pattern + * + * Each bit is stretch into n bits vertically and horizontally. + * Smart interpolation is attempted. + */ + void scale_pattern (unsigned int n); + + /** + * @brief Gets a scaled version of the pattern + */ + const DitherPatternInfo &scaled (unsigned int n) const; + /** * @brief Load from a string */ @@ -214,11 +234,15 @@ public: private: uint32_t *m_pattern[64]; - uint32_t m_buffer [64 * 32]; + uint32_t m_buffer [64 * 64]; unsigned int m_width, m_height; unsigned int m_pattern_stride; unsigned int m_order_index; std::string m_name; + mutable std::unique_ptr > m_scaled_pattern; + + void set_pattern_impl (const uint32_t *pattern, unsigned int w, unsigned int h); + void set_pattern_impl (const uint64_t *pattern, unsigned int w, unsigned int h); }; /** @@ -274,19 +298,6 @@ public: return m_pattern != p.m_pattern; } -#if defined(HAVE_QT) - /** - * @brief Gets a monochrome bitmap object for this pattern - * - * If the index is not valid, an empty bitmap is returned. - * - * @param i The index of the pattern to get the bitmap of - * @param width The desired width (-1 for default) - * @param height The desired height (-1 for default) - */ - QBitmap get_bitmap (unsigned int i, int width = -1, int height = -1) const; -#endif - /** * @brief Deliver the pattern with the given index * @@ -314,6 +325,11 @@ public: */ unsigned int add_pattern (const DitherPatternInfo &p); + /** + * @brief Scales the pattern by the given factor + */ + void scale_pattern (unsigned int n); + /** * @brief Renumber the order indices to numbers increasing by 1 only * diff --git a/src/laybasic/laybasic/layLayoutCanvas.cc b/src/laybasic/laybasic/layLayoutCanvas.cc index eb83b0f39..0a65906bf 100644 --- a/src/laybasic/laybasic/layLayoutCanvas.cc +++ b/src/laybasic/laybasic/layLayoutCanvas.cc @@ -281,7 +281,6 @@ LayoutCanvas::LayoutCanvas (lay::LayoutViewBase *view) mp_image_fg (0), m_background (0), m_foreground (0), m_active (0), m_oversampling (1), - m_dpr (1), m_need_redraw (false), m_redraw_clearing (false), m_redraw_force_update (true), @@ -329,6 +328,20 @@ LayoutCanvas::~LayoutCanvas () clear_fg_bitmaps (); } +#if defined(HAVE_QT) && QT_VERSION >= 0x050000 +double +LayoutCanvas::dpr () +{ + return widget () ? widget ()->devicePixelRatio () : 1.0; +} +#else +double +LayoutCanvas::dpr () +{ + return 1.0; +} +#endif + #if defined(HAVE_QT) void LayoutCanvas::init_ui (QWidget *parent) @@ -337,10 +350,6 @@ LayoutCanvas::init_ui (QWidget *parent) if (widget ()) { -#if QT_VERSION > 0x050000 - m_dpr = widget ()->devicePixelRatio (); -#endif - widget ()->setObjectName (QString::fromUtf8 ("canvas")); widget ()->setBackgroundRole (QPalette::NoRole); @@ -419,6 +428,7 @@ LayoutCanvas::set_view_ops (std::vector &view_ops) { if (view_ops != m_view_ops) { m_view_ops.swap (view_ops); + m_scaled_view_ops.clear (); update_image (); } } @@ -441,12 +451,33 @@ LayoutCanvas::set_line_styles (const lay::LineStyles &s) } } +const std::vector & +LayoutCanvas::scaled_view_ops (unsigned int lw) +{ + if (lw <= 1) { + return m_view_ops; + } + + auto cached = m_scaled_view_ops.find (lw); + if (cached != m_scaled_view_ops.end ()) { + return cached->second; + } + + std::vector &scaled_view_ops = m_scaled_view_ops [lw]; + scaled_view_ops = m_view_ops; + for (std::vector::iterator vo = scaled_view_ops.begin (); vo != scaled_view_ops.end (); ++vo) { + vo->width (std::min (31, vo->width () * int (lw))); + } + + return scaled_view_ops; +} + void LayoutCanvas::prepare_drawing () { if (m_need_redraw) { - BitmapViewObjectCanvas::set_size (m_viewport_l.width (), m_viewport_l.height (), 1.0 / double (m_oversampling * m_dpr)); + BitmapViewObjectCanvas::set_size (m_viewport_l.width (), m_viewport_l.height (), 1.0 / double (m_oversampling * dpr ())); if (! mp_image || (unsigned int) mp_image->width () != m_viewport_l.width () || @@ -482,7 +513,7 @@ LayoutCanvas::prepare_drawing () ++c; } - mp_redraw_thread->commit (m_layers, m_viewport_l, 1.0 / double (m_oversampling * m_dpr)); + mp_redraw_thread->commit (m_layers, m_viewport_l, 1.0 / double (m_oversampling * dpr ())); if (tl::verbosity () >= 20) { tl::info << "Restored image from cache"; @@ -532,7 +563,7 @@ LayoutCanvas::prepare_drawing () } if (m_redraw_clearing) { - mp_redraw_thread->start (mp_view->synchronous () ? 0 : mp_view->drawing_workers (), m_layers, m_viewport_l, 1.0 / double (m_oversampling * m_dpr), m_redraw_force_update); + mp_redraw_thread->start (mp_view->synchronous () ? 0 : mp_view->drawing_workers (), m_layers, m_viewport_l, 1.0 / double (m_oversampling * dpr ()), m_redraw_force_update); } else { mp_redraw_thread->restart (m_need_redraw_layer); } @@ -603,7 +634,7 @@ LayoutCanvas::paint_event () } // render the main bitmaps - to_image (m_view_ops, dither_pattern (), line_styles (), background_color (), foreground_color (), active_color (), this, *mp_image, m_viewport_l.width (), m_viewport_l.height ()); + to_image (scaled_view_ops (m_oversampling * dpr ()), dither_pattern (), line_styles (), m_oversampling * dpr (), background_color (), foreground_color (), active_color (), this, *mp_image, m_viewport_l.width (), m_viewport_l.height ()); if (mp_image_fg) { delete mp_image_fg; @@ -633,7 +664,7 @@ LayoutCanvas::paint_event () if (fg_bitmaps () > 0) { tl::PixelBuffer full_image (*mp_image); - bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dither_pattern (), line_styles (), &full_image, m_viewport_l.width (), m_viewport_l.height (), false, &m_mutex); + bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dither_pattern (), line_styles (), m_oversampling * dpr (), &full_image, m_viewport_l.width (), m_viewport_l.height (), false, &m_mutex); // render the foreground parts .. if (m_oversampling == 1) { @@ -669,8 +700,8 @@ LayoutCanvas::paint_event () // produce the pixmap first and then overdraw with dynamic content. QPainter painter (widget ()); QImage img = mp_image_fg->to_image (); -#if QT_VERSION > 0x050000 - img.setDevicePixelRatio (double (m_dpr)); +#if QT_VERSION >= 0x050000 + img.setDevicePixelRatio (dpr ()); #endif painter.drawImage (QPoint (0, 0), img); @@ -680,13 +711,13 @@ LayoutCanvas::paint_event () full_image.set_transparent (true); full_image.fill (0); - bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dither_pattern (), line_styles (), &full_image, m_viewport_l.width (), m_viewport_l.height (), false, &m_mutex); + bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dither_pattern (), line_styles (), m_oversampling * dpr (), &full_image, m_viewport_l.width (), m_viewport_l.height (), false, &m_mutex); // render the foreground parts .. if (m_oversampling == 1) { QImage img = full_image.to_image (); -#if QT_VERSION > 0x050000 - img.setDevicePixelRatio (double (m_dpr)); +#if QT_VERSION >= 0x050000 + img.setDevicePixelRatio (dpr ()); #endif painter.drawImage (QPoint (0, 0), img); } else { @@ -694,8 +725,8 @@ LayoutCanvas::paint_event () subsampled_image.set_transparent (true); subsample (full_image, subsampled_image, m_oversampling, m_gamma); QImage img = subsampled_image.to_image (); -#if QT_VERSION > 0x050000 - img.setDevicePixelRatio (double (m_dpr)); +#if QT_VERSION >= 0x050000 + img.setDevicePixelRatio (dpr ()); #endif painter.drawImage (QPoint (0, 0), img); } @@ -769,10 +800,10 @@ public: if (mp_image_l) { unsigned int os = mp_image_l->width () / width; blowup (*mp_image, *mp_image_l, os); - bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dp, ls, mp_image_l, mp_image_l->width (), mp_image_l->height (), false, 0); + bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dp, ls, 1.0 / resolution (), mp_image_l, mp_image_l->width (), mp_image_l->height (), false, 0); subsample (*mp_image_l, *mp_image, os, m_gamma); } else { - bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dp, ls, mp_image, width, height, false, 0); + bitmaps_to_image (fg_view_op_vector (), fg_bitmap_vector (), dp, ls, 1.0 / resolution (), mp_image, width, height, false, 0); } clear_fg_bitmaps (); } @@ -846,12 +877,12 @@ LayoutCanvas::image_with_options (unsigned int width, unsigned int height, int l if (oversampling <= 0) { oversampling = m_oversampling; } - if (linewidth <= 0) { - linewidth = 1; - } if (resolution <= 0.0) { resolution = 1.0 / oversampling; } + if (linewidth <= 0) { + linewidth = 1.0 / resolution + 0.5; + } if (! background.is_valid ()) { background = background_color (); } @@ -884,13 +915,6 @@ LayoutCanvas::image_with_options (unsigned int width, unsigned int height, int l Viewport vp (width * oversampling, height * oversampling, tb); vp.set_global_trans (m_viewport.global_trans ()); - std::vector view_ops (m_view_ops); - if (linewidth > 1) { - for (std::vector::iterator vo = view_ops.begin (); vo != view_ops.end (); ++vo) { - vo->width (std::min (31, vo->width () * linewidth)); - } - } - lay::RedrawThread redraw_thread (&rd_canvas, mp_view); // render the layout @@ -901,7 +925,7 @@ LayoutCanvas::image_with_options (unsigned int width, unsigned int height, int l do_render_bg (vp, vo_canvas); // paint the layout bitmaps - rd_canvas.to_image (view_ops, dither_pattern (), line_styles (), background, foreground, active, this, *vo_canvas.bg_image (), vp.width (), vp.height ()); + rd_canvas.to_image (scaled_view_ops (linewidth), dither_pattern (), line_styles (), 1.0 / resolution, background, foreground, active, this, *vo_canvas.bg_image (), vp.width (), vp.height ()); // subsample current image to provide the background for the foreground objects vo_canvas.make_background (); @@ -939,13 +963,6 @@ LayoutCanvas::image_with_options_mono (unsigned int width, unsigned int height, Viewport vp (width, height, tb); vp.set_global_trans (m_viewport.global_trans ()); - std::vector view_ops (m_view_ops); - if (linewidth > 1) { - for (std::vector::iterator vo = view_ops.begin (); vo != view_ops.end (); ++vo) { - vo->width (std::min (31, vo->width () * linewidth)); - } - } - lay::RedrawThread redraw_thread (&rd_canvas, mp_view); // render the layout @@ -955,7 +972,7 @@ LayoutCanvas::image_with_options_mono (unsigned int width, unsigned int height, tl::BitmapBuffer img (width, height); img.fill (background); - rd_canvas.to_image_mono (view_ops, dither_pattern (), line_styles (), background, foreground, active, this, img, vp.width (), vp.height ()); + rd_canvas.to_image_mono (scaled_view_ops (linewidth), dither_pattern (), line_styles (), linewidth, background, foreground, active, this, img, vp.width (), vp.height ()); return img; } @@ -969,13 +986,13 @@ LayoutCanvas::screenshot () tl::PixelBuffer img (m_viewport.width (), m_viewport.height ()); img.fill (m_background); - DetachedViewObjectCanvas vo_canvas (background_color (), foreground_color (), active_color (), m_viewport_l.width (), m_viewport_l.height (), 1.0 / double (m_oversampling * m_dpr), &img); + DetachedViewObjectCanvas vo_canvas (background_color (), foreground_color (), active_color (), m_viewport_l.width (), m_viewport_l.height (), 1.0 / double (m_oversampling * dpr ()), &img); // and paint the background objects. It uses "img" to paint on. do_render_bg (m_viewport_l, vo_canvas); // paint the layout bitmaps - to_image (m_view_ops, dither_pattern (), line_styles (), background_color (), foreground_color (), active_color (), this, *vo_canvas.bg_image (), m_viewport_l.width (), m_viewport_l.height ()); + to_image (scaled_view_ops (m_oversampling * dpr ()), dither_pattern (), line_styles (), m_oversampling * dpr (), background_color (), foreground_color (), active_color (), this, *vo_canvas.bg_image (), m_viewport_l.width (), m_viewport_l.height ()); // subsample current image to provide the background for the foreground objects vo_canvas.make_background (); @@ -993,8 +1010,8 @@ LayoutCanvas::screenshot () void LayoutCanvas::resize_event (unsigned int width, unsigned int height) { - unsigned int w = width * m_dpr, h = height * m_dpr; - unsigned int wl = width * m_oversampling * m_dpr, hl = height * m_oversampling * m_dpr; + unsigned int w = width * dpr () + 0.5, h = height * dpr () + 0.5; + unsigned int wl = width * m_oversampling * dpr () + 0.5, hl = height * m_oversampling * dpr () + 0.5; if (m_viewport.width () != w || m_viewport.height () != h || m_viewport_l.width () != wl || m_viewport_l.height () != hl) { @@ -1003,10 +1020,10 @@ LayoutCanvas::resize_event (unsigned int width, unsigned int height) m_image_cache.clear (); // set the viewport to the new size - m_viewport.set_size (width * m_dpr, height * m_dpr); - m_viewport_l.set_size (width * m_oversampling * m_dpr, height * m_oversampling * m_dpr); + m_viewport.set_size (width * dpr () + 0.5, height * dpr () + 0.5); + m_viewport_l.set_size (width * m_oversampling * dpr () + 0.5, height * m_oversampling * dpr () + 0.5); - mouse_event_trans (db::DCplxTrans (1.0 / double (m_dpr)) * m_viewport.trans ()); + mouse_event_trans (db::DCplxTrans (1.0 / dpr ()) * m_viewport.trans ()); do_redraw_all (true); viewport_changed_event (); @@ -1016,7 +1033,7 @@ LayoutCanvas::resize_event (unsigned int width, unsigned int height) void LayoutCanvas::update_viewport () { - mouse_event_trans (db::DCplxTrans (1.0 / double (m_dpr)) * m_viewport.trans ()); + mouse_event_trans (db::DCplxTrans (1.0 / dpr ()) * m_viewport.trans ()); for (service_iterator svc = begin_services (); svc != end_services (); ++svc) { (*svc)->update (); } diff --git a/src/laybasic/laybasic/layLayoutCanvas.h b/src/laybasic/laybasic/layLayoutCanvas.h index a09dbecca..ae4f58da2 100644 --- a/src/laybasic/laybasic/layLayoutCanvas.h +++ b/src/laybasic/laybasic/layLayoutCanvas.h @@ -378,8 +378,8 @@ private: std::vector m_view_ops; lay::DitherPattern m_dither_pattern; lay::LineStyles m_line_styles; + std::map > m_scaled_view_ops; unsigned int m_oversampling; - unsigned int m_dpr; double m_gamma; bool m_need_redraw; @@ -417,6 +417,9 @@ private: void do_redraw_all (bool force_redraw = true); void prepare_drawing (); + double dpr (); + + const std::vector &scaled_view_ops (unsigned int lw); }; } // namespace lay diff --git a/src/laybasic/laybasic/layLayoutViewBase.cc b/src/laybasic/laybasic/layLayoutViewBase.cc index 859156ca1..57c00aa38 100644 --- a/src/laybasic/laybasic/layLayoutViewBase.cc +++ b/src/laybasic/laybasic/layLayoutViewBase.cc @@ -5390,8 +5390,8 @@ unsigned int LayoutViewBase::intrinsic_mouse_modes (std::vector *descriptions) { if (descriptions) { - descriptions->push_back ("select\t" + tl::to_string (tr ("Select")) + "<:select.png>"); - descriptions->push_back ("move\t" + tl::to_string (tr ("Move")) + "<:move.png>"); + descriptions->push_back ("select\t" + tl::to_string (tr ("Select")) + "<:select_24px.png>"); + descriptions->push_back ("move\t" + tl::to_string (tr ("Move")) + "<:move_24px.png>"); } return 2; } diff --git a/src/laybasic/laybasic/layLayoutViewBase.h b/src/laybasic/laybasic/layLayoutViewBase.h index df8612f84..5837c042d 100644 --- a/src/laybasic/laybasic/layLayoutViewBase.h +++ b/src/laybasic/laybasic/layLayoutViewBase.h @@ -53,10 +53,6 @@ #include "tlTimer.h" #include "dbInstElement.h" -#if defined(HAVE_QT) -# include -#endif - namespace rdb { class Database; } diff --git a/src/laybasic/laybasic/layLineStyles.cc b/src/laybasic/laybasic/layLineStyles.cc index e086f19ae..993552722 100644 --- a/src/laybasic/laybasic/layLineStyles.cc +++ b/src/laybasic/laybasic/layLineStyles.cc @@ -24,6 +24,7 @@ #include "layLineStyles.h" #include "tlAssert.h" +#include "tlThreads.h" #include #include @@ -200,9 +201,16 @@ LineStyleInfo::get_bitmap (int width, int height) const } #endif +static tl::Mutex s_mutex; + void LineStyleInfo::set_pattern (uint32_t pt, unsigned int w) { + { + tl::MutexLocker locker (& s_mutex); + m_scaled_pattern.reset (0); + } + memset (m_pattern, 0, sizeof (m_pattern)); if (w >= 32) { @@ -244,6 +252,30 @@ LineStyleInfo::set_pattern (uint32_t pt, unsigned int w) } } +const LineStyleInfo & +LineStyleInfo::scaled (unsigned int n) const +{ + if (n <= 1) { + return *this; + } + + tl::MutexLocker locker (& s_mutex); + + if (! m_scaled_pattern.get ()) { + m_scaled_pattern.reset (new std::map ()); + } + + auto i = m_scaled_pattern->find (n); + if (i != m_scaled_pattern->end ()) { + return i->second; + } + + LineStyleInfo &sp = (*m_scaled_pattern) [n]; + sp = *this; + sp.scale_pattern (n); + return sp; +} + void LineStyleInfo::scale_pattern (unsigned int n) { @@ -262,7 +294,12 @@ LineStyleInfo::scale_pattern (unsigned int n) uint32_t *pp = m_pattern; uint32_t pt = m_pattern [0]; + uint32_t ptr = pt >> 1; // right-rotated by 1 + if (pt & 1) { + ptr |= (1 << (m_width - 1)); + } uint32_t dd = pt; + uint32_t ddr = ptr; memset (m_pattern, 0, sizeof (m_pattern)); @@ -271,14 +308,18 @@ LineStyleInfo::scale_pattern (unsigned int n) for (unsigned int i = 0; i < m_pattern_stride; ++i) { uint32_t dout = 0; for (uint32_t m = 1; m != 0; m <<= 1) { - if ((dd & 1) != 0) { + // NOTE: we do not fully expand "1" fields with a following "0" as pixel expansion + // will take care of this. + if ((dd & 1) != 0 && ((ddr & 1) != 0 || bi == 0)) { dout |= m; } if (++bi == n) { bi = 0; dd >>= 1; + ddr >>= 1; if (++b == m_width) { dd = pt; + ddr = ptr; b = 0; } } @@ -289,6 +330,8 @@ LineStyleInfo::scale_pattern (unsigned int n) m_width = w; } + + std::string LineStyleInfo::to_string () const { @@ -404,11 +447,8 @@ LineStyles::style (unsigned int i) const void LineStyles::replace_style (unsigned int i, const LineStyleInfo &p) { - bool chg = false; - while (i >= count ()) { m_styles.push_back (LineStyleInfo ()); - chg = true; } if (m_styles [i] != p) { @@ -416,7 +456,6 @@ LineStyles::replace_style (unsigned int i, const LineStyleInfo &p) manager ()->queue (this, new ReplaceLineStyleOp (i, m_styles [i], p)); } m_styles [i] = p; - chg = true; } } diff --git a/src/laybasic/laybasic/layLineStyles.h b/src/laybasic/laybasic/layLineStyles.h index 5cd760f3a..23c705d29 100644 --- a/src/laybasic/laybasic/layLineStyles.h +++ b/src/laybasic/laybasic/layLineStyles.h @@ -39,6 +39,7 @@ #include #include #include +#include namespace lay { @@ -168,6 +169,11 @@ public: */ void scale_pattern (unsigned int n); + /** + * @brief Gets a scaled version of the pattern + */ + const LineStyleInfo &scaled (unsigned int n) const; + /** * @brief Gets the pattern stride * @@ -209,6 +215,7 @@ private: unsigned int m_pattern_stride; unsigned int m_order_index; std::string m_name; + mutable std::unique_ptr > m_scaled_pattern; }; /** diff --git a/src/laybasic/laybasic/layRedrawThreadCanvas.cc b/src/laybasic/laybasic/layRedrawThreadCanvas.cc index ff5c6228a..537f2e8b2 100644 --- a/src/laybasic/laybasic/layRedrawThreadCanvas.cc +++ b/src/laybasic/laybasic/layRedrawThreadCanvas.cc @@ -392,7 +392,7 @@ BitmapRedrawThreadCanvas::initialize_plane (lay::CanvasPlane *plane, unsigned in } void -BitmapRedrawThreadCanvas::to_image (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, tl::Color background, tl::Color foreground, tl::Color active, const lay::Drawings *drawings, tl::PixelBuffer &img, unsigned int width, unsigned int height) +BitmapRedrawThreadCanvas::to_image (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, double dpr, tl::Color background, tl::Color foreground, tl::Color active, const lay::Drawings *drawings, tl::PixelBuffer &img, unsigned int width, unsigned int height) { if (width > m_width) { width = m_width; @@ -402,17 +402,17 @@ BitmapRedrawThreadCanvas::to_image (const std::vector &view_ops, c } // convert the plane data to image data - bitmaps_to_image (view_ops, mp_plane_buffers, dp, ls, &img, width, height, true, &mutex ()); + bitmaps_to_image (view_ops, mp_plane_buffers, dp, ls, dpr, &img, width, height, true, &mutex ()); // convert the planes of the "drawing" objects too: std::vector >::const_iterator bt = mp_drawing_plane_buffers.begin (); for (lay::Drawings::const_iterator d = drawings->begin (); d != drawings->end () && bt != mp_drawing_plane_buffers.end (); ++d, ++bt) { - bitmaps_to_image (d->get_view_ops (*this, background, foreground, active), *bt, dp, ls, &img, width, height, true, &mutex ()); + bitmaps_to_image (d->get_view_ops (*this, background, foreground, active), *bt, dp, ls, dpr, &img, width, height, true, &mutex ()); } } void -BitmapRedrawThreadCanvas::to_image_mono (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, bool background, bool foreground, bool active, const lay::Drawings *drawings, tl::BitmapBuffer &img, unsigned int width, unsigned int height) +BitmapRedrawThreadCanvas::to_image_mono (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, double dpr, bool background, bool foreground, bool active, const lay::Drawings *drawings, tl::BitmapBuffer &img, unsigned int width, unsigned int height) { if (width > m_width) { width = m_width; @@ -424,12 +424,12 @@ BitmapRedrawThreadCanvas::to_image_mono (const std::vector &view_o unsigned int all_one = 0xffffffff; // convert the plane data to image data - bitmaps_to_image (view_ops, mp_plane_buffers, dp, ls, &img, width, height, true, &mutex ()); + bitmaps_to_image (view_ops, mp_plane_buffers, dp, ls, dpr, &img, width, height, true, &mutex ()); // convert the planes of the "drawing" objects too: std::vector >::const_iterator bt = mp_drawing_plane_buffers.begin (); for (lay::Drawings::const_iterator d = drawings->begin (); d != drawings->end () && bt != mp_drawing_plane_buffers.end (); ++d, ++bt) { - bitmaps_to_image (d->get_view_ops (*this, background ? all_one : 0, foreground ? all_one : 0, active ? all_one : 0), *bt, dp, ls, &img, width, height, true, &mutex ()); + bitmaps_to_image (d->get_view_ops (*this, background ? all_one : 0, foreground ? all_one : 0, active ? all_one : 0), *bt, dp, ls, dpr, &img, width, height, true, &mutex ()); } } diff --git a/src/laybasic/laybasic/layRedrawThreadCanvas.h b/src/laybasic/laybasic/layRedrawThreadCanvas.h index 8fdab9f0e..fbd32f77b 100644 --- a/src/laybasic/laybasic/layRedrawThreadCanvas.h +++ b/src/laybasic/laybasic/layRedrawThreadCanvas.h @@ -319,12 +319,12 @@ public: /** * @brief Transfer the content to a PixelBuffer */ - void to_image (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, tl::Color background, tl::Color foreground, tl::Color active, const lay::Drawings *drawings, tl::PixelBuffer &img, unsigned int width, unsigned int height); + void to_image (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, double dpr, tl::Color background, tl::Color foreground, tl::Color active, const lay::Drawings *drawings, tl::PixelBuffer &img, unsigned int width, unsigned int height); /** * @brief Transfer the content to a BitmapBuffer (monochrome) */ - void to_image_mono (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, bool background, bool foreground, bool active, const lay::Drawings *drawings, tl::BitmapBuffer &img, unsigned int width, unsigned int height); + void to_image_mono (const std::vector &view_ops, const lay::DitherPattern &dp, const lay::LineStyles &ls, double dpr, bool background, bool foreground, bool active, const lay::Drawings *drawings, tl::BitmapBuffer &img, unsigned int width, unsigned int height); /** * @brief Gets the current bitmap data as a BitmapCanvasData object diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro index 037825ce8..f3b530330 100644 --- a/src/laybasic/laybasic/laybasic.pro +++ b/src/laybasic/laybasic/laybasic.pro @@ -115,7 +115,6 @@ HEADERS += \ layNetColorizer.h \ layObjectInstPath.h \ layParsedLayerSource.h \ - tlPixelBuffer.h \ layPixelBufferPainter.h \ layPlugin.h \ layRedrawLayerInfo.h \ diff --git a/src/laybasic/unit_tests/layBitmapsToImage.cc b/src/laybasic/unit_tests/layBitmapsToImage.cc index 879924deb..271e2d554 100644 --- a/src/laybasic/unit_tests/layBitmapsToImage.cc +++ b/src/laybasic/unit_tests/layBitmapsToImage.cc @@ -92,7 +92,7 @@ TEST(1) lay::LineStyles ls; tl::Mutex m; - lay::bitmaps_to_image (view_ops, pbitmaps, dp, ls, &img, 32, 32, 0, &m); + lay::bitmaps_to_image (view_ops, pbitmaps, dp, ls, 1.0, &img, 32, 32, 0, &m); EXPECT_EQ (to_string (img, 0x800000), "................................\n" diff --git a/src/layui/layui/AlignCellOptionsDialog.ui b/src/layui/layui/AlignCellOptionsDialog.ui index fb90dd6ac..637bdd8b2 100644 --- a/src/layui/layui/AlignCellOptionsDialog.ui +++ b/src/layui/layui/AlignCellOptionsDialog.ui @@ -109,8 +109,8 @@ ... - - :/ct.png:/ct.png + + :/ct_31px.png:/ct_31px.png @@ -129,8 +129,8 @@ ... - - :/lt.png:/lt.png + + :/lt_31px.png:/lt_31px.png @@ -149,8 +149,8 @@ ... - - :/rt.png:/rt.png + + :/rt_31px.png:/rt_31px.png @@ -169,8 +169,8 @@ ... - - :/lc.png:/lc.png + + :/lc_31px.png:/lc_31px.png @@ -189,8 +189,8 @@ ... - - :/cc.png:/cc.png + + :/cc_31px.png:/cc_31px.png @@ -209,8 +209,8 @@ ... - - :/rc.png:/rc.png + + :/rc_31px.png:/rc_31px.png @@ -229,8 +229,8 @@ ... - - :/lb.png:/lb.png + + :/lb_31px.png:/lb_31px.png @@ -249,8 +249,8 @@ ... - - :/cb.png:/cb.png + + :/cb_31px.png:/cb_31px.png @@ -269,8 +269,8 @@ ... - - :/rb.png:/rb.png + + :/rb_31px.png:/rb_31px.png @@ -482,7 +482,7 @@ adjust_calls_cbx - + diff --git a/src/layui/layui/BookmarkManagementForm.ui b/src/layui/layui/BookmarkManagementForm.ui index f6d45b126..958a4cf54 100644 --- a/src/layui/layui/BookmarkManagementForm.ui +++ b/src/layui/layui/BookmarkManagementForm.ui @@ -1,7 +1,8 @@ - + + BookmarkManagementForm - - + + 0 0 @@ -9,69 +10,69 @@ 240 - + Manage Bookmarks - - + + 8 - + 8 - - + + QFrame::NoFrame - + QFrame::Raised - - + + 0 - + 6 - - - + + + Double-click to edit bookmark name - - - + + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - - + + Delete - + Qt::Vertical - + QSizePolicy::Expanding - + 46 111 @@ -82,24 +83,24 @@ - - - + + + true - + false - + false - + QAbstractItemView::ExtendedSelection - + QListView::Static - + QListView::ListMode @@ -108,36 +109,36 @@ - - + + Qt::Horizontal - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + QSizePolicy::Expanding - + 81 31 @@ -146,21 +147,21 @@ - - + + OK - + true - - + + Cancel - + true @@ -170,10 +171,8 @@ - - - - + + ok_button @@ -181,11 +180,11 @@ BookmarkManagementForm accept() - + 182 334 - + 163 178 @@ -197,11 +196,11 @@ BookmarkManagementForm reject() - + 275 334 - + 163 178 diff --git a/src/layui/layui/BrowseInstancesForm.ui b/src/layui/layui/BrowseInstancesForm.ui index d295a1f40..69ad3dbb7 100644 --- a/src/layui/layui/BrowseInstancesForm.ui +++ b/src/layui/layui/BrowseInstancesForm.ui @@ -1,7 +1,8 @@ - + + BrowseInstancesForm - - + + 0 0 @@ -9,74 +10,68 @@ 193 - - - 5 - 5 + + 0 0 - + Browse Cell Instances - - - 4 - - + + 6 + + 4 + - - - - 5 - 3 + + + 0 1 - + QFrame::NoFrame - + QFrame::Plain - + 1 - + Qt::Horizontal - - - - 5 - 5 + + + 0 1 - + QFrame::NoFrame - + QFrame::Raised - - + + 4 - + 6 - + - + Qt::Horizontal - + 40 20 @@ -84,96 +79,95 @@ - - - - > + + + + > - - :/down.png + + + :/down_16px.png:/down_16px.png - - - - - 5 - 13 + + + + 0 0 - + false - + Parent - + Count - + Flat - - - + + + < - - :/up.png + + + :/up_16px.png:/up_16px.png - - - - 5 - 5 + + + 0 0 - + QFrame::NoFrame - + QFrame::Raised - - + + 4 - + 6 - - - - > + + + + > - - :/down.png + + + :/down_16px.png:/down_16px.png - + - + Qt::Horizontal - + 40 20 @@ -181,38 +175,37 @@ - - - - - 5 - 13 + + + + 0 0 - + false - + Cell instance - + Path - - - + + + < - - :/up.png + + + :/up_16px.png:/up_16px.png @@ -221,43 +214,43 @@ - - + + Qt::Horizontal - - - 0 - - + + 6 + + 0 + - - + + Configure - + false - - + + Choose Cell - + Qt::Horizontal - + 283 29 @@ -266,8 +259,8 @@ - - + + Close @@ -276,9 +269,9 @@ - + - + @@ -287,11 +280,11 @@ BrowseInstancesForm accept() - + 437 234 - + 245 129 diff --git a/src/layui/layui/BrowseShapesForm.ui b/src/layui/layui/BrowseShapesForm.ui index e4732cb64..fbf617eff 100644 --- a/src/layui/layui/BrowseShapesForm.ui +++ b/src/layui/layui/BrowseShapesForm.ui @@ -1,10 +1,8 @@ - - - - + + BrowseShapesForm - - + + 0 0 @@ -12,113 +10,109 @@ 199 - + Browse Shapes - - - 4 - - + + 6 + + 4 + - - - - 5 - 3 + + + 0 1 - + QFrame::NoFrame - + QFrame::Raised - + 1 - + Qt::Horizontal - - - - 5 - 5 + + + 1 1 - + QFrame::NoFrame - + QFrame::Raised - - + + 4 - + 6 - - - - > + + + + > - - :/down.png + + + :/down_16px.png:/down_16px.png - - - + + + < - - :/up.png + + + :/up_16px.png:/up_16px.png - - - - - 5 - 13 + + + + 0 0 - + Cell - + Shapes - + Flat - + - + Qt::Horizontal - + 40 20 @@ -128,34 +122,32 @@ - - - - 5 - 5 + + + 1 1 - + QFrame::NoFrame - + QFrame::Raised - - + + 4 - + 6 - + - + Qt::Horizontal - + 40 20 @@ -163,41 +155,41 @@ - - - - > + + + + > - - :/down.png + + + :/down_16px.png:/down_16px.png - - - + + + < - - :/up.png + + + :/up_16px.png:/up_16px.png - - - - - 5 - 13 + + + + 0 0 - + false - + Shape instance @@ -205,34 +197,32 @@ - - - - 5 - 5 + + + 1 0 - + QFrame::NoFrame - + QFrame::Raised - - + + 4 - + 6 - + - + Qt::Horizontal - + 40 20 @@ -240,46 +230,46 @@ - - - - > + + + + > - - :/down.png + + + :/down_16px.png:/down_16px.png - - - + + + < - - :/up.png + + + :/up_16px.png:/up_16px.png - - - - - 5 - 13 + + + + 0 0 - + false - + Cell instance - + Path @@ -290,36 +280,36 @@ - - + + Qt::Horizontal - - - 0 - - + + 6 + + 0 + - - + + Configure - + false - + Qt::Horizontal - + 325 29 @@ -328,8 +318,8 @@ - - + + Close @@ -338,10 +328,9 @@ - - + - + @@ -350,11 +339,11 @@ BrowseShapesForm accept() - + 479 212 - + 266 118 diff --git a/src/layui/layui/BrowserDialog.ui b/src/layui/layui/BrowserDialog.ui index 85b455b50..e15f1b54b 100644 --- a/src/layui/layui/BrowserDialog.ui +++ b/src/layui/layui/BrowserDialog.ui @@ -1,7 +1,8 @@ - + + BrowserDialog - - + + 0 0 @@ -9,22 +10,20 @@ 461 - + Browser - - - 9 - - + + 6 + + 9 + - - - - 13 - 7 + + + 0 0 @@ -32,26 +31,26 @@ - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + 40 20 @@ -60,8 +59,8 @@ - - + + Close @@ -78,9 +77,7 @@
layBrowserPanel.h
- - - + close_pb @@ -88,11 +85,11 @@ BrowserDialog accept() - + 469 422 - + 257 222 diff --git a/src/layui/layui/BrowserPanel.ui b/src/layui/layui/BrowserPanel.ui index 66071a8ee..c6cc0d220 100644 --- a/src/layui/layui/BrowserPanel.ui +++ b/src/layui/layui/BrowserPanel.ui @@ -223,8 +223,8 @@ ... - - :/find.png:/find.png + + :/find_16px.png:/find_16px.png true @@ -240,8 +240,8 @@ ... - - :/clear_edit.png:/clear_edit.png + + :/clear_edit_16px.png:/clear_edit_16px.png true @@ -267,8 +267,8 @@ ... - - :/forward.png:/forward.png + + :/forward_24px.png:/forward_24px.png @@ -290,8 +290,8 @@ ... - - :/back.png:/back.png + + :/back_24px.png:/back_24px.png @@ -313,8 +313,8 @@ ... - - :/home.png:/home.png + + :/home_24px.png:/home_24px.png @@ -352,8 +352,8 @@ ... - - :/prev_topic.png:/prev_topic.png + + :/prev_topic_24px.png:/prev_topic_24px.png @@ -388,8 +388,8 @@ ... - - :/find.png:/find.png + + :/find_16px.png:/find_16px.png true @@ -405,8 +405,8 @@ ... - - :/next_topic.png:/next_topic.png + + :/next_topic_24px.png:/next_topic_24px.png @@ -461,8 +461,8 @@ ... - - :/bookmark.png:/bookmark.png + + :/bookmark_24px.png:/bookmark_24px.png @@ -512,7 +512,7 @@ home_pb - + diff --git a/src/layui/layui/CellSelectionForm.ui b/src/layui/layui/CellSelectionForm.ui index 659d671a5..c92eaa52f 100644 --- a/src/layui/layui/CellSelectionForm.ui +++ b/src/layui/layui/CellSelectionForm.ui @@ -205,7 +205,7 @@ - :/right.png + :/right_16px@2x.png @@ -285,8 +285,8 @@ ... - - :/find.png:/find.png + + :/find_16px.png:/find_16px.png true @@ -428,7 +428,7 @@ - :/right.png + :/right_16px@2x.png @@ -546,7 +546,7 @@ - + diff --git a/src/layui/layui/EditLineStylesForm.ui b/src/layui/layui/EditLineStylesForm.ui index 49b6d48e9..885142f58 100644 --- a/src/layui/layui/EditLineStylesForm.ui +++ b/src/layui/layui/EditLineStylesForm.ui @@ -206,8 +206,8 @@ - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -254,8 +254,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -391,8 +391,8 @@ Clear - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -405,7 +405,7 @@ - + :/invert.png:/invert.png @@ -416,7 +416,7 @@ Flip h. - + :/fliph.png:/fliph.png @@ -427,8 +427,8 @@ Left - - :/left.png:/left.png + + :/left_16px.png:/left_16px.png @@ -438,8 +438,8 @@ Right - - :/right.png:/right.png + + :/right_16px.png:/right_16px.png @@ -546,7 +546,7 @@ - + diff --git a/src/layui/layui/EditStipplesForm.ui b/src/layui/layui/EditStipplesForm.ui index 2f8b473ba..9f536ffcd 100644 --- a/src/layui/layui/EditStipplesForm.ui +++ b/src/layui/layui/EditStipplesForm.ui @@ -200,8 +200,8 @@ - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -248,8 +248,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -376,8 +376,8 @@ Clear - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -390,8 +390,8 @@ - - :/invert.png:/invert.png + + :/invert_16px.png:/invert_16px.png @@ -401,8 +401,8 @@ Flip h. - - :/fliph.png:/fliph.png + + :/fliph_16px.png:/fliph_16px.png @@ -412,8 +412,8 @@ Flip v. - - :/flipv.png:/flipv.png + + :/flipv_16px.png:/flipv_16px.png @@ -423,8 +423,8 @@ Rotate - - :/rotate.png:/rotate.png + + :/rotate_16px.png:/rotate_16px.png @@ -434,8 +434,8 @@ Up - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -445,8 +445,8 @@ Left - - :/left.png:/left.png + + :/left_16px.png:/left_16px.png @@ -456,8 +456,8 @@ Right - - :/right.png:/right.png + + :/right_16px.png:/right_16px.png @@ -467,8 +467,8 @@ Down - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -588,7 +588,7 @@ - + diff --git a/src/layui/layui/LayerMappingWidget.ui b/src/layui/layui/LayerMappingWidget.ui index 03855fa9a..64e070fc8 100644 --- a/src/layui/layui/LayerMappingWidget.ui +++ b/src/layui/layui/LayerMappingWidget.ui @@ -102,8 +102,8 @@ Add - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png @@ -116,8 +116,8 @@ Delete - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -130,8 +130,8 @@ Edit - - :/edit.png:/edit.png + + :/edit_16px.png:/edit_16px.png @@ -165,7 +165,7 @@ - + diff --git a/src/layui/layui/LayoutViewConfigPage7.ui b/src/layui/layui/LayoutViewConfigPage7.ui index fc794d04d..ae9b834a9 100644 --- a/src/layui/layui/LayoutViewConfigPage7.ui +++ b/src/layui/layui/LayoutViewConfigPage7.ui @@ -200,8 +200,8 @@ (r0) - - :/r0.png:/r0.png + + :/r0_24px.png:/r0_24px.png @@ -209,8 +209,8 @@ (r90) - - :/r90.png:/r90.png + + :/r90_24px.png:/r90_24px.png @@ -218,8 +218,8 @@ (r180) - - :/r180.png:/r180.png + + :/r180_24px.png:/r180_24px.png @@ -227,8 +227,8 @@ (r270) - - :/r270.png:/r270.png + + :/r270_24px.png:/r270_24px.png @@ -236,8 +236,8 @@ (m0) - - :/m0.png:/m0.png + + :/m0_24px.png:/m0_24px.png @@ -245,8 +245,8 @@ (m45) - - :/m45.png:/m45.png + + :/m45_24px.png:/m45_24px.png @@ -254,8 +254,8 @@ (m90) - - :/m90.png:/m90.png + + :/m90_24px.png:/m90_24px.png @@ -263,8 +263,8 @@ (m135) - - :/m135.png:/m135.png + + :/m135_24px.png:/m135_24px.png @@ -350,7 +350,7 @@ - + diff --git a/src/layui/layui/LibraryCellSelectionForm.ui b/src/layui/layui/LibraryCellSelectionForm.ui index 0664aec43..aadc63877 100644 --- a/src/layui/layui/LibraryCellSelectionForm.ui +++ b/src/layui/layui/LibraryCellSelectionForm.ui @@ -1,7 +1,8 @@ - + + LibraryCellSelectionForm - - + + 0 0 @@ -9,58 +10,56 @@ 488 - + Select Cell - - - 9 - - + + 6 + + 9 + - - + + QFrame::NoFrame - + QFrame::Raised - - + + 0 - + 6 - - - - - 5 - 7 + + + + 1 1 - + QAbstractItemView::ExtendedSelection - + true - + - + Qt::Vertical - + QSizePolicy::Fixed - + 200 16 @@ -68,82 +67,81 @@ - - - + + + Cell list - - - + + + 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:'Sans Serif'; font-size:9pt; 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 next</p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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 next</p></body></html> - + ... - - :/find.png + + + :/find_16px.png:/find_16px.png - + true - - - + + + (* and ? can be used to match any text) - - - + + + Filter - - - - - 7 - 0 + + + + 1 1 - - - + + + Library - - + + @@ -152,21 +150,21 @@ p, li { white-space: pre-wrap; } - - + + Show all cells - + Qt::Vertical - + QSizePolicy::Fixed - + 200 16 @@ -175,36 +173,36 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + QSizePolicy::Expanding - + 91 31 @@ -213,18 +211,18 @@ p, li { white-space: pre-wrap; } - - + + _ok - + true - - + + _cancel @@ -234,7 +232,7 @@ p, li { white-space: pre-wrap; } - + lay::LibrarySelectionComboBox @@ -243,7 +241,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/src/layui/layui/MarkerBrowserPage.ui b/src/layui/layui/MarkerBrowserPage.ui index d352c1916..1eafe265d 100644 --- a/src/layui/layui/MarkerBrowserPage.ui +++ b/src/layui/layui/MarkerBrowserPage.ui @@ -62,7 +62,7 @@ ... - + :/run.png:/run.png @@ -188,7 +188,7 @@ - :/find.png + :/find_16px@2x.png @@ -247,8 +247,8 @@ ... - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -258,8 +258,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -355,8 +355,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -373,8 +373,8 @@ ... - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -419,7 +419,6 @@ - 75 true @@ -497,8 +496,8 @@ Photo - - :/photo.png:/photo.png + + :/photo_16px.png:/photo_16px.png @@ -511,8 +510,8 @@ W - - :/waived.png:/waived.png + + :/waived_16px.png:/waived_16px.png @@ -545,8 +544,8 @@ Imp - - :/important.png:/important.png + + :/important_16px.png:/important_16px.png @@ -562,8 +561,8 @@ p, li { white-space: pre-wrap; } ... - - :/nophoto.png:/nophoto.png + + :/nophoto_16px.png:/nophoto_16px.png @@ -644,7 +643,7 @@ p, li { white-space: pre-wrap; } photo_pb - + diff --git a/src/layui/layui/MoveToOptionsDialog.ui b/src/layui/layui/MoveToOptionsDialog.ui index 26cb98bc8..448a5e6b7 100644 --- a/src/layui/layui/MoveToOptionsDialog.ui +++ b/src/layui/layui/MoveToOptionsDialog.ui @@ -17,7 +17,7 @@ 6 - + 9 @@ -121,7 +121,7 @@ 6 - + 9 @@ -149,7 +149,7 @@ QFrame::Plain - + 15 @@ -161,8 +161,8 @@ ... - - :/ct.png:/ct.png + + :/ct_31px.png:/ct_31px.png @@ -181,8 +181,8 @@ ... - - :/lt.png:/lt.png + + :/lt_31px.png:/lt_31px.png @@ -201,8 +201,8 @@ ... - - :/rt.png:/rt.png + + :/rt_31px.png:/rt_31px.png @@ -221,8 +221,8 @@ ... - - :/lc.png:/lc.png + + :/lc_31px.png:/lc_31px.png @@ -241,8 +241,8 @@ ... - - :/cc.png:/cc.png + + :/cc_31px.png:/cc_31px.png @@ -261,8 +261,8 @@ ... - - :/rc.png:/rc.png + + :/rc_31px.png:/rc_31px.png @@ -281,8 +281,8 @@ ... - - :/lb.png:/lb.png + + :/lb_31px.png:/lb_31px.png @@ -301,8 +301,8 @@ ... - - :/cb.png:/cb.png + + :/cb_31px.png:/cb_31px.png @@ -321,8 +321,8 @@ ... - - :/rb.png:/rb.png + + :/rb_31px.png:/rb_31px.png @@ -366,7 +366,7 @@ 6 - + 0 @@ -418,7 +418,7 @@ rb - + diff --git a/src/layui/layui/NetlistBrowserPage.ui b/src/layui/layui/NetlistBrowserPage.ui index 74697088b..0f887e8a8 100644 --- a/src/layui/layui/NetlistBrowserPage.ui +++ b/src/layui/layui/NetlistBrowserPage.ui @@ -89,7 +89,7 @@ ... - + :/back_16.png:/back_16.png @@ -103,7 +103,7 @@ ... - + :/forward_16.png:/forward_16.png @@ -120,8 +120,8 @@ ... - - :/info_16.png:/info_16.png + + :/info_16px.png:/info_16px.png true @@ -134,7 +134,7 @@ ... - + :/run.png:/run.png @@ -189,8 +189,8 @@ ... - - :/find.png:/find.png + + :/find_16px.png:/find_16px.png true @@ -673,7 +673,7 @@ find_button - + diff --git a/src/layui/layui/PropertiesDialog.ui b/src/layui/layui/PropertiesDialog.ui index 4edb7171e..112840254 100644 --- a/src/layui/layui/PropertiesDialog.ui +++ b/src/layui/layui/PropertiesDialog.ui @@ -87,8 +87,8 @@ Previous - - :/left.png:/left.png + + :/left_16px.png:/left_16px.png false @@ -107,8 +107,8 @@ Next - - :/right.png:/right.png + + :/right_16px.png:/right_16px.png false @@ -185,7 +185,7 @@ - + diff --git a/src/layui/layui/SelectStippleForm.ui b/src/layui/layui/SelectStippleForm.ui index 40b6a314b..e4363cd98 100644 --- a/src/layui/layui/SelectStippleForm.ui +++ b/src/layui/layui/SelectStippleForm.ui @@ -54,8 +54,8 @@ - 34 - 36 + 32 + 32 diff --git a/src/layui/layui/TipDialog.ui b/src/layui/layui/TipDialog.ui index 8edc3f517..3eae32f3b 100644 --- a/src/layui/layui/TipDialog.ui +++ b/src/layui/layui/TipDialog.ui @@ -202,7 +202,10 @@ - :/bulb.png + :/bulb@2x.png + + + false @@ -313,7 +316,7 @@ - + diff --git a/src/layui/layui/UserPropertiesForm.ui b/src/layui/layui/UserPropertiesForm.ui index 6e78a8964..76ba34ca4 100644 --- a/src/layui/layui/UserPropertiesForm.ui +++ b/src/layui/layui/UserPropertiesForm.ui @@ -122,8 +122,8 @@ - - :/del.png:/del.png + + :/del_16px.png:/del_16px.png @@ -133,8 +133,8 @@ - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png @@ -195,7 +195,7 @@ buttonBox - + diff --git a/src/layui/layui/layBrowserPanel.cc b/src/layui/layui/layBrowserPanel.cc index 1f46f5858..b26bfba4b 100644 --- a/src/layui/layui/layBrowserPanel.cc +++ b/src/layui/layui/layBrowserPanel.cc @@ -332,7 +332,7 @@ BrowserPanel::refresh_bookmark_list () QTreeWidgetItem *item = new QTreeWidgetItem (mp_ui->browser_bookmark_view); item->setData (0, Qt::DisplayRole, tl::to_qstring (i->title)); item->setData (0, Qt::ToolTipRole, tl::to_qstring (i->title)); - item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16.png")); + item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16px.png")); } update_navigation_panel (); 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 a4d225ce1..5b1ff584c 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); @@ -348,32 +348,32 @@ LayerControlPanel::LayerControlPanel (lay::LayoutViewBase *view, db::Manager *ma b = new QToolButton (tb); b->setObjectName (QString::fromUtf8 ("lcp_dd")); ltb->addWidget (b); - b->setIcon (QIcon (QString::fromUtf8 (":downdown.png"))); + b->setIcon (QIcon (QString::fromUtf8 (":downdown_16px.png"))); connect (b, SIGNAL (clicked ()), this, SLOT (downdown_clicked ())); b = new QToolButton (tb); b->setObjectName (QString::fromUtf8 ("lcp_d")); ltb->addWidget (b); - b->setIcon (QIcon (QString::fromUtf8 (":down.png"))); + b->setIcon (QIcon (QString::fromUtf8 (":down_16px.png"))); connect (b, SIGNAL (clicked ()), this, SLOT (down_clicked ())); b = new QToolButton (tb); b->setObjectName (QString::fromUtf8 ("lcp_u")); ltb->addWidget (b); - b->setIcon (QIcon (QString::fromUtf8 (":up.png"))); + b->setIcon (QIcon (QString::fromUtf8 (":up_16px.png"))); connect (b, SIGNAL (clicked ()), this, SLOT (up_clicked ())); b = new QToolButton (tb); b->setObjectName (QString::fromUtf8 ("lcp_uu")); ltb->addWidget (b); - b->setIcon (QIcon (QString::fromUtf8 (":upup.png"))); + b->setIcon (QIcon (QString::fromUtf8 (":upup_16px.png"))); connect (b, SIGNAL (clicked ()), this, SLOT (upup_clicked ())); ltb->addStretch (0); m_no_stipples_label = new QLabel (tb); m_no_stipples_label->hide (); - m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/important.png"))); + m_no_stipples_label->setPixmap (QPixmap (QString::fromUtf8 (":/warn_16px@2x.png"))); m_no_stipples_label->setToolTip (tr ("Stipples are disabled - unselect \"View/Show Layers Without Fill\" to re-enable them")); ltb->addWidget (m_no_stipples_label); diff --git a/src/layui/layui/layLayerToolbox.cc b/src/layui/layui/layLayerToolbox.cc index 9f3ea1ada..d9ddd6a89 100644 --- a/src/layui/layui/layLayerToolbox.cc +++ b/src/layui/layui/layLayerToolbox.cc @@ -193,7 +193,7 @@ LCPDitherPalette::LCPDitherPalette (QWidget *parent, const char *name) void LCPDitherPalette::create_pixmap_for (LCPActiveLabel *b, int n) { - const lay::DitherPattern &pattern = !mp_view ? lay::DitherPattern::default_pattern () : mp_view->dither_pattern (); + lay::DitherPattern pattern = !mp_view ? lay::DitherPattern::default_pattern () : mp_view->dither_pattern (); QColor color0 = b->palette ().color (QPalette::Normal, b->backgroundRole ()); QColor color1 = b->palette ().color (QPalette::Normal, b->foregroundRole ()); @@ -207,23 +207,22 @@ LCPDitherPalette::create_pixmap_for (LCPActiveLabel *b, int n) unsigned int dpr = 1; #endif + pattern.scale_pattern (dpr); + QImage image (w * dpr, h * dpr, QImage::Format_RGB32); image.fill (color0.rgb ()); #if QT_VERSION > 0x050000 image.setDevicePixelRatio (dpr); #endif - // TODO include a scaling algorithm in get_bitmap, because it looks small in highDPI screens - QBitmap bitmap = pattern.pattern (n).get_bitmap (w * dpr, h * dpr); + QBitmap bitmap = pattern.pattern (n).get_bitmap (w * dpr, h * dpr, dpr); QPainter painter (&image); + painter.setPen (QPen (color1)); painter.setBackgroundMode (Qt::TransparentMode); painter.drawPixmap (0, 0, w, h, bitmap); - QPixmap pixmap = QPixmap::fromImage (image); // Qt 4.6.0 workaround -#if QT_VERSION > 0x050000 - pixmap.setDevicePixelRatio (dpr); -#endif + QPixmap pixmap = QPixmap::fromImage (image); b->setPixmap (pixmap); } @@ -632,31 +631,22 @@ LCPStylePalette::create_pixmap_for_line_style (LCPActiveLabel *b, int n) QColor color0 = b->palette ().color (QPalette::Normal, b->backgroundRole ()); QColor color1 = b->palette ().color (QPalette::Normal, b->foregroundRole ()); + // NOTE: we intentionally don't apply devicePixelRatio here as this way, the + // image looks more like the style applied on the layout canvas. + const unsigned int h = 14; const unsigned int w = 24; -#if QT_VERSION > 0x050000 - unsigned int dpr = devicePixelRatio (); -#else - unsigned int dpr = 1; -#endif - - QImage image (dpr * w, dpr * h, QImage::Format_RGB32); + QImage image (w, h, QImage::Format_RGB32); image.fill (color0.rgb ()); -#if QT_VERSION > 0x050000 - image.setDevicePixelRatio (dpr); -#endif - QBitmap bitmap = styles.style (n).get_bitmap (dpr * w, dpr * h); + QBitmap bitmap = styles.style (n).get_bitmap (w, h); QPainter painter (&image); painter.setPen (QPen (color1)); painter.setBackgroundMode (Qt::TransparentMode); painter.drawPixmap (0, 0, w, h, bitmap); - QPixmap pixmap = QPixmap::fromImage (image); // Qt 4.6.0 workaround -#if QT_VERSION > 0x050000 - pixmap.setDevicePixelRatio (dpr); -#endif + QPixmap pixmap = QPixmap::fromImage (image); b->setPixmap (pixmap); } @@ -796,7 +786,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-10, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":dark.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":dark_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); @@ -805,7 +795,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-11, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":bright.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":bright_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); @@ -814,7 +804,7 @@ LCPColorPalette::LCPColorPalette (QWidget *parent, const char *name) b = new LCPActiveLabel (-12, f); b->setFrameStyle (QFrame::Panel | QFrame::Raised); b->setLineWidth (1); - b->setPixmap (QPixmap (QString::fromUtf8 (":neutral.png"))); + b->setPixmap (QPixmap (QString::fromUtf8 (":neutral_12px@2x.png"))); b->setBackgroundRole (QPalette::Button); b->setAlignment (Qt::AlignHCenter); connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int))); diff --git a/src/layui/layui/layLayerTreeModel.cc b/src/layui/layui/layLayerTreeModel.cc index 383d75fd3..fe3f1a97f 100644 --- a/src/layui/layui/layLayerTreeModel.cc +++ b/src/layui/layui/layLayerTreeModel.cc @@ -526,23 +526,6 @@ LayerTreeModel::parent (const QModelIndex &index) const } } -/** - * @brief A helper function to create an image from a single bitmap - */ -static void -single_bitmap_to_image (const lay::ViewOp &view_op, lay::Bitmap &bitmap, - tl::PixelBuffer *pimage, const lay::DitherPattern &dither_pattern, const lay::LineStyles &line_styles, - unsigned int width, unsigned int height) -{ - std::vector view_ops; - view_ops.push_back (view_op); - - std::vector pbitmaps; - pbitmaps.push_back (&bitmap); - - lay::bitmaps_to_image (view_ops, pbitmaps, dither_pattern, line_styles, pimage, width, height, false, 0); -} - bool LayerTreeModel::is_hidden (const QModelIndex &index) const { @@ -637,12 +620,29 @@ LayerTreeModel::empty_within_view_predicate (const QModelIndex &index) const } } +/** + * @brief A helper function to create an image from a single bitmap + */ +static void +single_bitmap_to_image (const lay::ViewOp &view_op, lay::Bitmap &bitmap, + tl::PixelBuffer *pimage, const lay::DitherPattern &dither_pattern, const lay::LineStyles &line_styles, + double dpr, unsigned int width, unsigned int height) +{ + std::vector view_ops; + view_ops.push_back (view_op); + + std::vector pbitmaps; + pbitmaps.push_back (&bitmap); + + lay::bitmaps_to_image (view_ops, pbitmaps, dither_pattern, line_styles, dpr, pimage, width, height, false, 0); +} + LAYUI_PUBLIC QIcon -LayerTreeModel::icon_for_layer (const lay::LayerPropertiesConstIterator &iter, lay::LayoutViewBase *view, unsigned int w, unsigned int h, unsigned int di_off, bool no_state) +LayerTreeModel::icon_for_layer (const lay::LayerPropertiesConstIterator &iter, lay::LayoutViewBase *view, unsigned int w, unsigned int h, double dpr, unsigned int di_off, bool no_state) { - h = std::max ((unsigned int) 16, h); - w = std::max ((unsigned int) 16, w); + h = std::max ((unsigned int) 16, h) * dpr + 0.5; + w = std::max ((unsigned int) 16, w) * dpr + 0.5; tl::color_t def_color = 0x808080; tl::color_t fill_color = iter->has_fill_color (true) ? iter->eff_fill_color (true) : def_color; @@ -701,6 +701,7 @@ LayerTreeModel::icon_for_layer (const lay::LayerPropertiesConstIterator &iter, l // default line width is 0 for parents and 1 for leafs lw = iter->has_children () ? 0 : 1; } + lw = lw * dpr + 0.5; int p0 = lw / 2; p0 = std::max (0, std::min (int (w / 4 - 1), p0)); @@ -770,19 +771,22 @@ LayerTreeModel::icon_for_layer (const lay::LayerPropertiesConstIterator &iter, l lay::ViewOp::Mode mode = lay::ViewOp::Copy; // create fill - single_bitmap_to_image (lay::ViewOp (fill_color, mode, 0, iter->eff_dither_pattern (true), di_off), fill, &image, view->dither_pattern (), view->line_styles (), w, h); + single_bitmap_to_image (lay::ViewOp (fill_color, mode, 0, iter->eff_dither_pattern (true), di_off), fill, &image, view->dither_pattern (), view->line_styles (), dpr, w, h); // create frame if (lw == 0) { - single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0 /*solid line*/, 2 /*dotted*/, 0), frame, &image, view->dither_pattern (), view->line_styles (), w, h); + single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0 /*solid line*/, 2 /*dotted*/, 0), frame, &image, view->dither_pattern (), view->line_styles (), dpr, w, h); } else { - single_bitmap_to_image (lay::ViewOp (frame_color, mode, iter->eff_line_style (true), 0, 0, lay::ViewOp::Rect, lw), frame, &image, view->dither_pattern (), view->line_styles (), w, h); + single_bitmap_to_image (lay::ViewOp (frame_color, mode, iter->eff_line_style (true), 0, 0, lay::ViewOp::Rect, lw), frame, &image, view->dither_pattern (), view->line_styles (), dpr, w, h); } // create text - single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0, 0, 0), text, &image, view->dither_pattern (), view->line_styles (), w, h); + single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0, 0, 0), text, &image, view->dither_pattern (), view->line_styles (), dpr, w, h); // create vertex - single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0, 0, 0, lay::ViewOp::Cross, iter->marked (true) ? 9/*mark size*/ : 0), vertex, &image, view->dither_pattern (), view->line_styles (), w, h); + single_bitmap_to_image (lay::ViewOp (frame_color, mode, 0, 0, 0, lay::ViewOp::Cross, iter->marked (true) ? 9/*mark size*/ : 0), vertex, &image, view->dither_pattern (), view->line_styles (), dpr, w, h); - QPixmap pixmap = QPixmap::fromImage (image.to_image ()); // Qt 4.6.0 workaround + QPixmap pixmap = QPixmap::fromImage (image.to_image ()); +#if QT_VERSION >= 0x050000 + pixmap.setDevicePixelRatio (dpr); +#endif return QIcon (pixmap); } @@ -841,7 +845,12 @@ LayerTreeModel::data (const QModelIndex &index, int role) const QSize is = icon_size (); if (animate_visible) { - return QVariant (icon_for_layer (iter, mp_view, is.width (), is.height (), di_off)); +#if QT_VERSION >= 0x050000 + double dpr = mp_parent ? mp_parent->devicePixelRatio () : 1.0; +#else + double dpr = 1.0; +#endif + return QVariant (icon_for_layer (iter, mp_view, is.width (), is.height (), dpr, di_off)); } else { return QVariant (QIcon ()); } diff --git a/src/layui/layui/layLayerTreeModel.h b/src/layui/layui/layLayerTreeModel.h index 47132c990..902166bdd 100644 --- a/src/layui/layui/layLayerTreeModel.h +++ b/src/layui/layui/layLayerTreeModel.h @@ -27,6 +27,7 @@ #include "dbBox.h" #include "layuiCommon.h" +#include "layDitherPattern.h" #include #include @@ -109,7 +110,7 @@ public: /** * @brief Provides an icon for a given layer style */ - static QIcon icon_for_layer (const lay::LayerPropertiesConstIterator &iter, lay::LayoutViewBase *view, unsigned int w, unsigned int h, unsigned int di_offset, bool no_state = false); + static QIcon icon_for_layer (const lay::LayerPropertiesConstIterator &iter, lay::LayoutViewBase *view, unsigned int w, unsigned int h, double dpr, unsigned int di_offset, bool no_state = false); /** * @brief Gets the preferred icon size diff --git a/src/layui/layui/layLayoutViewConfigPages.cc b/src/layui/layui/layLayoutViewConfigPages.cc index d501ec102..ab8406b8e 100644 --- a/src/layui/layui/layLayoutViewConfigPages.cc +++ b/src/layui/layui/layLayoutViewConfigPages.cc @@ -871,9 +871,9 @@ LayoutViewConfigPage4::update () } #if QT_VERSION > 0x050000 - unsigned int dpr = 1; //devicePixelRatio (); + double dpr = devicePixelRatio (); #else - unsigned int dpr = 1; + double dpr = 1.0; #endif QFontMetrics fm (font (), this); @@ -882,21 +882,22 @@ LayoutViewConfigPage4::update () const unsigned int h = rt.height () + 10; const unsigned int w = rt.width () + 10; - QPixmap pxmp (w * dpr, h * dpr); + QImage img (w * dpr, h * dpr, QImage::Format_RGB32); #if QT_VERSION > 0x050000 - pxmp.setDevicePixelRatio (dpr); + img.setDevicePixelRatio (dpr); #endif - QPainter pxpainter (&pxmp); - pxpainter.setPen (QPen (palette ().color (QPalette::Active, QPalette::Text))); - pxpainter.setBrush (QBrush (color)); - QRect r (0, 0, pxmp.width () - 1, pxmp.height () - 1); - pxpainter.drawRect (r); - pxpainter.setFont (font ()); - pxpainter.setPen (QPen (text_color)); - pxpainter.drawText (r, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, text); + QPainter painter (&img); + painter.setPen (QPen (palette ().color (QPalette::Active, QPalette::Text), 1.0 / dpr)); + painter.setBrush (QBrush (color)); + QRectF r (0, 0, w - painter.pen ().widthF (), h - painter.pen ().widthF ()); + painter.drawRect (r); + painter.setFont (font ()); + painter.setPen (QPen (text_color)); + painter.drawText (r, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, text); - (mp_ui->*(cfg4_buttons [i]))->setIconSize (pxmp.size ()); + QPixmap pxmp = QPixmap::fromImage (img); + (mp_ui->*(cfg4_buttons [i]))->setIconSize (QSize (w, h)); (mp_ui->*(cfg4_buttons [i]))->setIcon (QIcon (pxmp)); } @@ -1226,9 +1227,9 @@ LayoutViewConfigPage6::update () QColor color1 = palette ().color (QPalette::Active, QPalette::Dark); #if QT_VERSION > 0x050000 - unsigned int dpr = 1; //devicePixelRatio (); + double dpr = devicePixelRatio (); #else - unsigned int dpr = 1; + double dpr = 1; #endif QImage image (w * dpr, h * dpr, QImage::Format_RGB32); @@ -1238,25 +1239,21 @@ LayoutViewConfigPage6::update () image.fill (color0.rgb ()); // copying code from layLayerToolbox.cc - QBitmap bitmap = m_pattern.pattern ((unsigned int) s).get_bitmap (w * dpr, h * dpr); + const lay::DitherPatternInfo &info = m_pattern.pattern ((unsigned int) s).scaled (dpr); + + QBitmap bitmap = info.get_bitmap (w * dpr, h * dpr, dpr); QPainter painter (&image); painter.setPen (QPen (color1)); painter.setBackgroundMode (Qt::TransparentMode); painter.drawPixmap (0, 0, w, h, bitmap); - QPixmap pxmp = QPixmap::fromImage (image); // Qt 4.6.0 workaround - QPainter pxpainter (&pxmp); - pxpainter.setPen (QPen (palette ().color (QPalette::Active, QPalette::Text))); - QRect r (0, 0, pxmp.width () - 1, pxmp.height () - 1); - pxpainter.drawRect (r); - pxpainter.setFont (font ()); - pxpainter.drawText (r, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, text); + painter.setPen (QPen (palette ().color (QPalette::Active, QPalette::Text), 1.0)); + QRectF r (0, 0, w - painter.pen ().widthF (), h - painter.pen ().widthF ()); + painter.setFont (font ()); + painter.drawText (r, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, text); -#if QT_VERSION > 0x050000 - pxmp.setDevicePixelRatio (dpr); -#endif - - (mp_ui->*(cfg6_buttons [i]))->setIconSize (pxmp.size ()); + QPixmap pxmp = QPixmap::fromImage (image); + (mp_ui->*(cfg6_buttons [i]))->setIconSize (QSize (w, h)); (mp_ui->*(cfg6_buttons [i]))->setIcon (QIcon (pxmp)); } @@ -1429,32 +1426,23 @@ LayoutViewConfigPage6a::update () QColor color0 = b->palette ().color (QPalette::Normal, b->backgroundRole ()); QColor color1 = b->palette ().color (QPalette::Normal, b->foregroundRole ()); + // NOTE: we intentionally don't apply devicePixelRatio here as this way, the + // image looks more like the style applied on the layout canvas. + const unsigned int h = 26; const unsigned int w = 26; -#if QT_VERSION > 0x050000 - unsigned int dpr = 1; //devicePixelRatio (); -#else - unsigned int dpr = 1; -#endif - - QImage image (w * dpr, h * dpr, QImage::Format_RGB32); + QImage image (w, h, QImage::Format_RGB32); image.fill (color0.rgb ()); -#if QT_VERSION > 0x050000 - image.setDevicePixelRatio (dpr); -#endif - QBitmap bitmap = m_style.style (s).get_bitmap (w * dpr, h * dpr); + QBitmap bitmap = m_style.style (s).get_bitmap (w, h); QPainter painter (&image); painter.setPen (QPen (color1)); painter.setBackgroundMode (Qt::TransparentMode); painter.drawPixmap (0, 0, w, h, bitmap); - QPixmap pixmap = QPixmap::fromImage (image); // Qt 4.6.0 workaround -#if QT_VERSION > 0x050000 - pixmap.setDevicePixelRatio (dpr); -#endif - b->setIconSize (pixmap.size ()); + QPixmap pixmap = QPixmap::fromImage (image); + b->setIconSize (QSize (w, h)); b->setIcon (QIcon (pixmap)); } diff --git a/src/layui/layui/layLayoutViewFunctions.cc b/src/layui/layui/layLayoutViewFunctions.cc index a321eb15a..81464f704 100644 --- a/src/layui/layui/layLayoutViewFunctions.cc +++ b/src/layui/layui/layLayoutViewFunctions.cc @@ -2190,14 +2190,14 @@ public: menu_entries.push_back (lay::submenu ("global_trans", at, tl::to_string (tr ("Global Transformation")))); { std::string at = "zoom_menu.global_trans.end"; - menu_entries.push_back (lay::config_menu_item ("r0", at, tl::to_string (tr ("\\(r0\\)<:/r0.png>")), cfg_global_trans, "?r0 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r90", at, tl::to_string (tr ("\\(r90\\)<:/r90.png>")), cfg_global_trans, "?r90 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r180", at, tl::to_string (tr ("\\(r180\\)<:/r180.png>")), cfg_global_trans, "?r180 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("r270", at, tl::to_string (tr ("\\(r270\\)<:/r270.png>")), cfg_global_trans, "?r270 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m0", at, tl::to_string (tr ("\\(m0\\)<:/m0.png>")), cfg_global_trans, "?m0 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m45", at, tl::to_string (tr ("\\(m45\\)<:/m45.png>")), cfg_global_trans, "?m45 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m90", at, tl::to_string (tr ("\\(m90\\)<:/m90.png>")), cfg_global_trans, "?m90 *1 0,0")); - menu_entries.push_back (lay::config_menu_item ("m135", at, tl::to_string (tr ("\\(m135\\)<:/m135.png>")), cfg_global_trans, "?m135 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r0", at, tl::to_string (tr ("\\(r0\\)<:/r0_24px.png>")), cfg_global_trans, "?r0 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r90", at, tl::to_string (tr ("\\(r90\\)<:/r90_24px.png>")), cfg_global_trans, "?r90 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r180", at, tl::to_string (tr ("\\(r180\\)<:/r180_24px.png>")), cfg_global_trans, "?r180 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("r270", at, tl::to_string (tr ("\\(r270\\)<:/r270_24px.png>")), cfg_global_trans, "?r270 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m0", at, tl::to_string (tr ("\\(m0\\)<:/m0_24px.png>")), cfg_global_trans, "?m0 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m45", at, tl::to_string (tr ("\\(m45\\)<:/m45_24px.png>")), cfg_global_trans, "?m45 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m90", at, tl::to_string (tr ("\\(m90\\)<:/m90_24px.png>")), cfg_global_trans, "?m90 *1 0,0")); + menu_entries.push_back (lay::config_menu_item ("m135", at, tl::to_string (tr ("\\(m135\\)<:/m135_24px.png>")), cfg_global_trans, "?m135 *1 0,0")); } menu_entries.push_back (lay::separator ("hier_group", at)); 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); diff --git a/src/layui/layui/layNetlistBrowserModel.cc b/src/layui/layui/layNetlistBrowserModel.cc index 82ffa4f81..0151762ef 100644 --- a/src/layui/layui/layNetlistBrowserModel.cc +++ b/src/layui/layui/layNetlistBrowserModel.cc @@ -2505,9 +2505,9 @@ NetlistBrowserModel::columnCount (const QModelIndex & /*parent*/) const QIcon icon_for_status (db::NetlistCrossReference::Status status) { if (status == db::NetlistCrossReference::NoMatch || status == db::NetlistCrossReference::Mismatch) { - return QIcon (":/error2_16.png"); + return QIcon (":/error2_16px.png"); } else if (status == db::NetlistCrossReference::MatchWithWarning || status == db::NetlistCrossReference::Skipped) { - return QIcon (":/warn_16.png"); + return QIcon (":/warn_16px.png"); } else { return QIcon (); } @@ -2921,7 +2921,7 @@ NetlistBrowserModel::headerData (int section, Qt::Orientation /*orientation*/, i } } else if (role == Qt::DecorationRole && section == m_status_column) { - return QIcon (":/info_16.png"); + return QIcon (":/info_16px.png"); } return QVariant (); diff --git a/src/layui/layui/layNetlistBrowserTreeModel.cc b/src/layui/layui/layNetlistBrowserTreeModel.cc index 4cf123eb2..f70084468 100644 --- a/src/layui/layui/layNetlistBrowserTreeModel.cc +++ b/src/layui/layui/layNetlistBrowserTreeModel.cc @@ -62,9 +62,9 @@ static QIcon icon_for_circuit () static QIcon icon_for_status (db::NetlistCrossReference::Status status) { if (status == db::NetlistCrossReference::NoMatch || status == db::NetlistCrossReference::Mismatch) { - return QIcon (":/error2_16.png"); + return QIcon (":/error2_16px.png"); } else if (status == db::NetlistCrossReference::MatchWithWarning || status == db::NetlistCrossReference::Skipped) { - return QIcon (":/warn_16.png"); + return QIcon (":/warn_16px.png"); } else { return QIcon (); } @@ -392,7 +392,7 @@ NetlistBrowserTreeModel::headerData (int section, Qt::Orientation /*orientation* return tr ("Circuits"); } } else if (role == Qt::DecorationRole && section == m_status_column) { - return QIcon (":/info_16.png"); + return QIcon (":/info_16px.png"); } return QVariant (); } diff --git a/src/layui/layui/layNetlistLogModel.cc b/src/layui/layui/layNetlistLogModel.cc index f65e9c84d..bb777690a 100644 --- a/src/layui/layui/layNetlistLogModel.cc +++ b/src/layui/layui/layNetlistLogModel.cc @@ -165,11 +165,11 @@ NetlistLogModel::data (const QModelIndex &index, int role) const if (! le) { // ignore } else if (le->severity == db::NetlistCrossReference::Error) { - return QIcon (QString::fromUtf8 (":/error_16.png")); + return QIcon (QString::fromUtf8 (":/error_16px.png")); } else if (le->severity == db::NetlistCrossReference::Warning) { - return QIcon (QString::fromUtf8 (":/warn_16.png")); + return QIcon (QString::fromUtf8 (":/warn_16px.png")); } else if (le->severity == db::NetlistCrossReference::Info) { - return QIcon (QString::fromUtf8 (":/info_16.png")); + return QIcon (QString::fromUtf8 (":/info_16px.png")); } } else if (role == Qt::DisplayRole) { diff --git a/src/layui/layui/laySaveLayoutOptionsDialog.h b/src/layui/layui/laySaveLayoutOptionsDialog.h index ba337ce20..8a333d93a 100644 --- a/src/layui/layui/laySaveLayoutOptionsDialog.h +++ b/src/layui/layui/laySaveLayoutOptionsDialog.h @@ -48,7 +48,7 @@ namespace Ui { class SaveLayoutAsOptionsDialog; class SaveLayoutOptionsDialog; -}; +} namespace lay { diff --git a/src/layui/layui/laySelectStippleForm.cc b/src/layui/layui/laySelectStippleForm.cc index 76f9354a4..609fab80e 100644 --- a/src/layui/layui/laySelectStippleForm.cc +++ b/src/layui/layui/laySelectStippleForm.cc @@ -77,8 +77,16 @@ namespace { void SelectStippleForm::update () { +#if QT_VERSION >= 0x050000 + double dpr = devicePixelRatio (); +#else + double dpr = 1.0; +#endif + mp_ui->stipple_items->clear (); + QSize icon_size = mp_ui->stipple_items->iconSize (); + if (m_include_nil) { new QListWidgetItem (QObject::tr ("None"), mp_ui->stipple_items); } @@ -91,21 +99,39 @@ SelectStippleForm::update () // fill the list of stipple items for (lay::DitherPattern::iterator i = m_pattern.begin (); i != m_pattern.begin_custom (); ++i) { + std::string name (i->name ()); if (name.empty ()) { name = tl::sprintf ("#%d", std::distance (m_pattern.begin (), i)); } - new QListWidgetItem (QIcon (i->get_bitmap ()), tl::to_qstring (name), mp_ui->stipple_items); + + const lay::DitherPatternInfo &dp_info = i->scaled (dpr); + QBitmap bitmap = dp_info.get_bitmap (icon_size.width () * dpr, icon_size.height () * dpr, dpr); +#if QT_VERSION >= 0x050000 + bitmap.setDevicePixelRatio (dpr); +#endif + new QListWidgetItem (QIcon (bitmap), tl::to_qstring (name), mp_ui->stipple_items); + } for (std::vector ::const_iterator i = iters.begin (); i != iters.end (); ++i) { + if ((*i)->order_index () > 0) { + std::string name ((*i)->name ()); if (name.empty ()) { name = tl::sprintf ("custom #%d", (*i)->order_index ()); } - new QListWidgetItem (QIcon ((*i)->get_bitmap ()), tl::to_qstring (name), mp_ui->stipple_items); + + const lay::DitherPatternInfo &dp_info = (*i)->scaled (dpr); + QBitmap bitmap = dp_info.get_bitmap (icon_size.width () * dpr, icon_size.height () * dpr, dpr); +#if QT_VERSION >= 0x050000 + bitmap.setDevicePixelRatio (dpr); +#endif + new QListWidgetItem (QIcon (bitmap), tl::to_qstring (name), mp_ui->stipple_items); + } + } } diff --git a/src/layui/layui/layWidgets.cc b/src/layui/layui/layWidgets.cc index 1878937b1..df3289568 100644 --- a/src/layui/layui/layWidgets.cc +++ b/src/layui/layui/layWidgets.cc @@ -151,9 +151,18 @@ DitherPatternSelectionButton::update_pattern () QPushButton::setIconSize (QSize (rt.width (), rt.height ())); +#if QT_VERSION >= 0x050000 + double dpr = devicePixelRatio (); +#else + double dpr = 1.0; +#endif + if (m_dither_pattern < 0) { - QPixmap pixmap (rt.width (), rt.height ()); + QPixmap pixmap (rt.width () * dpr, rt.height () * dpr); +#if QT_VERSION >= 0x050000 + pixmap.setDevicePixelRatio (dpr); +#endif pixmap.fill (QColor (0, 0, 0, 0)); QPainter pxpainter (&pixmap); @@ -161,20 +170,23 @@ DitherPatternSelectionButton::update_pattern () QColor text_color = palette ().color (QPalette::Active, QPalette::Text); pxpainter.setPen (QPen (text_color)); - QRect r (0, 0, pixmap.width () - 1, pixmap.height () - 1); + QRectF r (0, 0, rt.width () - pxpainter.pen ().widthF (), rt.height () - pxpainter.pen ().widthF ()); pxpainter.drawText (r, Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine, QObject::tr ("None")); QPushButton::setIcon (QIcon (pixmap)); } else { + const lay::DitherPatternInfo *dp_info; if (mp_view) { - QPushButton::setIcon (QIcon (mp_view->dither_pattern ().get_bitmap ((unsigned int) m_dither_pattern, rt.width (), rt.height ()))); + dp_info = & mp_view->dither_pattern ().pattern ((unsigned int) m_dither_pattern).scaled (dpr); } else { - lay::DitherPattern default_pattern; - QPushButton::setIcon (QIcon (default_pattern.get_bitmap ((unsigned int) m_dither_pattern, rt.width (), rt.height ()))); + static lay::DitherPattern default_pattern; + dp_info = & default_pattern.pattern ((unsigned int) m_dither_pattern).scaled (dpr); } + QPushButton::setIcon (dp_info->get_bitmap (rt.width () * dpr, rt.height () * dpr, dpr)); + } } @@ -208,14 +220,21 @@ DitherPatternSelectionButton::update_menu () unsigned int n = palette.stipple_by_index (i); if (int (n) < std::distance (patterns.begin (), patterns.end ())) { - const lay::DitherPatternInfo &info = patterns.begin () [n]; +#if QT_VERSION > 0x050000 + double dpr = devicePixelRatio (); +#else + double dpr = 1.0; +#endif + + lay::DitherPatternInfo info = patterns.begin () [n]; + info.scale_pattern (dpr); std::string name (info.name ()); if (name.empty ()) { name = tl::sprintf ("#%d", n); } - menu ()->addAction (QIcon (info.get_bitmap ()), tl::to_qstring (name), this, SLOT (menu_selected ()))->setData (n); + menu ()->addAction (QIcon (info.get_bitmap (-1, -1, dpr)), tl::to_qstring (name), this, SLOT (menu_selected ()))->setData (n); } } @@ -1001,12 +1020,12 @@ DecoratedLineEdit::DecoratedLineEdit (QWidget *parent) mp_options_label = new QLabel (this); mp_options_label->hide (); mp_options_label->setCursor (Qt::ArrowCursor); - mp_options_label->setPixmap (QString::fromUtf8 (":/options_edit.png")); + mp_options_label->setPixmap (QString::fromUtf8 (":/options_edit_16px@2x.png")); mp_clear_label = new QLabel (this); mp_clear_label->hide (); mp_clear_label->setCursor (Qt::ArrowCursor); - mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit.png")); + mp_clear_label->setPixmap (QString::fromUtf8 (":/clear_edit_16px@2x.png")); QMargins margins = textMargins (); m_default_left_margin = margins.left (); diff --git a/src/layui/layui/rdbMarkerBrowserPage.cc b/src/layui/layui/rdbMarkerBrowserPage.cc index d2193c701..3a7c48c87 100644 --- a/src/layui/layui/rdbMarkerBrowserPage.cc +++ b/src/layui/layui/rdbMarkerBrowserPage.cc @@ -56,11 +56,11 @@ struct FlagDescriptor static FlagDescriptor flag_descriptors[] = { - FlagDescriptor (":no_flag.png", tl::to_string (QObject::tr ("No flag")), ""), - FlagDescriptor (":red_flag.png", tl::to_string (QObject::tr ("Red flag")), "red"), - FlagDescriptor (":green_flag.png", tl::to_string (QObject::tr ("Green flag")), "green"), - FlagDescriptor (":blue_flag.png", tl::to_string (QObject::tr ("Blue flag")), "blue"), - FlagDescriptor (":yellow_flag.png", tl::to_string (QObject::tr ("Yellow flag")), "yellow") + FlagDescriptor (":no_flag_16px.png", tl::to_string (QObject::tr ("No flag")), ""), + FlagDescriptor (":red_flag_16px.png", tl::to_string (QObject::tr ("Red flag")), "red"), + FlagDescriptor (":green_flag_16px.png", tl::to_string (QObject::tr ("Green flag")), "green"), + FlagDescriptor (":blue_flag_16px.png", tl::to_string (QObject::tr ("Blue flag")), "blue"), + FlagDescriptor (":yellow_flag_16px.png", tl::to_string (QObject::tr ("Yellow flag")), "yellow") }; // ---------------------------------------------------------------------------------- @@ -1268,14 +1268,14 @@ public: const rdb::Item *i = item (index.row ()); if (i != 0 && i->has_tag (m_important_tag_id)) { - return QVariant (QIcon (QString::fromUtf8 (":important.png"))); + return QVariant (QIcon (QString::fromUtf8 (":important_16px.png"))); } } else if (index.column () == 2) { const rdb::Item *i = item (index.row ()); if (i != 0 && i->has_tag (m_waived_tag_id)) { - return QVariant (QIcon (QString::fromUtf8 (":waived.png"))); + return QVariant (QIcon (QString::fromUtf8 (":waived_16px.png"))); } } diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFImportOptionsDialog.ui index 7e3482704..dbb3e9401 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 @@ -219,7 +219,7 @@ - :/up.png:/up.png + :/up_16px.png:/up_16px.png @@ -233,7 +233,7 @@ - :/down.png:/down.png + :/down_16px.png:/down_16px.png diff --git a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui index de17b4e9a..d00f96cf6 100644 --- a/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui +++ b/src/plugins/streamers/lefdef/lay_plugin/LEFDEFTechnologyComponentEditor.ui @@ -236,8 +236,8 @@ ... - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -250,8 +250,8 @@ ... - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -264,8 +264,8 @@ ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png @@ -278,8 +278,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -340,8 +340,8 @@ ... - - :/add.png:/add.png + + :/add_16px.png:/add_16px.png @@ -354,8 +354,8 @@ ... - - :/clear.png:/clear.png + + :/clear_16px.png:/clear_16px.png @@ -368,8 +368,8 @@ ... - - :/up.png:/up.png + + :/up_16px.png:/up_16px.png @@ -382,8 +382,8 @@ ... - - :/down.png:/down.png + + :/down_16px.png:/down_16px.png @@ -620,7 +620,7 @@ - :/right.png + :/right_16px@2x.png @@ -670,7 +670,7 @@ - :/right.png + :/right_16px@2x.png @@ -716,7 +716,7 @@ - :/right.png + :/right_16px@2x.png @@ -736,7 +736,7 @@ - :/right.png + :/right_16px@2x.png @@ -765,7 +765,7 @@ - :/right.png + :/right_16px@2x.png @@ -899,7 +899,7 @@ - :/right.png + :/right_16px@2x.png @@ -1084,7 +1084,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1107,7 +1107,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1143,7 +1143,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1159,7 +1159,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1195,7 +1195,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1211,7 +1211,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1228,7 +1228,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1265,7 +1265,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1364,7 +1364,7 @@ suffix ... - :/right.png + :/right_16px@2x.png @@ -1470,7 +1470,7 @@ type ... - :/right.png + :/right_16px@2x.png @@ -1639,7 +1639,7 @@ type ... read_all_cbx - + diff --git a/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui b/src/plugins/streamers/magic/lay_plugin/MAGReaderOptionPage.ui index d2fbf099b..4dd76f3b7 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 @@ -162,7 +162,7 @@ - :/down.png:/down.png + :/down_16px.png:/down_16px.png @@ -176,7 +176,7 @@ - :/add.png:/add.png + :/add_16px.png:/add_16px.png @@ -198,7 +198,7 @@ You can use expressions inside the path components for variable paths - :/up.png:/up.png + :/up_16px.png:/up_16px.png diff --git a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui index 33cae9bb9..995fbd702 100644 --- a/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui +++ b/src/plugins/streamers/oasis/lay_plugin/OASISWriterOptionPage.ui @@ -284,7 +284,7 @@ - :/warn.png + :/warn_16px@2x.png @@ -379,7 +379,7 @@ - :/warn.png + :/warn_16px@2x.png diff --git a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui index 02421de0e..27ed8bb8f 100644 --- a/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui +++ b/src/plugins/streamers/pcb/lay_plugin/GerberImportDialog.ui @@ -229,7 +229,7 @@ surface. ... - :/down.png + :/down_16px.png Ctrl+Down @@ -245,7 +245,7 @@ surface. ... - :/up.png + :/up_16px.png Ctrl+Up @@ -261,7 +261,7 @@ surface. ... - :/clear.png + :/clear_16px.png Del @@ -277,7 +277,7 @@ surface. ... - :/add.png + :/add_16px.png Return @@ -586,7 +586,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/up.png + :/up_16px.png Ctrl+Up @@ -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 @@ -618,7 +618,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/down.png + :/down_16px.png Ctrl+Down @@ -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 @@ -704,7 +704,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/down.png + :/down_16px.png Ctrl+Down @@ -720,7 +720,7 @@ For "bottom" mounting, the top PCB layer will be assigned to the last layout lay ... - :/up.png + :/up_16px.png Ctrl+Up @@ -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 @@ -1278,7 +1278,7 @@ Alternatively the transformation (imported to existing layout) can be specified Next - :/forward.png + :/forward_24px.png @@ -1302,7 +1302,7 @@ Alternatively the transformation (imported to existing layout) can be specified Back - :/back.png + :/back_24px.png @@ -1461,7 +1461,7 @@ Alternatively the transformation (imported to existing layout) can be specified cancel_pb - + diff --git a/src/plugins/streamers/pcb/lay_plugin/layGerberImportDialog.cc b/src/plugins/streamers/pcb/lay_plugin/layGerberImportDialog.cc index fe39ac8c7..457cbfc6b 100644 --- a/src/plugins/streamers/pcb/lay_plugin/layGerberImportDialog.cc +++ b/src/plugins/streamers/pcb/lay_plugin/layGerberImportDialog.cc @@ -815,7 +815,7 @@ GerberImportDialog::free_layer_mapping_item_clicked (QTreeWidgetItem *item, int if (column > 0) { bool value = ! item->data (column, Qt::UserRole).toBool (); item->setData (column, Qt::UserRole, value); - item->setData (column, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (value ? ":checked.png" : ":unchecked.png")))); + item->setData (column, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (value ? ":checked_16px.png" : ":unchecked_16px.png")))); } } @@ -828,7 +828,7 @@ GerberImportDialog::reset_free_mapping () for (QList::const_iterator s = selected.begin (); s != selected.end (); ++s) { for (int column = 1; column <= int (mp_data->layout_layers.size ()); ++column) { (*s)->setData (column, Qt::UserRole, false); - (*s)->setData (column, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (":unchecked.png")))); + (*s)->setData (column, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (":unchecked_16px.png")))); } } } @@ -1607,7 +1607,7 @@ GerberImportDialog::update () } item->setData (layer + 1, Qt::UserRole, QVariant (is_present)); - item->setData (layer + 1, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (is_present ? ":checked.png" : ":unchecked.png")))); + item->setData (layer + 1, Qt::DecorationRole, QVariant (QIcon (QString::fromUtf8 (is_present ? ":checked_16px.png" : ":unchecked_16px.png")))); } diff --git a/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui b/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui index 9ada7a02d..1850e7b9a 100644 --- a/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui +++ b/src/plugins/tools/import/lay_plugin/StreamImportDialog.ui @@ -35,8 +35,8 @@ Back - - :/back.png:/back.png + + :/back_24px.png:/back_24px.png @@ -66,8 +66,8 @@ Next - - :/forward.png:/forward.png + + :/forward_24px.png:/forward_24px.png @@ -938,7 +938,7 @@ Alternatively the transformation (imported to existing layout) can be specified cancel_pb - + diff --git a/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui b/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui index 2fc2aa3ef..188969569 100644 --- a/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui +++ b/src/plugins/tools/net_tracer/lay_plugin/NetTracerTechComponentEditor.ui @@ -97,7 +97,7 @@ ... - :/down.png + :/down_16px.png @@ -107,7 +107,7 @@ ... - :/del.png + :/del_16px.png Del @@ -139,7 +139,7 @@ ... - :/add.png + :/add_16px.png Return @@ -165,7 +165,7 @@ ... - :/up.png + :/up_16px.png @@ -247,7 +247,7 @@ ... - :/down.png + :/down_16px.png @@ -257,7 +257,7 @@ ... - :/del.png + :/del_16px.png Del @@ -288,7 +288,7 @@ ... - :/add.png + :/add_16px.png Return @@ -314,7 +314,7 @@ ... - :/up.png + :/up_16px.png diff --git a/src/plugins/tools/view_25d/lay_plugin/D25View.ui b/src/plugins/tools/view_25d/lay_plugin/D25View.ui index a38817f62..5ac851c82 100644 --- a/src/plugins/tools/view_25d/lay_plugin/D25View.ui +++ b/src/plugins/tools/view_25d/lay_plugin/D25View.ui @@ -261,7 +261,7 @@ - :/fit_left.png:/fit_left.png + :/fit_left_24px.png:/fit_left_24px.png @@ -281,7 +281,7 @@ - :/fit_front.png:/fit_front.png + :/fit_front_24px.png:/fit_front_24px.png @@ -301,7 +301,7 @@ - :/fit_right.png:/fit_right.png + :/fit_right_24px.png:/fit_right_24px.png @@ -321,7 +321,7 @@ - :/fit_back.png:/fit_back.png + :/fit_back_24px.png:/fit_back_24px.png @@ -341,7 +341,7 @@ - :/fit_top.png:/fit_top.png + :/fit_top_24px.png:/fit_top_24px.png @@ -361,7 +361,7 @@ - :/fit_bottom.png:/fit_bottom.png + :/fit_bottom_24px.png:/fit_bottom_24px.png diff --git a/src/tl/tl/tlTimer.cc b/src/tl/tl/tlTimer.cc index fe75aa136..fac2767d5 100644 --- a/src/tl/tl/tlTimer.cc +++ b/src/tl/tl/tlTimer.cc @@ -28,7 +28,7 @@ #if defined(_MSC_VER) || defined(_WIN32) # include # include -#elif defined(__MACH__) +#elif defined(__MACH__) && defined(__APPLE__) # include # include # include @@ -54,7 +54,7 @@ const uint64_t ft_to_epoch_offset = uint64_t (11644473600) * uint64_t (10000000) void current_utc_time (struct timespec *ts) { -#if defined(__MACH__) +#if defined(__MACH__) && defined(__APPLE__) clock_serv_t cclock; mach_timespec_t mts; @@ -86,7 +86,7 @@ void current_utc_time (struct timespec *ts) static int64_t ms_time () { -#if defined(__MACH__) +#if defined(__MACH__) && defined(__APPLE__) clock_serv_t cclock; mach_timespec_t mts;