7 changed files with 179 additions and 206 deletions
--- a/gds-render-gui.c
+++ b/gds-render-gui.c
@ -691,13 +691,19 @@ static void on_select_all_layers_clicked(GtkWidget *button, gpointer user_data)
 	layer_selector_select_all_layers(gui->layer_selector, TRUE);
 }

-static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
+static void auto_naming_clicked(GtkWidget *button, gpointer user_data)
 {
+	GdsRenderGui *gui;
 	GtkDialog *dialog;
-	gint dialog_result;
-	gboolean overwrite = FALSE;
+	gboolean overwrite;
+	int dialog_result;
+	(void)button;

-	g_return_val_if_fail(RENDERER_IS_GUI(gui), FALSE);
+	gui = RENDERER_GUI(user_data);
+
+	/* 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,
@ -714,25 +720,6 @@ static gboolean auto_naming_ask_for_override(GdsRenderGui *gui)
 	}
 	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);
 }

--- a/include/gds-render/layer/layer-selector.h
+++ b/include/gds-render/layer/layer-selector.h
@ -130,13 +130,6 @@ 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__ */
--- a/include/gds-render/output-renderers/cairo-renderer.h
+++ b/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 (5000) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/
+#define MAX_LAYERS (300) /**< \brief Maximum layer count the output renderer can process. Typically GDS only specifies up to 255 layers.*/

 /**
 * @brief Create new CairoRenderer for SVG output
--- a/layer/layer-selector.c
+++ b/layer/layer-selector.c
@ -822,10 +822,12 @@ void layer_selector_auto_color_layers(LayerSelector *layer_selector, ColorPalett
 	unsigned int color_count;
 	GdkRGBA color;

-	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));
+	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;

 	le_list = gtk_container_get_children(GTK_CONTAINER(layer_selector->list_box));

@ -896,31 +898,4 @@ 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;
-}
-
 /** @} */
--- a/output-renderers/cairo-renderer.c
+++ b/output-renderers/cairo-renderer.c
@ -371,6 +371,8 @@ 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;
@ -379,8 +381,6 @@ 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);
--- a/resources/layer-widget.glade
+++ b/resources/layer-widget.glade
@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.22.1 -->
 <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.10</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</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="icon-name">open-menu-symbolic</property>
+            <property name="can_focus">False</property>
+            <property name="stock">gtk-justify-fill</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>
--- a/resources/main.glade
+++ b/resources/main.glade
@ -1,57 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.22.1 -->
 <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="icon-name">format-text-rich-symbolic</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-edit</property>
  </object>
  <object class="GtkImage" id="color-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">color-select-symbolic</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>
  </object>
  <object class="GtkImage" id="select-all-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-apply</property>
  </object>
  <object class="GtkImage" id="sort-down-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">view-sort-descending-symbolic</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-sort-ascending</property>
  </object>
  <object class="GtkImage" id="sort-up-img">
    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">view-sort-ascending-symbolic</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-sort-descending</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>
+    <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>
    <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>
@ -62,15 +150,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>
@ -93,20 +181,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>
@ -117,11 +205,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>
@ -132,11 +220,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>
@ -147,11 +235,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>
@ -162,11 +250,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>
@ -184,19 +272,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>
@ -225,7 +313,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/>
@ -239,75 +327,5 @@
        </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>