commit c34fe366fb6f9d7baeca337e6f448f98b09b46c9
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Thu Feb 17 23:43:48 2011 +0000
Migrate track display glade to gtkbuilder
.gitignore | 2 +-
plugins/track_display/Makefile.am | 2 +-
plugins/track_display/display_tracks.c | 41 ++--
.../{track_display.glade => track_display.xml} | 257 ++++++++++----------
plugins/track_display/track_display_preferences.c | 45 ++--
po/POTFILES.in | 2 +-
po/POTFILES.skip | 2 +-
7 files changed, 168 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f09e008..21e4d90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,7 +81,7 @@ version
/data/glade/exporter.xml
/data/glade/info_display.glade
/data/glade/sorttab_display.xml
-/data/glade/track_display.glade
+/data/glade/track_display.xml
/data/glade/repository_editor.glade
/data/glade/cover_display.xml
/data/glade/playlist_display_toolbar.xml
diff --git a/plugins/track_display/Makefile.am
b/plugins/track_display/Makefile.am
index 63673e3..ad79896 100644
--- a/plugins/track_display/Makefile.am
+++ b/plugins/track_display/Makefile.am
@@ -7,7 +7,7 @@ track_display_ui_DATA = $(plugin_name).ui
# Plugin Glade file
track_display_gladedir = $(gtkpod_glade_dir)
-track_display_glade_DATA = $(plugin_name).glade
+track_display_glade_DATA = $(plugin_name).xml
# Plugin Icon file
track_display_pixmapsdir = $(gtkpod_image_dir)
diff --git a/plugins/track_display/display_tracks.c
b/plugins/track_display/display_tracks.c
index 625527a..233de7c 100644
--- a/plugins/track_display/display_tracks.c
+++ b/plugins/track_display/display_tracks.c
@@ -58,8 +58,8 @@
#define gdk_drag_context_get_suggested_action(x) ((x)->suggested_action)
#endif
-/* reference to glade xml for use with track plugin */
-static GladeXML *track_glade = NULL;
+/* reference to gtkbuilder for use with track plugin */
+static GtkBuilder *trackbuilder = NULL;
/* pointer to the container for the track display */
static GtkWidget *track_container;
/* pointer to the current playlist label */
@@ -100,13 +100,13 @@ static GtkTargetEntry tm_drop_types[] =
const gchar *TM_PREFS_SEARCH_COLUMN = "tm_prefs_search_column";
const gchar *KEY_DISPLAY_SEARCH_ENTRY = "display_search_entry";
-static GladeXML *get_track_glade() {
- if (!track_glade) {
- gchar *glade_path = g_build_filename(get_glade_dir(),
"track_display.glade", NULL);
- track_glade = gtkpod_xml_new(glade_path, "track_display_window");
+static GtkBuilder *get_track_builder() {
+ if (!trackbuilder) {
+ gchar *glade_path = g_build_filename(get_glade_dir(),
"track_display.xml", NULL);
+ trackbuilder = gtkpod_builder_xml_new(glade_path);
g_free(glade_path);
}
- return track_glade;
+ return trackbuilder;
}
/* Convenience functions */
@@ -2009,7 +2009,7 @@ static void tm_create_treeview(void) {
gint col;
GtkWidget *stv = gtk_tree_view_new();
- track_window = gtkpod_xml_get_widget(get_track_glade(), "track_window");
+ track_window = gtkpod_builder_xml_get_widget(get_track_builder(),
"track_window");
g_return_if_fail (track_window);
/* create tree view */
@@ -2091,7 +2091,7 @@ static void tm_create_treeview(void) {
tm_set_search_column(TM_COLUMN_TITLE);
}
- track_filter_entry = gtkpod_xml_get_widget(get_track_glade(),
"search_entry");
+ track_filter_entry = gtkpod_builder_xml_get_widget(get_track_builder(),
"search_entry");
g_return_if_fail (track_filter_entry);
g_signal_connect (G_OBJECT (track_filter_entry), "changed",
@@ -2100,10 +2100,10 @@ static void tm_create_treeview(void) {
}
void tm_create_track_display(GtkWidget *parent) {
- GtkWidget *track_display_window = gtkpod_xml_get_widget(get_track_glade(),
"track_display_window");
- track_container = gtkpod_xml_get_widget(get_track_glade(),
"track_display_vbox");
- search_entry = gtkpod_xml_get_widget(get_track_glade(), "search_entry");
- current_playlist_label = gtkpod_xml_get_widget(get_track_glade(),
"current_playlist_label");
+ GtkWidget *track_display_window =
gtkpod_builder_xml_get_widget(get_track_builder(), "track_display_window");
+ track_container = gtkpod_builder_xml_get_widget(get_track_builder(),
"track_display_vbox");
+ search_entry = gtkpod_builder_xml_get_widget(get_track_builder(),
"search_entry");
+ current_playlist_label =
gtkpod_builder_xml_get_widget(get_track_builder(), "current_playlist_label");
tm_create_treeview();
g_object_ref(track_container);
@@ -2376,10 +2376,10 @@ gboolean tm_add_filelist(gchar *data, GtkTreePath
*path, GtkTreeViewDropPosition
* the prefs
*/
void display_show_hide_searchbar(void) {
- GtkWidget *upbutton = gtkpod_xml_get_widget(get_track_glade(),
"searchbar_up_button");
- GtkWidget *searchbar = gtkpod_xml_get_widget(get_track_glade(),
"searchbar_hpanel");
- GtkCheckMenuItem *mi = GTK_CHECK_MENU_ITEM (gtkpod_xml_get_widget
(get_track_glade(), "filterbar_menu"));
- GtkStatusbar *sb = GTK_STATUSBAR (gtkpod_xml_get_widget
(get_track_glade(), "tracks_statusbar"));
+ GtkWidget *upbutton = gtkpod_builder_xml_get_widget(get_track_builder(),
"searchbar_up_button");
+ GtkWidget *searchbar = gtkpod_builder_xml_get_widget(get_track_builder(),
"searchbar_hpanel");
+ GtkCheckMenuItem *mi = GTK_CHECK_MENU_ITEM (gtkpod_builder_xml_get_widget
(get_track_builder(), "filterbar_menu"));
+ GtkStatusbar *sb = GTK_STATUSBAR (gtkpod_builder_xml_get_widget
(get_track_builder(), "tracks_statusbar"));
g_return_if_fail (upbutton);
g_return_if_fail (searchbar);
@@ -2390,19 +2390,12 @@ void display_show_hide_searchbar(void) {
gtk_widget_show_all(searchbar);
gtk_widget_hide(upbutton);
gtk_check_menu_item_set_active(mi, TRUE);
- g_warning("Do we need to resize the status bar grip?");
- // gtk_statusbar_set_has_resize_grip(sb, TRUE);
- // /* hack needed to make GTK aware of the changed
- // position for the resize grip */
- // g_idle_add(display_redraw_statusbar, NULL);
}
else {
gtk_widget_hide_all(searchbar);
gtk_widget_show(upbutton);
gtk_widget_set_sensitive(upbutton, TRUE);
gtk_check_menu_item_set_active(mi, FALSE);
- g_warning("Do we need to resize the status bar grip?");
- // gtk_statusbar_set_has_resize_grip(sb, FALSE);
}
}
diff --git a/plugins/track_display/track_display.glade
b/plugins/track_display/track_display.xml
similarity index 82%
rename from plugins/track_display/track_display.glade
rename to plugins/track_display/track_display.xml
index 7312d58..e0a55c5 100644
--- a/plugins/track_display/track_display.glade
+++ b/plugins/track_display/track_display.xml
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.16 -->
+<interface>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="track_display_window">
+ <object class="GtkWindow" id="track_display_window">
<child>
- <widget class="GtkVBox" id="track_display_vbox">
+ <object class="GtkVBox" id="track_display_vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkHBox" id="searchbar_hpanel">
+ <object class="GtkHBox" id="searchbar_hpanel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="current_playlist_label">
+ <object class="GtkLabel" id="current_playlist_label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><span
weight='bold' size='larger'>No playlist selected</span></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -29,14 +29,14 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="search_entry">
+ <object class="GtkEntry" id="search_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="invisible_char">●</property>
<property name="width_chars">20</property>
<property name="primary_icon_stock">gtk-find</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -44,7 +44,7 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -52,7 +52,7 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="track_window">
+ <object class="GtkScrolledWindow" id="track_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
@@ -61,15 +61,15 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="prefs_columns_dialog">
+ </object>
+ <object class="GtkDialog" id="prefs_columns_dialog">
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Add Column</property>
@@ -81,68 +81,65 @@
<property name="skip_taskbar_hint">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox6">
+ <object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkFrame" id="frame14">
+ <object class="GtkFrame" id="frame14">
<property name="visible">True</property>
<property name="border_width">7</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment28">
+ <object class="GtkAlignment" id="alignment28">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="available_columns">
+ <object class="GtkTreeView" id="available_columns">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="headers_visible">False</property>
<property name="rules_hint">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label27">
+ <child type="label">
+ <object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Available
Columns</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area6">
+ <object class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="cancel_button2">
+ <object class="GtkButton" id="cancel_button2">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -150,99 +147,101 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="add_button">
+ <object class="GtkButton" id="add_button">
<property name="label">gtk-add</property>
- <property name="response_id">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_columns_dialog_add"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="prefs_window">
+ <action-widgets>
+ <action-widget response="0">cancel_button2</action-widget>
+ <action-widget response="1">add_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="prefs_window">
<child>
- <widget class="GtkNotebook" id="track_settings_notebook">
+ <object class="GtkNotebook" id="track_settings_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">40</property>
<child>
- <widget class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment14">
+ <object class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox46">
+ <object class="GtkVBox" id="vbox46">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow1">
+ <object class="GtkScrolledWindow"
id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="hscrollbar_policy">never</property>
<property
name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView"
id="displayed_columns">
+ <object class="GtkTreeView"
id="displayed_columns">
<property
name="height_request">90</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property
name="headers_visible">False</property>
<property name="rules_hint">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox2">
+ <object class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">spread</property>
<child>
- <widget class="GtkButton" id="column_add">
+ <object class="GtkButton" id="column_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked"
handler="on_column_add_clicked"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -250,34 +249,34 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="column_remove">
+ <object class="GtkButton" id="column_remove">
<property
name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked"
handler="on_column_remove_clicked"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="horizontal_scrollbar">
+ <object class="GtkCheckButton"
id="horizontal_scrollbar">
<property name="label" translatable="yes">Expand
columns beyond the track list width</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -285,104 +284,101 @@
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="on_horizontal_scrollbar_toggled"/>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="tm_cfg_case_sensitive">
+ <object class="GtkCheckButton"
id="tm_cfg_case_sensitive">
<property name="label" translatable="yes">Case
sensitive sorting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">If
checked, sorting will be case sensitive. Please note that case sensitive
sorting will not work well with most charsets.</property>
+ <property name="tooltip_text"
translatable="yes">If checked, sorting will be case sensitive. Please note that
case sensitive sorting will not work well with most charsets.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="on_tm_sort_case_sensitive_toggled"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label7">
+ <child type="label">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label"
translatable="yes"><b>Displayed Columns</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox137">
+ <object class="GtkVBox" id="vbox137">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow15">
+ <object class="GtkScrolledWindow"
id="scrolledwindow15">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="hscrollbar_policy">never</property>
<property
name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView"
id="ign_words_view">
+ <object class="GtkTreeView"
id="ign_words_view">
<property
name="height_request">90</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="headers_visible">False</property>
<property
name="headers_clickable">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">spread</property>
<child>
- <widget class="GtkButton" id="ign_word_add">
+ <object class="GtkButton" id="ign_word_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked"
handler="on_ign_word_add_clicked"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -390,39 +386,39 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="ign_word_remove">
+ <object class="GtkButton"
id="ign_word_remove">
<property
name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked"
handler="on_ign_word_remove_clicked"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label310">
+ <object class="GtkLabel" id="label310">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="xalign">0.039999999105930328</property>
<property name="label" translatable="yes">Ignore
these words when at the beginning of the following fields:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -430,21 +426,21 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox158">
+ <object class="GtkHBox" id="hbox158">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox138">
+ <object class="GtkVBox" id="vbox138">
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton"
id="sort_ign_field_3">
+ <object class="GtkCheckButton"
id="sort_ign_field_3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -452,12 +448,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="sort_ign_field_1">
+ <object class="GtkCheckButton"
id="sort_ign_field_1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -470,23 +466,23 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox139">
+ <object class="GtkVBox" id="vbox139">
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton"
id="sort_ign_field_2">
+ <object class="GtkCheckButton"
id="sort_ign_field_2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -494,12 +490,12 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="sort_ign_field_6">
+ <object class="GtkCheckButton"
id="sort_ign_field_6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -512,13 +508,13 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox140">
+ <object class="GtkVBox" id="vbox140">
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
@@ -534,84 +530,77 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <child type="label">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Ignore
Frequent Words</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkComboBox" id="track_exec_cmd_combo">
+ <object class="GtkComboBox" id="track_exec_cmd_combo">
<property name="visible">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label"
translatable="yes"><b>Preferred Track Execution
Command</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="display_page_label">
+ <child type="tab">
+ <object class="GtkLabel" id="display_page_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Track Display</property>
- </widget>
+ </object>
<packing>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+</interface>
diff --git a/plugins/track_display/track_display_preferences.c
b/plugins/track_display/track_display_preferences.c
index 8b39109..52a88e1 100644
--- a/plugins/track_display/track_display_preferences.c
+++ b/plugins/track_display/track_display_preferences.c
@@ -27,7 +27,6 @@
*/
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "libgtkpod/misc.h"
#include "libgtkpod/misc_conversion.h"
#include "libgtkpod/prefs.h"
@@ -35,7 +34,7 @@
#include "plugin.h"
#include "display_tracks.h"
-static GladeXML *preference_xml;
+static GtkBuilder *prefbuilder;
static GtkWidget *notebook = NULL;
static GtkWidget *displayed_columns_view = NULL;
@@ -198,7 +197,7 @@ static void apply_ign_strings() {
/* read sort field states */
for (i = 0; sort_ign_fields[i] != -1; ++i) {
buf = g_strdup_printf("sort_ign_field_%d", sort_ign_fields[i]);
- GtkWidget *w = gtkpod_xml_get_widget(preference_xml, buf);
+ GtkWidget *w = gtkpod_builder_xml_get_widget(prefbuilder, buf);
g_return_if_fail (w);
prefs_set_int(buf, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(w)));
g_free(buf);
@@ -293,12 +292,12 @@ G_MODULE_EXPORT void on_column_add_clicked (GtkButton
*sender, gpointer e) {
gint i;
GtkTreeModel *model;
GtkTreeIter iter;
- GladeXML *xml;
+ GtkBuilder *builder;
- gchar *glade_path = g_build_filename(get_glade_dir(),
"track_display.glade", NULL);
- xml = gtkpod_xml_new(glade_path, "prefs_columns_dialog");
- GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_columns_dialog");
- GtkTreeView *view = GTK_TREE_VIEW (gtkpod_xml_get_widget (xml,
"available_columns"));
+ gchar *glade_path = g_build_filename(get_glade_dir(), "track_display.xml",
NULL);
+ builder = gtkpod_builder_xml_new(glade_path);
+ GtkWidget *dlg = gtkpod_builder_xml_get_widget (builder,
"prefs_columns_dialog");
+ GtkTreeView *view = GTK_TREE_VIEW (gtkpod_builder_xml_get_widget (builder,
"available_columns"));
g_free(glade_path);
gtk_window_set_transient_for (GTK_WINDOW (dlg),
notebook_get_parent_window());
@@ -308,7 +307,7 @@ G_MODULE_EXPORT void on_column_add_clicked (GtkButton
*sender, gpointer e) {
if(!gtk_dialog_run (GTK_DIALOG (dlg)))
{
gtk_widget_destroy (dlg);
- g_object_unref (xml);
+ g_object_unref (builder);
return;
}
@@ -318,7 +317,7 @@ G_MODULE_EXPORT void on_column_add_clicked (GtkButton
*sender, gpointer e) {
gtk_tree_model_get (model, &iter, 1, &i, -1);
gtk_widget_destroy (dlg);
- g_object_unref (xml);
+ g_object_unref (builder);
view = GTK_TREE_VIEW (displayed_columns_view);
model = gtk_tree_view_get_model (view);
@@ -420,15 +419,19 @@ G_MODULE_EXPORT void
on_tm_sort_case_sensitive_toggled(GtkToggleButton *togglebu
GtkWidget *init_track_display_preferences() {
GtkComboBox *cmd_combo;
gint i = 0;
- GtkWidget *w;
-
- gchar *glade_path = g_build_filename(get_glade_dir(),
"track_display.glade", NULL);
- preference_xml = gtkpod_xml_new(glade_path, "track_settings_notebook");
- notebook = gtkpod_xml_get_widget(preference_xml,
"track_settings_notebook");
- cmd_combo = GTK_COMBO_BOX(gtkpod_xml_get_widget(preference_xml,
"track_exec_cmd_combo"));
- displayed_columns_view = gtkpod_xml_get_widget(preference_xml,
"displayed_columns");
- ign_words_view = gtkpod_xml_get_widget(preference_xml, "ign_words_view");
+ GtkWidget *w, *win;
+
+ gchar *glade_path = g_build_filename(get_glade_dir(), "track_display.xml",
NULL);
+ prefbuilder = gtkpod_builder_xml_new(glade_path);
+ win = gtkpod_builder_xml_get_widget(prefbuilder, "prefs_window");
+ notebook = gtkpod_builder_xml_get_widget(prefbuilder,
"track_settings_notebook");
+ cmd_combo = GTK_COMBO_BOX(gtkpod_builder_xml_get_widget(prefbuilder,
"track_exec_cmd_combo"));
+ displayed_columns_view = gtkpod_builder_xml_get_widget(prefbuilder,
"displayed_columns");
+ ign_words_view = gtkpod_builder_xml_get_widget(prefbuilder,
"ign_words_view");
g_object_ref(notebook);
+ gtk_container_remove(GTK_CONTAINER(win), notebook);
+ gtk_widget_destroy(win);
+
g_free(glade_path);
setup_column_tree (GTK_TREE_VIEW(displayed_columns_view), TRUE);
@@ -437,7 +440,7 @@ GtkWidget *init_track_display_preferences() {
/* label the ignore-field checkbox-labels */
for (i = 0; sort_ign_fields[i] != -1; ++i) {
gchar *buf = g_strdup_printf("sort_ign_field_%d", sort_ign_fields[i]);
- w = gtkpod_xml_get_widget(preference_xml, buf);
+ w = gtkpod_builder_xml_get_widget(prefbuilder, buf);
g_return_val_if_fail (w, NULL);
gtk_button_set_label(GTK_BUTTON (w), gettext (get_t_string
(sort_ign_fields[i])));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (w),
prefs_get_int(buf));
@@ -447,11 +450,11 @@ GtkWidget *init_track_display_preferences() {
populate_track_cmd_combo(cmd_combo);
- if ((w = gtkpod_xml_get_widget(preference_xml, "tm_cfg_case_sensitive"))) {
+ if ((w = gtkpod_builder_xml_get_widget(prefbuilder,
"tm_cfg_case_sensitive"))) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("tm_case_sensitive"));
}
- glade_xml_signal_autoconnect(preference_xml);
+ gtk_builder_connect_signals(prefbuilder, NULL);
return notebook;
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 449b03a..908f512 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,7 +106,7 @@ plugins/sorttab_display/sorttab_display_context_menu.c
[type: gettext/ini]plugins/sorttab_display/sorttab_display.plugin.in
plugins/track_display/display_tracks.c
plugins/track_display/plugin.c
-plugins/track_display/track_display.glade
+[type: gettext/glade]plugins/track_display/track_display.xml
plugins/track_display/track_display_context_menu.c
[type: gettext/ini]plugins/track_display/track_display.plugin.in
plugins/track_display/track_display_preferences.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1d1706d..229c16e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -9,4 +9,4 @@ data/glade/photo_editor.glade
data/glade/playlist_display.glade
data/glade/repository_editor.glade
data/glade/sorttab_display.xml
-data/glade/track_display.glade
+data/glade/track_display.xml
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
