GNOME Bugzilla – Bug 474080
Port gnome-panel from glade to GtkBuilder
Last modified: 2015-03-24 13:01:17 UTC
The next milestone (2.22) should migrate from glade to GtkBuilder.
Created attachment 131476 [details] [review] [PATCH] panel-run-dialog: migrate to GtkBuilder Part of bug #474080. Note that panel-properties-dialog.c couldn't be ported because of Gnome* widgets. Changes are only to allow it to build. --- gnome-panel/Makefile.am | 10 +- gnome-panel/panel-properties-dialog.c | 4 +- gnome-panel/panel-run-dialog.c | 76 +++++---- gnome-panel/panel-run-dialog.ui | 299 +++++++++++++++++++++++++++++++++ 4 files changed, 350 insertions(+), 39 deletions(-)
Note that this applies on top of bug #576916.
Created attachment 131679 [details] [review] [PATCH] Remove useless image_details_dialog gnome-panel/panel-properties-dialog.glade | 241 ++++++++--------------------- 1 files changed, 64 insertions(+), 177 deletions(-)
Created attachment 131680 [details] [review] [PATCH] Don't use GnomeIconEntry in the glade file Instead build it manually in panel-properties-dialog.c so we can remove glade dependency. --- gnome-panel/panel-properties-dialog.c | 7 +++++-- gnome-panel/panel-properties-dialog.glade | 7 +------ 2 files changed, 6 insertions(+), 8 deletions(-)
Created attachment 131681 [details] [review] [PATCH] Remove panel-properties-dialog.glade gnome-panel/panel-properties-dialog.glade | 607 ----------------------------- 1 files changed, 0 insertions(+), 607 deletions(-)
Created attachment 131682 [details] [review] [PATCH] Add panel-properties-dialog.ui Port of panel-properties-dialog.glade to GtkBuilder. git was trying to see it as a rename if I committed this two on a single commit. --- gnome-panel/panel-properties-dialog.ui | 607 ++++++++++++++++++++++++++++++++ 1 files changed, 607 insertions(+), 0 deletions(-)
Created attachment 131683 [details] [review] [PATCH] Remove glade dependency in panel-properties-dialog gnome-panel/Makefile.am | 2 +- gnome-panel/panel-properties-dialog.c | 112 ++++++------ gnome-panel/panel-properties-dialog.ui | 2 - gnome-panel/panel-run-dialog.glade | 290 -------------------------------- 4 files changed, 57 insertions(+), 349 deletions(-)
Created attachment 131684 [details] [review] [PATCH] Drop glade dependency in libpanel-applet libpanel-applet/Makefile.am | 8 +- libpanel-applet/panel-test-applets.c | 38 +++-- libpanel-applet/panel-test-applets.glade | 288 ------------------------------ libpanel-applet/panel-test-applets.ui | 197 ++++++++++++++++++++ 4 files changed, 224 insertions(+), 307 deletions(-)
Have you tested that loading the converted .ui files in glade-3, and re-saving them doesn't change them in a significant way (ie. it should only remove properties that have their default value), and the re-saved file still works as expected?
I created the .ui files with glade-3. I guess you thought I used the converter script?
So... any progress here?
Not yet, maybe during guadec, else after guadec.
The first patch (for the run dialog) should be further fixed to make the run button obey the button-images setting. I'll attach a fixed version.
Created attachment 139031 [details] [review] panel-run-dialog migration, take 2
Current status: I've committed the libpanel-applet patch (with a few changes), and ported all applets in gnome-panel. Will do the panel itself now, based on the patches that are here.
Everything's done.