[Xfce4-commits] <parole:bluesabre/gtk3> inline-toolbar, sensitive fixes
Sean Davis
noreply at xfce.org
Wed Aug 21 13:26:01 CEST 2013
Updating branch refs/heads/bluesabre/gtk3
to 735559aeb9c4eeaed4c31661ee68b14590cfd497 (commit)
from 416c64fbbf0534620de26effdab71525c515bcb9 (commit)
commit 735559aeb9c4eeaed4c31661ee68b14590cfd497
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Aug 21 07:24:02 2013 -0400
inline-toolbar, sensitive fixes
data/interfaces/parole.ui | 66 +++++++------
data/interfaces/playlist.ui | 229 ++++++++++++++++++++-----------------------
src/parole-medialist.c | 38 +++----
3 files changed, 163 insertions(+), 170 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ed87acf..d938c4d 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,6 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkImage" id="image_media_fullscreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">24</property>
+ <property name="icon_name">view-fullscreen-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image_media_next">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">24</property>
+ <property name="icon_name">media-skip-forward-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image_media_play">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">24</property>
+ <property name="icon_name">media-playback-start-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image_media_prev">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">24</property>
+ <property name="icon_name">media-skip-backward-symbolic</property>
+ </object>
+ <object class="GtkImage" id="image_media_toggleplaylist">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">24</property>
+ <property name="icon_name">view-list-symbolic</property>
+ </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -50,36 +80,6 @@
<property name="pixel_size">16</property>
<property name="icon_name">parole-extension</property>
</object>
- <object class="GtkImage" id="image_media_fullscreen">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">view-fullscreen-symbolic</property>
- </object>
- <object class="GtkImage" id="image_media_next">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">media-skip-forward-symbolic</property>
- </object>
- <object class="GtkImage" id="image_media_play">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">media-playback-start-symbolic</property>
- </object>
- <object class="GtkImage" id="image_media_prev">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">media-skip-backward-symbolic</property>
- </object>
- <object class="GtkImage" id="image_media_toggleplaylist">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">view-list-symbolic</property>
- </object>
<object class="GtkWindow" id="main-window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Parole Media Player</property>
@@ -456,8 +456,8 @@
<property name="use_underline">True</property>
<property name="image">image3</property>
<property name="use_stock">False</property>
- <accelerator key="plus" signal="activate"/>
<accelerator key="equal" signal="activate"/>
+ <accelerator key="plus" signal="activate"/>
<signal name="activate" handler="parole_player_volume_up" swapped="no"/>
</object>
</child>
@@ -700,6 +700,7 @@
<child>
<object class="GtkButton" id="media_prev">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
@@ -719,6 +720,7 @@
<child>
<object class="GtkButton" id="media_play">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
@@ -738,6 +740,7 @@
<child>
<object class="GtkButton" id="media_next">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
@@ -770,6 +773,7 @@
<child>
<object class="GtkScale" id="media_progress_slider">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index 37ff424..1fa5466 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -45,42 +45,6 @@
</object>
</child>
</object>
- <object class="GtkImage" id="image_add">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">3</property>
- </object>
- <object class="GtkImage" id="image_clear">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-clear</property>
- <property name="icon-size">3</property>
- </object>
- <object class="GtkImage" id="image_remove">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-remove</property>
- <property name="icon-size">3</property>
- </object>
- <object class="GtkImage" id="image_repeat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">media-playlist-repeat</property>
- </object>
- <object class="GtkImage" id="image_settings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-properties</property>
- <property name="icon-size">3</property>
- </object>
- <object class="GtkImage" id="image_shuffle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">24</property>
- <property name="icon_name">media-playlist-shuffle</property>
- </object>
<object class="GtkBox" id="playlist-box">
<property name="width_request">220</property>
<property name="visible">True</property>
@@ -237,30 +201,113 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="n_items">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Playlist empty</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkButton" id="add-media">
+ <object class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_add</property>
- <signal name="clicked" handler="parole_media_list_add_clicked_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">2</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
+ <child>
+ <object class="GtkToolButton" id="add-media">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-add-symbolic</property>
+ <signal name="clicked" handler="parole_media_list_add_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="remove-media">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ <signal name="clicked" handler="parole_media_list_remove_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="clear-media">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Clear</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-remove-all-symbolic</property>
+ <signal name="clicked" handler="parole_media_list_clear_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="repeat-media">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Repeat</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playlist-repeat-symbolic</property>
+ <signal name="toggled" handler="parole_media_list_repeat_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="shuffle-media">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Shuffle</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">media-playlist-shuffle-symbolic</property>
+ <signal name="toggled" handler="parole_media_list_shuffle_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="settings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">document-properties-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -269,82 +316,24 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="remove-media">
+ <object class="GtkLabel" id="n_items">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_remove</property>
- <signal name="clicked" handler="parole_media_list_remove_clicked_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Playlist empty</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="clear-media">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_clear</property>
- <signal name="clicked" handler="parole_media_list_clear_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="repeat-media">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_repeat</property>
- <signal name="toggled" handler="parole_media_list_repeat_toggled_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="shuffle-media">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_shuffle</property>
- <signal name="toggled" handler="parole_media_list_shuffle_toggled_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="settings">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image_settings</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">2</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index e9232fd..716a3c1 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -109,10 +109,10 @@ void parole_media_list_remove_clicked_cb (GtkButton *button,
void parole_media_list_clear_clicked_cb (GtkButton *button,
ParoleMediaList *list);
-void parole_media_list_repeat_toggled_cb (GtkToggleButton *button,
+void parole_media_list_repeat_toggled_cb (GtkToggleToolButton *button,
ParoleMediaList *list);
-void parole_media_list_shuffle_toggled_cb (GtkToggleButton *button,
+void parole_media_list_shuffle_toggled_cb (GtkToggleToolButton *button,
ParoleMediaList *list);
void parole_media_list_row_activated_cb (GtkTreeView *view,
@@ -579,22 +579,22 @@ parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
/* Callback for the repeat togglebutton */
void
-parole_media_list_repeat_toggled_cb (GtkToggleButton *button, ParoleMediaList *list)
+parole_media_list_repeat_toggled_cb (GtkToggleToolButton *button, ParoleMediaList *list)
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (button);
+ toggled = gtk_toggle_tool_button_get_active (button);
g_signal_emit (G_OBJECT (list), signals [REPEAT_TOGGLED], 0, toggled);
}
/* Callback for the shuffle togglebutton */
void
-parole_media_list_shuffle_toggled_cb (GtkToggleButton *button, ParoleMediaList *list)
+parole_media_list_shuffle_toggled_cb (GtkToggleToolButton *button, ParoleMediaList *list)
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (button);
+ toggled = gtk_toggle_tool_button_get_active (button);
g_signal_emit (G_OBJECT (list), signals [SHUFFLE_TOGGLED], 0, toggled);
}
@@ -1208,14 +1208,14 @@ static void
repeat_activated_cb (GtkWidget *mi, ParoleMediaList *list)
{
gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON( list->priv->repeat_button ), active);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON( list->priv->repeat_button ), active);
}
static void
shuffle_activated_cb (GtkWidget *mi, ParoleMediaList *list)
{
gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON( list->priv->shuffle_button ), active);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON( list->priv->shuffle_button ), active);
}
void
@@ -1244,7 +1244,7 @@ parole_media_list_menu_pos (GtkMenu *menu, gint *px, gint *py, gboolean *push_in
static void
parole_media_list_hide_menu (GtkWidget *widget)
{
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( widget ), FALSE );
+ gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON( widget ), FALSE );
}
static void
@@ -1314,9 +1314,9 @@ parole_media_list_dvd_chapter_activated (GtkMenuItem *widget, ParoleMediaList *l
static void
-parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList *list)
+parole_media_list_show_dvd_menu (GtkToggleToolButton *button, ParoleMediaList *list)
{
- gboolean toggled = gtk_toggle_button_get_active( button );
+ gboolean toggled = gtk_toggle_tool_button_get_active( button );
GtkBuilder *builder;
GtkMenu *menu;
GtkMenuItem *dvd_menu, *title_menu, *audio_menu, *angle_menu, *chapter_menu;
@@ -1363,9 +1363,9 @@ parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList *list)
}
static void
-parole_media_list_show_button_menu (GtkToggleButton *button, ParoleMediaList *list)
+parole_media_list_show_button_menu (GtkToggleToolButton *button, ParoleMediaList *list)
{
- gboolean toggled = gtk_toggle_button_get_active( button );
+ gboolean toggled = gtk_toggle_tool_button_get_active( button );
gboolean val;
GtkBuilder *builder;
GtkMenu *menu;
@@ -1745,7 +1745,7 @@ parole_media_list_init (ParoleMediaList *list)
list->priv->playlist_controls = GTK_WIDGET (gtk_builder_get_object(builder, "playlist_controls"));
list->priv->playlist_notebook = GTK_WIDGET (gtk_builder_get_object(builder, "playlist_notebook"));
- g_signal_connect (GTK_TOGGLE_BUTTON(list->priv->dvd_menu_button), "toggled",
+ g_signal_connect (GTK_TOGGLE_TOOL_BUTTON(list->priv->dvd_menu_button), "toggled",
G_CALLBACK (parole_media_list_show_dvd_menu), list);
list->priv->view = GTK_WIDGET (gtk_builder_get_object (builder, "media-list"));
@@ -1764,7 +1764,7 @@ parole_media_list_init (ParoleMediaList *list)
list->priv->settings_button = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
list->priv->n_items = GTK_WIDGET (gtk_builder_get_object (builder, "n_items"));
- g_signal_connect (GTK_TOGGLE_BUTTON(list->priv->settings_button), "toggled",
+ g_signal_connect (GTK_TOGGLE_TOOL_BUTTON(list->priv->settings_button), "toggled",
G_CALLBACK (parole_media_list_show_button_menu), list);
gtk_builder_connect_signals (builder, list);
@@ -2309,11 +2309,11 @@ parole_media_list_set_repeat_toggled (ParoleMediaList *list,
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (list->priv->repeat_button));
+ toggled = gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (list->priv->repeat_button));
if (toggled != repeat_toggled)
{
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (list->priv->repeat_button), repeat_toggled );
+ gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->repeat_button), repeat_toggled );
}
}
@@ -2323,10 +2323,10 @@ parole_media_list_set_shuffle_toggled (ParoleMediaList *list,
{
gboolean toggled;
- toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (list->priv->shuffle_button));
+ toggled = gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (list->priv->shuffle_button));
if (toggled != shuffle_toggled)
{
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (list->priv->shuffle_button), shuffle_toggled );
+ gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->shuffle_button), shuffle_toggled );
}
}
More information about the Xfce4-commits
mailing list