diff options
| author | jstebbins <[email protected]> | 2014-02-25 06:27:44 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-02-25 06:27:44 +0000 |
| commit | 113493ed5cc207301b0bd474707ffcf26769a356 (patch) | |
| tree | 2fd9ed684fbcecfd761db571f4798dd9f5725c4d /gtk/src/ghb.ui | |
| parent | 52140b164daccfbad57c9dbf91b196f1ff203e48 (diff) | |
LinGui: UI layout changes
Make some things fit a little better and make room for additional auto
passthru options.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6082 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/ghb.ui')
| -rw-r--r-- | gtk/src/ghb.ui | 364 |
1 files changed, 179 insertions, 185 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index b1aff07ae..d9dbc64a4 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -956,6 +956,7 @@ Here you can adjust cropping, resolution, aspect ratio, and filters.</property> <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">False</property> <child> <object class="GtkBox" id="vbox15"> <property name="orientation">vertical</property> @@ -2268,36 +2269,6 @@ VFR is not compatible with some players.</property> <property name="column_spacing">5</property> <property name="row_spacing">2</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkScale" id="VideoQualitySlider"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2860,7 +2831,7 @@ Colon separated list of x264 options.</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="min_content_height">108</property> + <property name="min_content_height">84</property> <child> <object class="GtkListBox" id="audio_avail_lang"> <property name="visible">True</property> @@ -2960,168 +2931,209 @@ Colon separated list of x264 options.</property> <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">5</property> - <property name="row_spacing">2</property> - <child> - <object class="GtkLabel" id="labela3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Auto Passthru Options:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> <child> - <object class="GtkCheckButton" id="AudioAllowMP3Pass"> - <property name="label" translatable="yes">MP3</property> + <object class="GtkCheckButton" id="AudioSecondaryEncoderMode"> + <property name="label" translatable="yes">Use only first encoder for secondary audio</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP3. -This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property> + <property name="tooltip_text" translatable="yes">Only the primary audio track will be encoded with the full encoder list. + All other secondary audio output tracks will be encoded with first encoder only.</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + <signal name="toggled" handler="audio_def_widget_changed_cb" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="auto_pass_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="margin_left">6</property> + <property name="spacing">2</property> <child> - <object class="GtkCheckButton" id="AudioAllowAACPass"> - <property name="label" translatable="yes">AAC</property> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AAC. + <property name="can_focus">False</property> + <property name="column_spacing">5</property> + <property name="row_spacing">2</property> + <property name="halign">end</property> + <child> + <object class="GtkLabel" id="labela3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Auto Passthru:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AudioAllowMP3Pass"> + <property name="label" translatable="yes">MP3</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP3. +This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AudioAllowAACPass"> + <property name="label" translatable="yes">AAC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selection is enabled.</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="AudioAllowAC3Pass"> - <property name="label" translatable="yes">AC-3</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AC-3. + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AudioAllowAC3Pass"> + <property name="label" translatable="yes">AC-3</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AC-3. This permits AC-3 passthru to be selected when automatic passthru selection is enabled.</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="AudioAllowDTSPass"> - <property name="label" translatable="yes">DTS</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS. + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AudioAllowDTSPass"> + <property name="label" translatable="yes">DTS</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selection is enabled.</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="AudioAllowDTSHDPass"> - <property name="label" translatable="yes">DTS-HD</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS-HD. + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="AudioAllowDTSHDPass"> + <property name="label" translatable="yes">DTS-HD</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="labela4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">1</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes">Passthru Fallback:</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="AudioEncoderFallback"> + <object class="GtkBox" id="auto_fallback_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property> - <signal name="changed" handler="audio_fallback_widget_changed_cb" swapped="no"/> + <property name="orientation">horizontal</property> + <property name="spacing">6</property> + <property name="halign">end</property> + <child> + <object class="GtkLabel" id="labela4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes">Passthru Fallback:</property> + </object> + <packing> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="AudioEncoderFallback"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Set the audio codec to encode with when a suitable track can not be found for audio passthru.</property> + <signal name="changed" handler="audio_fallback_widget_changed_cb" swapped="no"/> + </object> + <packing> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> @@ -3136,28 +3148,10 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is </packing> </child> <child> - <object class="GtkCheckButton" id="AudioSecondaryEncoderMode"> - <property name="label" translatable="yes">Use only first encoder for secondary audio</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Only the primary audio track will be encoded with the full encoder list. -All other secondary audio output tracks will be encoded with first encoder only.</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="audio_def_widget_changed_cb" swapped="no"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkLabel" id="audio_def_settings_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">12</property> + <property name="margin_top">6</property> <property name="xalign">0</property> <property name="use_markup">True</property> <property name="label" translatable="yes"><b>Audio Encoder Settings:</b></property> |