[pitivi] projectsettings: Move the presets on the right side



commit 1dde786272c535a6ae8ff6d1b0d2a107d0a54e9c
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Tue May 12 07:32:37 2015 +0200

    projectsettings: Move the presets on the right side
    
    Differential Revision: https://phabricator.freedesktop.org/D354
    Reviewed-by: Thibault Saunier <tsaunier gnome org>

 data/ui/projectsettings.ui |  392 ++++++++++++++++++++++----------------------
 1 files changed, 196 insertions(+), 196 deletions(-)
---
diff --git a/data/ui/projectsettings.ui b/data/ui/projectsettings.ui
index c43b50e..e5fe387 100644
--- a/data/ui/projectsettings.ui
+++ b/data/ui/projectsettings.ui
@@ -119,160 +119,6 @@
                 <property name="border_width">12</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkBox" id="video_preset">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel" id="label11">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_start">6</property>
-                        <property name="label" translatable="yes">Video Preset</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkInfoBar" id="video-preset-infobar">
-                        <property name="app_paintable">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="message_type">error</property>
-                        <child internal-child="action_area">
-                          <object class="GtkButtonBox" id="infobar-action_area2">
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="layout_style">center</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child internal-child="content_area">
-                          <object class="GtkBox" id="infobar-content_area2">
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="video-preset-error-label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="video_preset_treeview">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolbar" id="video_presets_toolbar">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="show_arrow">False</property>
-                        <property name="icon_size">1</property>
-                        <child>
-                          <object class="GtkToolButton" id="add_video_preset_button">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Create a new preset</property>
-                            <property name="icon_name">list-add-symbolic</property>
-                            <signal name="clicked" handler="_addVideoPresetButtonClickedCb" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="remove_video_preset_button">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Remove the selected 
preset</property>
-                            <property name="icon_name">list-remove-symbolic</property>
-                            <signal name="clicked" handler="_removeVideoPresetButtonClickedCb" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="save_video_preset_button">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="tooltip_text" translatable="yes">Save changes to the currently 
selected preset</property>
-                            <property name="icon_name">document-save-symbolic</property>
-                            <signal name="clicked" handler="_saveVideoPresetButtonClickedCb" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkBox" id="video_details">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -560,39 +406,21 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Video</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="audio_tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="spacing">12</property>
                 <child>
-                  <object class="GtkBox" id="audio_preset">
+                  <object class="GtkBox" id="video_preset">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkLabel" id="label10">
+                      <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="margin_start">6</property>
-                        <property name="label" translatable="yes">Audio Preset</property>
+                        <property name="margin_start">0</property>
+                        <property name="label" translatable="yes">Video Preset</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -604,12 +432,12 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkInfoBar" id="audio-preset-infobar">
+                      <object class="GtkInfoBar" id="video-preset-infobar">
                         <property name="app_paintable">True</property>
                         <property name="can_focus">False</property>
                         <property name="message_type">error</property>
                         <child internal-child="action_area">
-                          <object class="GtkButtonBox" id="infobar-action_area3">
+                          <object class="GtkButtonBox" id="infobar-action_area2">
                             <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <property name="layout_style">center</property>
@@ -624,10 +452,10 @@
                           </packing>
                         </child>
                         <child internal-child="content_area">
-                          <object class="GtkBox" id="infobar-content_area3">
+                          <object class="GtkBox" id="infobar-content_area2">
                             <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkLabel" id="audio-preset-error-label">
+                              <object class="GtkLabel" id="video-preset-error-label">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                               </object>
@@ -652,16 +480,17 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkTreeView" id="audio_preset_treeview">
+                          <object class="GtkTreeView" id="video_preset_treeview">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection2"/>
+                              <object class="GtkTreeSelection" id="treeview-selection1"/>
                             </child>
                           </object>
                         </child>
@@ -673,18 +502,18 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolbar" id="audio_presets_toolbar">
+                      <object class="GtkToolbar" id="video_presets_toolbar">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="show_arrow">False</property>
                         <property name="icon_size">1</property>
                         <child>
-                          <object class="GtkToolButton" id="add_audio_preset_button">
+                          <object class="GtkToolButton" id="add_video_preset_button">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Create a new preset</property>
                             <property name="icon_name">list-add-symbolic</property>
-                            <signal name="clicked" handler="_addAudioPresetButtonClickedCb" swapped="no"/>
+                            <signal name="clicked" handler="_addVideoPresetButtonClickedCb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -692,14 +521,14 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToolButton" id="remove_audio_preset_button">
+                          <object class="GtkToolButton" id="remove_video_preset_button">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Remove the selected 
preset</property>
                             <property name="icon_name">list-remove-symbolic</property>
-                            <signal name="clicked" handler="_removeAudioPresetButtonClickedCb" swapped="no"/>
+                            <signal name="clicked" handler="_removeVideoPresetButtonClickedCb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -707,14 +536,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToolButton" id="save_audio_preset_button">
+                          <object class="GtkToolButton" id="save_video_preset_button">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="tooltip_text" translatable="yes">Save changes to the currently 
selected preset</property>
                             <property name="icon_name">document-save-symbolic</property>
-                            <signal name="clicked" handler="_saveAudioPresetButtonClickedCb" swapped="no"/>
+                            <signal name="clicked" handler="_saveVideoPresetButtonClickedCb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -724,17 +552,35 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label8">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Video</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="audio_tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">12</property>
                 <child>
                   <object class="GtkGrid" id="audio_details">
                     <property name="visible">True</property>
@@ -824,6 +670,160 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="audio_preset">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_start">0</property>
+                        <property name="label" translatable="yes">Audio Preset</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkInfoBar" id="audio-preset-infobar">
+                        <property name="app_paintable">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="message_type">error</property>
+                        <child internal-child="action_area">
+                          <object class="GtkButtonBox" id="infobar-action_area3">
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <property name="layout_style">center</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child internal-child="content_area">
+                          <object class="GtkBox" id="infobar-content_area3">
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="audio-preset-error-label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="audio_preset_treeview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection2"/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkToolbar" id="audio_presets_toolbar">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_size">1</property>
+                        <child>
+                          <object class="GtkToolButton" id="add_audio_preset_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Create a new preset</property>
+                            <property name="icon_name">list-add-symbolic</property>
+                            <signal name="clicked" handler="_addAudioPresetButtonClickedCb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="remove_audio_preset_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Remove the selected 
preset</property>
+                            <property name="icon_name">list-remove-symbolic</property>
+                            <signal name="clicked" handler="_removeAudioPresetButtonClickedCb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="save_audio_preset_button">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Save changes to the currently 
selected preset</property>
+                            <property name="icon_name">document-save-symbolic</property>
+                            <signal name="clicked" handler="_saveAudioPresetButtonClickedCb" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="homogeneous">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]