Merge branch 'dev'

Reviewed-on: #45

.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}}

CMakeLists.txt

@@ -38,7 +38,7 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"${CMAKE_CURRENT_BINARY_DIR}/translations/output\")
 	message("${BoldMagenta}${CMAKE_CURRENT_BINARY_DIR}/translations/output used as data dir${ColorReset}")
 else(CMAKE_BUILD_TYPE STREQUAL "Debug")
-	message("${BoldCyan}Global locale directory used. Make sure files in /usr/share/locale are available${ColorReset}")
+	message("Global locale directory used. Make sure files in /usr/share/locale are available")
 	add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"/usr/share\")
 ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
 

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.

command-line.c

@@ -146,7 +146,6 @@ int command_line_convert_gds(const char *gds_name,
 			      double scale)
 {
 	int ret = -1;
-	int render_ret;
 	GList *libs = NULL;
 	int res;
 	GList *renderer_list = NULL;
@@ -156,6 +155,10 @@ int command_line_convert_gds(const char *gds_name,
 	LayerSettings *layer_sett;
 	GdsOutputRenderer *current_renderer;
 
+	const struct gds_library_parsing_opts gds_parsing_options = {
+		.simplified_polygons = 1,
+	};
+
 	/* Check if parameters are valid */
 	if (!gds_name || !cell_name || !output_file_names || !layer_file || !renderers) {
 		printf(_("Probably missing argument. Check --help option\n"));
@@ -164,14 +167,7 @@ int command_line_convert_gds(const char *gds_name,
 
 	/* Load layer_settings */
 	layer_sett = layer_settings_new();
-	if (!layer_sett)
+	layer_settings_load_from_csv(layer_sett, layer_file);
-		goto return_value;
-
-	ret = layer_settings_load_from_csv(layer_sett, layer_file);
-	if (ret) {
-		fprintf(stderr, _("Loading layer mapping file failed.\n"));
-		goto ret_destroy_layer_mapping;
-	}
 
 	/* Create renderers */
 	if (create_renderers(renderers, output_file_names, tex_layers, tex_standalone,
@@ -181,7 +177,7 @@ int command_line_convert_gds(const char *gds_name,
 
 	/* Load GDS */
 	clear_lib_list(&libs);
-	res = parse_gds_from_file(gds_name, &libs);
+	res = parse_gds_from_file(gds_name, &libs, &gds_parsing_options);
 	if (res)
 		goto ret_destroy_library_list;
 
@@ -229,9 +225,7 @@ int command_line_convert_gds(const char *gds_name,
 	/* Execute all rendererer instances */
 	for (list_iter = renderer_list; list_iter; list_iter = list_iter->next) {
 		current_renderer = GDS_RENDER_OUTPUT_RENDERER(list_iter->data);
-		render_ret = gds_output_renderer_render_output(current_renderer, toplevel_cell, scale);
+		gds_output_renderer_render_output(current_renderer, toplevel_cell, scale);
-		if (render_ret)
-			fprintf(stderr, "Rendering failed with error code: %d\n", render_ret);
 	}
 
 ret_destroy_library_list:
@@ -241,7 +235,6 @@ ret_clear_renderers:
 		g_object_unref(list_iter->data);
 ret_destroy_layer_mapping:
 	g_object_unref(layer_sett);
-return_value:
 	return ret;
 }
 

doxygen/external-renderer.dox

@@ -22,6 +22,5 @@
  * @ref EXTERNAL_LIBRARY_RENDER_FUNCTION	| int EXTERNAL_LIBRARY_RENDER_FUNCTION(struct gds_cell *toplevel, GList *layer_info_list, const char *output_file_name, double scale)		| Render cell to output file
  * @ref EXTERNAL_LIBRARY_INIT_FUNCTION		| int EXTERNAL_LIBRARY_INIT_FUNCTION(const char *option_string, const char *version_string)							| Init function. Executed before rendering. This is given the command line parameters specified for the external renderer and the version string of the currently running gds-render program.
  * @ref EXTERNAL_LIBRARY_FORK_REQUEST		| int EXTERNAL_LIBRARY_FORK_REQUEST;														| The pure presence of this integer results in the execution inside a subprocess of hte whole shared object's code
- * @ref EXTERNAL_LIBRARY_FINALIZE_FUNCTION | int EXTERNAL_LIBRARY_FINALIZE_FUNCTION(void) | Called after rendering
  *
  */

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;
 	}
@@ -277,6 +278,10 @@ static void on_load_gds(gpointer button, gpointer user)
 	char *filename;
 	unsigned int cell_error_level;
 
+	const struct gds_library_parsing_opts gds_parsing_options = {
+		.simplified_polygons = 1,
+	};
+
 	self = RENDERER_GUI(user);
 	if (!self)
 		return;
@@ -306,7 +311,7 @@ static void on_load_gds(gpointer button, gpointer user)
 	clear_lib_list(&self->gds_libraries);
 
 	/* Parse new GDSII file */
-	gds_result = parse_gds_from_file(filename, &self->gds_libraries);
+	gds_result = parse_gds_from_file(filename, &self->gds_libraries, &gds_parsing_options);
 
 	/* Delete file name afterwards */
 	g_free(filename);
@@ -690,19 +695,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;
+	gint dialog_result;
-	int dialog_result;
+	gboolean overwrite = FALSE;
-	(void)button;
 
-	gui = RENDERER_GUI(user_data);
+	g_return_val_if_fail(RENDERER_IS_GUI(gui), FALSE);
-
-	/* Don't do anything if the selector is empty. */
-	if (!layer_selector_contains_elements(gui->layer_selector))
-		return;
 
 	/* Ask for overwrite */
 	dialog = GTK_DIALOG(gtk_message_dialog_new(gui->main_window, GTK_DIALOG_USE_HEADER_BAR, GTK_MESSAGE_QUESTION,
@@ -719,6 +718,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);
 }
 

gds-utils/gds-parser.c

@@ -266,7 +266,8 @@ static uint16_t gds_convert_unsigned_int16(const char *data)
  * @param library_ptr Return of newly created library.
  * @return Newly created list pointer
  */
-static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
+static GList *append_library(GList *curr_list, const struct gds_library_parsing_opts *opts,
+			     struct gds_library **library_ptr)
 {
 	struct gds_library *lib;
 
@@ -276,6 +277,8 @@ static GList *append_library(GList *curr_list, struct gds_library **library_ptr)
 		lib->name[0] = 0;
 		lib->unit_in_meters = GDS_DEFAULT_UNITS; // Default. Will be overwritten
 		lib->cell_names = NULL;
+		/* Copy the settings into the library */
+		memcpy(&lib->parsing_opts, opts, sizeof(struct gds_library_parsing_opts));
 	} else
 		return NULL;
 	if (library_ptr)
@@ -488,20 +491,102 @@ static void parse_reference_list(gpointer gcell_ref, gpointer glibrary)
 }
 
 /**
- * @brief Scans cell references inside cell
+ * @brief Simplify graphics objects
- This function searches all the references in \p gcell and updates the gds_cell_instance::cell_ref field in each instance
+ * @param graphics gfx struct
+ * @param user_data GDS library
+ */
+static void simplify_graphics(gpointer graphics, gpointer user_data)
+{
+	struct gds_graphics *gfx;
+	const struct gds_point *first_vertex = NULL;
+	const struct gds_point *prev_vertex = NULL;
+	const struct gds_point *current_vertex;
+	GList *vertex_iter;
+	GList *next_iter;
+	(void)user_data;
+	size_t processed_count = 0U;
+	size_t removed_count = 0U;
+
+	gfx = (struct gds_graphics *)graphics;
+	if (gfx->gfx_type == GRAPHIC_POLYGON) {
+		GDS_INF("\t\t\tPolygon found\n");
+
+		/* Loop over all vertices */
+		for (vertex_iter = gfx->vertices; vertex_iter;) {
+			current_vertex = (const struct gds_point *)vertex_iter->data;
+			next_iter = g_list_next(vertex_iter);
+			processed_count++;
+
+			if (vertex_iter == gfx->vertices) {
+				/* This is the first vertex */
+				first_vertex = current_vertex;
+				prev_vertex = NULL;
+			}
+
+			if (prev_vertex) {
+				if (current_vertex->x == prev_vertex->x && current_vertex->y == prev_vertex->y) {
+					/* Vertex is the same as the previous one */
+					GDS_INF("\t\t\t\tDuplicate vertex (%d,%d). Removing...\n",
+						current_vertex->x, current_vertex->y);
+
+					/* Delete the current one from the list */
+					gfx->vertices = g_list_remove_link(gfx->vertices, vertex_iter);
+
+					/* Free the data */
+					if (vertex_iter->data)
+						free(vertex_iter->data);
+					vertex_iter->data = NULL;
+					g_list_free_1(vertex_iter);
+					removed_count++;
+				} else if (!g_list_next(vertex_iter)) {
+					/* This is the last element in the list */
+					if (current_vertex->x == first_vertex->x &&
+							current_vertex->y == first_vertex->y) {
+						GDS_INF("\t\t\t\tLast vertex is identical to first vertex (%d,%d). Removing\n",
+							current_vertex->x, current_vertex->y);
+						gfx->vertices = g_list_remove_link(gfx->vertices, vertex_iter);
+						if (vertex_iter->data)
+							free(vertex_iter->data);
+						g_list_free_1(vertex_iter);
+						removed_count++;
+					} else {
+						GDS_WARN("First vertex is not coincident with first vertex, although the GDS file format specifies this. However, this is not a problem.");
+					}
+				}
+			}
+
+			vertex_iter = next_iter;
+			prev_vertex = current_vertex;
+		}
+		GDS_INF("\t\t\tProcessed %zu vertices. %zu removed.\n", processed_count, removed_count);
+	}
+}
+
+/**
+ * @brief Scans cell and resolves references and simplifies polygons
+ * This function searches all the references in \p gcell and updates the gds_cell_instance::cell_ref field in each instance
+ *
  * @param gcell pointer cast of #gds_cell *
  * @param library Library where the cell references are searched in
  */
-static void scan_cell_reference_dependencies(gpointer gcell, gpointer library)
+static void scan_cell_references_and_polygons(gpointer gcell, gpointer library)
 {
 	struct gds_cell *cell = (struct gds_cell *)gcell;
+	struct gds_library *my_lib = (struct gds_library *)library;
+	int simplify_polygons;
+
+	simplify_polygons = my_lib->parsing_opts.simplified_polygons;
 
 	GDS_INF("\tScanning cell: %s\n", cell->name);
-
+	GDS_INF("\t\tCell references\n");
 	/* Scan all library references */
 	g_list_foreach(cell->child_cells, parse_reference_list, library);
 
+
+	GDS_INF("\t\tSimplifying Polygons%s\n", simplify_polygons ? "" : ": skipped");
+	if (simplify_polygons) {
+		g_list_foreach(cell->graphic_objs, simplify_graphics, library);
+	}
 }
 
 /**
@@ -517,7 +602,7 @@ static void scan_library_references(gpointer library_list_item, gpointer user)
 	(void)user;
 
 	GDS_INF("Scanning Library: %s\n", lib->name);
-	g_list_foreach(lib->cells, scan_cell_reference_dependencies, lib);
+	g_list_foreach(lib->cells, scan_cell_references_and_polygons, lib);
 }
 
 /**
@@ -617,7 +702,8 @@ static void convert_aref_to_sref(struct gds_cell_array_instance *aref, struct gd
 	GDS_INF("Converted AREF to SREFs\n");
 }
 
-int parse_gds_from_file(const char *filename, GList **library_list)
+int parse_gds_from_file(const char *filename, GList **library_list,
+			const struct gds_library_parsing_opts *parsing_options)
 {
 	char *workbuff;
 	int read;
@@ -697,7 +783,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 		/* if begin: Allocate structures */
 		switch (rec_type) {
 		case BGNLIB:
-			lib_list = append_library(lib_list, &current_lib);
+			lib_list = append_library(lib_list, parsing_options, &current_lib);
 			if (lib_list == NULL) {
 				GDS_ERROR("Allocating memory failed");
 				run = -3;
@@ -771,7 +857,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 				run = -4;
 				break;
 			}
-			GDS_INF("\tEntering boundary/Box\n");
+			GDS_INF("\tEntering boundary of type %s\n", rec_type==BOUNDARY ? "polygon" : "box");
 			break;
 		case SREF:
 			if (current_cell == NULL) {
@@ -806,7 +892,9 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 			break;
 		case ENDEL:
 			if (current_graphics != NULL) {
-				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary" : "path"));
+				GDS_INF("\tLeaving %s\n", (current_graphics->gfx_type == GRAPHIC_POLYGON ? "boundary"
+							: (current_graphics->gfx_type == GRAPHIC_PATH ? "path"
+							: "box")));
 				current_graphics = NULL;
 			}
 			if (current_s_reference != NULL) {
@@ -825,11 +913,11 @@ int parse_gds_from_file(const char *filename, GList **library_list)
 
 			} else if (current_s_reference) {
 				if (rec_data_length != 8) {
-					GDS_WARN("Instance has weird coordinates. Rendered output might be screwed!");
+					GDS_WARN("Instance has weird coordinates. Rendered output might be wrong!");
 				}
 			} else if (current_a_reference) {
 				if (rec_data_length != (3*(4+4)))
-					GDS_WARN("Array instance has weird coordinates. Rendered output might be screwed!");
+					GDS_WARN("Array instance has weird coordinates. Rendered output might be wrong!");
 			}
 			break;
 		case AREF:

include/gds-render/gds-utils/gds-parser.h

@@ -48,9 +48,11 @@
  *
  * @param[in] filename Path to the GDS file
  * @param[in,out] library_array GList Pointer.
+ * @param[in] parsing_options Parsing options.
  * @return 0 if successful
  */
-int parse_gds_from_file(const char *filename, GList **library_array);
+int parse_gds_from_file(const char *filename, GList **library_array,
+                        const struct gds_library_parsing_opts *parsing_options);
 
 /**
  * @brief Deletes all libraries including cells, references etc.

include/gds-render/gds-utils/gds-types.h

@@ -129,6 +129,13 @@ struct gds_cell {
 	struct gds_cell_checks checks; /**< @brief Checking results */
 };
 
+/**
+ * @brief Options, hwo this liobrary was parsed.
+ */
+struct gds_library_parsing_opts {
+    int simplified_polygons; /**< @brief Polygons have been simplified. Coincident end point removed. */
+};
+
 /**
  * @brief GDS Toplevel library
  */
@@ -136,6 +143,7 @@ struct gds_library {
 	char name[CELL_NAME_MAX];
 	struct gds_time_field mod_time;
 	struct gds_time_field access_time;
+    struct gds_library_parsing_opts parsing_opts;
 	double unit_in_meters;  /**< Length of a database unit in meters */
 	GList *cells; /**< List of #gds_cell that contains all cells in this library*/
 	GList *cell_names /**< List of strings that contains all cell names */;

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

include/gds-render/output-renderers/external-renderer-interfaces.h

@@ -37,11 +37,6 @@
  */
 #define EXPORT_FUNC __attribute__((visibility("default")))
 
-/**
- * @brief This define is used to export a variable symbol from a shared object
- */
-#define EXPORT_VAR EXPORT_FUNC
-
 /**
  * @brief Function name expected to be found in external library for rendering.
  *
@@ -61,15 +56,6 @@
  */
 #define EXTERNAL_LIBRARY_INIT_FUNCTION exported_init
 
-/**
- * @brief Function name expected to be found in external library for finalizing.
- *
- * @code
- * int EXTERNAL_LIBRARY_FINALIZE_FUNCTION(void);
- * @endcode
- */
-#define EXTERNAL_LIBRARY_FINALIZE_FUNCTION exported_finalize
-
 /**
  * @brief Global integer specified by an external renderer to signal, that the init and render functions shall be executed in a subprocess
  *
@@ -81,29 +67,10 @@
 /**
  * @brief Define for declaring the exported functions.
  *
- * This not only helps with the declaration but also makes the symbols visible, so they can be called from outside the library
+ * This not only helps with the declaration but also makes the symbols visible, so they can be called form outside the library
  */
 #define EXPORTED_FUNC_DECL(FUNC) EXPORT_FUNC FUNC
 
-/**
- * @brief Define for declaring exported variables
- *
- * This not only helps with the declaration but also makes the symbols visible, so they can be accessed from outside the library
- */
-#define EXPORTED_VAR_DECL(VAR) EXPORT_VAR VAR
-
-/**
- * @brief Define for declaring variables based on a define expansion
- * @note If you want to declare an exported variable use @ref EXPORTED_VAR_DECL
- */
-#define VAR_DECL(VAR) VAR
-
-/**
- * @brief Define for declaring functions based on a define expansion
- * @note If you want to declare an exported function use @ref EXPORTED_FUNC_DECL
- */
-#define FUNC_DECL(FUNC) FUNC
-
 /** @} */
 
 #endif /* __EXTERNAL_RENDERER_INTERFACES_H__ */

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)
+	g_return_if_fail(GDS_RENDER_IS_COLOR_PALETTE(palette));
-		return;
+	g_return_if_fail(LAYER_IS_SELECTOR(layer_selector));
-	if (global_alpha <= 0)
+	g_return_if_fail(global_alpha > 0);
-		return;
+	g_return_if_fail(GTK_IS_LIST_BOX(layer_selector->list_box));
-	if (GTK_IS_LIST_BOX(layer_selector->list_box) == FALSE)
-		return;
 
 	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/external-renderer.c

@@ -67,7 +67,6 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *
 {
 	int (*so_render_func)(struct gds_cell *, GList *, const char *, double) = NULL;
 	int (*so_init_func)(const char *, const char *) = NULL;
-	int (*so_finalize_func)(void) = NULL;
 	void *so_handle = NULL;
 	char *error_msg;
 	int forking_req;
@@ -95,7 +94,7 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *
 	so_render_func = (int (*)(struct gds_cell *, GList *, const char *, double))
 				dlsym(so_handle, xstr(EXTERNAL_LIBRARY_RENDER_FUNCTION));
 	error_msg = dlerror();
-	if (error_msg) {
+	if (error_msg != NULL) {
 		fprintf(stderr, _("Rendering function not found in library:\n%s\n"), error_msg);
 		goto ret_close_so_handle;
 	}
@@ -103,16 +102,8 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *
 	/* Load the init function */
 	so_init_func = (int (*)(const char *, const char *))dlsym(so_handle, xstr(EXTERNAL_LIBRARY_INIT_FUNCTION));
 	error_msg = dlerror();
-	if (error_msg) {
+	if (error_msg != NULL) {
-		fprintf(stderr, _("Rendering function not found in library:\n%s\n"), error_msg);
+		fprintf(stderr, _("Init function not found in library:\n%s\n"), error_msg);
-		goto ret_close_so_handle;
-	}
-
-	/* Load the finalize function */
-	so_finalize_func = (int (*)(void))dlsym(so_handle, xstr(EXTERNAL_LIBRARY_FINALIZE_FUNCTION));
-	error_msg = dlerror();
-	if (error_msg) {
-		fprintf(stderr, "Finalize function not found in library:\n%s\n", error_msg);
 		goto ret_close_so_handle;
 	}
 
@@ -137,9 +128,6 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList *
 	if (!ret)
 		ret = so_render_func(toplevel_cell, layer_info_list, output_file, scale);
 
-	/* Finalize the external renderer */
-	ret |= so_finalize_func();
-
 	/* If we are in a separate process, terminate here */
 	if (forking_req)
 		exit(ret);

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)

plugins/CMakeLists.txt

@@ -1,4 +1,2 @@
 add_subdirectory(plugin-example)
-add_subdirectory(python-renderer)
+add_custom_target(plugins DEPENDS pluginexample)
-
-add_custom_target(plugins DEPENDS pluginexample pythonrenderer)

plugins/plugin-example/CMakeLists.txt

@@ -1,11 +1,12 @@
 project(pluginexample)
 cmake_minimum_required(VERSION 2.8)
 find_package(PkgConfig REQUIRED)
+pkg_search_module(PYTHON REQUIRED python3)
 
 aux_source_directory(src SOURCES)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
-link_libraries(version)
+link_libraries(${PYTHON_LDFLAGS} version)
 
 add_library(${PROJECT_NAME} SHARED EXCLUDE_FROM_ALL ${SOURCES})
 add_dependencies(${PROJECT_NAME} version)

plugins/plugin-example/src/plugin-main.c

@@ -25,6 +25,7 @@
  * @{
  */
 
+
 #include <stdio.h>
 #include <glib.h>
 #include <gds-render/gds-utils/gds-types.h>
@@ -45,10 +46,4 @@ int EXPORTED_FUNC_DECL(EXTERNAL_LIBRARY_INIT_FUNCTION)(const char *params, const
 	return 0;
 }
 
-int EXPORTED_FUNC_DECL(EXTERNAL_LIBRARY_FINALIZE_FUNCTION)(void)
-{
-	printf("Finalize function called.\n");
-	return 0;
-}
-
 /** @} */

plugins/python-renderer/CMakeLists.txt

@@ -1,34 +0,0 @@
-project(pythonrenderer)
-cmake_minimum_required(VERSION 2.8.8)
-find_package(PythonLibs)
-
-if(NOT WIN32)
-  string(ASCII 27 Esc)
-  set(ColorReset "${Esc}[m")
-  set(ColorBold  "${Esc}[1m")
-  set(Red         "${Esc}[31m")
-  set(Green       "${Esc}[32m")
-  set(Yellow      "${Esc}[33m")
-  set(Blue        "${Esc}[34m")
-  set(Magenta     "${Esc}[35m")
-  set(Cyan        "${Esc}[36m")
-  set(White       "${Esc}[37m")
-  set(BoldRed     "${Esc}[1;31m")
-  set(BoldGreen   "${Esc}[1;32m")
-  set(BoldYellow  "${Esc}[1;33m")
-  set(BoldBlue    "${Esc}[1;34m")
-  set(BoldMagenta "${Esc}[1;35m")
-  set(BoldCyan    "${Esc}[1;36m")
-  set(BoldWhite   "${Esc}[1;37m")
-endif()
-
-aux_source_directory(src SOURCES)
-
-include_directories(${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
-link_libraries(${PYTHON_LIBRARIES} version)
-
-message("${BoldCyan}Python version found: ${PYTHONLIBS_VERSION_STRING}${ColorReset}")
-
-add_library(${PROJECT_NAME} SHARED EXCLUDE_FROM_ALL ${SOURCES})
-add_dependencies(${PROJECT_NAME} version)
-

plugins/python-renderer/include/python-renderer/force-fork.h

@@ -1,43 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2019  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file force-fork.h
- * @brief Header file force fork variabel definition.
- *
- * This file makes the force fork variable accessible.
- * Actually this is kind of useless. However, here it is :)
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-#ifndef __PYTHON_PLUGIN_FORCE_FORK_H__
-#define __PYTHON_PLUGIN_FORCE_FORK_H__
-
-/**
- * @addtogroup python-plugin
- * @{
- */
-#include <gds-render/output-renderers/external-renderer-interfaces.h>
-
-extern const int VAR_DECL(EXTERNAL_LIBRARY_FORK_REQUEST);
-
-/** @} */
-
-#endif /* __PYTHON_PLUGIN_FORCE_FORK_H__ */
-

plugins/python-renderer/include/python-renderer/gds-render-module.h

@@ -1,49 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2019  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file gds-render-module.h
- * @brief Header file for the gds-render python module implementation
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-#ifndef __GDS_RENDER_MODULE_H__
-#define __GDS_RENDER_MODULE_H__
-
-/**
- * @addtogroup python-renderer
- * @{
- */
-
-#include <Python.h>
-
-/**
- * @brief The gds_render python module name as string
- */
-#define GDS_RENDER_MOD_NAME "gds_render"
-
-/**
- * @brief Set up the gds_render python module
- * @return New module reference
- */
-PyObject *init_gds_render_module();
-
-/** @} */
-
-#endif /* __GDS_RENDER_MODULE_H__ */

plugins/python-renderer/include/python-renderer/glist.h

@@ -1,50 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file python-renderer/glist.c
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-/**
- * @defgroup python-plugin-glist GList wrapper for python
- * @ingroup python-plugin
- * This is a wrapping class for GLists
- * @addtogroup python-plugin-glist
- * @{
- */
-
-#ifndef __GLIST_H__
-#define __GLIST_H__
-
-#ifndef PY_SSIZE_T_CLEAN
-#define PY_SSIZE_T_CLEAN
-#endif
-#include <Python.h>
-#include <glib.h>
-
-extern PyTypeObject GListType;
-
-typedef struct _GListObject GListObject;
-
-void glist_set_head_ptr(GListObject *self, GList *head);
-
-#endif /* __GLIST_H__ */
-
-/** @} */

plugins/python-renderer/src/force-fork.c

@@ -1,37 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2019  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file python-renderer/force-fork.c
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-#include <python-renderer/force-fork.h>
-
-/**
- * @addtogroup python-plugin
- * @{
- */
-
-/* The precense of this variable tells the gds-render application to execute this plugin in a separate process
- * The variable's value is don't care
- */
-const int EXPORTED_VAR_DECL(EXTERNAL_LIBRARY_FORK_REQUEST) = 1;
-
-/** @} */

plugins/python-renderer/src/gds-render-module.c

@@ -1,100 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2019  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file gds-render-module.c
- * @brief Gds-render python module implementation
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-#include <python-renderer/gds-render-module.h>
-#include <gds-render/gds-utils/gds-types.h>
-#include <python-renderer/glist.h>
-
-static PyObject *test(PyObject *self, PyObject *args)
-{
-	long int i;
-
-	if(!PyArg_ParseTuple(args, "l:get_number", &i))
-		return NULL;
-
-	i *= i;
-
-	return PyLong_FromLong(i);
-}
-
-static PyMethodDef gds_render_methods[] = {
-	{"get_number", test, METH_VARARGS, "Return the number of arguments received by the process."},
-	{NULL, NULL, 0, NULL}
-};
-
-static PyModuleDef gds_render_module_def = {
-	PyModuleDef_HEAD_INIT,
-	.m_name = GDS_RENDER_MOD_NAME,
-	.m_doc = "GDS Render Base App Module",
-	.m_size = -1,
-	.m_methods = gds_render_methods,
-	NULL, NULL, NULL, NULL
-};
-
-static int gds_render_module_check_types_ready()
-{
-	if (!PyType_Ready(&GListType))
-		return -1;
-
-	return 0;
-}
-
-static int gds_render_module_add_types(PyObject *module)
-{
-	int err;
-
-	Py_INCREF(&GListType);
-	err = PyModule_AddObject(module, "GdsPoint", (PyObject *)&GListType);
-	if (err < 0) {
-		goto decref_glist;
-	}
-
-	return 0;
-
-decref_glist:
-	Py_DECREF(&GListType);
-	return -1;
-}
-
-PyObject *init_gds_render_module(void)
-{
-	int err;
-	PyObject *gds_render_module;
-
-	if (gds_render_module_check_types_ready())
-		return NULL;
-
-	gds_render_module = PyModule_Create(&gds_render_module_def);
-
-	err = gds_render_module_add_types(gds_render_module);
-	if (err) {
-		Py_DECREF(gds_render_module);
-		gds_render_module = NULL;
-		goto return_module;
-	}
-
-return_module:
-	return gds_render_module;
-}

plugins/python-renderer/src/glist.c

@@ -1,72 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file python-renderer/glist.c
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-/**
- * @defgroup python-plugin-glist GList wrapper for python
- * @ingroup python-plugin
- * This is a wrapping class for GLists
- * This wrpper acts as a read only access to the lists
- *
- * @addtogroup python-plugin-glist
- * @{
- */
-
-#include <python-renderer/glist.h>
-
-struct _GListObject {
-	PyObject_HEAD
-	GList *head;
-	size_t len;
-};
-
-static PyObject *glist_to_list(GListObject *self, PyObject *Py_UNUSED(ignored))
-{
-	return Py_BuildValue("");
-}
-
-static PyMethodDef glist_methods[] = {
-	{"tolist", (PyCFunction)glist_to_list, METH_NOARGS, "Convert GList to editable list"}
-};
-
-void glist_set_head_ptr(GListObject *self, GList *head)
-{
-	if (!self || !head)
-		return;
-
-	self->head = head;
-	self->len = g_list_length(self->head);
-}
-
-PyTypeObject GListType = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	.tp_name = "gds_render.GList",
-	.tp_doc = "Read only GList",
-	.tp_basicsize = sizeof(GListObject),
-	.tp_itemsize = 0,
-	.tp_flags = Py_TPFLAGS_DEFAULT,
-	.tp_new = PyType_GenericNew,
-	.tp_methods = glist_methods
-};
-
-/** @} */

plugins/python-renderer/src/plugin-main.c

@@ -1,173 +0,0 @@
-/*
- * GDSII-Converter Python Plugin
- * Copyright (C) 2019  Mario Hüttel <mario.huettel@gmx.net>
- *
- * This file is part of GDSII-Converter.
- *
- * GDSII-Converter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * GDSII-Converter 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 GDSII-Converter. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file python-renderer/plugin-main.c
- * @author Mario Hüttel <mario.huettel@gmx.net>
- */
-
-/**
- * @defgroup python-plugin Python Plugin for External Renderer
- * @ingroup plugins
- * This is a plugin for calling an external python script as renderer
- * @addtogroup python-plugin
- * @{
- */
-
-#include <stdio.h>
-#include <libgen.h>
-#include <glib.h>
-#include <unistd.h>
-#include <Python.h>
-
-#include <gds-render/gds-utils/gds-types.h>
-#include <gds-render/output-renderers/external-renderer-interfaces.h>
-
-#include <python-renderer/gds-render-module.h>
-
-/**
- * @brief Global variable for loaded module. This is not very nice.
- * @warning This has to be changed, if this api wants to be re-entrant.
- */
-static PyObject *p_module = NULL;
-
-int EXPORTED_FUNC_DECL(EXTERNAL_LIBRARY_RENDER_FUNCTION)(struct gds_cell *toplevel, GList *layer_info_list, const char *output_file_name, double scale)
-{
-	int ret = 0;
-	PyObject *p_render_func;
-	PyObject *p_return_value;
-
-	if (!toplevel)
-		return -1000;
-	if (!p_module)
-		return -2000;
-
-	printf("Rendering %s\n", toplevel->name);
-
-	p_render_func = PyObject_GetAttrString(p_module, "test_func");
-	if (!p_render_func && !PyCallable_Check(p_render_func)) {
-		if (PyErr_Occurred())
-			PyErr_Print();
-		else
-			fprintf(stderr, "Function not found in python module\n");
-
-		ret = -1;
-		goto return_value;
-	}
-
-	p_return_value = PyObject_CallObject(p_render_func, NULL);
-	if (p_return_value) {
-		printf("Result of call: %ld\n", PyLong_AsLong(p_return_value));
-		Py_DECREF(p_return_value);
-	}
-
-	Py_XDECREF(p_render_func);
-
-return_value:
-	return ret;
-}
-
-int EXPORTED_FUNC_DECL(EXTERNAL_LIBRARY_INIT_FUNCTION)(const char *params, const char *version)
-{
-	int ret = 0;
-	PyObject *p_name;
-	PyObject *p_sys_path;
-	PyObject *p_mod_dir_string;
-	PyObject *gds_render_module;
-	char file_path[PATH_MAX];
-	char *file_path_for_dir;
-	char *file_path_for_base;
-	char *dir_name;
-	char *base_name;
-
-	if (!params || !version)
-		return -1000;
-
-	printf("Init with params: %s\ngds-render version: %s\n", params, version);
-
-	ret = PyImport_AppendInittab("gds_render", &init_gds_render_module);
-	if (ret) {
-		ret = -1;
-		fprintf(stderr, "Registration of gds_render python module failed\n");
-		goto return_value;
-	}
-
-	Py_Initialize();
-
-	if (!realpath(params, file_path)) {
-		ret = -2;
-		fprintf(stderr, "Invalid file name.\n");
-		goto return_value;
-	}
-
-	file_path_for_dir = strdup(file_path);
-	if (!file_path_for_dir) {
-		ret = -3;
-		goto return_value;
-	}
-
-	file_path_for_base = strdup(file_path);
-	if (!file_path_for_base) {
-		ret = -3;
-		free (file_path_for_dir);
-		goto return_value;
-	}
-
-	dir_name = dirname(file_path_for_dir);
-	base_name = basename(file_path_for_base);
-
-	printf("Dir name : %s\n BAse name: %s\n", dir_name, base_name);
-
-	p_sys_path = PySys_GetObject("path");
-	p_mod_dir_string = PyUnicode_FromString(dir_name);
-	PyList_Append(p_sys_path, p_mod_dir_string);
-	Py_DECREF(p_mod_dir_string);
-
-	p_name = PyUnicode_DecodeFSDefault(strtok(base_name, "."));
-	p_module = PyImport_Import(p_name);
-	Py_DECREF(p_name);
-
-	if (!p_module) {
-		PyErr_Print();
-		fprintf(stderr, "Failed to load %s\n", params);
-		ret = -1;
-		goto return_value;
-	}
-
-	free(file_path_for_dir);
-	free(file_path_for_base);
-
-return_value:
-	return ret;
-}
-
-int EXPORTED_FUNC_DECL(EXTERNAL_LIBRARY_FINALIZE_FUNCTION)(void)
-{
-	int ret;
-
-	printf("Finalizing\n");
-
-	if (p_module)
-		Py_DECREF(p_module);
-
-	ret = Py_FinalizeEx();
-	return ret;
-}
-
-/** @} */

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="step-increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</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="can-focus">False</property>
-            <property name="stock">gtk-justify-fill</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="can-focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="receives-default">True</property>
-        <property name="use_alpha">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="can-focus">True</property>
-        <property name="receives_default">False</property>
+        <property name="receives-default">False</property>
-        <property name="draw_indicator">True</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="can-focus">False</property>
-    <property name="stock">gtk-edit</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="can-focus">False</property>
-    <property name="stock">gtk-select-color</property>
+    <property name="icon-name">color-select-symbolic</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>
   </object>
   <object class="GtkImage" id="select-all-img">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="stock">gtk-apply</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="can-focus">False</property>
-    <property name="stock">gtk-sort-ascending</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="can-focus">False</property>
-    <property name="stock">gtk-sort-descending</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="height-request">250</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
-    <property name="icon_name">gds-render</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>
     <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="can-focus">True</property>
-                    <property name="primary_icon_name">edit-find-symbolic</property>
+                    <property name="primary-icon-name">edit-find-symbolic</property>
-                    <property name="primary_icon_activatable">False</property>
+                    <property name="primary-icon-activatable">False</property>
-                    <property name="primary_icon_sensitive">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="can-focus">True</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="hscrollbar-policy">never</property>
-                    <property name="shadow_type">in</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="can-focus">True</property>
-                        <property name="enable_search">False</property>
+                        <property name="enable-search">False</property>
-                        <property name="enable_grid_lines">both</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="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers ascending</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="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort layers descending</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="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically color layers</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="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Select all layers for export</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="can-focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="receives-default">True</property>
-                        <property name="tooltip_text" translatable="yes">Automatically name layers</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="can-focus">True</property>
-                    <property name="margin_top">1</property>
+                    <property name="margin-top">1</property>
-                    <property name="hscrollbar_policy">never</property>
+                    <property name="hscrollbar-policy">never</property>
-                    <property name="shadow_type">in</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="can-focus">False</property>
-                            <property name="selection_mode">none</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>