diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2020-08-08 21:37:21 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2020-08-08 21:37:21 (GMT) |
commit | 4370d2d77d623f560c7df94a3bc15b1395e4878b (patch) | |
tree | 57cc6268f504c19aaac3b1adda4295ed3b1ddc7f /src/gui/panels/welcome.c | |
parent | 34d28c7418342d3c67be4747b13cdcb124edda32 (diff) |
Updated all the code relative to GUI items.
Diffstat (limited to 'src/gui/panels/welcome.c')
-rw-r--r-- | src/gui/panels/welcome.c | 59 |
1 files changed, 49 insertions, 10 deletions
diff --git a/src/gui/panels/welcome.c b/src/gui/panels/welcome.c index 2693b9a..02649e1 100644 --- a/src/gui/panels/welcome.c +++ b/src/gui/panels/welcome.c @@ -45,6 +45,7 @@ #include "../../core/global.h" #include "../../core/params.h" #include "../../core/paths.h" +#include "../../gtkext/named.h" @@ -94,6 +95,9 @@ static void g_welcome_panel_dispose(GWelcomePanel *); /* Procède à la libération totale de la mémoire. */ static void g_welcome_panel_finalize(GWelcomePanel *); +/* Fournit le nom interne attribué à l'élément réactif. */ +static char *g_welcome_panel_get_key(const GWelcomePanel *); + /* Place un panneau dans l'ensemble affiché. */ static void g_welcome_panel_dock(GWelcomePanel *); @@ -150,6 +154,7 @@ G_DEFINE_TYPE(GWelcomePanel, g_welcome_panel, G_TYPE_PANEL_ITEM); static void g_welcome_panel_class_init(GWelcomePanelClass *klass) { GObjectClass *object; /* Autre version de la classe */ + GEditorItemClass *item; /* Encore une autre vision... */ GPanelItemClass *parent; /* Version parente de classe */ object = G_OBJECT_CLASS(klass); @@ -157,6 +162,10 @@ static void g_welcome_panel_class_init(GWelcomePanelClass *klass) object->dispose = (GObjectFinalizeFunc/* ! */)g_welcome_panel_dispose; object->finalize = (GObjectFinalizeFunc)g_welcome_panel_finalize; + item = G_EDITOR_ITEM_CLASS(klass); + + item->get_key = (get_item_key_fc)g_welcome_panel_get_key; + parent = G_PANEL_ITEM_CLASS(klass); parent->ack_dock = (ack_undock_process_fc)g_welcome_panel_dock; @@ -178,7 +187,6 @@ static void g_welcome_panel_class_init(GWelcomePanelClass *klass) static void g_welcome_panel_init(GWelcomePanel *panel) { - GEditorItem *base; /* Version basique d'instance */ GPanelItem *pitem; /* Version parente du panneau */ GtkBuilder *builder; /* Constructeur utilisé */ GtkTreeView *treeview; /* Affichage de la liste */ @@ -190,14 +198,14 @@ static void g_welcome_panel_init(GWelcomePanel *panel) /* Eléments de base */ - base = G_EDITOR_ITEM(panel); - - base->name = PANEL_WELCOME_ID; - pitem = G_PANEL_ITEM(panel); pitem->personality = PIP_SINGLETON; - pitem->lname = _("Welcome"); + + pitem->widget = G_NAMED_WIDGET(gtk_built_named_widget_new_for_panel(_("Welcome"), + _("Welcome panel"), + PANEL_WELCOME_ID)); + pitem->dock_at_startup = false; pitem->path = strdup("M"); @@ -205,7 +213,7 @@ static void g_welcome_panel_init(GWelcomePanel *panel) /* Représentation graphique */ - builder = g_panel_item_build(pitem, "welcome"); + builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(pitem->widget)); /* Liste des projets récents */ @@ -248,6 +256,8 @@ static void g_welcome_panel_init(GWelcomePanel *panel) gtk_builder_connect_signals(builder, panel); + g_object_unref(G_OBJECT(builder)); + } @@ -329,6 +339,29 @@ GPanelItem *g_welcome_panel_new(void) /****************************************************************************** * * +* Paramètres : panel = instance à consulter. * +* * +* Description : Fournit le nom interne attribué à l'élément réactif. * +* * +* Retour : Désignation (courte) de l'élément de l'éditeur. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static char *g_welcome_panel_get_key(const GWelcomePanel *panel) +{ + char *result; /* Description à renvoyer */ + + result = strdup(PANEL_WELCOME_ID); + + return result; + +} + + +/****************************************************************************** +* * * Paramètres : panel = composant à présenter à l'affichage. * * * * Description : Place un panneau dans l'ensemble affiché. * @@ -519,7 +552,7 @@ static void g_welcome_panel_reload_project_list(GWelcomePanel *panel, GtkRecentM /* Réinitialisation */ - builder = G_PANEL_ITEM(panel)->builder; + builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(G_PANEL_ITEM(panel)->widget)); store = GTK_LIST_STORE(gtk_builder_get_object(builder, "store")); @@ -570,6 +603,8 @@ static void g_welcome_panel_reload_project_list(GWelcomePanel *panel, GtkRecentM } + g_object_unref(G_OBJECT(builder)); + } @@ -711,7 +746,7 @@ static void g_welcome_panel_check_version(GWelcomePanel *panel) /* Affichage */ - builder = G_PANEL_ITEM(panel)->builder; + builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(G_PANEL_ITEM(panel)->widget)); label = GTK_LABEL(gtk_builder_get_object(builder, "version")); @@ -753,6 +788,8 @@ static void g_welcome_panel_check_version(GWelcomePanel *panel) free(msg); + g_object_unref(G_OBJECT(builder)); + } @@ -825,12 +862,14 @@ static void g_welcome_panel_refresh_tip(GWelcomePanel *panel) assert(panel->current < panel->count); - builder = G_PANEL_ITEM(panel)->builder; + builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(G_PANEL_ITEM(panel)->widget)); label = GTK_LABEL(gtk_builder_get_object(builder, "tip")); gtk_label_set_markup(label, panel->tips[panel->current]); + g_object_unref(G_OBJECT(builder)); + } |