Command line: Fix auto-guessing of SVG file name.

Add version number to about dialog
Add documentation target, which at the moment is only an alias for the
2019-03-15 18:03:29 +01:00 · 2019-03-14 21:01:16 +01:00 · 2019-03-14 19:24:17 +01:00 · 2019-03-14 19:10:06 +01:00 · 2019-03-14 19:02:17 +01:00 · 2019-03-13 22:54:52 +01:00
16 changed files with 583 additions and 90 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ pkg_check_modules(CAIRO REQUIRED cairo)

 add_subdirectory(glade)
 add_subdirectory(doxygen)
+add_subdirectory(version)

 include_directories(${GLIB_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS})
 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
@@ -19,7 +20,8 @@ aux_source_directory("gds-parser" PARSER_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)
 aux_source_directory("cairo-output" CAIRO_SOURCES)
 aux_source_directory("trigonometric" TRIG_SOURCES)
-set(SOURCE "main.c" "layer-selector.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")
+aux_source_directory("layer-selector" LAYER_SELECTOR_SOURCES)
+set(SOURCE "main.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")

 set(SOURCE
  ${SOURCE}
@@ -29,13 +31,16 @@ set(SOURCE
  ${LATEX_SOURCES}
  ${CAIRO_SOURCES}
  ${TRIG_SOURCES}
+  ${LAYER_SELECTOR_SOURCES}
 )

 add_compile_options(-Wall)

 add_executable(${PROJECT_NAME} ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c)
 add_dependencies(${PROJECT_NAME} glib-resources)
+add_dependencies(${PROJECT_NAME} version)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/glade/resources.c PROPERTIES GENERATED 1)
-target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m ${CMAKE_DL_LIBS})
+target_link_libraries(${PROJECT_NAME} ${GLIB_LDFLAGS} ${GTK3_LDFLAGS} ${CAIRO_LDFLAGS} m version ${CMAKE_DL_LIBS})
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)

+add_custom_target(documentation DEPENDS doxygen)
--- a/cairo-output/cairo-output.h
+++ b/cairo-output/cairo-output.h
@@ -24,7 +24,7 @@
 #ifndef __CAIRO_OUTPUT_H__
 #define __CAIRO_OUTPUT_H__

-#include "../layer-selector.h"
+#include "../layer-selector/layer-selector.h"
 #include "../gds-parser/gds-types.h"

 /** @addtogroup Cairo-Renderer
--- a/command-line.c
+++ b/command-line.c
@@ -42,6 +42,7 @@
 *
 * Like delete_layer_info_struct() but also frees layer_info::name
 * @param info
+ * @warning This function must not be used if the layer_info::name field references the internal storage strings if e.g. an entry field
 */
 static void delete_layer_info_with_name(struct layer_info *info)
 {
--- a/doxygen/CMakeLists.txt
+++ b/doxygen/CMakeLists.txt
@@ -1,10 +1,10 @@
 find_package(Doxygen)
+
 if (DOXYGEN_FOUND)
 	add_custom_target(doxygen
 		COMMAND ./build-doxygen.sh "${PROJECT_BINARY_DIR}"
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 		COMMENT "Generating documentation with Doxygen")
-		
 else (DOXYGEN_FOUND)
  message("Doxygen need to be installed to generate the doxygen documentation")
 endif (DOXYGEN_FOUND)
--- a/glade/main.glade
+++ b/glade/main.glade
@@ -2,17 +2,26 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-up</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
  <object class="GtkWindow" id="main-window">
    <property name="height_request">250</property>
    <property name="can_focus">False</property>
    <property name="icon_name">gds-render</property>
    <child type="titlebar">
-      <object class="GtkHeaderBar">
+      <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 Renderer</property>
-        <property name="subtitle" translatable="yes">GDSII to PDF/TikZ Converter</property>
        <property name="show_close_button">True</property>
        <child>
          <object class="GtkButton" id="button-load-gds">
@@ -133,23 +142,74 @@
          </packing>
        </child>
        <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkBox">
            <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">False</property>
+            <property name="orientation">vertical</property>
            <child>
-              <object class="GtkViewport">
+              <object class="GtkBox">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
-                  <object class="GtkListBox" id="layer-list">
+                  <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="image">image1</property>
+                    <property name="always_show_image">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <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="image">image2</property>
+                    <property name="always_show_image">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <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>
+                <child>
+                  <object class="GtkViewport">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
-                    <property name="selection_mode">none</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>
+                      </object>
+                    </child>
                  </object>
                </child>
              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
            </child>
          </object>
          <packing>
--- a/layer-selector/layer-selector-dnd.c
+++ b/layer-selector/layer-selector-dnd.c
@@ -0,0 +1,231 @@
+/*
+ * GDSII-Converter
+ * 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/>.
+ */
+
+/*
+ * Original Drag and Drop Code taken from:
+ * https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/tests/testlist3.c
+ */
+
+/**
+ * @file layer-selector-dnd.c
+ * @brief This file implements the drag and drop functions regarding the list box containing the layer elements
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+#include "layer-selector-dnd.h"
+
+static GtkTargetEntry entries[] = {
+	{ "GTK_LIST_BOX_ROW", GTK_TARGET_SAME_APP, 0 }
+};
+
+static GtkListBoxRow *layer_selector_get_last_row (GtkListBox *list)
+{
+	int i;
+	GtkListBoxRow *row;
+
+	row = NULL;
+	for (i = 0; ; i++) {
+		GtkListBoxRow *tmp;
+		tmp = gtk_list_box_get_row_at_index(list, i);
+		if (tmp == NULL)
+			break;
+		row = tmp;
+	}
+
+	return row;
+}
+
+
+static GtkListBoxRow *layer_selector_get_row_before (GtkListBox *list, GtkListBoxRow *row)
+{
+	int pos;
+
+	pos = gtk_list_box_row_get_index (row);
+	return gtk_list_box_get_row_at_index (list, pos - 1);
+}
+
+static GtkListBoxRow *layer_selector_get_row_after (GtkListBox *list, GtkListBoxRow *row)
+{
+	int pos;
+
+	pos = gtk_list_box_row_get_index(row);
+	return gtk_list_box_get_row_at_index(list, pos + 1);
+}
+
+static void layer_selector_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
+					     GtkSelectionData *selection_data, guint info, guint32 time,
+					     gpointer data)
+{
+	GtkWidget *row_before, *row_after;
+	GtkWidget *row;
+	GtkWidget *source;
+	int pos;
+
+	row_before = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-before"));
+	row_after = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-after"));
+
+	g_object_set_data(G_OBJECT(widget), "row-before", NULL);
+	g_object_set_data(G_OBJECT(widget), "row-after", NULL);
+
+	if (row_before)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_before), "drag-hover-bottom");
+	if (row_after)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_after), "drag-hover-top");
+
+	row = (gpointer) *((gpointer *)gtk_selection_data_get_data(selection_data));
+	source = gtk_widget_get_ancestor(row, GTK_TYPE_LIST_BOX_ROW);
+
+	if (source == row_after)
+		return;
+
+	g_object_ref(source);
+	gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(source)), source);
+
+	if (row_after)
+		pos = gtk_list_box_row_get_index(GTK_LIST_BOX_ROW(row_after));
+	else
+		pos = gtk_list_box_row_get_index(GTK_LIST_BOX_ROW(row_before)) + 1;
+
+	gtk_list_box_insert(GTK_LIST_BOX(widget), source, pos);
+	g_object_unref(source);
+}
+
+static gboolean layer_selector_drag_motion(GtkWidget *widget, GdkDragContext *context, int x, int y, guint time)
+{
+	GtkAllocation alloc;
+	GtkWidget *row;
+	int hover_row_y;
+	int hover_row_height;
+	GtkWidget *drag_row;
+	GtkWidget *row_before;
+	GtkWidget *row_after;
+
+	row = GTK_WIDGET(gtk_list_box_get_row_at_y(GTK_LIST_BOX(widget), y));
+
+	drag_row = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "drag-row"));
+	row_after = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-after"));
+	row_before = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-before"));
+
+	gtk_style_context_remove_class(gtk_widget_get_style_context(drag_row), "drag-hover");
+	if (row_before)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_before), "drag-hover-bottom");
+	if (row_after)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_after), "drag-hover-top");
+
+	if (row) {
+		gtk_widget_get_allocation(row, &alloc);
+		hover_row_y = alloc.y;
+		hover_row_height = alloc.height;
+
+		if (y < hover_row_y + hover_row_height/2) {
+			row_after = row;
+			row_before = GTK_WIDGET(layer_selector_get_row_before(GTK_LIST_BOX(widget), GTK_LIST_BOX_ROW(row)));
+		} else {
+			row_before = row;
+			row_after = GTK_WIDGET(layer_selector_get_row_after(GTK_LIST_BOX(widget), GTK_LIST_BOX_ROW(row)));
+		}
+	} else {
+		row_before = GTK_WIDGET(layer_selector_get_last_row(GTK_LIST_BOX(widget)));
+		row_after = NULL;
+	}
+
+	g_object_set_data(G_OBJECT(widget), "row-before", row_before);
+	g_object_set_data(G_OBJECT(widget), "row-after", row_after);
+
+	if (drag_row == row_before || drag_row == row_after) {
+		gtk_style_context_add_class(gtk_widget_get_style_context(drag_row), "drag-hover");
+		return FALSE;
+	}
+
+	if (row_before)
+		gtk_style_context_add_class(gtk_widget_get_style_context(row_before), "drag-hover-bottom");
+	if (row_after)
+		gtk_style_context_add_class(gtk_widget_get_style_context(row_after), "drag-hover-top");
+
+	return TRUE;
+}
+
+static void layer_selector_drag_leave(GtkWidget *widget, GdkDragContext *context, guint time)
+{
+	GtkWidget *drag_row;
+	GtkWidget *row_before;
+	GtkWidget *row_after;
+
+	drag_row = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "drag-row"));
+	row_before = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-before"));
+	row_after = GTK_WIDGET(g_object_get_data(G_OBJECT(widget), "row-after"));
+
+	gtk_style_context_remove_class(gtk_widget_get_style_context(drag_row), "drag-hover");
+	if (row_before)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_before), "drag-hover-bottom");
+	if (row_after)
+		gtk_style_context_remove_class(gtk_widget_get_style_context(row_after), "drag-hover-top");
+
+}
+
+static const char *dnd_additional_css =
+  ".row:not(:first-child) { "
+  "  border-top: 1px solid alpha(gray,0.5); "
+  "  border-bottom: 1px solid transparent; "
+  "}"
+  ".row:first-child { "
+  "  border-top: 1px solid transparent; "
+  "  border-bottom: 1px solid transparent; "
+  "}"
+  ".row:last-child { "
+  "  border-top: 1px solid alpha(gray,0.5); "
+  "  border-bottom: 1px solid alpha(gray,0.5); "
+  "}"
+  ".row.drag-icon { "
+  "  background: #282828; "
+  "  border: 1px solid blue; "
+  "}"
+  ".row.drag-row { "
+  "  color: gray; "
+  "  background: alpha(gray,0.2); "
+  "}"
+  ".row.drag-row.drag-hover { "
+  "  border-top: 1px solid #4e9a06; "
+  "  border-bottom: 1px solid #4e9a06; "
+  "}"
+  ".row.drag-hover image, "
+  ".row.drag-hover label { "
+  "  color: #4e9a06; "
+  "}"
+  ".row.drag-hover-top {"
+  "  border-top: 1px solid #4e9a06; "
+  "}"
+  ".row.drag-hover-bottom {"
+  "  border-bottom: 1px solid #4e9a06; "
+  "}";
+
+void layer_selector_list_box_setup_dnd(GtkListBox *box)
+{
+	GtkCssProvider *provider;
+
+	provider = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (provider, dnd_additional_css, -1, NULL);
+	gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider), 800);
+
+	gtk_drag_dest_set(GTK_WIDGET(box), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 1, GDK_ACTION_MOVE);
+	g_signal_connect(box, "drag-data-received", G_CALLBACK(layer_selector_drag_data_received), NULL);
+	g_signal_connect(box, "drag-motion", G_CALLBACK(layer_selector_drag_motion), NULL);
+	g_signal_connect(box, "drag-leave", G_CALLBACK(layer_selector_drag_leave), NULL);
+
+}
--- a/layer-selector/layer-selector-dnd.h
+++ b/layer-selector/layer-selector-dnd.h
@@ -0,0 +1,33 @@
+/*
+ * GDSII-Converter
+ * 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 layer-selector-dnd.h
+ * @brief Header for drag and drop of layer selector
+ * @author Mario Hüttel <mario.huettel@gmx.net>
+ */
+
+#ifndef _LAYER_SELECTOR_DND_H_
+#define _LAYER_SELECTOR_DND_H_
+
+#include <gtk/gtk.h>
+
+void layer_selector_list_box_setup_dnd(GtkListBox *box);
+
+#endif /* _LAYER_SELECTOR_DND_H_ */
--- a/layer-selector/layer-selector.c
+++ b/layer-selector/layer-selector.c
@@ -29,8 +29,8 @@
 */

 #include "layer-selector.h"
-#include "gds-parser/gds-parser.h"
-#include "widgets/layer-element.h"
+#include "../gds-parser/gds-parser.h"
+#include "../widgets/layer-element.h"
 #include <glib.h>
 #include <string.h>
 #include <stdio.h>
@@ -155,19 +155,30 @@ static void analyze_cell_layers(GtkListBox *listbox, struct gds_cell *cell)
 * @param row1
 * @param row2
 * @param unused
- * @note Do not use this function
- * @return
+ * @note Do not use this function. This is an internal callback
+ * @return See sort function documentation of GTK+
 */
 static gint sort_func(GtkListBoxRow *row1, GtkListBoxRow *row2, gpointer unused)
 {
 	LayerElement *le1, *le2;
 	gint ret;
+	static const enum layer_selector_sort_algo default_sort = LAYER_SELECTOR_SORT_DOWN;
+	const enum layer_selector_sort_algo *algo = (const enum layer_selector_sort_algo *)unused;
+
+	/* Assume downward sorting */
+	/* TODO: This is nasty. Find a better way */
+	if (!algo)
+		algo = &default_sort;

 	le1 = LAYER_ELEMENT(row1);
 	le2 = LAYER_ELEMENT(row2);

+	/* Determine sort fow downward sort */
 	ret = layer_element_get_layer(le1) - layer_element_get_layer(le2);

+	/* Change order if upward sort is requested */
+	ret *= (*algo == LAYER_SELECTOR_SORT_DOWN ? 1 : -1);
+
 	return ret;
 }

@@ -179,7 +190,6 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
 	global_list_box = listbox;

 	clear_list_box_widgets(listbox);
-	gtk_list_box_set_sort_func(listbox, sort_func, NULL, NULL);

 	for (; libs != NULL; libs = libs->next) {
 		lib = (struct gds_library *)libs->data;
@@ -188,11 +198,8 @@ void generate_layer_widgets(GtkListBox *listbox, GList *libs)
 		} /* For Cell List */
 	} /* For libs */

-	/* Force sort */
-	gtk_list_box_invalidate_sort(listbox);
-
-	/* Disable sort, so user can sort layers */
-	gtk_list_box_set_sort_func(listbox, NULL, NULL, NULL);
+	/* Sort the layers */
+	layer_selector_force_sort(LAYER_SELECTOR_SORT_DOWN);

 	/* Activate Buttons */
 	gtk_widget_set_sensitive(global_load_button, TRUE);
@@ -435,4 +442,15 @@ void setup_save_mapping_callback(GtkWidget *button,  GtkWindow *main_window)
 	g_signal_connect(button, "clicked", G_CALLBACK(save_mapping_clicked), main_window);
 }

+void layer_selector_force_sort(enum layer_selector_sort_algo sort_function)
+{
+	if (!global_list_box)
+		return;
+
+	/* Set dorting function, sort, and disable sorting function */
+	gtk_list_box_set_sort_func(global_list_box, sort_func, (gpointer)&sort_function, NULL);
+	gtk_list_box_invalidate_sort(global_list_box);
+	gtk_list_box_set_sort_func(global_list_box, NULL, NULL, NULL);
+}
+
 /** @} */
--- a/layer-selector/layer-selector.h
+++ b/layer-selector/layer-selector.h
@@ -28,7 +28,12 @@

 #include <gtk/gtk.h>
 #include <glib.h>
-#include "mapping-parser.h"
+#include "../mapping-parser.h"
+
+/**
+ * @brief Defines how to sort the layer selector list box.
+ */
+enum layer_selector_sort_algo {LAYER_SELECTOR_SORT_DOWN = 0, LAYER_SELECTOR_SORT_UP};

 /**
 * @brief Generate layer widgets in \p listbox
@@ -64,4 +69,14 @@ GList *export_rendered_layer_info();
 * @note The layer_info::name Element has to be freed manually
 */
 void delete_layer_info_struct(struct layer_info *info);
+
+/**
+ * @brief Force sorting of the layer selector in a specified way
+ *
+ * If the layer selector is not yet set up, this function has no effect.
+ *
+ * @param sort_function Sorting direction
+ */
+void layer_selector_force_sort(enum layer_selector_sort_algo sort_function);
+
 #endif /* __LAYER_SELECTOR_H__ */
--- a/main-window.c
+++ b/main-window.c
@@ -31,15 +31,16 @@
 #include <stdio.h>
 #include "gds-parser/gds-parser.h"
 #include <gtk/gtk.h>
-#include "layer-selector.h"
+#include "layer-selector/layer-selector.h"
+#include "layer-selector/layer-selector-dnd.h"
 #include "tree-renderer/tree-store.h"
 #include "latex-output/latex-output.h"
 #include "widgets/conv-settings-dialog.h"
 #include "cairo-output/cairo-output.h"
 #include "trigonometric/cell-trigonometrics.h"
+#include "version/version.h"
 #include "tree-renderer/lib-cell-renderer.h"
 #include "gds-parser/gds-tree-checker.h"
-
 /**
 * @brief User data supplied to callback function of the open button
 */
@@ -224,6 +225,7 @@ end_destroy:
 */
 static void on_convert_clicked(gpointer button, gpointer user)
 {
+	(void)button;
 	static struct render_settings sett = {
 		.scale = 1000.0,
 		.renderer = RENDERER_LATEX_TIKZ,
@@ -243,6 +245,9 @@ static void on_convert_clicked(gpointer button, gpointer user)
 	union bounding_box cell_box;
 	unsigned int height, width;

+	if (!data)
+		return;
+
 	/* Get selected cell */
 	selection = gtk_tree_view_get_selection(data->tree_view);
 	if (gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
@@ -342,6 +347,21 @@ ret_layer_destroy:
 	g_list_free_full(layer_list, (GDestroyNotify)delete_layer_info_struct);
 }

+/**
+ * @brief cell_tree_view_activated
+ * @param tree_view Not used
+ * @param user convert button data
+ */
+static void cell_tree_view_activated(gpointer tree_view, GtkTreePath *path,
+				     GtkTreeViewColumn *column, gpointer user)
+{
+	(void)tree_view;
+	(void)path;
+	(void)column;
+
+	on_convert_clicked(NULL, user);
+}
+

 /**
 * @brief Callback for cell-selection change event
@@ -364,6 +384,22 @@ static void cell_selection_changed(GtkTreeSelection *sel, GtkWidget *convert_but
 	}
 }

+static void sort_up_callback(GtkWidget *widget, gpointer user)
+{
+	(void)widget;
+	(void)user;
+
+	layer_selector_force_sort(LAYER_SELECTOR_SORT_UP);
+}
+
+static void sort_down_callback(GtkWidget *widget, gpointer user)
+{
+	(void)widget;
+	(void)user;
+
+	layer_selector_force_sort(LAYER_SELECTOR_SORT_DOWN);
+}
+
 GtkWindow *create_main_window()
 {
 	GtkBuilder *main_builder;
@@ -371,10 +407,13 @@ GtkWindow *create_main_window()
 	GtkWidget *listbox;
 	GtkWidget *conv_button;
 	GtkWidget *search_entry;
+	GtkHeaderBar *header_bar;
 	static GList *gds_libs;
 	static struct open_button_data open_data;
 	static struct convert_button_data conv_data;
 	struct tree_stores *cell_selector_stores;
+	GtkWidget *sort_up_button;
+	GtkWidget *sort_down_button;

 	main_builder = gtk_builder_new_from_resource("/main.glade");
 	gtk_builder_connect_signals(main_builder, NULL);
@@ -402,6 +441,9 @@ GtkWindow *create_main_window()
 	g_signal_connect(conv_button, "clicked", G_CALLBACK(on_convert_clicked), &conv_data);

 	listbox = GTK_WIDGET(gtk_builder_get_object(main_builder, "layer-list"));
+	/* Set up the list box sided callbacks for drag and drop */
+	layer_selector_list_box_setup_dnd(GTK_LIST_BOX(listbox));
+
 	open_data.layer_box = GTK_LIST_BOX(listbox);

 	/* Set buttons fpr layer mapping GUI */
@@ -413,6 +455,18 @@ GtkWindow *create_main_window()
 	/* Callback for selection change of cell selector */
 	g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(cell_tree)), "changed",
 			 G_CALLBACK(cell_selection_changed), conv_button);
+	g_signal_connect(cell_tree, "row-activated", G_CALLBACK(cell_tree_view_activated), &conv_data);
+
+	/* Set version in main window subtitle */
+	header_bar = GTK_HEADER_BAR(gtk_builder_get_object(main_builder, "header-bar"));
+	gtk_header_bar_set_subtitle(header_bar, _app_version_string);
+
+	/* Get layer sorting buttons and set callbacks */
+	sort_up_button = GTK_WIDGET(gtk_builder_get_object(main_builder, "button-up-sort"));
+	sort_down_button = GTK_WIDGET(gtk_builder_get_object(main_builder, "button-down-sort"));
+
+	g_signal_connect(sort_up_button, "clicked", G_CALLBACK(sort_up_callback), NULL);
+	g_signal_connect(sort_down_button, "clicked", G_CALLBACK(sort_down_callback), NULL);

 	g_object_unref(main_builder);

--- a/main.c
+++ b/main.c
@@ -23,10 +23,11 @@
 #include "main-window.h"
 #include "command-line.h"
 #include "external-renderer.h"
+#include "version/version.h"

 struct application_data {
-	GtkApplication *app;
-	GtkWindow *main_window;
+		GtkApplication *app;
+		GtkWindow *main_window;
 };

 static void app_quit(GSimpleAction *action, GVariant *parameter, gpointer user_data)
@@ -49,6 +50,7 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 	builder = gtk_builder_new_from_resource("/about.glade");
 	dialog = GTK_DIALOG(gtk_builder_get_object(builder, "about-dialog"));
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), appdata->main_window);
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), _app_version_string);
 	gtk_dialog_run(dialog);

 	gtk_widget_destroy(GTK_WIDGET(dialog));
@@ -56,8 +58,8 @@ static void app_about(GSimpleAction *action, GVariant *parameter, gpointer user_
 }

 const static GActionEntry app_actions[] = {
-	{"quit", app_quit},
-	{"about", app_about}
+	{"quit", app_quit, NULL, NULL, NULL, {0}},
+	{"about", app_about, NULL, NULL, NULL, {0}}
 };

 static void gapp_activate(GApplication *app, gpointer user_data)
@@ -81,7 +83,7 @@ static int start_gui(int argc, char **argv)
 	GMenu *m_quit;
 	GMenu *m_about;

-	gapp = gtk_application_new("de.shimatta.gds-render", G_APPLICATION_FLAGS_NONE);
+	gapp = gtk_application_new("de.shimatta.gds-render", G_APPLICATION_NON_UNIQUE);
 	g_application_register(G_APPLICATION(gapp), NULL, NULL);
 	g_signal_connect(gapp, "activate", G_CALLBACK(gapp_activate), &appdata);

@@ -106,6 +108,12 @@ static int start_gui(int argc, char **argv)
 	return app_status;
 }

+static void print_version()
+{
+	printf("This is gds-render, version: %s\n\nFor a list of supported commands execute with --help option.\n",
+	       _app_version_string);
+}
+
 int main(int argc, char **argv)
 {
 	GError *error = NULL;
@@ -114,26 +122,28 @@ int main(int argc, char **argv)
 	gchar *basename;
 	gchar *pdfname = NULL, *texname = NULL, *mappingname = NULL, *cellname = NULL, *svgname = NULL;
 	gboolean tikz = FALSE, pdf = FALSE, pdf_layers = FALSE, pdf_standalone = FALSE, svg = FALSE;
+	gboolean version = FALSE;
 	gchar *custom_library_path = NULL;
 	gchar *custom_library_file_name = NULL;
 	int scale = 1000;
-	int app_status;
+	int app_status = 0;

 	GOptionEntry entries[] = {
-	  {"tikz", 't', 0, G_OPTION_ARG_NONE, &tikz, "Output TikZ code", NULL },
-	  {"pdf", 'p', 0, G_OPTION_ARG_NONE, &pdf, "Output PDF document", NULL },
-	  //{"svg", 'S', 0, G_OPTION_ARG_NONE, &svg, "Output SVG image", NULL },
-	  {"scale", 's', 0, G_OPTION_ARG_INT, &scale, "Divide output coordinates by <SCALE>", "<SCALE>" },
-	  {"tex-output", 'o', 0, G_OPTION_ARG_FILENAME, &texname, "Optional path for TeX file", "PATH" },
-	  {"pdf-output", 'O', 0, G_OPTION_ARG_FILENAME, &pdfname, "Optional path for PDF file", "PATH" },
-	  //{"svg-output", 0, 0, G_OPTION_ARG_FILENAME, &svgname, "Optional path for PDF file", "PATH"},
-	  {"mapping", 'm', 0, G_OPTION_ARG_FILENAME, &mappingname, "Path for Layer Mapping File", "PATH" },
-	  {"cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, "Cell to render", "NAME" },
-	  {"tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, "Create standalone PDF", NULL },
-	  {"tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, "Create PDF Layers (OCG)", NULL },
-	  {"custom-render-lib", 'P', 0, G_OPTION_ARG_FILENAME, &custom_library_path, "Path to a custom shared object, that implements the " EXTERNAL_LIBRARY_FUNCTION " function", "PATH"},
-	  {"external-lib-output", 'e', 0, G_OPTION_ARG_FILENAME, &custom_library_file_name, "Output path for external render library", "PATH"},
-	  {NULL}
+		{"version", 'v', 0, G_OPTION_ARG_NONE, &version, "Print version", NULL},
+		{"tikz", 't', 0, G_OPTION_ARG_NONE, &tikz, "Output TikZ code", NULL },
+		{"pdf", 'p', 0, G_OPTION_ARG_NONE, &pdf, "Output PDF document", NULL },
+		//{"svg", 'S', 0, G_OPTION_ARG_NONE, &svg, "Output SVG image", NULL },
+		{"scale", 's', 0, G_OPTION_ARG_INT, &scale, "Divide output coordinates by <SCALE>", "<SCALE>" },
+		{"tex-output", 'o', 0, G_OPTION_ARG_FILENAME, &texname, "Optional path for TeX file", "PATH" },
+		{"pdf-output", 'O', 0, G_OPTION_ARG_FILENAME, &pdfname, "Optional path for PDF file", "PATH" },
+		//{"svg-output", 0, 0, G_OPTION_ARG_FILENAME, &svgname, "Optional path for PDF file", "PATH"},
+		{"mapping", 'm', 0, G_OPTION_ARG_FILENAME, &mappingname, "Path for Layer Mapping File", "PATH" },
+		{"cell", 'c', 0, G_OPTION_ARG_STRING, &cellname, "Cell to render", "NAME" },
+		{"tex-standalone", 'a', 0, G_OPTION_ARG_NONE, &pdf_standalone, "Create standalone PDF", NULL },
+		{"tex-layers", 'l', 0, G_OPTION_ARG_NONE, &pdf_layers, "Create PDF Layers (OCG)", NULL },
+		{"custom-render-lib", 'P', 0, G_OPTION_ARG_FILENAME, &custom_library_path, "Path to a custom shared object, that implements the " EXTERNAL_LIBRARY_FUNCTION " function", "PATH"},
+		{"external-lib-output", 'e', 0, G_OPTION_ARG_FILENAME, &custom_library_file_name, "Output path for external render library", "PATH"},
+		{NULL}
 	};

 	context = g_option_context_new(" FILE - Convert GDS file <FILE> to graphic");
@@ -145,6 +155,11 @@ int main(int argc, char **argv)
 		exit(1);
 	}

+	if (version) {
+		print_version();
+		goto ret_status;
+	}
+
 	if (argc >= 2) {
 		if (scale < 1) {
 			printf("Scale < 1 not allowed. Setting to 1\n");
@@ -167,13 +182,13 @@ int main(int argc, char **argv)
 		if (!pdfname)
 			pdfname = g_strdup_printf("./%s.pdf", basename);

-		if (!pdfname)
-			pdfname = g_strdup_printf("./%s.svg", basename);
+		if (!svgname)
+			svgname = g_strdup_printf("./%s.svg", basename);

 		command_line_convert_gds(gds_name, pdfname, texname, pdf, tikz,
-					mappingname, cellname, (double)scale,
-					pdf_layers, pdf_standalone, svg, svgname,
-					custom_library_path, custom_library_file_name);
+					 mappingname, cellname, (double)scale,
+					 pdf_layers, pdf_standalone, svg, svgname,
+					 custom_library_path, custom_library_file_name);
 		/* Clean up */
 		g_free(pdfname);
 		g_free(texname);
@@ -188,5 +203,6 @@ int main(int argc, char **argv)
 		app_status = start_gui(argc, argv);
 	}

+ret_status:
 	return app_status;
 }
--- a/version/CMakeLists.txt
+++ b/version/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(version STATIC "version.c")
+execute_process(COMMAND bash ./generate-version-string.sh
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}		
+		OUTPUT_VARIABLE GIT_VER)
+target_compile_definitions(version PUBLIC PROJECT_GIT_VERSION=${GIT_VER})
--- a/version/generate-version-string.sh
+++ b/version/generate-version-string.sh
@@ -0,0 +1 @@
+git describe --tags
--- a/version/version.c
+++ b/version/version.c
@@ -0,0 +1,34 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2018  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/>.
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+#ifdef PROJECT_GIT_VERSION
+
+#define xstr(a) str(a)
+#define str(a) #a
+const char *_app_version_string = xstr(PROJECT_GIT_VERSION);
+#else
+const char *_app_version_string = "! version not set !";
+#endif
+
+/** @} */
--- a/version/version.h
+++ b/version/version.h
@@ -0,0 +1,28 @@
+/*
+ * GDSII-Converter
+ * Copyright (C) 2018  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/>.
+ */
+
+/**
+ * @addtogroup MainApplication
+ * @{
+ */
+
+/** @brief This string holds the 'git describe' version of the app */
+extern char *_app_version_string;
+
+/** @} */
--- a/widgets/layer-element.c
+++ b/widgets/layer-element.c
@@ -17,9 +17,16 @@
 * along with GDSII-Converter.  If not, see <http://www.gnu.org/licenses/>.
 */

+/*
+ * The drag and drop implementation is adapted from
+ * https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/tests/testlist3.c
+ *
+ * Thanks to the GTK3 people for creating these examples.
+ */
+
 /**
 * @file layer-element.c
- * @brief Omplementation of the layer element used for configuring layer colors etc.
+ * @brief Implementation of the layer element used for configuring layer colors etc.
 * @author Mario Hüttel <mario.huettel@gmx.net>
 */

@@ -65,14 +72,14 @@ static void layer_element_drag_begin(GtkWidget *widget,
 	int x, y;
 	(void)data;

-	row = gtk_widget_get_ancestor (widget, GTK_TYPE_LIST_BOX_ROW);
-	gtk_widget_get_allocation (row, &alloc);
-	surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, alloc.width, alloc.height);
-	cr = cairo_create (surface);
+	row = gtk_widget_get_ancestor(widget, GTK_TYPE_LIST_BOX_ROW);
+	gtk_widget_get_allocation(row, &alloc);
+	surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, alloc.width, alloc.height);
+	cr = cairo_create(surface);

-	gtk_style_context_add_class (gtk_widget_get_style_context (row), "drag-icon");
+	gtk_style_context_add_class (gtk_widget_get_style_context(row), "drag-icon");
 	gtk_widget_draw (row, cr);
-	gtk_style_context_remove_class (gtk_widget_get_style_context (row), "drag-icon");
+	gtk_style_context_remove_class(gtk_widget_get_style_context(row), "drag-icon");

 	gtk_widget_translate_coordinates (widget, row, 0, 0, &x, &y);
 	cairo_surface_set_device_offset (surface, -x, -y);
@@ -80,6 +87,21 @@ static void layer_element_drag_begin(GtkWidget *widget,

 	cairo_destroy (cr);
 	cairo_surface_destroy (surface);
+
+	g_object_set_data(G_OBJECT(gtk_widget_get_parent(row)), "drag-row", row);
+	gtk_style_context_add_class(gtk_widget_get_style_context(row), "drag-row");
+}
+
+static void layer_element_drag_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+{
+	GtkWidget *row;
+	(void)context;
+	(void)data;
+
+	row = gtk_widget_get_ancestor(widget, GTK_TYPE_LIST_BOX_ROW);
+	g_object_set_data(G_OBJECT(gtk_widget_get_parent(row)), "drag-row", NULL);
+	gtk_style_context_remove_class(gtk_widget_get_style_context(row), "drag-row");
+	gtk_style_context_remove_class(gtk_widget_get_style_context(row), "drag-hover");
 }

 static void layer_element_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
@@ -94,36 +116,6 @@ static void layer_element_drag_data_get(GtkWidget *widget, GdkDragContext *conte
 			       32, (const guchar *)&widget, sizeof(gpointer));
 }

-static void layer_element_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
-					     GtkSelectionData *selection_data, guint info, guint32 time,
-					     gpointer data)
-{
-	GtkWidget *target;
-	GtkWidget *row;
-	GtkWidget *source;
-	int pos;
-	(void)context;
-	(void)x;
-	(void)y;
-	(void)info;
-	(void)time;
-	(void)data;
-
-	target = widget;
-
-	pos = gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (target));
-	row = (gpointer)(*(gpointer *)gtk_selection_data_get_data(selection_data));
-	source = gtk_widget_get_ancestor (row, GTK_TYPE_LIST_BOX_ROW);
-
-	if (source == target)
-		return;
-
-	g_object_ref (source);
-	gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (source)), source);
-	gtk_list_box_insert (GTK_LIST_BOX (gtk_widget_get_parent (target)), source, pos);
-	g_object_unref (source);
-}
-
 static void layer_element_init(LayerElement *self)
 {
 	GtkBuilder *builder;
@@ -140,11 +132,11 @@ static void layer_element_init(LayerElement *self)
 	self->priv.event_handle = GTK_EVENT_BOX(gtk_builder_get_object(builder, "event-box"));

 	/* Setup drag and drop */
+	gtk_style_context_add_class (gtk_widget_get_style_context(GTK_WIDGET(self)), "row");
 	gtk_drag_source_set(GTK_WIDGET(self->priv.event_handle), GDK_BUTTON1_MASK, entries, 1, GDK_ACTION_MOVE);
 	g_signal_connect(self->priv.event_handle, "drag-begin", G_CALLBACK(layer_element_drag_begin), NULL);
 	g_signal_connect(self->priv.event_handle, "drag-data-get", G_CALLBACK(layer_element_drag_data_get), NULL);
-	gtk_drag_dest_set(GTK_WIDGET(self), GTK_DEST_DEFAULT_ALL, entries, 1, GDK_ACTION_MOVE);
-	g_signal_connect(GTK_WIDGET(self), "drag-data-received", G_CALLBACK(layer_element_drag_data_received), NULL);
+	g_signal_connect(self->priv.event_handle, "drag-end", G_CALLBACK(layer_element_drag_end), NULL);

 	g_object_unref(builder);
 }
Author	SHA1	Message	Date
Mario Hüttel	33deba8ca4	Command line: Fix auto-guessing of SVG file name.	2019-03-15 18:03:29 +01:00
Mario Hüttel	b0c25a4bcf	Add version number to about dialog	2019-03-14 21:01:16 +01:00
Mario Hüttel	899c8daf81	Add documentation target, which at the moment is only an alias for the doxygen target	2019-03-14 19:24:17 +01:00
Mario Hüttel	a9c7b9f61f	Gui: Menubar: GActionEntry definition expanded to set unused values to zero, especially pointers	2019-03-14 19:10:06 +01:00
Mario Hüttel	55fd080796	Fix Issue #11 * Set NON_UNIQUE Flag of GApplication. When opening a second program instance, Glib will not try to open a second window inside the first instance, which was the feature, that caused problems	2019-03-14 19:02:17 +01:00
Mario Hüttel	178ef2d5b2	Insert quick fix, that prevents starting multiple instances in GUI mode the same time	2019-03-13 22:54:52 +01:00
Mario Hüttel	6a78e0df15	Fix background color of drag element in Drag and Drop code for the layer selector. With this commit Issue #8 is fixed.	2019-03-13 21:01:49 +01:00
Mario Hüttel	1e6d0bd1b9	Restructured code for layer selector	2019-03-13 20:32:09 +01:00
Mario Hüttel	658e681c38	Implement a more convenient drag and drop	2019-03-13 20:22:11 +01:00
Mario Hüttel	e24b4a8367	implement layer sorting buttons, This fixes #5	2019-03-12 19:47:39 +01:00
Mario Hüttel	960a773ed1	Implement fucntion to force sort of the layer selector	2019-03-12 19:39:36 +01:00
Mario Hüttel	ab23be1cfc	Make enum in sorting function const	2019-03-12 19:28:17 +01:00
Mario Hüttel	72d5352b09	Change sorting function in order to add capability to sort both ways	2019-03-12 19:26:31 +01:00
Mario Hüttel	3f198f870a	Add buttons for layer sorting to glade file	2019-03-12 19:10:43 +01:00
Mario Hüttel	2a204640bd	Add warning to probably misunderstandable function	2019-03-12 19:02:34 +01:00
Mario Hüttel	a237a89ecf	Feature: Double click on cells now also opens the convert settings menu. Same callback as for the convert button is used.	2019-03-11 23:33:51 +01:00
Mario Hüttel	1ec0f9b297	Merge branch 'master' of git.shimatta.de:mhu/gds-render	2019-03-11 10:38:35 +01:00
Mario Hüttel	2f2eb90b69	Add automatic version numbering to command line and GUI	2019-03-11 10:36:02 +01:00