Simplify tools enable/disable codes

diff --git a/ChangeLog b/ChangeLog
index 2ad0a71fb90311f29aa2e36061a853afb3ceb50a..4e73bdf6b670f468e908643f985cfc436dde5f50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-04
+Quy Tonthat <qtonthat@gmail.com>:
+       * Simplify tools enable/disable codes.
+
 2007-02-01
 Quy Tonthat <qtonthat@gmail.com>:
        * Only tools that work with current active layer are enable,

diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
index 80e3c214ced4192159f268b5f701dee25f3d8ab1..3ce013c3396c189eb36dba36a263d60fc04b189a 100644 (file)
--- a/src/viklayerspanel.c
+++ b/src/viklayerspanel.c
@@ -47,7 +47,6 @@ struct _VikLayersPanel {
   VikViewport *vvp; /* reference */
 
   GtkItemFactory *popup_factory;
-  VikWindow *vw;
 };
 
 static GtkItemFactoryEntry base_entries[] = {
@@ -112,16 +111,6 @@ VikLayersPanel *vik_layers_panel_new ()
   return VIK_LAYERS_PANEL ( g_object_new ( VIK_LAYERS_PANEL_TYPE, NULL ) );
 }
 
-void vik_layers_panel_set_window ( VikLayersPanel *vlp, VikWindow *vw )
-{
-  vlp->vw = vw;
-}
-
-VikWindow * vik_layers_panel_get_window ( VikLayersPanel *vlp)
-{
-  return(vlp->vw);
-}
-
 void vik_layers_panel_set_viewport ( VikLayersPanel *vlp, VikViewport *vvp )
 {
   vlp->vvp = vvp;
@@ -145,7 +134,6 @@ static void layers_panel_init ( VikLayersPanel *vlp )
 
   hbox = gtk_hbox_new ( TRUE, 2 );
   vlp->vt = vik_treeview_new ( );
-  vik_treeview_set_layers_panel(vlp->vt, vlp);
 
   vlp->toplayer = vik_aggregate_layer_new ();
   vik_layer_rename ( VIK_LAYER(vlp->toplayer), "Top Layer");

diff --git a/src/viklayerspanel.h b/src/viklayerspanel.h
index c26df0a82729d88575f4858d31a853299a48dee1..b225d534b623eed9942741ce675fbaa5f3d98523 100644 (file)
--- a/src/viklayerspanel.h
+++ b/src/viklayerspanel.h
@@ -58,8 +58,6 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp );
 void vik_layers_panel_paste_selected ( VikLayersPanel *vlp );
 void vik_layers_panel_delete_selected ( VikLayersPanel *vlp );
 VikLayer *vik_layers_panel_get_layer_of_type ( VikLayersPanel *vlp, gint type );
-void vik_layers_panel_set_window ( VikLayersPanel *vlp, VikWindow *vw );
-VikWindow * vik_layers_panel_get_window ( VikLayersPanel *vlp);
 void vik_layers_panel_set_viewport ( VikLayersPanel *vlp, VikViewport *vvp );
 //gboolean vik_layers_panel_tool ( VikLayersPanel *vlp, guint16 layer_type, VikToolInterfaceFunc tool_func, GdkEventButton *event, VikViewport *vvp );
 VikViewport *vik_layers_panel_get_viewport ( VikLayersPanel *vlp );

diff --git a/src/viktreeview.c b/src/viktreeview.c
index 7a5a6d49ba8b7e9879248f0b33a552fc049647b5..9eb401ddc12a9774f35bd1ee3074fd9cbe7a0b61 100644 (file)
--- a/src/viktreeview.c
+++ b/src/viktreeview.c
@@ -59,7 +59,6 @@ struct _VikTreeview {
   GtkTreeModel *model;
 
   GdkPixbuf *layer_type_icons[VIK_LAYER_NUM_TYPES];
-  VikLayersPanel *vlp;
 };
 
 /* TODO: find, make "static" and put up here all non-"a_" functions */
@@ -140,16 +139,6 @@ VikTreeview *vik_treeview_new ()
   return VIK_TREEVIEW ( g_object_new ( VIK_TREEVIEW_TYPE, NULL ) );
 }
 
-void vik_treeview_set_layers_panel(VikTreeview *vt, VikLayersPanel *vlp)
-{
-  vt->vlp = vlp;
-}
-
-VikLayersPanel *vik_treeview_get_layers_panel(VikTreeview *vt)
-{
-  return(vt->vlp);
-}
-
 gint vik_treeview_item_get_type ( VikTreeview *vt, GtkTreeIter *iter )
 {
   gint rv;
@@ -276,7 +265,7 @@ static void select_cb(GtkTreeSelection *selection, gpointer data)
 
   vl = VIK_LAYER( vik_treeview_item_get_pointer ( vt, &iter ) );
 
-  vw = vik_layers_panel_get_window(vt->vlp);
+  vw = VIK_GTK_WINDOW_FROM_LAYER(vl);
   vik_window_selected_layer(vw, vl);
 }
 

diff --git a/src/viktreeview.h b/src/viktreeview.h
index 19be76d5bc62d5b21526e5848b6d6a888dbce2c0..097da7df6e192887a6ee830c6ccd9e9fda384246 100644 (file)
--- a/src/viktreeview.h
+++ b/src/viktreeview.h
@@ -55,8 +55,6 @@ GType vik_treeview_get_type ();
 
 
 VikTreeview *vik_treeview_new ();
-void vik_treeview_set_layers_panel(VikTreeview *vt, VikLayersPanel *vlp);
-VikLayersPanel *vik_treeview_get_layers_panel(VikTreeview *vt);
 
 GtkWidget *vik_treeview_get_widget ( VikTreeview *vt );
 

diff --git a/src/vikwindow.c b/src/vikwindow.c
index 7c6513a399d0dafcff601933af3ee3477b98698e..724dd9dec44ba15765305e6f1b259324003bf080 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -236,7 +236,6 @@ static void window_init ( VikWindow *vw )
 
   vw->viking_vvp = vik_viewport_new();
   vw->viking_vlp = vik_layers_panel_new();
-  vik_layers_panel_set_window(vw->viking_vlp, vw);
   vik_layers_panel_set_viewport ( vw->viking_vlp, vw->viking_vvp );
   vw->viking_vs = vik_statusbar_new();