[gnac/devel] Ported to GTK3
- From: BenoÃt Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac/devel] Ported to GTK3
- Date: Tue, 24 Jan 2012 23:49:18 +0000 (UTC)
commit 3ef80af560214a3da1ef70528006aeb2e2894500
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date: Tue Jan 24 23:49:08 2012 +0000
Ported to GTK3
configure.ac | 4 +-
data/profiles/ui/gnac-profiles-aac.xml | 26 ++++--
data/profiles/ui/gnac-profiles-base-advanced.xml | 10 ++-
data/profiles/ui/gnac-profiles-combo.xml | 26 +++---
data/profiles/ui/gnac-profiles-flac.xml | 16 +++-
data/profiles/ui/gnac-profiles-lame.xml | 61 ++++++++++---
data/profiles/ui/gnac-profiles-manager.xml | 103 ++++++++++------------
data/profiles/ui/gnac-profiles-properties.xml | 50 ++++------
data/profiles/ui/gnac-profiles-speex.xml | 71 +++++++++++----
data/profiles/ui/gnac-profiles-unknown.xml | 10 ++-
data/profiles/ui/gnac-profiles-vorbis.xml | 42 +++++++--
data/profiles/ui/gnac-profiles-wav.xml | 8 ++-
data/profiles/ui/gnac-profiles-wavpack.xml | 42 +++++++---
data/ui/gnac-pref-window.xml | 10 +--
data/ui/gnac-properties-window.xml | 23 -----
data/ui/gnac.xml | 2 -
src/gnac-options.c | 3 +-
src/profiles/gnac-profiles-properties.c | 2 +-
18 files changed, 303 insertions(+), 206 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f781f16..951a6d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
dnl Find the UI libraries
-AM_PATH_GTK_2_0
+AM_PATH_GTK_3_0
dnl libnotify
PKG_CHECK_MODULES(NOTIFY,
@@ -87,7 +87,7 @@ AC_SUBST(NOTIFY_LIBS)
dnl libunique
PKG_CHECK_MODULES(UNIQUE,
- [unique-1.0],
+ [unique-3.0],
AC_DEFINE(HAVE_LIBUNIQUE, 1,
[Define to 1 if you have the <unique/unique.h> header file.]),
AC_MSG_WARN(['libunique' was not found. Multiple instances of Gnac will be allowed.])
diff --git a/data/profiles/ui/gnac-profiles-aac.xml b/data/profiles/ui/gnac-profiles-aac.xml
index d28a437..8a6bfd4 100755
--- a/data/profiles/ui/gnac-profiles-aac.xml
+++ b/data/profiles/ui/gnac-profiles-aac.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -17,10 +18,12 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -28,6 +31,7 @@
<child>
<object class="GtkLabel" id="label-outputformat">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Output format</property>
</object>
@@ -41,10 +45,12 @@
<child>
<object class="GtkHBox" id="hbox-outputformat">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-outputformat">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -64,6 +70,7 @@
<child>
<object class="GtkLabel" id="label-profile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Profile</property>
</object>
@@ -77,10 +84,12 @@
<child>
<object class="GtkHBox" id="hbox-profile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-profile">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -104,8 +113,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gnac_profiles_aac_generate_pipeline"/>
+ <signal name="toggled" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -128,6 +138,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Advanced</property>
</object>
@@ -142,10 +153,12 @@
<child>
<object class="GtkHBox" id="hbox-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-bitrate">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -164,6 +177,7 @@
<child>
<object class="GtkLabel" id="label-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate</property>
</object>
diff --git a/data/profiles/ui/gnac-profiles-base-advanced.xml b/data/profiles/ui/gnac-profiles-base-advanced.xml
index 7fcac07..2b7569d 100755
--- a/data/profiles/ui/gnac-profiles-base-advanced.xml
+++ b/data/profiles/ui/gnac-profiles-base-advanced.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkTable" id="table-advanced-base">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -11,9 +11,11 @@
<child>
<object class="GtkHBox" id="hbox-sample-rate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-sample-rate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -34,9 +36,11 @@
<child>
<object class="GtkHBox" id="hbox-channels">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-channels">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -55,6 +59,7 @@
<child>
<object class="GtkLabel" id="label-sample-rate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Sample rate</property>
</object>
@@ -68,6 +73,7 @@
<child>
<object class="GtkLabel" id="label-channels">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Channels</property>
</object>
diff --git a/data/profiles/ui/gnac-profiles-combo.xml b/data/profiles/ui/gnac-profiles-combo.xml
index 2bfdc88..c7e39e2 100644
--- a/data/profiles/ui/gnac-profiles-combo.xml
+++ b/data/profiles/ui/gnac-profiles-combo.xml
@@ -1,15 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy project-wide -->
+ <object class="GtkListStore" id="liststore-profile">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name profile -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="window-temp">
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox-combo-profile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkComboBoxText" id="combo-profile">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore-profile</property>
</object>
<packing>
@@ -21,14 +31,16 @@
<child>
<object class="GtkHButtonBox" id="hbuttonbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="button-modify-profile">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="gnac_profiles_on_modify"/>
+ <signal name="clicked" handler="gnac_profiles_on_modify" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -46,12 +58,4 @@
</object>
</child>
</object>
- <object class="GtkListStore" id="liststore-profile">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name profile -->
- <column type="gpointer"/>
- </columns>
- </object>
</interface>
diff --git a/data/profiles/ui/gnac-profiles-flac.xml b/data/profiles/ui/gnac-profiles-flac.xml
index be43f74..4ffe63d 100755
--- a/data/profiles/ui/gnac-profiles-flac.xml
+++ b/data/profiles/ui/gnac-profiles-flac.xml
@@ -1,13 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1"/>
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -18,10 +19,12 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<property name="row_spacing">5</property>
@@ -38,6 +41,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Advanced</property>
</object>
@@ -52,9 +56,11 @@
<child>
<object class="GtkHBox" id="hbox-quality">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">fastest</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -73,15 +79,18 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_flac_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_flac_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">highest</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -104,6 +113,7 @@
<child>
<object class="GtkLabel" id="label-compression">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Compression</property>
</object>
diff --git a/data/profiles/ui/gnac-profiles-lame.xml b/data/profiles/ui/gnac-profiles-lame.xml
index 415739a..c77111f 100755
--- a/data/profiles/ui/gnac-profiles-lame.xml
+++ b/data/profiles/ui/gnac-profiles-lame.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -16,9 +15,11 @@
</object>
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">7</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -29,11 +30,13 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">5</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -41,10 +44,12 @@
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -66,6 +71,7 @@
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mode</property>
</object>
@@ -82,8 +88,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="slider-mean-vbr"/>
+ <signal name="toggled" handler="gnac_profiles_lame_advanced_bitrate_on_toggle" object="slider-mean-vbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -98,8 +105,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="combo-min-vbr"/>
+ <signal name="toggled" handler="gnac_profiles_lame_advanced_bitrate_on_toggle" object="combo-min-vbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">3</property>
@@ -114,8 +122,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_lame_advanced_bitrate_on_toggle" name="toggled" object="combo-max-vbr"/>
+ <signal name="toggled" handler="gnac_profiles_lame_advanced_bitrate_on_toggle" object="combo-max-vbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">4</property>
@@ -131,7 +140,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -143,11 +152,13 @@
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-min-vbr">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -167,11 +178,13 @@
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-max-vbr">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -201,6 +214,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Advanced</property>
</object>
</child>
@@ -215,10 +229,12 @@
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-encoding-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_lame_on_encoding_mode_changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_on_encoding_mode_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -236,10 +252,12 @@
<child>
<object class="GtkHBox" id="hbox-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-bitrate">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -260,10 +278,12 @@
<child>
<object class="GtkHBox" id="hbox-preset">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-preset">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -284,6 +304,7 @@
<child>
<object class="GtkLabel" id="label-preset">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Preset</property>
</object>
@@ -297,6 +318,7 @@
<child>
<object class="GtkLabel" id="label-vbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Quality</property>
</object>
@@ -310,6 +332,7 @@
<child>
<object class="GtkLabel" id="label-cbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Constant bitrate (CBR)</property>
</object>
@@ -323,6 +346,7 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Encoding mode</property>
</object>
@@ -334,9 +358,11 @@
<child>
<object class="GtkHBox" id="hbox-vbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">worst</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -356,15 +382,18 @@
<property name="adjustment">adjustment2</property>
<property name="inverted">True</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">best</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -389,6 +418,7 @@
<child>
<object class="GtkLabel" id="label-mean-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Average bitrate (ABR)</property>
</object>
@@ -405,7 +435,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -417,6 +447,7 @@
<child>
<object class="GtkLabel" id="label-compression-ratio">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Compression ratio</property>
</object>
@@ -433,7 +464,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_lame_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/data/profiles/ui/gnac-profiles-manager.xml b/data/profiles/ui/gnac-profiles-manager.xml
index c49668f..34f50df 100644
--- a/data/profiles/ui/gnac-profiles-manager.xml
+++ b/data/profiles/ui/gnac-profiles-manager.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name Name -->
@@ -15,13 +14,13 @@
</columns>
</object>
<object class="GtkWindow" id="profile_manager_window">
+ <property name="width_request">450</property>
+ <property name="height_request">420</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Profile Manager</property>
+ <property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
- <property name="default_width">400</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
<signal name="key-press-event" handler="gnac_profiles_mgr_on_key_pressed" swapped="no"/>
<signal name="delete-event" handler="gnac_profiles_mgr_on_delete_event" swapped="no"/>
<child>
@@ -51,8 +50,6 @@
<object class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="profile_treeview">
@@ -214,30 +211,52 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame-description">
+ <object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="gnac_profiles_mgr_on_close" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</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>
+ <child>
+ <object class="GtkFrame" id="frame-description">
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkLabel" id="label-description-content">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <object class="GtkLabel" id="label-description-content">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="ypad">5</property>
- <property name="justify">fill</property>
- <property name="wrap">True</property>
- <attributes>
- <attribute name="style" value="italic"/>
- </attributes>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="ypad">5</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">50</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
</child>
<child type="label">
@@ -253,8 +272,8 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -293,7 +312,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -347,7 +366,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -385,7 +404,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -408,34 +427,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="gnac_profiles_mgr_on_close" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
diff --git a/data/profiles/ui/gnac-profiles-properties.xml b/data/profiles/ui/gnac-profiles-properties.xml
index 0f9916c..5de12a6 100755
--- a/data/profiles/ui/gnac-profiles-properties.xml
+++ b/data/profiles/ui/gnac-profiles-properties.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name name -->
@@ -13,15 +12,18 @@
</columns>
</object>
<object class="GtkWindow" id="window1">
+ <property name="width_request">240</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
+ <property name="default_width">240</property>
<property name="type_hint">dialog</property>
<signal name="key-press-event" handler="gnac_profiles_properties_on_window_key_pressed" swapped="no"/>
<signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
<child>
<object class="GtkVBox" id="vbox1">
+ <property name="width_request">240</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -69,8 +71,6 @@
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<signal name="key-press-event" handler="gnac_profiles_properties_on_name_entry_key_pressed" swapped="no"/>
</object>
<packing>
@@ -105,8 +105,6 @@
<property name="height_request">80</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTextView" id="profile_description_text_view">
@@ -201,32 +199,26 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkLabel" id="format_description_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">7</property>
- <property name="right_padding">6</property>
- <child>
- <object class="GtkLabel" id="format_decription_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Description</property>
- <property name="justify">fill</property>
- <property name="wrap">True</property>
- <property name="angle">8.1699999999999999</property>
- <attributes>
- <attribute name="style" value="italic"/>
- </attributes>
- </object>
- </child>
+ <property name="xpad">6</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes">description</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="max-width-chars">50</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -339,8 +331,6 @@
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTextView" id="gstreamer_pipeline_text_view">
@@ -353,7 +343,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -361,7 +351,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@@ -394,15 +384,15 @@
<property name="wrap">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="pack_type">end</property>
<property name="position">4</property>
diff --git a/data/profiles/ui/gnac-profiles-speex.xml b/data/profiles/ui/gnac-profiles-speex.xml
index 45d9b0a..afd7051 100644
--- a/data/profiles/ui/gnac-profiles-speex.xml
+++ b/data/profiles/ui/gnac-profiles-speex.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1"/>
<object class="GtkAdjustment" id="adjustment2"/>
<object class="GtkAdjustment" id="adjustment3"/>
@@ -9,9 +8,11 @@
<object class="GtkAdjustment" id="adjustment5"/>
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -22,10 +23,12 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -33,10 +36,12 @@
<child>
<object class="GtkHBox" id="hbox-mode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -54,13 +59,13 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-bitrate-cbr">
+ <object class="GtkScale" id="slider-bitrate-cbr">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -76,9 +81,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_speex_advanced_on_toggle" name="toggled" object="slider-bitrate-cbr"/>
+ <signal name="toggled" handler="gnac_profiles_speex_advanced_on_toggle" object="slider-bitrate-cbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -90,6 +96,7 @@
<child>
<object class="GtkLabel" id="label-mode1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mode</property>
</object>
@@ -106,8 +113,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_speex_advanced_on_toggle" name="toggled" object="hbox-complexity"/>
+ <signal name="toggled" handler="gnac_profiles_speex_advanced_on_toggle" object="hbox-complexity" swapped="yes"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -120,9 +128,11 @@
<object class="GtkHBox" id="hbox-complexity">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">worst</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -136,20 +146,23 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-complexity">
+ <object class="GtkScale" id="slider-complexity">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment5</property>
<property name="digits">2</property>
- <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">best</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -176,8 +189,9 @@
<property name="label" translatable="yes">Discontinuous transmission</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_speex_generate_pipeline" name="toggled"/>
+ <signal name="toggled" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -193,8 +207,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_speex_vad_on_toggle" name="toggled"/>
+ <signal name="toggled" handler="gnac_profiles_speex_vad_on_toggle" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -217,6 +232,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Advanced</property>
</object>
@@ -231,10 +247,12 @@
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-bitrate-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_speex_on_bitrate_mode_changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_speex_on_bitrate_mode_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -252,6 +270,7 @@
<child>
<object class="GtkLabel" id="label-quality-cbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Quality</property>
</object>
@@ -265,6 +284,7 @@
<child>
<object class="GtkLabel" id="label-bitrate-mode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate mode</property>
</object>
@@ -276,9 +296,11 @@
<child>
<object class="GtkHBox" id="hbox-quality-cbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">worst</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -292,20 +314,23 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-quality-cbr">
+ <object class="GtkScale" id="slider-quality-cbr">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">1</property>
- <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">best</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -331,6 +356,7 @@
<child>
<object class="GtkLabel" id="label-quality-vbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Quality</property>
</object>
@@ -344,9 +370,11 @@
<child>
<object class="GtkHBox" id="hbox-quality-vbr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">worst</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -360,20 +388,23 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-quality-vbr">
+ <object class="GtkScale" id="slider-quality-vbr">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment4</property>
<property name="digits">1</property>
- <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">best</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -399,6 +430,7 @@
<child>
<object class="GtkLabel" id="label-bitrate-abr">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate (kbit/s)</property>
</object>
@@ -410,12 +442,12 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-bitrate-abr">
+ <object class="GtkScale" id="slider-bitrate-abr">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -429,8 +461,9 @@
<property name="label" translatable="yes">Quality</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gnac_profiles_speex_generate_pipeline"/>
+ <signal name="toggled" handler="gnac_profiles_speex_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="top_attach">4</property>
diff --git a/data/profiles/ui/gnac-profiles-unknown.xml b/data/profiles/ui/gnac-profiles-unknown.xml
index 3566d54..fb166a1 100644
--- a/data/profiles/ui/gnac-profiles-unknown.xml
+++ b/data/profiles/ui/gnac-profiles-unknown.xml
@@ -1,18 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">25</property>
- <signal name="hide" handler="gnac_profiles_unknown_on_hide"/>
+ <signal name="hide" handler="gnac_profiles_unknown_on_hide" swapped="no"/>
<child>
<object class="GtkTable" id="table-properties">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label-extension">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Extension</property>
</object>
@@ -24,6 +26,7 @@
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkEntry" id="entry-extension">
<property name="visible">True</property>
@@ -31,6 +34,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
diff --git a/data/profiles/ui/gnac-profiles-vorbis.xml b/data/profiles/ui/gnac-profiles-vorbis.xml
index 364225c..2bd82cd 100755
--- a/data/profiles/ui/gnac-profiles-vorbis.xml
+++ b/data/profiles/ui/gnac-profiles-vorbis.xml
@@ -1,13 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1"/>
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -18,10 +19,12 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -32,8 +35,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" name="toggled" object="combo-min-vbr"/>
+ <signal name="toggled" handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" object="combo-min-vbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -48,8 +52,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" name="toggled" object="combo-max-vbr"/>
+ <signal name="toggled" handler="gnac_profiles_vorbis_advanced_bitrate_on_toggle" object="combo-max-vbr" swapped="yes"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -61,11 +66,13 @@
<child>
<object class="GtkHBox" id="hbox-min-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-min-vbr">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -85,11 +92,13 @@
<child>
<object class="GtkHBox" id="hbox-max-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-max-vbr">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -119,6 +128,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Advanced</property>
</object>
@@ -133,10 +143,12 @@
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-encoding-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_vorbis_on_encoding_mode_changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_vorbis_on_encoding_mode_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -154,10 +166,12 @@
<child>
<object class="GtkHBox" id="hbox-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-bitrate">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -178,6 +192,7 @@
<child>
<object class="GtkLabel" id="label-quality">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Quality</property>
</object>
@@ -191,6 +206,7 @@
<child>
<object class="GtkLabel" id="label-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Goal bitrate</property>
</object>
@@ -204,6 +220,7 @@
<child>
<object class="GtkLabel" id="label-encoding-mode">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Encoding mode</property>
</object>
@@ -215,9 +232,11 @@
<child>
<object class="GtkHBox" id="hbox-quality">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">worst</property>
<attributes>
<attribute name="style" value="italic"/>
@@ -231,20 +250,23 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="slider-quality">
+ <object class="GtkScale" id="slider-quality">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">1</property>
- <signal name="value-changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_vorbis_generate_pipeline" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">best</property>
<attributes>
<attribute name="style" value="italic"/>
diff --git a/data/profiles/ui/gnac-profiles-wav.xml b/data/profiles/ui/gnac-profiles-wav.xml
index 5e7449d..bfa7e7f 100755
--- a/data/profiles/ui/gnac-profiles-wav.xml
+++ b/data/profiles/ui/gnac-profiles-wav.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<child>
@@ -16,10 +17,12 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<property name="row_spacing">5</property>
@@ -36,6 +39,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="ypad">10</property>
<property name="label" translatable="yes">Advanced</property>
</object>
diff --git a/data/profiles/ui/gnac-profiles-wavpack.xml b/data/profiles/ui/gnac-profiles-wavpack.xml
index 8fd6fc9..03d3a48 100644
--- a/data/profiles/ui/gnac-profiles-wavpack.xml
+++ b/data/profiles/ui/gnac-profiles-wavpack.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -16,9 +15,11 @@
</object>
<object class="GtkAlignment" id="properties-alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -29,11 +30,13 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">5</property>
<property name="left_padding">10</property>
<child>
<object class="GtkTable" id="properties-table-advanced">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">8</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
@@ -43,7 +46,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -56,6 +59,7 @@
<child>
<object class="GtkLabel" id="label-bitrate">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bitrate (kbit/s)</property>
</object>
@@ -69,6 +73,7 @@
<child>
<object class="GtkLabel" id="label-bits-per-sample">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bits per sample</property>
</object>
@@ -82,11 +87,13 @@
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-joint-stereo-mode">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -107,17 +114,20 @@
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="checkbutton-bitrate-control">
<property name="label" translatable="yes">Enable bitrate control (lossy)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_wavpack_bitrate_control_on_toggle" name="toggled" object="combo-bitrate-control"/>
+ <signal name="toggled" handler="gnac_profiles_wavpack_bitrate_control_on_toggle" object="combo-bitrate-control" swapped="yes"/>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -138,7 +148,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -156,8 +166,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <signal name="toggled" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="top_attach">7</property>
@@ -169,10 +180,12 @@
<child>
<object class="GtkHBox" id="hbox-control-method">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-bitrate-control">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_wavpack_on_bitrate_control_changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_wavpack_on_bitrate_control_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -192,6 +205,7 @@
<child>
<object class="GtkLabel" id="label-control-method">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Control method</property>
</object>
@@ -208,8 +222,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal handler="gnac_profiles_wavpack_joint_stereo_mode_on_toggle" name="toggled" object="combo-joint-stereo-mode"/>
+ <signal name="toggled" handler="gnac_profiles_wavpack_joint_stereo_mode_on_toggle" object="combo-joint-stereo-mode" swapped="yes"/>
</object>
<packing>
<property name="top_attach">6</property>
@@ -221,6 +236,7 @@
<child>
<object class="GtkLabel" id="label-extra-processing">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Extra processing</property>
</object>
@@ -237,7 +253,7 @@
<property name="can_focus">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">0</property>
- <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <signal name="value-changed" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -264,6 +280,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Advanced</property>
</object>
</child>
@@ -278,6 +295,7 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Compression mode</property>
</object>
@@ -289,10 +307,12 @@
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBoxText" id="combo-mode">
<property name="visible">True</property>
- <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/gnac-pref-window.xml b/data/ui/gnac-pref-window.xml
index fecd31f..05c9719 100644
--- a/data/ui/gnac-pref-window.xml
+++ b/data/ui/gnac-pref-window.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="folder_hierarchy_model">
<columns>
<!-- column-name gchararray -->
@@ -237,8 +236,6 @@
<property name="caps_lock_warning">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<signal name="changed" handler="gnac_prefs_subfolder_editing_done" swapped="no"/>
</object>
</child>
@@ -394,6 +391,7 @@
<object class="GtkTable" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="row_spacing">2</property>
@@ -499,8 +497,6 @@
<property name="caps_lock_warning">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<signal name="changed" handler="gnac_prefs_update_example_label" swapped="no"/>
</object>
</child>
@@ -527,8 +523,6 @@
<property name="caps_lock_warning">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<signal name="changed" handler="gnac_prefs_update_example_label" swapped="no"/>
</object>
</child>
@@ -563,7 +557,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/data/ui/gnac-properties-window.xml b/data/ui/gnac-properties-window.xml
index 48eccf0..f8709b0 100644
--- a/data/ui/gnac-properties-window.xml
+++ b/data/ui/gnac-properties-window.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkAdjustment" id="adjustment_date">
<property name="step_increment">1</property>
</object>
@@ -81,8 +80,6 @@
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -121,8 +118,6 @@
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -161,8 +156,6 @@
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -201,8 +194,6 @@
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -241,8 +232,6 @@
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -310,8 +299,6 @@
<property name="max_length">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_tn</property>
<property name="update_policy">if-valid</property>
</object>
@@ -341,8 +328,6 @@
<property name="max_length">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_tc</property>
<property name="update_policy">if-valid</property>
</object>
@@ -396,8 +381,6 @@
<property name="max_length">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_dn</property>
<property name="update_policy">if-valid</property>
</object>
@@ -427,8 +410,6 @@
<property name="max_length">2</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_dc</property>
<property name="update_policy">if-valid</property>
</object>
@@ -478,8 +459,6 @@
<property name="width_chars">4</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_date</property>
<property name="update_policy">if-valid</property>
</object>
@@ -533,8 +512,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="properties_view">
diff --git a/data/ui/gnac.xml b/data/ui/gnac.xml
index 78b0c9f..b5a0864 100644
--- a/data/ui/gnac.xml
+++ b/data/ui/gnac.xml
@@ -242,8 +242,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="file_list">
diff --git a/src/gnac-options.c b/src/gnac-options.c
index 603880a..79e245b 100644
--- a/src/gnac-options.c
+++ b/src/gnac-options.c
@@ -185,8 +185,7 @@ gnac_options_init(gint argc,
g_option_context_add_group(context, gst_init_get_option_group());
g_option_context_add_group(context, gtk_get_option_group(TRUE));
- if (!g_option_context_parse(context, &argc, &argv, &error))
- {
+ if (!g_option_context_parse(context, &argc, &argv, &error)) {
if (error) {
g_print("%s\n", error->message);
g_clear_error(&error);
diff --git a/src/profiles/gnac-profiles-properties.c b/src/profiles/gnac-profiles-properties.c
index 3758833..12dfe4b 100644
--- a/src/profiles/gnac-profiles-properties.c
+++ b/src/profiles/gnac-profiles-properties.c
@@ -325,7 +325,7 @@ gnac_profiles_properties_combo_format_on_changed(GtkComboBox *combo,
#endif
GtkLabel *label = GTK_LABEL(
- gnac_profiles_properties_get_widget("format_decription_label"));
+ gnac_profiles_properties_get_widget("format_description_label"));
gtk_label_set_text(label, format_module->funcs.get_description());
GtkWidget *widget = format_module->funcs.get_widget();
gtk_widget_show(widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
