Merge pull request 'Merge new features and minor fixes for v1.2.1 release' (#43) from dev into master

Reviewed-on: #43

.github/workflows/cmake.yml

@@ -0,0 +1,37 @@
+name: CMake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Install system dependencies
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install libgtk-3-dev gettext
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

README.MD

@@ -1,5 +1,7 @@
 # GDS-Render Readme
 
+[![CMake](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml/badge.svg?branch=master)](https://github.com/0mhu/gds-render/actions/workflows/cmake.yml)
+
 This software is a rendering programm for GDS2 layout files.
 The GDS2 format is mainly used in integrated circuit development.
 This program allows the conversion of a GDS file to a vector graphics file.

doxygen/compilation.dox

@@ -30,7 +30,7 @@ Development is done with the following library versions:
 
 | Cairographics | GLib2      | GTK3      |
 | ------------- | ---------- | --------- |
-| 1.17.3        | 2.60.6-1   | 3.24.10-1 |
+| 1.17.2        | 2.64.2     | 3.24.18   |
 
 @section comp-instr Compilation Instructions
 @subsection linux-build General Linux Build Instruction
@@ -47,7 +47,7 @@ Once cmake has finished, type
  make
 @endcode
 to build the program and 
-
+ 
 @code
  make documentation
 @endcode
@@ -59,7 +59,7 @@ The subfolder 'AUR' contains a PKGBUILD file to build an Archlinux/Pacman packag
 
 @subsection comp-warnings Compiler Warnings
 
-The compiler will throw the following warnings. Compiled with GCC 8.2.1.
+The compiler will throw the following warnings. Compiled with GCC 9.3.0.
 
 | Warning | Assessment |
 | ------- | ---------- |

doxygen/translation.dox

@@ -1,53 +0,0 @@
-/**
-
-@page translation Translations / Internationalization
-
-@section lang-available Available Languages
-
-The development, documentation and default application language of gds-render is English.
-Translations of GUI and console output exist for the following locales/languages
-
-- de German (Deutsch)
-- ja Japanese (日本語) (Work in progess)
-
-On how to add new languages, see @ref lang-add
-
-@section lang-internals Internals
-This progamm uses gettext for translations.
-
-@subsection lang-coding Make Strings Translatable in Code
-Only strings, that are marked as translatable are actually available for translation and shown in the user's language.
-All other text is displayed as written in the source files.
-
-@subsubsection lang-add-glade Make GUI Elements in Glade Files Translatable
-Text inside Glade's GUI files can be made translatable by checking the *translatable* option for the specific text property.
-The following image shows the label property of a button. Notice the checked Translatable option.
-@image html translate-glade.png
-@image latex translate-glade.png
-
-@subsubsection lang-add-c Make C Strings Translatable
-In order to make strings in C code translatable, the following header has to be included:
-@code
-#inlcude <glib/gi18n.h>
-@endcode
-This header provides a few macros useful for translation. The most important one is the function-like macro
-@code
-_("Text here")
-@endcode
-which is just a underline character.
-You can use this marco to encapsulate all static strings that shall be translated. The whole expression is still usable like any other string (except for compile time concatenation, like: "This is foo" " and this is bar")
-
-Example:
-@code
-printf(_("The value of foo is %d\n"), foo);
-@endcode
-
-Text that must not be translated can be encapsulated inside a N_ macro like
-@code
-N_("This has to stay in English")
-@endcode
-The N_ macro is basically an empty macro and just for visualization.
-
-@subsection lang-add Add a New Language
-
-*/

doxygen/versioning.dox

@@ -2,8 +2,8 @@
 @page versioning Version Number
 
 @section main-version Main Versioning Scheme
-The version number of this application consists of a given version in the format of 'v1.0.0' (formely only 2 digits).
-Where the first number indicates a major release and the second and third numbers indicate minor changes.
+The version number of this application consists of a given version in the format of 'v1.0'.
+Where the first number indicates a major release and the second number indicates minor changes.
 
 Versions, including release candidates and patch-levels, are tagged in git.
 
@@ -13,7 +13,7 @@ The 3rd release candidate of version 4.2 would be '*v4.2-rc3*'.
 Release candidates are in a frozen state. Only bugfixes that are necessary for functionality are applied to these versions before releasing the final version.
 
 @subsection patch-level Patch Levels
-If an already released version contains bugs that need to be fixed, the version number is not incremented. Insted a new version number with a patch-level is created. The patch-level is appended with a dash directly after the version number. The fist patch-level of version 3.5.2 would be: 'v3.5.2-1'.
+If an already released version contains bugs that need to be fixed, the version number is not incremented. Insted a new version number with a patch-level is created. The patch-level is appended with a dash directly after the version number. The fist patch-level of version 3.5 would be: 'v3.5-1'.
 
 
 @section git-version-num Git Based Version Number

gds-render-gui.c

@@ -187,7 +187,8 @@ static gboolean cell_store_filter_visible_func(GtkTreeModel *model, GtkTreeIter
 
 	gtk_tree_model_get(model, iter, CELL_SEL_CELL, &cell, CELL_SEL_LIBRARY, &lib, -1);
 
-	if (lib) {
+    /* Show always, if this is a pure lib entry */
+    if (lib && !cell) {
 		result = TRUE;
 		goto exit_filter;
 	}
@@ -690,19 +691,13 @@ static void on_select_all_layers_clicked(GtkWidget *button, gpointer user_data)
 	layer_selector_select_all_layers(gui->layer_selector, TRUE);
 }
 
-static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
+static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
 {
-	GdsRenderGui *gui;
 	GtkDialog *dialog;
-	gboolean overwrite;
-	int dialog_result;
-	(void)button;
+	gint dialog_result;
+	gboolean overwrite = FALSE;
 
-	gui = RENDERER_GUI(user_data);
-
-	/* Don't do anything if the selector is empty. */
-	if (!layer_selector_contains_elements(gui->layer_selector))
-		return;
+	g_return_val_if_fail(RENDERER_IS_GUI(gui), FALSE);
 
 	/* Ask for overwrite */
 	dialog = GTK_DIALOG(gtk_message_dialog_new(gui->main_window, GTK_DIALOG_USE_HEADER_BAR, GTK_MESSAGE_QUESTION,
@@ -719,6 +714,25 @@ static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
 	}
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 
+	return overwrite;
+}
+
+static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
+{
+	GdsRenderGui *gui;
+	gboolean overwrite = FALSE;
+	(void)button;
+
+	gui = RENDERER_GUI(user_data);
+
+	/* Don't do anything if the selector is empty. */
+	if (!layer_selector_contains_elements(gui->layer_selector))
+		return;
+
+	/* Ask, if names shall be overwritten, if they are not empty */
+	if (layer_selector_num_of_named_elements(gui->layer_selector) > 0)
+		overwrite = auto_naming_ask_for_override(gui);
+
 	layer_selector_auto_name_layers(gui->layer_selector, overwrite);
 }
 

geometric/vector-operations.c

@@ -65,7 +65,7 @@ void vector_2d_rotate(struct vector_2d *vec, double angle)
 	sin_val = sin(angle);
 	cos_val = cos(angle);
 
-	vector_2d_copy(&temp, vec);
+	(void)vector_2d_copy(&temp, vec);
 
 	/* Apply rotation matrix */
 	vec->x = (cos_val * temp.x) - (sin_val * temp.y);

include/gds-render/geometric/cell-geometrics.h

@@ -35,10 +35,17 @@
 #include <gds-render/gds-utils/gds-types.h>
 
 /**
- * @brief calculate_cell_bounding_box Calculate bounding box of gds cell
- * @param box Resulting boundig box. Will be uüdated and not overwritten
+ * @brief Calculate bounding box of a gds cell.
+ *
+ * This function updates a given bounding box with the dimensions of a
+ * gds_cell. Please note that the handling of path miter points is not complete yet.
+ * If a path object is the outmost object of your cell at any edge,
+ * the resulting bounding box might be the wrong size. The devistion from the real size
+ * is guaranteed to be within the width of the path object.
+ *
+ * @param box Resulting boundig box. Will be updated and not overwritten
  * @param cell Toplevel cell
- * @warning Path handling not yet implemented correctly.
+ * @warning Handling of Path graphic objects not yet implemented correctly.
  */
 void calculate_cell_bounding_box(union bounding_box *box, struct gds_cell *cell);
 

include/gds-render/layer/layer-selector.h

@@ -130,6 +130,13 @@ void layer_selector_auto_name_layers(LayerSelector *layer_selector, gboolean ove
  */
 gboolean layer_selector_contains_elements(LayerSelector *layer_selector);
 
+/**
+ * @brief Get number of layer elements that are named
+ * @param[in] layer_selector Layer selector
+ * @return Number of layers with a name != NULL or != ""
+ */
+size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector);
+
 G_END_DECLS
 
 #endif /* __LAYER_SELECTOR_H__ */

include/gds-render/output-renderers/cairo-renderer.h

@@ -38,7 +38,7 @@ G_DECLARE_FINAL_TYPE(CairoRenderer, cairo_renderer, GDS_RENDER, CAIRO_RENDERER,
 
 #define GDS_RENDER_TYPE_CAIRO_RENDERER (cairo_renderer_get_type())
 
-#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+#define MAX_LAYERS (5000) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
 
 /**
  * @brief Create new CairoRenderer for SVG output

layer/color-palette.c

@@ -238,6 +238,7 @@ static void color_palette_dispose(GObject *gobj)
 	if (palette->color_array) {
 		palette->color_array_length = 0;
 		free(palette->color_array);
+		palette->color_array = NULL;
 	}
 
 	/* Chain up to parent class */

layer/layer-selector.c

@@ -822,12 +822,10 @@ void layer_selector_auto_color_layers(LayerSelector *layer_selector, ColorPalett
 	unsigned int color_count;
 	GdkRGBA color;
 
-	if (GDS_RENDER_IS_COLOR_PALETTE(palette) == FALSE || LAYER_IS_SELECTOR(layer_selector) == FALSE)
-		return;
-	if (global_alpha <= 0)
-		return;
-	if (GTK_IS_LIST_BOX(layer_selector->list_box) == FALSE)
-		return;
+	g_return_if_fail(GDS_RENDER_IS_COLOR_PALETTE(palette));
+	g_return_if_fail(LAYER_IS_SELECTOR(layer_selector));
+	g_return_if_fail(global_alpha > 0);
+	g_return_if_fail(GTK_IS_LIST_BOX(layer_selector->list_box));
 
 	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
 
@@ -898,4 +896,31 @@ gboolean layer_selector_contains_elements(LayerSelector *layer_selector)
 	return (layer_element_list ? TRUE : FALSE);
 }
 
+size_t layer_selector_num_of_named_elements(LayerSelector *layer_selector)
+{
+	GList *le_list;
+	GList *le_list_ptr;
+	LayerElement *le;
+	const char *layer_name;
+	size_t count = 0U;
+
+	g_return_val_if_fail(LAYER_IS_SELECTOR(layer_selector), 0U);
+
+	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));
+
+	for (le_list_ptr = le_list; le_list_ptr != NULL; le_list_ptr = g_list_next(le_list_ptr)) {
+		le = LAYER_ELEMENT(le_list_ptr->data);
+		if (!le)
+			continue;
+		layer_name = layer_element_get_name(le);
+
+		if (layer_name && *layer_name) {
+			/* Layer name is not empty. Count it */
+			count++;
+		}
+	}
+
+	return count;
+}
+
 /** @} */

output-renderers/cairo-renderer.c

@@ -371,8 +371,6 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 	for (info_list = layer_infos; info_list != NULL; info_list = g_list_next(info_list)) {
 		linfo = (struct layer_info *)info_list->data;
 
-		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
-
 		if (linfo->layer >= MAX_LAYERS) {
 			printf(_("Layer outside of spec.\n"));
 			continue;
@@ -381,6 +379,8 @@ static int cairo_renderer_render_cell_to_vector_file(GdsOutputRenderer *renderer
 		if (!linfo->render)
 			continue;
 
+		dprintf(comm_pipe[1], _("Exporting layer %d to file\n"), linfo->layer);
+
 		if (pdf_file && pdf_cr) {
 			cairo_set_source_surface(pdf_cr, layers[linfo->layer].rec, -xmin, -ymin);
 			cairo_paint_with_alpha(pdf_cr, linfo->color.alpha);

output-renderers/latex-renderer.c

@@ -370,7 +370,7 @@ static int latex_renderer_render_output(GdsOutputRenderer *renderer,
 						l_renderer->pdf_layers, l_renderer->tex_standalone, renderer);
 		fclose(tex_file);
 	} else {
-		g_error(_("Could not open LaTeX output file"));
+        g_warning(_("Could not open LaTeX output file"));
 	}
 
 	if (settings)

resources/layer-widget.glade

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">1</property>
     <property name="value">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.10</property>
   </object>
   <object class="GtkBox" id="box">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="spacing">3</property>
     <child>
       <object class="GtkEventBox" id="event-box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="stock">gtk-justify-fill</property>
+            <property name="can-focus">False</property>
+            <property name="icon-name">open-menu-symbolic</property>
           </object>
         </child>
       </object>
@@ -33,7 +33,7 @@
     <child>
       <object class="GtkLabel" id="layer">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="label" translatable="yes">label</property>
       </object>
       <packing>
@@ -45,9 +45,9 @@
     <child>
       <object class="GtkColorButton" id="color">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="use_alpha">True</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">True</property>
+        <property name="use-alpha">True</property>
         <property name="title" translatable="yes">Select Layer Color and Opacity</property>
         <property name="rgba">rgb(0,0,0)</property>
       </object>
@@ -61,9 +61,9 @@
       <object class="GtkCheckButton" id="export">
         <property name="label" translatable="yes">Export Layer</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">False</property>
+        <property name="draw-indicator">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -74,7 +74,7 @@
     <child>
       <object class="GtkEntry" id="entry">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="can-focus">True</property>
       </object>
       <packing>
         <property name="expand">True</property>

resources/main.glade

@@ -1,145 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="auto-name-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-edit</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">format-text-rich-symbolic</property>
   </object>
   <object class="GtkImage" id="color-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-select-color</property>
-  </object>
-  <object class="GtkImage" id="load-mapping-img">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-open</property>
-  </object>
-  <object class="GtkImage" id="save-mapping-img">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">Save the current layer configuration to CSV</property>
-    <property name="stock">gtk-save-as</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">color-select-symbolic</property>
   </object>
   <object class="GtkImage" id="select-all-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-apply</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">emblem-ok-symbolic</property>
   </object>
   <object class="GtkImage" id="sort-down-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-sort-ascending</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">view-sort-descending-symbolic</property>
   </object>
   <object class="GtkImage" id="sort-up-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-sort-descending</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">view-sort-ascending-symbolic</property>
   </object>
   <object class="GtkWindow" id="main-window">
-    <property name="height_request">250</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gds-render</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header-bar">
-        <property name="name">header</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title" translatable="yes">GDS-Render</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkButton" id="button-load-gds">
-            <property name="label">gtk-open</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Open GDS2 Database</property>
-            <property name="use_stock">True</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button-load-mapping">
-            <property name="label" translatable="yes">Load Mapping</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Load the current layer configuration from CSV</property>
-            <property name="image">load-mapping-img</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button-save-mapping">
-            <property name="label" translatable="yes">Save Mapping</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="image">save-mapping-img</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="convert-button">
-            <property name="label">gtk-convert</property>
-            <property name="name">button-convert</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Convert selected cell</property>
-            <property name="use_stock">True</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
+    <property name="height-request">250</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">gds-render</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkSearchEntry" id="cell-search">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="primary_icon_name">edit-find-symbolic</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="primary_icon_sensitive">False</property>
+                    <property name="can-focus">True</property>
+                    <property name="primary-icon-name">edit-find-symbolic</property>
+                    <property name="primary-icon-activatable">False</property>
+                    <property name="primary-icon-sensitive">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -150,15 +62,15 @@
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">True</property>
+                    <property name="hscrollbar-policy">never</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkTreeView" id="cell-tree">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="enable_search">False</property>
-                        <property name="enable_grid_lines">both</property>
+                        <property name="can-focus">True</property>
+                        <property name="enable-search">False</property>
+                        <property name="enable-grid-lines">both</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection"/>
                         </child>
@@ -181,20 +93,20 @@
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <child>
                       <object class="GtkButton" id="button-up-sort">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers ascending</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Sort layers ascending</property>
                         <property name="image">sort-up-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -205,11 +117,11 @@
                     <child>
                       <object class="GtkButton" id="button-down-sort">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers descending</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Sort layers descending</property>
                         <property name="image">sort-down-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -220,11 +132,11 @@
                     <child>
                       <object class="GtkButton" id="auto-color-button">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically color layers</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Automatically color layers</property>
                         <property name="image">color-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -235,11 +147,11 @@
                     <child>
                       <object class="GtkButton" id="button-select-all">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Select all layers for export</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Select all layers for export</property>
                         <property name="image">select-all-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -250,11 +162,11 @@
                     <child>
                       <object class="GtkButton" id="button-auto-name">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically name layers</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
+                        <property name="tooltip-text" translatable="yes">Automatically name layers</property>
                         <property name="image">auto-name-img</property>
-                        <property name="always_show_image">True</property>
+                        <property name="always-show-image">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -272,19 +184,19 @@
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_top">1</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can-focus">True</property>
+                    <property name="margin-top">1</property>
+                    <property name="hscrollbar-policy">never</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <child>
                           <object class="GtkListBox" id="layer-list">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="selection_mode">none</property>
+                            <property name="can-focus">False</property>
+                            <property name="selection-mode">none</property>
                           </object>
                         </child>
                       </object>
@@ -313,7 +225,7 @@
         <child>
           <object class="GtkBox" id="activity-bar">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -327,5 +239,75 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header-bar">
+        <property name="name">header</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="title" translatable="yes">GDS-Render</property>
+        <property name="show-close-button">True</property>
+        <child>
+          <object class="GtkButton" id="button-load-gds">
+            <property name="label">Open GDS</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Open GDS2 Database</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="button-load-mapping">
+            <property name="label" translatable="yes">Load Mapping</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Load the current layer configuration from CSV</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button-save-mapping">
+            <property name="label" translatable="yes">Save Mapping</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="convert-button">
+            <property name="label">Convert Cell</property>
+            <property name="name">button-convert</property>
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="tooltip-text" translatable="yes">Convert selected cell</property>
+            <property name="always-show-image">True</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
   </object>
 </interface>

translations/.gitignore

@@ -1 +0,0 @@
-*.mo

translations/pot/po/de/gds-render.po

@@ -1,7 +1,7 @@
 # German translations for gds-render package.
 # Copyright (C) 2019 THE gds-render'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gds-render package.
-# Mario Hüttel <mario.huettel@gmx.net>, 2019.
+# マリオ <mario.huettel@gmx.net>, 2019.
 #
 msgid ""
 msgstr ""

translations/pot/po/ja/gds-render.po

@@ -1,460 +0,0 @@
-# Japanese translations for gds-render package.
-# Copyright (C) 2019 THE gds-render'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the gds-render package.
-# Mario Hüttel <mario.huettel@gmx.net>, 2019.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gds-render\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-16 18:27+0100\n"
-"PO-Revision-Date: 2020-01-16 22:54+0100\n"
-"Last-Translator: Mario Hüttel <mario.huettel@gmx.net>\n"
-"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.4\n"
-
-#: ../main.c:97
-#, c-format
-msgid ""
-"\n"
-"\n"
-"Full git commit: %s"
-msgstr ""
-"\n"
-"\n"
-"git コミット: %s"
-
-#: ../main.c:294
-msgid " FILE - Convert GDS file <FILE> to graphic"
-msgstr " ファイル - ファイルを変換する"
-
-#: ../resources/about.glade:10
-msgid "!! Replaced during runtime !!"
-msgstr "!! ランタイムで代わる !!"
-
-#: ../command-line.c:205
-#, c-format
-msgid "%d reference loops found.\n"
-msgstr "%d 参照ループが見つかりました.\n"
-
-#: ../main.c:220
-msgid "About"
-msgstr "情報"
-
-#: ../main.c:290
-msgid "Argument string passed to render lib"
-msgstr "レンダリングに渡されるデタ"
-
-#: ../resources/main.glade:225
-msgid "Automatically color layers"
-msgstr "レイヤーを自動的に色付けする"
-
-#: ../resources/main.glade:255
-msgid "Automatically name layers"
-msgstr "レイヤーに自動的に名前を付ける"
-
-#: ../gds-utils/gds-tree-checker.c:71
-#, c-format
-msgid "Broken cell list item found in cell %s. Will continue.\n"
-msgstr "%sのセルで壊れたセルリストアイテムが見つかりました。続けます。\n"
-
-#: ../gds-utils/gds-tree-checker.c:57
-#, c-format
-msgid "Broken cell list item found. Will continue.\n"
-msgstr "壊れたセルリストアイテムが見つかりました。続けます。\n"
-
-#: ../output-renderers/cairo-renderer.c:409
-#, c-format
-msgid "Cairo export finished. It might still be buggy!\n"
-msgstr "Cairoの変換が終了しました.\n"
-
-#. Execute
-#: ../output-renderers/external-renderer.c:120
-msgid "Calling external renderer."
-msgstr "外部レンダラーの実行。"
-
-#: ../gds-render-gui.c:286 ../widgets/conv-settings-dialog.c:291
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../gds-render-gui.c:244
-msgid "Cell"
-msgstr "セル"
-
-#: ../command-line.c:209
-#, c-format
-msgid "Cell is affected by reference loop. Abort!\n"
-msgstr "このセルに参照ループがあります。アボート！\n"
-
-#: ../main.c:284
-msgid "Cell to render"
-msgstr "レンダリングされるセル"
-
-#: ../command-line.c:215
-#, c-format
-msgid ""
-"Cell was not checked. This should not happen. Please report this issue. Will "
-"continue either way.\n"
-msgstr "セルのチェックはしませんでした。これは問題です。\n"
-
-#: ../command-line.c:202
-#, c-format
-msgid "Checking library %s failed.\n"
-msgstr "ライブラリ %s のチェックは失敗しました。\n"
-
-#: ../resources/dialog.glade:79
-msgid "Configure LaTeX as standalone document"
-msgstr ""
-
-#: ../resources/main.glade:109
-msgid "Convert selected cell"
-msgstr ""
-
-#: ../output-renderers/external-renderer.c:89
-#, c-format
-msgid ""
-"Could not load external library '%s'\n"
-"Detailed error is:\n"
-"%s\n"
-msgstr ""
-
-#: ../output-renderers/latex-renderer.c:373
-msgid "Could not open LaTeX output file"
-msgstr ""
-
-#: ../command-line.c:195
-#, c-format
-msgid "Couldn't find cell in first library!\n"
-msgstr ""
-
-#: ../command-line.c:81
-#, c-format
-msgid "Count of renderers %d does not match count of output file names %d\n"
-msgstr ""
-
-#: ../main.c:286
-msgid "Create PDF Layers (OCG)"
-msgstr ""
-
-#: ../main.c:285
-msgid "Create standalone TeX"
-msgstr ""
-
-#: ../main.c:280
-msgid "Divide output coordinates by <SCALE>"
-msgstr ""
-
-#: ../resources/layer-widget.glade:62
-msgid "Export Layer"
-msgstr ""
-
-#: ../output-renderers/cairo-renderer.c:366
-#, c-format
-msgid "Exporting layer %d to file\n"
-msgstr ""
-
-#: ../output-renderers/external-renderer.c:142
-msgid "External renderer finished."
-msgstr ""
-
-#. This should not happen
-#: ../output-renderers/cairo-renderer.c:271
-#, c-format
-msgid "Fatal error: Cairo Renderer: Could not spawn child process!"
-msgstr ""
-
-#: ../resources/main.glade:50
-msgid "GDS-Render"
-msgstr ""
-
-#: ../gds-render-gui.c:294
-msgid "GDSII-Files"
-msgstr ""
-
-#: ../resources/dialog.glade:18
-msgid "Generate LaTeX/TikZ output"
-msgstr ""
-
-#: ../resources/dialog.glade:93
-msgid "Generate PDF Layers"
-msgstr ""
-
-#: ../output-renderers/latex-renderer.c:253
-#, c-format
-msgid "Generating cell %s"
-msgstr ""
-
-#: ../resources/about.glade:12
-msgid "Git Repository"
-msgstr ""
-
-#: ../widgets/conv-settings-dialog.c:246
-#, c-format
-msgid "Height: %.3lf %sm"
-msgstr ""
-
-#: ../main.c:321
-#, c-format
-msgid "Ignored argument: %s"
-msgstr ""
-
-#: ../output-renderers/external-renderer.c:106
-#, c-format
-msgid ""
-"Init function not found in library:\n"
-"%s\n"
-msgstr ""
-
-#: ../output-renderers/cairo-renderer.c:321
-#, c-format
-msgid "Layer number too high / outside of spec.\n"
-msgstr ""
-
-#: ../output-renderers/cairo-renderer.c:369
-#, c-format
-msgid "Layer outside of spec.\n"
-msgstr ""
-
-#: ../widgets/layer-element.c:102
-#, c-format
-msgid "Layer: %d"
-msgstr ""
-
-#: ../gds-render-gui.c:241
-msgid "Library"
-msgstr ""
-
-#: ../resources/main.glade:68
-msgid "Load Mapping"
-msgstr ""
-
-#: ../resources/main.glade:73
-msgid "Load the current layer configuration from CSV"
-msgstr ""
-
-#: ../main.c:116
-#, c-format
-msgid "Logo could not be displayed: %s\n"
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:293
-msgid "No layer specification supplied."
-msgstr ""
-
-#: ../command-line.c:186
-#, c-format
-msgid "No library in library list. This should not happen.\n"
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:288
-msgid "No/invalid output file set."
-msgstr ""
-
-#: ../widgets/conv-settings-dialog.c:291
-msgid "OK"
-msgstr ""
-
-#: ../resources/main.glade:58
-msgid "Open GDS2 Database"
-msgstr ""
-
-#: ../gds-render-gui.c:287
-msgid "Open GDSII"
-msgstr ""
-
-#: ../gds-render-gui.c:284
-msgid "Open GDSII File"
-msgstr ""
-
-#: ../main.c:299
-#, c-format
-msgid "Option parsing failed: %s\n"
-msgstr ""
-
-#: ../widgets/conv-settings-dialog.c:255
-#, c-format
-msgid "Output Height: %u px"
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:283
-msgid "Output Renderer not valid."
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:304
-msgid "Output Renderer: Rendering function broken. This is a bug."
-msgstr ""
-
-#. Set the pixel sizes
-#: ../widgets/conv-settings-dialog.c:252
-#, c-format
-msgid "Output Width: %u px"
-msgstr ""
-
-#: ../main.c:282
-msgid "Output file path. Can be used multiple times."
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:298
-msgid "Output renderer called without cell to render."
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:74
-msgid "Output renderer does not define a render_output function!"
-msgstr ""
-
-#: ../main.c:283
-msgid "Path for Layer Mapping File"
-msgstr ""
-
-#: ../main.c:288
-msgid ""
-"Path to a custom shared object, that implements the necessary rendering "
-"functions"
-msgstr ""
-
-#: ../output-renderers/external-renderer.c:78
-#, c-format
-msgid "Path to shared object not set!\n"
-msgstr ""
-
-#: ../command-line.c:74
-#, c-format
-msgid "Please specify renderers and file names\n"
-msgstr ""
-
-#: ../command-line.c:104
-#, c-format
-msgid ""
-"Please specify shared object for external renderer. Will ignore this "
-"renderer.\n"
-msgstr ""
-
-#: ../main.c:277
-msgid "Print version"
-msgstr ""
-
-#: ../command-line.c:160
-#, c-format
-msgid "Probably missing argument. Check --help option\n"
-msgstr ""
-
-#: ../main.c:219
-msgid "Quit"
-msgstr ""
-
-#: ../widgets/activity-bar.c:104
-msgid "Ready"
-msgstr ""
-
-#: ../resources/dialog.glade:33
-msgid "Render PDF using Cairographics"
-msgstr ""
-
-#: ../resources/dialog.glade:48
-msgid "Render SVG using Cairographics (too buggy at the moment)"
-msgstr ""
-
-#: ../widgets/conv-settings-dialog.c:293
-msgid "Renderer Settings"
-msgstr ""
-
-#: ../output-renderers/gds-output-renderer.c:365
-msgid "Renderer already started asynchronously"
-msgstr ""
-
-#: ../main.c:279
-msgid "Renderer to use. Can be used multiple times."
-msgstr ""
-
-#: ../output-renderers/cairo-renderer.c:467
-msgid "Rendering Cairo Output..."
-msgstr ""
-
-#: ../gds-render-gui.c:554
-msgid "Rendering cell..."
-msgstr ""
-
-#: ../output-renderers/external-renderer.c:98
-#, c-format
-msgid ""
-"Rendering function not found in library:\n"
-"%s\n"
-msgstr ""
-
-#: ../resources/main.glade:86
-msgid "Save Mapping"
-msgstr ""
-
-#: ../resources/main.glade:23
-msgid "Save the current layer configuration to CSV"
-msgstr ""
-
-#: ../main.c:312
-#, c-format
-msgid "Scale < 1 not allowed. Setting to 1\n"
-msgstr ""
-
-#: ../resources/layer-widget.glade:51
-msgid "Select Layer Color and Opacity"
-msgstr ""
-
-#: ../resources/main.glade:240
-msgid "Select all layers for export"
-msgstr ""
-
-#: ../output-renderers/cairo-renderer.c:331
-#, c-format
-msgid "Size of layer %d%s%s%s: <%lf x %lf> @ (%lf | %lf)\n"
-msgstr ""
-
-#: ../resources/main.glade:195
-msgid "Sort layers ascending"
-msgstr ""
-
-#: ../resources/main.glade:210
-msgid "Sort layers descending"
-msgstr ""
-
-#: ../main.c:212
-#, c-format
-msgid ""
-"There is already an open instance. Will open second window in that "
-"instance.\n"
-msgstr ""
-
-#: ../main.c:244
-#, c-format
-msgid ""
-"This is gds-render, version: %s\n"
-"\n"
-"For a list of supported commands execute with --help option.\n"
-msgstr ""
-
-#: ../gds-utils/gds-tree-checker.c:188
-#, c-format
-msgid "Visited cell list should be empty. This is a bug. Please report this.\n"
-msgstr ""
-
-#: ../widgets/conv-settings-dialog.c:244
-#, c-format
-msgid "Width: %.3lf %sm"
-msgstr ""
-
-#: ../widgets/activity-bar.c:110
-msgid "Working..."
-msgstr ""
-
-#: ../main.c:96
-msgid ""
-"gds-render is a free tool for rendering GDS2 layout files into vector "
-"graphics."
-msgstr ""
-
-#: ../resources/layer-widget.glade:37
-msgid "label"
-msgstr ""