Prepared the new organization of display widgets.

3 files changed, 41 insertions, 41 deletions

diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c
index 14bc3bf..40d486c 100644
--- a/src/analysis/db/items/move.c
+++ b/src/analysis/db/items/move.c
@@ -37,7 +37,7 @@
 #include "../item-int.h"
 #include "../../../common/io.h"
 #include "../../../gui/editem.h"
-#include "../../../gtkext/gtkviewpanel.h"
+#include "../../../gtkext/gtkdisplaypanel.h"
 
 
 
@@ -423,11 +423,11 @@ static void g_db_move_build_label(GDbMove *move)
 
 static bool g_db_move_run(const GDbMove *move, const vmpa2t *addr)
 {
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *panel;                 /* Afficheur effectif de code  */
 
     typedef struct _move_params
     {
-        GtkViewPanel *vpanel;               /* Afficheur effectif de code  */
+        GtkDisplayPanel *panel;             /* Afficheur effectif de code  */
         vmpa2t addr;                        /* Adresse de déplacement      */
 
     } move_params;
@@ -438,7 +438,7 @@ static bool g_db_move_run(const GDbMove *move, const vmpa2t *addr)
 
     void delete_move_params(move_params *p)
     {
-        g_object_unref(G_OBJECT(p->vpanel));
+        g_object_unref(G_OBJECT(p->panel));
 
         free(p);
 
@@ -448,7 +448,7 @@ static bool g_db_move_run(const GDbMove *move, const vmpa2t *addr)
 
     gboolean do_move_in_main_loop(move_params *p)
     {
-        gtk_view_panel_scroll_to_address(p->vpanel, &p->addr, SPT_CENTER);
+        gtk_display_panel_scroll_to_address(p->panel, &p->addr, SPT_CENTER);
 
         return G_SOURCE_REMOVE;
 
@@ -456,14 +456,14 @@ static bool g_db_move_run(const GDbMove *move, const vmpa2t *addr)
 
     /* Lancement de l'opération */
 
-    vpanel = g_editor_item_get_current_view(NULL);
+    panel = g_editor_item_get_current_view(NULL);
 
-    if (vpanel != NULL)
+    if (panel != NULL)
     {
         params = (move_params *)calloc(1, sizeof(move_params));
 
-        params->vpanel = vpanel;
-        g_object_ref(G_OBJECT(vpanel));
+        params->panel = panel;
+        g_object_ref(G_OBJECT(panel));
 
         copy_vmpa(&params->addr, addr);
 
diff --git a/src/analysis/project.c b/src/analysis/project.c
index 7b4f621..dce55b6 100644
--- a/src/analysis/project.c
+++ b/src/analysis/project.c
@@ -113,7 +113,7 @@ static void g_study_project_hide(const GStudyProject *);
 
 
 /* Met en place un ensemble de vues pour un binaire. */
-GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *, GLoadedBinary *, BinaryView, GtkViewPanel **);
+GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *, GLoadedBinary *, BinaryView, GtkDisplayPanel **);
 
 
 
@@ -589,7 +589,7 @@ void g_study_project_add_loaded_binary(GLoadedBinary *binary, GStudyProject *pro
 void g_study_project_attach_binary(GStudyProject *project, GLoadedBinary *binary)
 {
     loaded_binary *new;                     /* Nouveau binaire à présenter */
-    GtkViewPanel *view;                     /* Composant d'affichage       */
+    GtkDisplayPanel *display;               /* Composant d'affichage       */
     GPanelItem *panel;                      /* Nouveau panneau associé     */
 
     /* Mise en place */
@@ -627,7 +627,7 @@ void g_study_project_attach_binary(GStudyProject *project, GLoadedBinary *binary
         {
             range = g_binary_symbol_get_range(symbol);
 
-            gtk_view_panel_request_move(GTK_VIEW_PANEL(widget), get_mrange_addr(range));
+            gtk_display_panel_request_move(GTK_DISPLAY_PANEL(widget), get_mrange_addr(range));
 
         }
 
@@ -637,11 +637,11 @@ void g_study_project_attach_binary(GStudyProject *project, GLoadedBinary *binary
 
     }
 
-    panel = _setup_new_panel_item_for_binary(project, binary, BVW_BLOCK, &view);
+    panel = _setup_new_panel_item_for_binary(project, binary, BVW_BLOCK, &display);
 
     g_mutex_unlock(&project->bin_mutex);
 
-    g_signal_connect(view, "size-allocate", G_CALLBACK(scroll_for_the_first_time), binary);
+    g_signal_connect(display, "size-allocate", G_CALLBACK(scroll_for_the_first_time), binary);
 
     g_panel_item_dock(panel);
 
@@ -803,14 +803,14 @@ GLoadedBinary **g_study_project_get_binaries(const GStudyProject *project, size_
 *                                                                             *
 ******************************************************************************/
 
-GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBinary *binary, BinaryView wanted, GtkViewPanel **panel)
+GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBinary *binary, BinaryView wanted, GtkDisplayPanel **panel)
 {
     GPanelItem *result;                     /* Nouveau panneau à renvoyer  */
     size_t k;                               /* Boucle de parcours #3       */
     loaded_binary *handled;                 /* Dossier de suivi à compléter*/
-    GtkViewPanel *views[BVW_COUNT];         /* Composants pour l'affichage */
+    GtkDisplayPanel *displays[BVW_COUNT];   /* Composants pour l'affichage */
     BinaryView i;                           /* Boucle de parcours #1       */
-    GtkWidget *view;                        /* Affichage du binaire        */
+    GtkWidget *display;                     /* Affichage du binaire        */
     GtkWidget *scroll;                      /* Surface d'exposition        */
     GtkWidget *selected;                    /* Interface de prédilection   */
     const char *name;                       /* Titre associé au binaire    */
@@ -836,33 +836,33 @@ GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBina
         switch (i)
         {
             case BVW_BLOCK:
-                view = gtk_block_view_new();
+                display = gtk_block_view_new();
                 break;
             case BVW_GRAPH:
-                view = gtk_graph_view_new();
+                display = gtk_graph_view_new();
                 break;
             case BVW_SOURCE:
-                view = gtk_source_view_new();
+                display = gtk_source_view_new();
                 break;
             default: /* GCC ! */
                 break;
         }
 
-        gtk_widget_show(view);
+        gtk_widget_show(display);
 
-        views[i] = GTK_VIEW_PANEL(view);
+        displays[i] = GTK_DISPLAY_PANEL(display);
 
-        gtk_view_panel_attach_binary(views[i], binary, i);
+        gtk_display_panel_attach_binary(displays[i], binary, i);
 
         /* Intégration finale dans un support défilant */
 
         scroll = qck_create_scrolled_window(NULL, NULL);
-        gtk_container_add(GTK_CONTAINER(scroll), view);
+        gtk_container_add(GTK_CONTAINER(scroll), display);
 
         if (i == wanted)
         {
             selected = scroll;
-            *panel = GTK_VIEW_PANEL(view);
+            *panel = GTK_DISPLAY_PANEL(display);
         }
 
     }
@@ -889,13 +889,13 @@ GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBina
             switch (j)
             {
                 case BVW_BLOCK:
-                    g_object_set_data(G_OBJECT(views[i]), "block_alt_view", views[j]);
+                    g_object_set_data(G_OBJECT(displays[i]), "block_alt_view", displays[j]);
                     break;
                 case BVW_GRAPH:
-                    g_object_set_data(G_OBJECT(views[i]), "graph_alt_view", views[j]);
+                    g_object_set_data(G_OBJECT(displays[i]), "graph_alt_view", displays[j]);
                     break;
                 case BVW_SOURCE:
-                    g_object_set_data(G_OBJECT(views[i]), "source_alt_view", views[j]);
+                    g_object_set_data(G_OBJECT(displays[i]), "source_alt_view", displays[j]);
                     break;
                 default: /* GCC ! */
                     break;
@@ -923,7 +923,7 @@ GPanelItem *_setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBina
 *                                                                             *
 ******************************************************************************/
 
-GPanelItem *setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBinary *binary, BinaryView wanted, GtkViewPanel **panel)
+GPanelItem *setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBinary *binary, BinaryView wanted, GtkDisplayPanel **panel)
 {
     GPanelItem *result;                     /* Nouveau panneau à renvoyer  */
 
@@ -955,7 +955,7 @@ GPanelItem *setup_new_panel_item_for_binary(GStudyProject *project, GLoadedBinar
 *                                                                             *
 ******************************************************************************/
 
-GtkDockStation *get_dock_station_for_view_panel(GtkViewPanel *panel)
+GtkDockStation *get_dock_station_for_view_panel(GtkDisplayPanel *panel)
 {
     GtkWidget *result;                      /* Support trouvé à retourner  */
 
@@ -988,7 +988,7 @@ GtkDockStation *get_dock_station_for_view_panel(GtkViewPanel *panel)
 *                                                                             *
 ******************************************************************************/
 
-GtkWidget *get_scroll_window_for_view_panel(GtkViewPanel *panel)
+GtkWidget *get_scroll_window_for_view_panel(GtkDisplayPanel *panel)
 {
     GtkWidget *result;                      /* Support trouvé à retourner  */
 
@@ -1021,20 +1021,20 @@ GtkWidget *get_scroll_window_for_view_panel(GtkViewPanel *panel)
 *                                                                             *
 ******************************************************************************/
 
-GtkViewPanel *get_alt_view_for_view_panel(GtkViewPanel *panel, BinaryView view)
+GtkDisplayPanel *get_alt_view_for_view_panel(GtkDisplayPanel *panel, BinaryView view)
 {
-    GtkViewPanel *result;                   /* Panneau visé à renvoyer     */
+    GtkDisplayPanel *result;                /* Panneau visé à renvoyer     */
 
     switch (view)
     {
         case BVW_BLOCK:
-            result = GTK_VIEW_PANEL(g_object_get_data(G_OBJECT(panel), "block_alt_view"));
+            result = GTK_DISPLAY_PANEL(g_object_get_data(G_OBJECT(panel), "block_alt_view"));
             break;
         case BVW_GRAPH:
-            result = GTK_VIEW_PANEL(g_object_get_data(G_OBJECT(panel), "graph_alt_view"));
+            result = GTK_DISPLAY_PANEL(g_object_get_data(G_OBJECT(panel), "graph_alt_view"));
             break;
         case BVW_SOURCE:
-            result = GTK_VIEW_PANEL(g_object_get_data(G_OBJECT(panel), "source_alt_view"));
+            result = GTK_DISPLAY_PANEL(g_object_get_data(G_OBJECT(panel), "source_alt_view"));
             break;
         default:
             assert(false);
diff --git a/src/analysis/project.h b/src/analysis/project.h
index 7d8d010..3c29102 100644
--- a/src/analysis/project.h
+++ b/src/analysis/project.h
@@ -30,7 +30,7 @@
 
 #include "binary.h"
 #include "../gtkext/gtkdockstation.h"
-#include "../gtkext/gtkviewpanel.h"
+#include "../gtkext/gtkdisplaypanel.h"
 
 
 /**
@@ -112,16 +112,16 @@ GLoadedBinary **g_study_project_get_binaries(const GStudyProject *, size_t *);
 
 
 /* Met en place un ensemble de vues pour un binaire. */
-GPanelItem *setup_new_panel_item_for_binary(GStudyProject *, GLoadedBinary *, BinaryView, GtkViewPanel **);
+GPanelItem *setup_new_panel_item_for_binary(GStudyProject *, GLoadedBinary *, BinaryView, GtkDisplayPanel **);
 
 /* Fournit la station d'accueil d'un panneau d'affichage. */
-GtkDockStation *get_dock_station_for_view_panel(GtkViewPanel *);
+GtkDockStation *get_dock_station_for_view_panel(GtkDisplayPanel *);
 
 /* Fournit le support défilant d'un panneau d'affichage. */
-GtkWidget *get_scroll_window_for_view_panel(GtkViewPanel *);
+GtkWidget *get_scroll_window_for_view_panel(GtkDisplayPanel *);
 
 /* Fournit une vision alternative d'un panneau d'affichage. */
-GtkViewPanel *get_alt_view_for_view_panel(GtkViewPanel *, BinaryView);
+GtkDisplayPanel *get_alt_view_for_view_panel(GtkDisplayPanel *, BinaryView);