[gnome-main-menu] [main-menu] Replace libglade with gtkbuilder



commit 08e5a3212e10680f93c80ff98e92d39b7733c140
Author: Julian Andres Klode <jak debian org>
Date:   Wed May 5 17:29:16 2010 +0200

    [main-menu] Replace libglade with gtkbuilder
    
    This patch was originally written by Robert Ancell <robert ancell gmail com>,
    and later adapted to main-menu trunk.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=590221

 configure.in                        |    4 -
 main-menu/src/Makefile.am           |   10 +-
 main-menu/src/main-menu-ui.c        |  154 ++--
 main-menu/src/network-status-tile.c |   37 +-
 main-menu/src/slab-button.ui        |  211 ++++++
 main-menu/src/slab-window.glade     | 1395 -----------------------------------
 main-menu/src/slab-window.ui        |  635 ++++++++++++++++
 po/POTFILES.in                      |    3 +-
 8 files changed, 951 insertions(+), 1498 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2f61406..fc5d7dc 100644
--- a/configure.in
+++ b/configure.in
@@ -43,10 +43,6 @@ COMMON_MODULES="glib-2.0 >= $GLIB_REQUIRED	\
 		gdk-2.0				\
 		libslab >= $SLAB_REQUIRED"
 
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
-
 NM_GLIB=
 PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
 if test "x$NM_GLIB" = "x"; then
diff --git a/main-menu/src/Makefile.am b/main-menu/src/Makefile.am
index 77ae71b..fdfa6e4 100644
--- a/main-menu/src/Makefile.am
+++ b/main-menu/src/Makefile.am
@@ -2,15 +2,14 @@ INCLUDES =								\
 	$(MAIN_MENU_CFLAGS)						\
 	$(WARN_CFLAGS)
 
-gladedir = $(datadir)/$(PACKAGE)
-glade_DATA = slab-window.glade
+uidir = $(datadir)/$(PACKAGE)
+ui_DATA = slab-button.ui slab-window.ui
 
 libexec_PROGRAMS = main-menu
 
 bin_PROGRAMS = trigger-panel-run-dialog
 
 AM_CPPFLAGS =								\
-	$(GLADE_CFLAGS)							\
 	-DDATADIR=\""$(datadir)"\"					\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
@@ -27,8 +26,7 @@ main_menu_SOURCES =							\
 	eggaccelerators.c		eggaccelerators.h
 
 main_menu_LDADD =							\
-	$(MAIN_MENU_LIBS)						\
-	$(GLADE_LIBS)
+	$(MAIN_MENU_LIBS)
 
 trigger_panel_run_dialog_SOURCES =					\
 	trigger-panel-run-dialog.c
@@ -36,4 +34,4 @@ trigger_panel_run_dialog_SOURCES =					\
 trigger_panel_run_dialog_LDADD =					\
 	$(MAIN_MENU_LIBS)
 
-EXTRA_DIST = $(glade_DATA)
+EXTRA_DIST = $(ui_DATA)
diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
index dbe7fc7..67e6102 100644
--- a/main-menu/src/main-menu-ui.c
+++ b/main-menu/src/main-menu-ui.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <panel-applet.h>
-#include <glade/glade.h>
 #include <cairo.h>
 #include <string.h>
 #include <libxml/parser.h>
@@ -76,8 +75,8 @@ typedef struct {
 	PanelApplet *panel_applet;
 	GtkWidget   *panel_about_dialog;
 
-	GladeXML *main_menu_xml;
-	GladeXML *panel_button_xml;
+	GtkBuilder *main_menu_ui;
+	GtkBuilder *panel_button_ui;
 
 	GtkToggleButton *panel_buttons [4];
 	GtkToggleButton *panel_button;
@@ -314,7 +313,7 @@ main_menu_ui_new (PanelApplet *applet)
 	MainMenuUI        *this;
 	MainMenuUIPrivate *priv;
 
-	gchar *glade_xml_path;
+	gchar *window_ui_path, *button_ui_path;
 
 
 	this = g_object_new (MAIN_MENU_UI_TYPE, NULL);
@@ -322,11 +321,15 @@ main_menu_ui_new (PanelApplet *applet)
 
 	priv->panel_applet = applet;
 
-	glade_xml_path = g_build_filename (DATADIR, PACKAGE, "slab-window.glade", NULL);
+	window_ui_path = g_build_filename (DATADIR, PACKAGE, "slab-window.ui", NULL);
+	button_ui_path = g_build_filename (DATADIR, PACKAGE, "slab-button.ui", NULL);
 
-	priv->main_menu_xml    = glade_xml_new (glade_xml_path, "slab-main-menu-window", NULL);
-	priv->panel_button_xml = glade_xml_new (glade_xml_path, "slab-panel-button-root", NULL);
-	g_free (glade_xml_path);
+	priv->main_menu_ui    = gtk_builder_new ();
+	gtk_builder_add_from_file (priv->main_menu_ui, window_ui_path, NULL);
+	priv->panel_button_ui = gtk_builder_new ();
+	gtk_builder_add_from_file (priv->panel_button_ui, button_ui_path, NULL);
+	g_free (window_ui_path);
+	g_free (button_ui_path);
 
 	libslab_checkpoint ("main_menu_ui_new(): create_panel_button");
 	create_panel_button (this);
@@ -353,8 +356,8 @@ main_menu_ui_init (MainMenuUI *this)
 	priv->panel_applet                               = NULL;
 	priv->panel_about_dialog                         = NULL;
 
-	priv->main_menu_xml                              = NULL;
-	priv->panel_button_xml                           = NULL;
+	priv->main_menu_ui                               = NULL;
+	priv->panel_button_ui                            = NULL;
 
 	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP]    = NULL;
 	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = NULL;
@@ -492,19 +495,19 @@ create_panel_button (MainMenuUI *this)
 	gint i;
 
 
-	button_root = glade_xml_get_widget (
-		priv->panel_button_xml, "slab-panel-button-root");
+	button_root = GTK_WIDGET (gtk_builder_get_object (
+		priv->panel_button_ui, "slab-panel-button-root"));
 
 	gtk_widget_hide (button_root);
 
-	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
-		priv->panel_button_xml, "slab-main-menu-panel-button-top"));
-	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
-		priv->panel_button_xml, "slab-main-menu-panel-button-bottom"));
-	priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
-		priv->panel_button_xml, "slab-main-menu-panel-button-left"));
-	priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
-		priv->panel_button_xml, "slab-main-menu-panel-button-right"));
+	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
+		priv->panel_button_ui, "slab-main-menu-panel-button-top"));
+	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
+		priv->panel_button_ui, "slab-main-menu-panel-button-bottom"));
+	priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
+		priv->panel_button_ui, "slab-main-menu-panel-button-left"));
+	priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
+		priv->panel_button_ui, "slab-main-menu-panel-button-right"));
 
 	for (i = 0; i < 4; ++i) {
 		g_object_set_data (
@@ -554,6 +557,13 @@ create_panel_button (MainMenuUI *this)
 		G_CALLBACK (panel_applet_change_background_cb), this);
 }
 
+static GtkWidget *
+get_widget (MainMenuUIPrivate *priv, const gchar *name)
+{
+	return GTK_WIDGET (gtk_builder_get_object (priv->main_menu_ui, name));
+}
+
+
 static void
 create_slab_window (MainMenuUI *this)
 {
@@ -562,14 +572,13 @@ create_slab_window (MainMenuUI *this)
 	GdkAtom slab_action_atom;
 
 
-	priv->slab_window = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-main-menu-window");
+	priv->slab_window = get_widget (priv, "slab-main-menu-window");
 	gtk_widget_set_app_paintable (priv->slab_window, TRUE);
 	gtk_widget_hide              (priv->slab_window);
 	gtk_window_stick             (GTK_WINDOW (priv->slab_window));
 
-	priv->top_pane  = glade_xml_get_widget (priv->main_menu_xml, "top-pane");
-	priv->left_pane = glade_xml_get_widget (priv->main_menu_xml, "left-pane");
+	priv->top_pane  = get_widget (priv, "top-pane");
+	priv->left_pane = get_widget (priv, "left-pane");
 
 	tomboy_keybinder_init ();
 	tomboy_keybinder_bind ("<Ctrl>Escape", slab_window_tomboy_bindkey_cb, this);
@@ -614,8 +623,8 @@ create_search_section (MainMenuUI *this)
 {
 	MainMenuUIPrivate *priv = PRIVATE (this);
 
-        priv->search_section = glade_xml_get_widget (priv->main_menu_xml, "search-section");
-	priv->search_entry   = glade_xml_get_widget (priv->main_menu_xml, "search-entry");
+	priv->search_section = get_widget (priv, "search-section");
+	priv->search_entry   = get_widget (priv, "search-entry");
 
 	g_signal_connect (
 		G_OBJECT (priv->search_entry), "activate",
@@ -637,19 +646,19 @@ create_file_section (MainMenuUI *this)
 	gint i;
 
 
-	priv->file_section = GTK_NOTEBOOK (glade_xml_get_widget (
-		priv->main_menu_xml, "file-area-notebook"));
+	priv->file_section = GTK_NOTEBOOK (gtk_builder_get_object (
+		priv->main_menu_ui, "file-area-notebook"));
 
-	priv->page_selectors [APPS_PAGE] = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-page-selector-button-applications");
-	priv->page_selectors [DOCS_PAGE] = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-page-selector-button-documents");
-	priv->page_selectors [DIRS_PAGE] = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-page-selector-button-places");
+	priv->page_selectors [APPS_PAGE] =
+        get_widget (priv, "slab-page-selector-button-applications");
+	priv->page_selectors [DOCS_PAGE] =
+        get_widget (priv, "slab-page-selector-button-documents");
+	priv->page_selectors [DIRS_PAGE] =
+        get_widget (priv, "slab-page-selector-button-places");
 
-	pages [APPS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "applications-page");
-	pages [DOCS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "documents-page");
-	pages [DIRS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "places-page");
+	pages [APPS_PAGE] = get_widget (priv, "applications-page");
+	pages [DOCS_PAGE] = get_widget (priv, "documents-page");
+	pages [DIRS_PAGE] = get_widget (priv, "places-page");
 
 	for (i = 0; i < 3; ++i) {
 		gtk_container_child_get (
@@ -667,16 +676,16 @@ create_file_section (MainMenuUI *this)
 	priv->current_page_gconf_mntr_id = libslab_gconf_notify_add (
 		CURRENT_PAGE_GCONF_KEY, current_page_notify_cb, this);
 
-	priv->table_sections [USER_APPS_TABLE] = glade_xml_get_widget (
-		priv->main_menu_xml, "user-apps-section");
-	priv->table_sections [RCNT_APPS_TABLE] = glade_xml_get_widget (
-		priv->main_menu_xml, "recent-apps-section");
-	priv->table_sections [USER_DOCS_TABLE] = glade_xml_get_widget (
-		priv->main_menu_xml, "user-docs-section");
-	priv->table_sections [RCNT_DOCS_TABLE] = glade_xml_get_widget (
-		priv->main_menu_xml, "recent-docs-section");
-	priv->table_sections [USER_DIRS_TABLE] = glade_xml_get_widget (
-		priv->main_menu_xml, "user-dirs-section");
+	priv->table_sections [USER_APPS_TABLE] =
+        get_widget (priv, "user-apps-section");
+	priv->table_sections [RCNT_APPS_TABLE] =
+        get_widget (priv, "recent-apps-section");
+	priv->table_sections [USER_DOCS_TABLE] =
+        get_widget (priv, "user-docs-section");
+	priv->table_sections [RCNT_DOCS_TABLE] =
+        get_widget (priv, "recent-docs-section");
+	priv->table_sections [USER_DIRS_TABLE] =
+        get_widget (priv, "user-dirs-section");
 }
 
 static void
@@ -687,8 +696,8 @@ create_system_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "system-item-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "system-item-table-container"));
 
 	priv->sys_table = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_SYSTEM], -1, 1, TRUE, TRUE,
@@ -702,8 +711,7 @@ create_system_section (MainMenuUI *this)
 		G_OBJECT (priv->sys_table), "notify::" TILE_TABLE_TILES_PROP,
 		G_CALLBACK (tile_table_notify_cb), this);
 
-	priv->system_section = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-system-section");
+	priv->system_section = get_widget (priv, "slab-system-section");
 }
 
 static void
@@ -717,8 +725,8 @@ create_status_section (MainMenuUI *this)
 	gint icon_width;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "hard-drive-status-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "hard-drive-status-container"));
 	tile = hard_drive_status_tile_new ();
 
 	gtk_icon_size_lookup (GTK_ICON_SIZE_DND, & icon_width, NULL);
@@ -729,8 +737,8 @@ create_status_section (MainMenuUI *this)
 	gtk_container_add   (ctnr, tile);
 	gtk_widget_show_all (GTK_WIDGET (ctnr));
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "network-status-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "network-status-container"));
 	priv->network_status = network_status_tile_new ();
 
 	gtk_widget_set_size_request (priv->network_status, 6 * icon_width, -1);
@@ -742,8 +750,8 @@ create_status_section (MainMenuUI *this)
 	gtk_container_add   (ctnr, priv->network_status);
 	gtk_widget_show_all (GTK_WIDGET (ctnr));
 
-	priv->status_section = glade_xml_get_widget (
-		priv->main_menu_xml, "slab-status-section");
+	priv->status_section = get_widget (priv, "slab-status-section");
+
 }
 
 static void
@@ -754,8 +762,8 @@ create_user_apps_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "user-apps-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "user-apps-table-container"));
 
 	priv->file_tables [USER_APPS_TABLE] = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_USER_APPS], -1, 2, TRUE, TRUE,
@@ -772,8 +780,8 @@ create_rct_apps_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "recent-apps-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "recent-apps-table-container"));
 
 	priv->file_tables [RCNT_APPS_TABLE] = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_RECENT_APPS], -1, 2, FALSE, FALSE,
@@ -790,8 +798,8 @@ create_user_docs_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "user-docs-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "user-docs-table-container"));
 
 	priv->file_tables [USER_DOCS_TABLE] = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_USER_DOCS], -1, 2, TRUE, TRUE,
@@ -808,8 +816,8 @@ create_rct_docs_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "recent-docs-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "recent-docs-table-container"));
 
 	priv->file_tables [RCNT_DOCS_TABLE] = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_RECENT_DOCS], -1, 2, FALSE, FALSE,
@@ -832,8 +840,8 @@ create_user_dirs_section (MainMenuUI *this)
 	GtkContainer *ctnr;
 
 
-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
-		priv->main_menu_xml, "user-dirs-table-container"));
+	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+		priv->main_menu_ui, "user-dirs-table-container"));
 
 	priv->file_tables [USER_DIRS_TABLE] = TILE_TABLE (tile_table_new (
 		priv->bm_agents [BOOKMARK_STORE_USER_DIRS], -1, 2, FALSE, FALSE,
@@ -850,9 +858,9 @@ create_more_buttons (MainMenuUI *this)
 	gint i;
 
 
-	priv->more_buttons [0] = glade_xml_get_widget (priv->main_menu_xml, "more-applications-button");
-	priv->more_buttons [1] = glade_xml_get_widget (priv->main_menu_xml, "more-documents-button");
-	priv->more_buttons [2] = glade_xml_get_widget (priv->main_menu_xml, "more-places-button");
+	priv->more_buttons [0] = get_widget (priv, "more-applications-button");
+	priv->more_buttons [1] = get_widget (priv, "more-documents-button");
+	priv->more_buttons [2] = get_widget (priv, "more-places-button");
 
 	for (i = 0; i < 3; ++i) {
 		g_object_set_data (
@@ -864,9 +872,9 @@ create_more_buttons (MainMenuUI *this)
 			G_CALLBACK (more_buttons_clicked_cb), this);
 	}
 
-	priv->more_sections [0] = glade_xml_get_widget (priv->main_menu_xml, "more-apps-section");
-	priv->more_sections [1] = glade_xml_get_widget (priv->main_menu_xml, "more-docs-section");
-	priv->more_sections [2] = glade_xml_get_widget (priv->main_menu_xml, "more-dirs-section");
+	priv->more_sections [0] = get_widget (priv, "more-apps-section");
+	priv->more_sections [1] = get_widget (priv, "more-docs-section");
+	priv->more_sections [2] = get_widget (priv, "more-dirs-section");
 }
 
 static void
diff --git a/main-menu/src/network-status-tile.c b/main-menu/src/network-status-tile.c
index 3b31cfd..655d9e7 100644
--- a/main-menu/src/network-status-tile.c
+++ b/main-menu/src/network-status-tile.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glade/glade.h>
 
 #include "network-status-agent.h"
 #include "network-status-info.h"
@@ -46,7 +45,7 @@ static void tile_show_event_cb (GtkWidget *, gpointer);
 static void status_changed_cb (NetworkStatusAgent *, gpointer);
 static void info_dialog_cfg_button_clicked_cb (GtkButton *, gpointer);
 
-static void set_glade_label (GladeXML *, const gchar *, const gchar *);
+static void set_ui_label (GtkBuilder *, const gchar *, const gchar *);
 static void launch_network_config (const gchar * desktop_key);
 
 typedef struct
@@ -54,7 +53,7 @@ typedef struct
 	NetworkStatusAgent *agent;
 	NetworkStatusInfo *status_info;
 	
-	GladeXML *info_dialog_xml;
+	GtkBuilder *info_dialog_ui;
 	GtkWidget *info_dialog;
 } NetworkStatusTilePrivate;
 
@@ -120,7 +119,7 @@ network_status_tile_init (NetworkStatusTile * tile)
 	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
 
 	priv->agent = NULL;
-	priv->info_dialog_xml = NULL;
+	priv->info_dialog_ui = NULL;
 	priv->info_dialog = NULL;
 }
 
@@ -132,8 +131,8 @@ network_status_tile_finalize (GObject * g_object)
 		g_object_unref (priv->status_info);
 	if (priv->agent)
 		g_object_unref (priv->agent);
-	if (priv->info_dialog_xml)
-		g_object_unref (priv->info_dialog_xml);
+	if (priv->info_dialog_ui)
+		g_object_unref (priv->info_dialog_ui);
 
 	(*G_OBJECT_CLASS (network_status_tile_parent_class)->finalize) (g_object);
 }
@@ -330,7 +329,7 @@ update_info_dialog (NetworkStatusTile * tile)
 {
 	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
 
-	GladeXML *xml = priv->info_dialog_xml;
+	GtkBuilder *ui = priv->info_dialog_ui;
 
 	gchar *iface_and_type = NULL;
 	gchar *speed = NULL;
@@ -365,7 +364,7 @@ update_info_dialog (NetworkStatusTile * tile)
 		break;
 	}
 
-	set_glade_label (xml, "label-interface", iface_and_type);
+	set_ui_label (ui, "label-interface", iface_and_type);
 	g_free (iface_and_type);
 
 	if (priv->status_info->speed_mbs)
@@ -373,18 +372,18 @@ update_info_dialog (NetworkStatusTile * tile)
 	else
 		speed = g_strdup_printf (_("Unknown"));
 
-	set_glade_label (xml, "label-speed", speed);
+	set_ui_label (ui, "label-speed", speed);
 	g_free (speed);
 
-	set_glade_label (xml, "label-driver", priv->status_info->driver);
-	set_glade_label (xml, "label-ip-address", priv->status_info->ip4_addr);
-	set_glade_label (xml, "label-broadcast-address", priv->status_info->broadcast);
-	set_glade_label (xml, "label-subnet-mask", priv->status_info->subnet_mask);
-	set_glade_label (xml, "label-default-route", priv->status_info->route);
-	set_glade_label (xml, "label-primary-dns", priv->status_info->primary_dns);
-	set_glade_label (xml, "label-secondary-dns", priv->status_info->secondary_dns);
+	set_ui_label (ui, "label-driver", priv->status_info->driver);
+	set_ui_label (ui, "label-ip-address", priv->status_info->ip4_addr);
+	set_ui_label (ui, "label-broadcast-address", priv->status_info->broadcast);
+	set_ui_label (ui, "label-subnet-mask", priv->status_info->subnet_mask);
+	set_ui_label (ui, "label-default-route", priv->status_info->route);
+	set_ui_label (ui, "label-primary-dns", priv->status_info->primary_dns);
+	set_ui_label (ui, "label-secondary-dns", priv->status_info->secondary_dns);
 	if (priv->status_info->hw_addr)
-		set_glade_label (xml, "label-hardware-address", priv->status_info->hw_addr);
+		set_ui_label (ui, "label-hardware-address", priv->status_info->hw_addr);
 }
 
 static void
@@ -432,11 +431,11 @@ info_dialog_cfg_button_clicked_cb (GtkButton * button, gpointer user_data)
 }
 
 static void
-set_glade_label (GladeXML * xml, const gchar * id, const gchar * text)
+set_ui_label (GtkBuilder * ui, const gchar * id, const gchar * text)
 {
 	GtkLabel *label = NULL;
 
-	label = GTK_LABEL (glade_xml_get_widget (xml, id));
+	label = GTK_LABEL (gtk_builder_get_object (ui, id));
 
 	if (label)
 		gtk_label_set_text (label, text);
diff --git a/main-menu/src/slab-button.ui b/main-menu/src/slab-button.ui
new file mode 100644
index 0000000..4b3d863
--- /dev/null
+++ b/main-menu/src/slab-button.ui
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="slab-panel-button-root">
+    <property name="title" translatable="yes">window1</property>
+    <child>
+      <object class="GtkHBox" id="hbox42">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkAlignment" id="alignment12">
+            <property name="visible">True</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkToggleButton" id="slab-main-menu-panel-button-top">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <child>
+                  <object class="GtkHBox" id="panel-button-inner-container">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="panel-button-icon">
+                        <property name="visible">True</property>
+                        <property name="icon_name">gnome-fs-client</property>
+                        <property name="icon-size">1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="panel-button-label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Computer</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment14">
+            <property name="visible">True</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkToggleButton" id="slab-main-menu-panel-button-left">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <child>
+                  <object class="GtkVBox" id="vbox42">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label91">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Computer</property>
+                        <property name="angle">90</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="image42">
+                        <property name="visible">True</property>
+                        <property name="icon_name">gnome-fs-client</property>
+                        <property name="icon-size">1</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment13">
+            <property name="visible">True</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkToggleButton" id="slab-main-menu-panel-button-right">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <child>
+                  <object class="GtkVBox" id="vbox43">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="image43">
+                        <property name="visible">True</property>
+                        <property name="icon_name">gnome-fs-client</property>
+                        <property name="icon-size">1</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label92">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Computer</property>
+                        <property name="angle">270</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment25">
+            <property name="visible">True</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkToggleButton" id="slab-main-menu-panel-button-bottom">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <child>
+                  <object class="GtkHBox" id="hbox43">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="image44">
+                        <property name="visible">True</property>
+                        <property name="icon_name">gnome-fs-client</property>
+                        <property name="icon-size">1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label93">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Computer</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/main-menu/src/slab-window.ui b/main-menu/src/slab-window.ui
new file mode 100644
index 0000000..74b8067
--- /dev/null
+++ b/main-menu/src/slab-window.ui
@@ -0,0 +1,635 @@
+<?xml version="1.0"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="slab-main-menu-window">
+    <property name="border_width">3</property>
+    <property name="type">popup</property>
+    <property name="title" translatable="yes">GNOME Main Menu</property>
+    <property name="resizable">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">gnome-fs-client</property>
+    <property name="type_hint">menu</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="decorated">False</property>
+    <signal name="expose_event" handler="slab_window_expose_cb"/>
+    <child>
+      <object class="GtkHBox" id="hbox1">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkAlignment" id="left-pane">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" id="vbox_0">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkAlignment" id="top-pane">
+                    <property name="visible">True</property>
+                    <property name="right_padding">6</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox_1">
+                        <property name="visible">True</property>
+                        <property name="border_width">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkHBox" id="search-section">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="icon_name">system-search</property>
+                                <property name="icon-size">5</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Search:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="search-entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment1">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox3">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="slab-page-selector-button-applications">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="focus_on_click">False</property>
+                                    <property name="draw_indicator">False</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label94">
+                                        <property name="visible">True</property>
+                                        <property name="xpad">12</property>
+                                        <property name="label" translatable="yes">Applications</property>
+                                        <property name="justify">center</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="slab-page-selector-button-documents">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="focus_on_click">False</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">slab-page-selector-button-applications</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label95">
+                                        <property name="visible">True</property>
+                                        <property name="xpad">12</property>
+                                        <property name="label" translatable="yes">Documents</property>
+                                        <property name="justify">center</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="slab-page-selector-button-places">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="focus_on_click">False</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">slab-page-selector-button-applications</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label96">
+                                        <property name="visible">True</property>
+                                        <property name="xpad">12</property>
+                                        <property name="label" translatable="yes">Places</property>
+                                        <property name="justify">center</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkNotebook" id="file-area-notebook">
+                    <property name="visible">True</property>
+                    <property name="border_width">3</property>
+                    <property name="show_tabs">False</property>
+                    <property name="show_border">False</property>
+                    <child>
+                      <object class="GtkAlignment" id="applications-page">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <property name="right_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox3">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkVBox" id="user-apps-section">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="slab-favorite-applications">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Favorite Applications</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="user-apps-table-container">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="recent-apps-section">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="slab-recent-applications">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Recent Applications</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="recent-apps-table-container">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="more-apps-section">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <property name="bottom_padding">18</property>
+                                <child>
+                                  <object class="GtkButton" id="more-applications-button">
+                                    <property name="label" translatable="yes">More Applications...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">label2</property>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="documents-page">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <property name="right_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox44">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkVBox" id="user-docs-section">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="slab-favorite-documents">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Favorite Documents</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="user-docs-table-container">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVBox" id="recent-docs-section">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="slab-recent-documents">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Recent Documents</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="recent-docs-table-container">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="more-docs-section">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <property name="bottom_padding">18</property>
+                                <child>
+                                  <object class="GtkButton" id="more-documents-button">
+                                    <property name="label" translatable="yes">More Documents...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">label3</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="places-page">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <property name="right_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox45">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkVBox" id="user-dirs-section">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="slab-favorite-places">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Favorite Places</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="user-dirs-table-container">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="more-dirs-section">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <property name="bottom_padding">18</property>
+                                <child>
+                                  <object class="GtkButton" id="more-places-button">
+                                    <property name="label" translatable="yes">More Places...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="focus_on_click">False</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">label4</property>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkAlignment" id="alignment5">
+            <property name="visible">True</property>
+            <property name="top_padding">15</property>
+            <property name="bottom_padding">18</property>
+            <property name="left_padding">12</property>
+            <property name="right_padding">6</property>
+            <child>
+              <object class="GtkVBox" id="vbox30">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkVBox" id="slab-system-section">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="slab-side-system-label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">System</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="system-item-table-container">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="slab-status-section">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="slab-side-status-label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Status</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkVBox" id="vbox52">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkAlignment" id="hard-drive-status-container">
+                            <property name="visible">True</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="network-status-container">
+                            <property name="visible">True</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eeca3e3..c3be7a0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ main-menu/src/hard-drive-status-tile.c
 main-menu/src/main-menu-migration.c
 main-menu/src/main-menu-ui.c
 main-menu/src/network-status-tile.c
-main-menu/src/slab-window.glade
+[type: gettext/glade]main-menu/src/slab-button.ui
+[type: gettext/glade]main-menu/src/slab-window.ui
 nautilus-main-menu/nautilus-main-menu.c
 [type: gettext/xml] main-menu/etc/system-items.xbel.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]