dialog implementation

CMakeLists.txt

@@ -13,7 +13,7 @@ link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})
 
 
-aux_source_directory("layer-widget" LAYER_SOURCES)
+aux_source_directory("widgets" LAYER_SOURCES)
 aux_source_directory("tree-renderer" RENDERER_SOURCES)
 aux_source_directory("gds-parser" PARSER_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)

glade/dialog.glade

@@ -9,98 +9,47 @@
     <property name="step_increment">10</property>
     <property name="page_increment">1000</property>
   </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkBox" id="dialog-box">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-save</property>
-  </object>
-  <object class="GtkDialog">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Render Options</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child internal-child="vbox">
-      <object class="GtkBox">
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">Convert</property>
-                <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">True</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="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Please select Render Engine and Output Scale</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
     <child>
       <object class="GtkRadioButton" id="latex-radio">
-            <property name="label" translatable="yes">Generate laTeX/TikZ Code</property>
+        <property name="label" translatable="yes">Generate LaTeX/TikZ output</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="active">True</property>
         <property name="draw_indicator">True</property>
-            <property name="group">cairo-radio</property>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-            <property name="position">1</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkRadioButton" id="cairo-radio">
-            <property name="label" translatable="yes">Generate PDF using Cairographics</property>
+        <property name="label" translatable="yes">Render PDF using Cairographics</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="active">True</property>
         <property name="draw_indicator">True</property>
+        <property name="group">latex-radio</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScale">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="adjustment">adjustment1</property>
+        <property name="round_digits">1</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -108,26 +57,5 @@
         <property name="position">2</property>
       </packing>
     </child>
-        <child>
-          <object class="GtkScale" id="dialog-scale">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="adjustment">adjustment1</property>
-            <property name="round_digits">0</property>
-            <property name="digits">0</property>
-            <property name="value_pos">left</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">button1</action-widget>
-      <action-widget response="-3">button2</action-widget>
-    </action-widgets>
   </object>
 </interface>

layer-selector.c

@@ -19,7 +19,7 @@
 
 #include "layer-selector.h"
 #include "gds-parser/gds-parser.h"
-#include "layer-widget/layer-element.h"
+#include "widgets/layer-element.h"
 #include <glib.h>
 #include <string.h>
 #include <stdio.h>

main.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include "gds-parser/gds-parser.h"
 #include <gtk/gtk.h>
-#include "layer-widget/layer-element.h"
 #include "layer-selector.h"
 #include "tree-renderer/tree-store.h"
 #include "latex-output/latex-output.h"

widgets/conv-settings-dialog.c

@@ -0,0 +1,48 @@
+/*
+ * 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/>.
+ */
+
+#include "conv-settings-dialog.h"
+
+G_DEFINE_TYPE(RendererSettingsDialog, renderer_settings_dialog, GTK_TYPE_DIALOG)
+
+static void renderer_settings_dialog_class_init(RendererSettingsDialogClass *klass)
+{
+	/*  No special code needed. Child cells are destroyed automatically due to reference counter */
+	return;
+}
+
+static void renderer_settings_dialog_init(RendererSettingsDialog *self)
+{
+	GtkBuilder *builder;
+	GtkBox *box;
+	GtkDialog *dialog;
+
+	dialog = &(self->parent);
+
+	builder = gtk_builder_new_from_resource("/dialog.glade");
+	box = GTK_BOX(gtk_builder_get_object(builder, "dialog-box"));
+	gtk_dialog_add_buttons(dialog, "Cancel", GTK_RESPONSE_CANCEL, "OK", GTK_RESPONSE_OK, NULL);
+	gtk_container_add(GTK_CONTAINER(dialog), box);
+	g_object_unref(builder);
+}
+
+GtkWidget *renderer_settings_dialog_new(void)
+{
+	return (GtkWidget *) g_object_new(RENDERER_TYPE_SETTINGS_DIALOG, NULL);
+}

widgets/conv-settings-dialog.h

@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ */
+
+#ifndef __CONV_SETTINGS_DIALOG_H__
+#define __CONV_SETTINGS_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+G_DECLARE_FINAL_TYPE(RendererSettingsDialog, renderer_settings_dialog, RENDERER, SETTINGS_DIALOG, GtkDialog)
+
+GtkWidget *renderer_settings_dialog_new(void);
+
+struct  _RendererSettingsDialog {
+        GtkDialog parent;
+};
+
+#define RENDERER_TYPE_SETTINGS_DIALOG (renderer_settings_dialog_get_type())
+
+G_END_DECLS
+
+#endif /* __CONV_SETTINGS_DIALOG_H__ */

widgets/layer-element.h

@@ -38,12 +38,12 @@ typedef struct _LayerElementPriv {
 	GtkCheckButton *export;
 } LayerElementPriv;
 
-typedef struct _LayerElement {
+struct _LayerElement {
 	/* Inheritance */
 	GtkListBoxRow parent;
 	/* Custom Elements */
 	LayerElementPriv priv;
-} LayerElement;
+};
 
 GtkWidget *layer_element_new(void);