Remove dependencies to gob2

[andy/viking.git] / src / viktreeview.c

diff --git a/src/viktreeview.c b/src/viktreeview.c
index 7042803094e8e54a4629bfd57a261571de9d096f..0e5e81b5bea4c2533c49d14affcb45a8f476a6d4 100644 (file)
--- a/src/viktreeview.c
+++ b/src/viktreeview.c
@@ -19,16 +19,18 @@
  *
  */
 
  *
  */
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

+#include <glib/gi18n.h>
+

 #include <string.h>
 
 #include "viking.h"
 #include "config.h"
 
 #include <string.h>
 
 #include "viking.h"
 #include "config.h"
 

-#define VT_COL_WIDTH_NAME     160
-#define VT_COL_WIDTH_TYPE     20
-#define VT_COL_WIDTH_VISIBLE  20
-

 #define TREEVIEW_GET(model,iter,what,dest) gtk_tree_model_get(GTK_TREE_MODEL(model),(iter),(what),(dest),-1)
 
 enum {
 #define TREEVIEW_GET(model,iter,what,dest) gtk_tree_model_get(GTK_TREE_MODEL(model),(iter),(what),(dest),-1)
 
 enum {


@@ -187,6 +189,7 @@ static void treeview_add_columns ( VikTreeview *vt )
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
 
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
 

+  /* Layer column */

   renderer = gtk_cell_renderer_text_new ();
   g_signal_connect (renderer, "edited",
                    G_CALLBACK (treeview_edited_cb), vt);
   renderer = gtk_cell_renderer_text_new ();
   g_signal_connect (renderer, "edited",
                    G_CALLBACK (treeview_edited_cb), vt);


@@ -194,7 +197,7 @@ static void treeview_add_columns ( VikTreeview *vt )
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
 
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vt),
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
 
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vt),

-                                                           -1, "Layer Name",
+                                                           -1, _("Layer Name"),

                                                            renderer, "text",
                                                            NAME_COLUMN,
                                                            "editable", EDITABLE_COLUMN,
                                                            renderer, "text",
                                                            NAME_COLUMN,
                                                            "editable", EDITABLE_COLUMN,


@@ -202,12 +205,10 @@ static void treeview_add_columns ( VikTreeview *vt )
 
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),

-                                  GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column),
-                                   VT_COL_WIDTH_NAME);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-  gtk_tree_view_column_set_resizable (GTK_TREE_VIEW_COLUMN (column), TRUE);
+                                   GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+  gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE);

 
 

+  /* Layer type */

   renderer = gtk_cell_renderer_pixbuf_new ();
 
   g_object_set (G_OBJECT (renderer), "xalign", 0.5, NULL);
   renderer = gtk_cell_renderer_pixbuf_new ();
 
   g_object_set (G_OBJECT (renderer), "xalign", 0.5, NULL);


@@ -218,15 +219,11 @@ static void treeview_add_columns ( VikTreeview *vt )
                                                            ICON_COLUMN,
                                                            NULL);
 
                                                            ICON_COLUMN,
                                                            NULL);
 

-

   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);

-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column),
-                                        VT_COL_WIDTH_TYPE);

   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),

-                                  GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
-
+                                   GTK_TREE_VIEW_COLUMN_AUTOSIZE);

 
 

+  /* Layer visible */

   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (G_OBJECT (renderer), "xalign", 0.5, NULL);
 
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (G_OBJECT (renderer), "xalign", 0.5, NULL);
 


@@ -244,11 +241,8 @@ static void treeview_add_columns ( VikTreeview *vt )
                                                            NULL);
 
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);
                                                            NULL);
 
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1);

-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column),
-                                        VT_COL_WIDTH_VISIBLE);

   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),

-                                  GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
+                                   GTK_TREE_VIEW_COLUMN_AUTOSIZE);

 
 }
 
 
 }
 


@@ -600,7 +594,7 @@ static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTree
 static gboolean treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path )
 {
   gchar *s_dest = gtk_tree_path_to_string(path);
 static gboolean treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path )
 {
   gchar *s_dest = gtk_tree_path_to_string(path);

-  g_print("delete data from %s\n", s_dest);
+  g_print(_("delete data from %s\n"), s_dest);

   g_free(s_dest);
   return FALSE;
 }
   g_free(s_dest);
   return FALSE;
 }