[Xfce4-commits] <parole:master> Force LTR orientation on some of the controls (Bug #9822) The controls now use this layout in RTL: [Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Next] [Playtime]
Simon Steinbeiss
noreply at xfce.org
Fri Oct 11 11:52:57 CEST 2013
Updating branch refs/heads/master
to 5e2bc996c1db4f0b081526d212df02f5cd86f856 (commit)
from 4de371b7136f6d3d65778aac9a1cd9a14dfade10 (commit)
commit 5e2bc996c1db4f0b081526d212df02f5cd86f856
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Oct 7 11:12:14 2013 +0200
Force LTR orientation on some of the controls (Bug #9822)
The controls now use this layout in RTL:
[Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Next] [Playtime]
data/interfaces/parole.ui | 209 ++++++++++++++++++++++++---------------------
src/parole-player.c | 1 +
2 files changed, 111 insertions(+), 99 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 007d497..bb4964b 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -6,11 +6,11 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkImage" id="image_help_reportbug">
+ <object class="GtkImage" id="image_about">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">16</property>
- <property name="icon_name">face-sick-symbolic</property>
+ <property name="icon_name">gtk-about-symbolic</property>
<property name="use_fallback">True</property>
</object>
<object class="GtkImage" id="image_disc">
@@ -20,6 +20,13 @@
<property name="icon_name">media-optical-symbolic</property>
<property name="use_fallback">True</property>
</object>
+ <object class="GtkImage" id="image_help_reportbug">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">face-sick-symbolic</property>
+ <property name="use_fallback">True</property>
+ </object>
<object class="GtkImage" id="image_media_fullscreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -48,13 +55,6 @@
<property name="icon_name">media-skip-backward-symbolic</property>
<property name="use_fallback">True</property>
</object>
- <object class="GtkImage" id="image_about">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">16</property>
- <property name="icon_name">gtk-about-symbolic</property>
- <property name="use_fallback">True</property>
- </object>
<object class="GtkImage" id="image_menu_fullscreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -864,85 +864,109 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkButton" id="media_previous">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="image">image_media_previous</property>
- <property name="relief">none</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="media_playpause">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="image">image_media_playpause</property>
- <property name="relief">none</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="media_next">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="image">image_media_next</property>
- <property name="relief">none</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="media_time_elapsed">
+ <object class="GtkBox" id="ltrbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="label" translatable="yes">0:00</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="media_progress_slider">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="adjustment">adjustment1</property>
- <property name="draw_value">False</property>
- <signal name="value-changed" handler="parole_player_range_value_changed" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkProgressBar" id="media_buffering_progressbar">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="text" translatable="yes">Buffering (0%)</property>
- <property name="show_text">True</property>
+ <child>
+ <object class="GtkButton" id="media_previous">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="image">image_media_previous</property>
+ <property name="relief">none</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="media_playpause">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="image">image_media_playpause</property>
+ <property name="relief">none</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="media_next">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">True</property>
+ <property name="image">image_media_next</property>
+ <property name="relief">none</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="media_time_elapsed">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes">0:00</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="media_buffering_progressbar">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="text" translatable="yes">Buffering (0%)</property>
+ <property name="show_text">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="media_progress_slider">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="draw_value">False</property>
+ <signal name="value-changed" handler="parole_player_range_value_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="media_time_duration">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">0:00</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -951,19 +975,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="media_time_duration">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">12</property>
- <property name="label" translatable="yes">0:00</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
<object class="GtkVolumeButton" id="media_volumebutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/src/parole-player.c b/src/parole-player.c
index 6c2172b..27c8ffa 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3264,6 +3264,7 @@ parole_player_init (ParolePlayer *player)
gtk_activatable_set_related_action(GTK_ACTIVATABLE(player->priv->showhide_playlist_button), GTK_ACTION(player->priv->toggle_playlist_action));
/* End Media Controls */
+ gtk_widget_set_direction (GTK_WIDGET (gtk_builder_get_object (builder, "ltrbox")),GTK_TEXT_DIR_LTR);
g_signal_connect(player->priv->control, "draw", G_CALLBACK(parole_overlay_expose_event), NULL);
/* Info Bar */
More information about the Xfce4-commits
mailing list