[rhythmbox] media-player: add encoding settings to the preferences dialog
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] media-player: add encoding settings to the preferences dialog
- Date: Thu, 30 Jul 2015 11:40:42 +0000 (UTC)
commit 06284bac27dd328e0b7ddb6c825ac519cdaa49cb
Author: Jonathan Matthew <jonathan d14n org>
Date: Wed Jul 29 23:06:01 2015 +1000
media-player: add encoding settings to the preferences dialog
data/ui/media-player-properties.ui | 39 +++++++++++++++++++++++++++++++++++-
sources/rb-media-player-source.c | 12 +++++++++++
2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/media-player-properties.ui b/data/ui/media-player-properties.ui
index cba03ce..2d643d2 100644
--- a/data/ui/media-player-properties.ui
+++ b/data/ui/media-player-properties.ui
@@ -101,12 +101,13 @@
<object class="GtkBox" id="device-usage-container">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -131,6 +132,42 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkBox" id="encoding-settings-container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Preferred format</property>
+ <property name="use_markup">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
<child type="tab">
diff --git a/sources/rb-media-player-source.c b/sources/rb-media-player-source.c
index 9affb61..6ff47f6 100644
--- a/sources/rb-media-player-source.c
+++ b/sources/rb-media-player-source.c
@@ -46,6 +46,7 @@
#include "rb-builder-helpers.h"
#include "rb-playlist-manager.h"
#include "rb-util.h"
+#include "rb-encoding-settings.h"
typedef struct {
RBSyncSettings *sync_settings;
@@ -478,6 +479,17 @@ rb_media_player_source_show_properties (RBMediaPlayerSource *source)
gtk_box_pack_start (GTK_BOX (container), rb_sync_state_ui_new (priv->sync_state), TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET (container));
+ /* create encoding settings UI */
+ if (priv->encoding_settings) {
+ container = GTK_CONTAINER (gtk_builder_get_object (builder, "encoding-settings-container"));
+ gtk_container_add (container, rb_encoding_settings_new (priv->encoding_settings,
priv->encoding_target, TRUE));
+ gtk_widget_show_all (GTK_WIDGET (container));
+ } else {
+ container = GTK_CONTAINER (gtk_builder_get_object (builder, "encoding-settings-frame"));
+ gtk_widget_hide (GTK_WIDGET (container));
+ gtk_widget_set_no_show_all (GTK_WIDGET (container), TRUE);
+ }
+
gtk_widget_show (GTK_WIDGET (priv->properties_dialog));
g_object_unref (builder);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]