X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/3570ad57c1f814bf6e04e84dd15ea50e0bc14925..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/viktreeview.c?ds=inline

diff --git a/src/viktreeview.c b/src/viktreeview.c
index 9a4274d9..0e5e81b5 100644
--- 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 <glib/gi18n.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 {
@@ -187,6 +189,7 @@ static void treeview_add_columns ( VikTreeview *vt )
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
 
+  /* Layer column */
   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),
-							    -1, "Layer Name",
+							    -1, _("Layer Name"),
 							    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),
-				   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);
@@ -218,15 +219,11 @@ static void treeview_add_columns ( VikTreeview *vt )
 							    ICON_COLUMN,
 							    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_TYPE);
   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);
 
@@ -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);
-  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_FIXED);
-  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
+                                   GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
 }
 
@@ -272,7 +266,7 @@ static void select_cb(GtkTreeSelection *selection, gpointer data)
 
   vl = VIK_LAYER( vik_treeview_item_get_pointer ( vt, &iter ) );
 
-  vw = VIK_GTK_WINDOW_FROM_LAYER(vl);
+  vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vl));
   vik_window_selected_layer(vw, vl);
 }
 
@@ -519,7 +513,7 @@ static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTree
   GtkTreePath *src_path = NULL, *dest_cp = NULL;
   gboolean retval = FALSE;
   GtkTreeIter src_iter, root_iter, dest_iter, dest_parent;
-  guint *i_src = NULL;
+  gint *i_src = NULL;
   VikTreeview *vt;
   VikLayer *vl;
 
@@ -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);
-  g_print("delete data from %s\n", s_dest);
+  g_print(_("delete data from %s\n"), s_dest);
   g_free(s_dest);
   return FALSE;
 }