[pitivi] Verify all ui files with glade for latest Gtk
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Verify all ui files with glade for latest Gtk
- Date: Wed, 24 Sep 2014 17:04:00 +0000 (UTC)
commit 61f5e6cb0de8ac58a0eb6811365b6f7461bf5f9a
Author: Lubosz Sarnecki <lubosz gmail com>
Date: Thu Sep 18 03:40:05 2014 +0200
Verify all ui files with glade for latest Gtk
* Replace GtkTable with GtkGrid
* switch glade files to 3.10 for compatibility
data/ui/alignmentprogress.ui | 15 ++-
data/ui/clipmediaprops.ui | 7 +-
data/ui/cliptransformation.ui | 39 ++----
data/ui/depsmanager.ui | 11 +-
data/ui/effectslibrary.ui | 16 +--
data/ui/elementsettingsdialog.ui | 7 +-
data/ui/filelisterrordialog.ui | 64 +++++-----
data/ui/mainmenubutton.ui | 4 +-
data/ui/medialibrary.ui | 106 ++++++++--------
data/ui/preferences.ui | 189 +++++++++++++--------------
data/ui/projectsettings.ui | 235 ++++++++++++++-------------------
data/ui/renderingdialog.ui | 173 +++++++++++--------------
data/ui/renderingprogress.ui | 70 +++++-----
data/ui/startupwizard.ui | 21 ++--
data/ui/titleeditor.ui | 269 +++++++++++++++++---------------------
pitivi/project.py | 12 +--
16 files changed, 570 insertions(+), 668 deletions(-)
---
diff --git a/data/ui/alignmentprogress.ui b/data/ui/alignmentprogress.ui
index f133583..ea82461 100644
--- a/data/ui/alignmentprogress.ui
+++ b/data/ui/alignmentprogress.ui
@@ -1,7 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <requires lib="gtk+" version="3.4"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="align-progress">
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Auto-Alignment Starting</property>
<property name="modal">True</property>
@@ -12,26 +14,33 @@
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="ypad">12</property>
<property name="label" translatable="yes"><b><big>Performing
Auto-Alignment</big></b></property>
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkProgressBar" id="progressbar">
<property name="visible">True</property>
- <property name="show_text">True</property>
+ <property name="can_focus">False</property>
<property name="text" translatable="yes">Estimating...</property>
+ <property name="show_text">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/data/ui/clipmediaprops.ui b/data/ui/clipmediaprops.ui
index 5fc3033..15ed402 100644
--- a/data/ui/clipmediaprops.ui
+++ b/data/ui/clipmediaprops.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="Import Settings">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -74,8 +75,8 @@
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="margin_start">12</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
@@ -262,8 +263,8 @@
<object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="margin_start">12</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
diff --git a/data/ui/cliptransformation.ui b/data/ui/cliptransformation.ui
index 859311a..66fa62c 100644
--- a/data/ui/cliptransformation.ui
+++ b/data/ui/cliptransformation.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <requires lib="gtk+" version="3.4"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkAdjustment" id="crop_bottom_adjustment">
<property name="upper">1</property>
<property name="step_increment">0.01</property>
@@ -47,7 +48,13 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="zoom_adjustment">
+ <object class="GtkAdjustment" id="width_adjustment">
+ <property name="upper">100</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
+ <object class="GtkAdjustment" id="zoom_adjustment">
<property name="lower">0.10000000000000001</property>
<property name="upper">1</property>
<property name="value">1</property>
@@ -55,13 +62,12 @@
<property name="page_increment">0.10000000000000001</property>
</object>
<object class="GtkBox" id="transform_box">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkButtonBox" id="buttonbox1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -69,10 +75,10 @@
<child>
<object class="GtkButton" id="clear_button">
<property name="label">gtk-clear</property>
+ <property name="use_action_appearance">False</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>
</object>
<packing>
@@ -103,7 +109,6 @@
<property name="left_padding">12</property>
<child>
<object class="GtkScale" id="zoom_scale">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">zoom_adjustment</property>
@@ -143,7 +148,6 @@
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box3">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -164,7 +168,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">position_x_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -192,7 +195,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">position_y_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -237,7 +239,6 @@
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box2">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -285,7 +286,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">height_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -330,18 +330,16 @@
<property name="xalign">0</property>
<property name="xscale">0</property>
<child>
- <object class="GtkTable" id="grid1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">3</property>
<property name="row_spacing">3</property>
+ <property name="column_spacing">3</property>
<child>
<object class="GtkSpinButton" id="crop_left_spinbtn">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">crop_left_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -356,13 +354,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">crop_top_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -370,7 +368,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">crop_bottom_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -385,7 +382,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">crop_right_adjustment</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -441,11 +437,4 @@
</packing>
</child>
</object>
- <object class="GtkAdjustment" id="width_adjustment">
- <property name="upper">100</property>
- <property name="value">0.5</property>
- <property name="step_increment">0.01</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
-
</interface>
diff --git a/data/ui/depsmanager.ui b/data/ui/depsmanager.ui
index fc1845d..96d34d4 100644
--- a/data/ui/depsmanager.ui
+++ b/data/ui/depsmanager.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <requires lib="gtk+" version="3.4"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="window1">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -18,10 +19,10 @@
<child>
<object class="GtkButton" id="close_btn">
<property name="label">window-close</property>
+ <property name="use_action_appearance">False</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="_onCloseButtonClickedCb" swapped="no"/>
</object>
@@ -34,10 +35,10 @@
<child>
<object class="GtkButton" id="install_btn">
<property name="label" translatable="yes">Install</property>
+ <property name="use_action_appearance">False</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>
<signal name="clicked" handler="_onInstallButtonClickedCb" swapped="no"/>
</object>
<packing>
@@ -56,9 +57,9 @@
</child>
<child>
<object class="GtkBox" id="box1">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label1">
@@ -84,7 +85,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="no">label</property>
+ <property name="label">label</property>
<property name="wrap">True</property>
</object>
</child>
diff --git a/data/ui/effectslibrary.ui b/data/ui/effectslibrary.ui
index 265c134..cbacf68 100644
--- a/data/ui/effectslibrary.ui
+++ b/data/ui/effectslibrary.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkToolbar" id="effectslibrary_toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14,12 +15,12 @@
<property name="use_underline">True</property>
<property name="icon_name">video-x-generic</property>
<property name="active">True</property>
+ <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="video_togglebutton-atkobject">
<property name="AtkObject::accessible-name">effects library video togglebutton</property>
</object>
</child>
- <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -33,12 +34,12 @@
<property name="tooltip_text" translatable="yes">Show audio effects</property>
<property name="use_underline">True</property>
<property name="icon_name">audio-x-generic</property>
+ <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="audio_togglebutton-atkobject">
<property name="AtkObject::accessible-name">effects library audio togglebutton</property>
</object>
</child>
- <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -53,14 +54,12 @@
<object class="GtkComboBoxText" id="categories">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
+ <signal name="changed" handler="_categoryChangedCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="categories-atkobject">
<property name="AtkObject::accessible-name">effect category combobox</property>
</object>
</child>
- <signal name="changed" handler="_categoryChangedCb" swapped="no"/>
</object>
</child>
</object>
@@ -81,18 +80,17 @@
<property name="has_tooltip">True</property>
<property name="margin_start">3</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="secondary_icon_name">edit-clear-symbolic</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Clear the current
search</property>
<property name="secondary_icon_tooltip_markup" translatable="yes">Clear the current
search</property>
<property name="placeholder_text">Search...</property>
+ <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
+ <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="search_entry-atkobject">
<property name="AtkObject::accessible-name">effects library search entry</property>
</object>
</child>
- <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
- <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
</object>
</child>
</object>
diff --git a/data/ui/elementsettingsdialog.ui b/data/ui/elementsettingsdialog.ui
index 067d6ac..d6b040b 100644
--- a/data/ui/elementsettingsdialog.ui
+++ b/data/ui/elementsettingsdialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <requires lib="gtk+" version="3.4"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkImage" id="clear_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -31,10 +32,10 @@
<child>
<object class="GtkButton" id="reset">
<property name="label" translatable="yes">Clear</property>
+ <property name="use_action_appearance">False</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="image">clear_icon</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="_resetValuesClickedCb" swapped="no"/>
@@ -48,11 +49,11 @@
<child>
<object class="GtkButton" id="okbutton1">
<property name="label" translatable="yes">Close</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="image">close_icon</property>
<property name="always_show_image">True</property>
</object>
diff --git a/data/ui/filelisterrordialog.ui b/data/ui/filelisterrordialog.ui
index 65c577e..ad90acf 100644
--- a/data/ui/filelisterrordialog.ui
+++ b/data/ui/filelisterrordialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="filelisterrordialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14,18 +15,44 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ </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="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">dialog-warning</property>
- <property name="icon-size">6</property>
+ <property name="icon_name">dialog-warning</property>
+ <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
@@ -54,33 +81,6 @@
<property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="label" translatable="true">OK</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- </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="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width_request">500</property>
@@ -96,10 +96,10 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkBox" id="errorvbox">
- <property name="orientation">vertical</property>
<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="orientation">vertical</property>
<child>
<placeholder/>
</child>
diff --git a/data/ui/mainmenubutton.ui b/data/ui/mainmenubutton.ui
index 7a9de5b..d16aaa5 100644
--- a/data/ui/mainmenubutton.ui
+++ b/data/ui/mainmenubutton.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.1 -->
<interface>
- <requires lib="gtk+" version="3.10"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/data/ui/medialibrary.ui b/data/ui/medialibrary.ui
index cdd457c..bb1615f 100644
--- a/data/ui/medialibrary.ui
+++ b/data/ui/medialibrary.ui
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkToolbar" id="medialibrary_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 internal-child="accessible">
- <object class="AtkObject" id="medialibrary_toolbar-atkobject">
- <property name="AtkObject::accessible-name">medialibrary_toolbar</property>
- </object>
- </child>
<child>
<object class="GtkToolButton" id="media_import_button">
<property name="visible">True</property>
@@ -21,12 +17,12 @@
<property name="label" translatable="yes">Import</property>
<property name="use_underline">True</property>
<property name="icon_name">list-add-symbolic</property>
+ <signal name="clicked" handler="_importSourcesCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_import_button-atkobject">
<property name="AtkObject::accessible-name">media_import_button</property>
</object>
</child>
- <signal name="clicked" handler="_importSourcesCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -44,12 +40,12 @@
<property name="label" translatable="yes">_Remove from Project</property>
<property name="use_underline">True</property>
<property name="icon_name">list-remove-symbolic</property>
+ <signal name="clicked" handler="_removeClickedCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_remove_button-atkobject">
<property name="AtkObject::accessible-name">media_remove_button</property>
</object>
</child>
- <signal name="clicked" handler="_removeClickedCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -66,12 +62,12 @@
<property name="tooltip_text" translatable="yes">Clip Properties...</property>
<property name="use_underline">True</property>
<property name="icon_name">document-properties-symbolic</property>
+ <signal name="clicked" handler="_clipPropertiesCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_props_button-atkobject">
<property name="AtkObject::accessible-name">media_props_button</property>
</object>
</child>
- <signal name="clicked" handler="_clipPropertiesCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -89,12 +85,12 @@
<property name="label" translatable="yes">Insert at _End of Timeline</property>
<property name="use_underline">True</property>
<property name="icon_name">insert-object-symbolic</property>
+ <signal name="clicked" handler="_insertEndCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_insert_button-atkobject">
<property name="AtkObject::accessible-name">media_insert_button</property>
</object>
</child>
- <signal name="clicked" handler="_insertEndCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -108,12 +104,12 @@
<property name="tooltip_markup" translatable="yes">Show clips as a detailed list</property>
<property name="use_underline">True</property>
<property name="icon_name">view-list-symbolic</property>
+ <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_listview_button-atkobject">
<property name="AtkObject::accessible-name">media_listview_button</property>
</object>
</child>
- <signal name="toggled" handler="_toggleViewTypeCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -132,20 +128,19 @@
<property name="has_tooltip">True</property>
<property name="margin_start">3</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="primary_icon_name">starred-symbolic</property>
<property name="secondary_icon_name">edit-clear-symbolic</property>
<property name="primary_icon_tooltip_text" translatable="yes" comments="This is used as a
toolbar button tooltip. Here, "select" means "find" rather than "choose". It is
not the user who selects, but rather the user requesting the application to select the relevant
items.">Select clips that have not been used in the project</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Show all clips</property>
<property name="secondary_icon_tooltip_markup" translatable="yes">Show all clips</property>
<property name="placeholder_text">Search...</property>
+ <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
+ <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_search_entry-atkobject">
<property name="AtkObject::accessible-name">media_search_entry</property>
</object>
</child>
- <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
- <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
</object>
</child>
</object>
@@ -154,41 +149,17 @@
<property name="homogeneous">True</property>
</packing>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="medialibrary_toolbar-atkobject">
+ <property name="AtkObject::accessible-name">medialibrary_toolbar</property>
+ </object>
+ </child>
</object>
<object class="GtkInfoBar" id="warning_infobar">
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
<property name="message_type">warning</property>
- <child internal-child="content_area">
- <object class="GtkBox" id="infobar-content_area3">
- <property name="can_focus">False</property>
- <property name="border_width">8</property>
- <property name="spacing">16</property>
- <child>
- <object class="GtkLabel" id="warning_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="wrap">True</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>
- <action-widgets>
- <action-widget response="0">view_error_button</action-widget>
- <action-widget response="0">warnings_dismiss_button</action-widget>
- </action-widgets>
<child internal-child="action_area">
<object class="GtkButtonBox" id="infobar-action_area3">
<property name="can_focus">False</property>
@@ -213,9 +184,9 @@
<property name="label">✖</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Close this message</property>
- <property name="receives_default">True</property>
<signal name="clicked" handler="_warningInfoBarDismissedCb" swapped="no"/>
</object>
<packing>
@@ -235,23 +206,16 @@
<action-widget response="0">view_error_button</action-widget>
<action-widget response="0">warnings_dismiss_button</action-widget>
</action-widgets>
- </object>
- <object class="GtkInfoBar" id="welcome_infobar">
- <property name="visible">True</property>
- <property name="app_paintable">True</property>
- <property name="can_focus">False</property>
- <property name="message_type">other</property>
<child internal-child="content_area">
- <object class="GtkBox" id="infobar-content_area1">
+ <object class="GtkBox" id="infobar-content_area3">
<property name="can_focus">False</property>
<property name="border_width">8</property>
<property name="spacing">16</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="warning_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Add media to your project by dragging files and
folders here or by using the "Import" button.</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -267,6 +231,16 @@
<property name="position">0</property>
</packing>
</child>
+ <action-widgets>
+ <action-widget response="0">view_error_button</action-widget>
+ <action-widget response="0">warnings_dismiss_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkInfoBar" id="welcome_infobar">
+ <property name="visible">True</property>
+ <property name="app_paintable">True</property>
+ <property name="can_focus">False</property>
+ <property name="message_type">other</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="infobar-action_area1">
<property name="can_focus">False</property>
@@ -284,5 +258,31 @@
<property name="position">1</property>
</packing>
</child>
+ <child internal-child="content_area">
+ <object class="GtkBox" id="infobar-content_area1">
+ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="spacing">16</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Add media to your project by dragging files and
folders here or by using the "Import" button.</property>
+ <property name="wrap">True</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>
</interface>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index ad13007..cc7d301 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,10 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkImage" id="close_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">window-close</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name column1 -->
+ <column type="gchararray"/>
+ <!-- column-name column2 -->
+ <column type="gchararray"/>
+ </columns>
</object>
<object class="GtkDialog" id="dialog1">
<property name="can_focus">False</property>
@@ -18,9 +27,72 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="resetButton">
+ <property name="label" translatable="yes">Reset to Factory Settings</property>
+ <property name="use_action_appearance">False</property>
+ <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">Reset all settings to their default
values</property>
+ <signal name="clicked" handler="_factorySettingsButtonCb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="revertButton">
+ <property name="label" translatable="yes">Revert</property>
+ <property name="use_action_appearance">False</property>
+ <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">Revert all settings to the previous values
(before you opened the preferences dialog)</property>
+ <signal name="clicked" handler="_revertButtonCb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="acceptButton">
+ <property name="label" translatable="yes">Close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">close_icon</property>
+ <property name="always_show_image">True</property>
+ <signal name="clicked" handler="_acceptButtonCb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkPaned" id="paned1">
- <property name="orientation">horizontal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
@@ -74,9 +146,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@@ -101,6 +173,23 @@
<object class="GtkInfoBar" id="restartWarning">
<property name="can_focus">False</property>
<property name="message_type">warning</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="infobar-action_area1">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">end</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_area1">
<property name="can_focus">False</property>
@@ -125,23 +214,6 @@
<property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="infobar-action_area1">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="layout_style">end</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -149,73 +221,6 @@
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="resetButton">
- <property name="label" translatable="yes">Reset to Factory Settings</property>
- <property name="use_action_appearance">False</property>
- <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">Reset all settings to their default
values</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="_factorySettingsButtonCb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="revertButton">
- <property name="label" translatable="yes">Revert</property>
- <property name="use_action_appearance">False</property>
- <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">Revert all settings to the previous values
(before you opened the preferences dialog)</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="_revertButtonCb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="acceptButton">
- <property name="label" translatable="yes">Close</property>
- <property name="use_action_appearance">False</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="image">close_icon</property>
- <property name="always_show_image">True</property>
- <signal name="clicked" handler="_acceptButtonCb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -224,12 +229,4 @@
<action-widget response="0">acceptButton</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name column1 -->
- <column type="gchararray"/>
- <!-- column-name column2 -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
diff --git a/data/ui/projectsettings.ui b/data/ui/projectsettings.ui
index b4c71f0..dd2b369 100644
--- a/data/ui/projectsettings.ui
+++ b/data/ui/projectsettings.ui
@@ -1,16 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
- <object class="GtkImage" id="cancel_icon">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-name">gtk-cancel</property>
- </object>
- <object class="GtkImage" id="ok_icon">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-name">gtk-ok</property>
- </object>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">9999</property>
@@ -32,6 +23,11 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkImage" id="cancel_icon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-cancel</property>
+ </object>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
@@ -65,6 +61,11 @@
</row>
</data>
</object>
+ <object class="GtkImage" id="ok_icon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-ok</property>
+ </object>
<object class="GtkDialog" id="project-settings-dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -127,16 +128,15 @@
<property name="can_focus">True</property>
<child>
<object class="GtkBox" id="hbox4">
- <property name="orientation">horizontal</property>
<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="vbox2">
- <property name="orientation">vertical</property>
<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>
@@ -159,6 +159,21 @@
<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>
@@ -180,21 +195,6 @@
<property name="position">0</property>
</packing>
</child>
- <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>
</object>
<packing>
<property name="expand">False</property>
@@ -287,24 +287,13 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="video_properties_table">
+ <object class="GtkGrid" id="video_properties_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
- <property name="n_rows">7</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
@@ -317,7 +306,8 @@
</attributes>
</object>
<packing>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -332,10 +322,8 @@
</attributes>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -350,9 +338,8 @@
<signal name="toggled" handler="_selectDarRadiobuttonToggledCb" swapped="no"/>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -368,9 +355,8 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -387,10 +373,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -405,23 +388,19 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox3">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkSpinButton" id="width_spinbutton">
<property name="visible">True</property>
@@ -487,8 +466,9 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">3</property>
+ <property name="height">2</property>
</packing>
</child>
<child>
@@ -504,8 +484,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -522,12 +501,15 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -553,12 +535,11 @@
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkBox" id="vbox1">
- <property name="orientation">vertical</property>
<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>
@@ -581,6 +562,21 @@
<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>
@@ -602,21 +598,6 @@
<property name="position">0</property>
</packing>
</child>
- <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>
</object>
<packing>
<property name="expand">False</property>
@@ -709,13 +690,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="table7">
<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">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
@@ -728,39 +707,35 @@
</attributes>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Channels:</property>
- <property name="margin_start">12</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_start">12</property>
+ <property name="label" translatable="yes">Channels:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
- <property name="margin_start">12</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Sample rate:</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_start">12</property>
+ <property name="label" translatable="yes">Sample rate:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
<child>
<object class="GtkComboBox" id="channels_combo">
@@ -776,10 +751,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -796,12 +768,12 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"/>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -826,14 +798,12 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkSpinButton" id="year_spinbutton">
<property name="visible">True</property>
@@ -843,10 +813,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -857,10 +824,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -871,8 +835,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -883,10 +846,8 @@
<property name="label" translatable="yes">Author:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -897,10 +858,8 @@
<property name="label" translatable="yes">Year:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -911,8 +870,8 @@
<property name="label" translatable="yes">Project title:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
diff --git a/data/ui/renderingdialog.ui b/data/ui/renderingdialog.ui
index bd8376b..ba310c9 100644
--- a/data/ui/renderingdialog.ui
+++ b/data/ui/renderingdialog.ui
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
<object class="GtkImage" id="close_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">window-close</property>
+ <property name="icon_name">window-close</property>
</object>
<object class="GtkImage" id="help_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">help-contents</property>
- </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">100</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
+ <property name="icon_name">help-contents</property>
</object>
<object class="GtkListStore" id="model1">
<columns>
@@ -98,9 +99,9 @@
<child>
<object class="GtkButton" id="closebutton">
<property name="label" translatable="yes">Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="image">close_icon</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="_closeButtonClickedCb" swapped="no"/>
@@ -140,12 +141,11 @@
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkBox" id="vbox4">
- <property name="orientation">vertical</property>
<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>
@@ -168,6 +168,21 @@
<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>
@@ -189,21 +204,6 @@
<property name="position">0</property>
</packing>
</child>
- <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>
</object>
<packing>
<property name="expand">False</property>
@@ -306,31 +306,30 @@
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
- <property name="spacing">12</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<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">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkFileChooserButton" id="filebutton">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="action">select-folder</property>
+ <signal name="current-folder-changed" handler="_checkForExistingFile"
swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="filebutton-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes">Folder</property>
</object>
</child>
- <signal name="current-folder-changed" handler="_checkForExistingFile"
swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -341,9 +340,8 @@
<property name="label" translatable="yes">Container format:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -357,7 +355,8 @@
</accessibility>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -371,9 +370,8 @@
</accessibility>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -381,18 +379,16 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
+ <signal name="changed" handler="_checkForExistingFile" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="fileentry-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">File
name</property>
</object>
</child>
- <signal name="changed" handler="_checkForExistingFile" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -406,11 +402,6 @@
<property name="can_focus">False</property>
<property name="model">model1</property>
<property name="active">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="muxercombobox-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Container
format</property>
- </object>
- </child>
<signal name="changed" handler="_muxerComboChangedCb" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -418,6 +409,11 @@
<attribute name="text">0</attribute>
</attributes>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="muxercombobox-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Container
format</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -444,9 +440,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
</object>
@@ -499,26 +493,23 @@
</child>
<child>
<object class="GtkBox" id="vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<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">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkComboBox" id="video_encoder_combo">
<property name="visible">True</property>
@@ -555,9 +546,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -568,9 +557,8 @@
<property name="label" translatable="yes">Codec:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -578,11 +566,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">model3</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="frame_rate_combo-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes">Framerate</property>
- </object>
- </child>
<signal name="changed" handler="_frameRateComboChangedCb" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="renderer3"/>
@@ -590,12 +573,15 @@
<attribute name="text">0</attribute>
</attributes>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="frame_rate_combo-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes">Framerate</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -603,7 +589,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkSpinButton" id="scale_spinbutton">
<property name="visible">True</property>
@@ -614,12 +599,12 @@
<property name="adjustment">adjustment1</property>
<property name="digits">1</property>
<property name="numeric">True</property>
+ <signal name="value-changed" handler="_scaleSpinbuttonChangedCb"
swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="scale_spinbutton-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes">Scale</property>
</object>
</child>
- <signal name="value-changed" handler="_scaleSpinbuttonChangedCb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -663,9 +648,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -676,9 +659,8 @@
<property name="label" translatable="yes">Frame rate:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -689,9 +671,8 @@
<property name="label" translatable="yes">Scale:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -706,10 +687,13 @@
<signal name="toggled" handler="_videoOutputCheckbuttonToggledCb" swapped="no"/>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -739,16 +723,14 @@
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">12</property>
- <property name="spacing">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table4">
+ <object class="GtkGrid" id="table4">
<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">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="channels_combo">
<property name="visible">True</property>
@@ -764,9 +746,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -777,9 +757,8 @@
<property name="label" translatable="yes">Channels:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -790,9 +769,8 @@
<property name="label" translatable="yes">Sample rate:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -809,9 +787,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -826,8 +802,8 @@
<signal name="toggled" handler="_audioOutputCheckbuttonToggledCb" swapped="no"/>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -838,9 +814,8 @@
<property name="label" translatable="yes">Codec:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -848,7 +823,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkComboBox" id="audio_encoder_combo">
<property name="visible">True</property>
@@ -885,11 +859,12 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/ui/renderingprogress.ui b/data/ui/renderingprogress.ui
index fd6884f..b020c8c 100644
--- a/data/ui/renderingprogress.ui
+++ b/data/ui/renderingprogress.ui
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
- <object class="GtkImage" id="play_pause_icon">
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkImage" id="cancel_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">media-playback-pause</property>
+ <property name="icon_name">gtk-cancel</property>
</object>
- <object class="GtkImage" id="cancel_icon">
+ <object class="GtkImage" id="close_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">gtk-cancel</property>
+ <property name="icon_name">window-close</property>
</object>
<object class="GtkImage" id="media_play_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">media-playback-start</property>
+ <property name="icon_name">media-playback-start</property>
</object>
- <object class="GtkImage" id="close_icon">
+ <object class="GtkImage" id="play_pause_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">window-close</property>
+ <property name="icon_name">media-playback-pause</property>
</object>
<object class="GtkDialog" id="render-progress">
<property name="can_focus">False</property>
@@ -37,37 +38,21 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="informational_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="opacity">0.69999999999999996</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><small>This process may take a long time
depending on the selected codecs, the image resolution, your computer's processing power, applied effects and
the length of your movie.</small></property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkToggleButton" id="play_pause_button">
+ <object class="GtkToggleButton" id="play_pause_button">
<property name="label" translatable="yes">Pause</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="image">play_pause_icon</property>
<property name="always_show_image">True</property>
<signal name="toggled" handler="_pauseButtonClickedCb" swapped="no"/>
- </object>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -131,6 +116,22 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="informational_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="opacity">0.69999999999999996</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><small>This process may take a long time
depending on the selected codecs, the image resolution, your computer's processing power, applied effects and
the length of your movie.</small></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkProgressBar" id="progressbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -144,13 +145,12 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="estimated_filesize_value_label">
<property name="can_focus">False</property>
@@ -158,7 +158,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -167,6 +167,10 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Estimated filesize:</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/data/ui/startupwizard.ui b/data/ui/startupwizard.ui
index a19c19a..498d215 100644
--- a/data/ui/startupwizard.ui
+++ b/data/ui/startupwizard.ui
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.4 -->
- <object class="GtkImage" id="new_icon">
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkImage" id="help_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">document-new</property>
+ <property name="icon_name">help-contents</property>
</object>
- <object class="GtkImage" id="help_icon">
+ <object class="GtkImage" id="new_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">help-contents</property>
+ <property name="icon_name">document-new</property>
</object>
<object class="GtkImage" id="open_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">document-open</property>
+ <property name="icon_name">document-open</property>
</object>
<object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
@@ -24,8 +25,8 @@
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="skip_taskbar_hint">True</property>
- <signal name="key-press-event" handler="_keyPressCb" swapped="no"/>
<signal name="delete-event" handler="_deleteCb" swapped="no"/>
+ <signal name="key-press-event" handler="_keyPressCb" swapped="no"/>
<child>
<object class="GtkBox" id="topvbox">
<property name="visible">True</property>
@@ -37,12 +38,11 @@
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="spacing">12</property>
- <property name="orientation">horizontal</property>
<child>
<object class="GtkBox" id="vbox2">
- <property name="orientation">vertical</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
@@ -63,7 +63,6 @@
<property name="height_request">215</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="limit">10</property>
<property name="show_not_found">False</property>
<property name="show_tips">True</property>
@@ -87,10 +86,10 @@
<object class="GtkButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="homogeneous">True</property>
<property name="layout_style">start</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="new_button">
<property name="label" translatable="yes">New</property>
diff --git a/data/ui/titleeditor.ui b/data/ui/titleeditor.ui
index 8527857..ab4a747 100644
--- a/data/ui/titleeditor.ui
+++ b/data/ui/titleeditor.ui
@@ -1,6 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.12"/>
+ <object class="GtkAdjustment" id="position_x_adj">
+ <property name="upper">1</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
+ <object class="GtkAdjustment" id="position_y_adj">
+ <property name="upper">1</property>
+ <property name="value">0.5</property>
+ <property name="step_increment">0.050000000000000003</property>
+ <property name="page_increment">0.10000000000000001</property>
+ </object>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11,17 +24,20 @@
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
<property name="message_type">other</property>
- <child internal-child="content_area">
- <object class="GtkBox" id="infobar-content_area1">
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="infobar-action_area1">
<property name="can_focus">False</property>
- <property name="border_width">8</property>
- <property name="spacing">16</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="info_bar_label2">
+ <object class="GtkButton" id="create">
+ <property name="label" translatable="yes">Create and insert</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Select a title clip to edit or create a new
one.</property>
- <property name="wrap">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="_createCb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -31,29 +47,25 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<action-widgets>
<action-widget response="0">create</action-widget>
</action-widgets>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="infobar-action_area1">
+ <child internal-child="content_area">
+ <object class="GtkBox" id="infobar-content_area1">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="border_width">8</property>
+ <property name="spacing">16</property>
<child>
- <object class="GtkButton" id="create">
- <property name="label" translatable="yes">Create and insert</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="info_bar_label2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="_createCb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Select a title clip to edit or create a new
one.</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -63,9 +75,9 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<action-widgets>
@@ -95,7 +107,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Bold</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Bold</property>
<property name="icon_name">gtk-bold</property>
</object>
@@ -110,7 +121,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Italic</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Italic</property>
<property name="use_underline">True</property>
<property name="icon_name">gtk-italic</property>
@@ -125,19 +135,16 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkFontButton" id="fontbutton1">
<property name="use_action_appearance">False</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="font">Sans 12</property>
- <property name="preview_text"></property>
+ <property name="font">Cantarell 12</property>
+ <property name="preview_text"/>
<property name="show_preview_entry">False</property>
<property name="title" translatable="yes">Choose a font</property>
- <property name="font_name">Cantarell 12</property>
<property name="show_style">False</property>
<signal name="font-set" handler="_fontButtonCb" swapped="no"/>
</object>
@@ -145,6 +152,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -155,14 +163,12 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Font color</property>
<property name="tooltip_text" translatable="yes">Font color</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkColorButton" id="fore_text_color">
<property name="use_action_appearance">False</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="title" translatable="yes">Pick a font color</property>
<signal name="color-set" handler="_frontTextColorButtonCb" swapped="no"/>
</object>
@@ -170,6 +176,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -180,14 +187,12 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Background color</property>
<property name="tooltip_text" translatable="yes">Background color</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkColorButton" id="back_color">
<property name="use_action_appearance">False</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_alpha">True</property>
<property name="title" translatable="yes">Pick a background color</property>
<property name="rgba">rgb(255,255,255)</property>
@@ -197,6 +202,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
@@ -207,7 +213,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Convert to markup</property>
<property name="tooltip_text" translatable="yes">Convert to markup</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="icon_name">gtk-convert</property>
<signal name="toggled" handler="_markupToggleCb" swapped="no"/>
@@ -250,107 +255,89 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkGrid" id="box4">
+ <object class="GtkGrid" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_start">24</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Horizontal alignment:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">6</property>
- <property name="margin_start">24</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Horizontal alignment:</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="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Vertical alignment:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="halignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <signal name="changed" handler="_updateSource" 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="GtkComboBoxText" id="valignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="active">1</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <signal name="changed" handler="_updateSource" 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="GtkSpinButton" id="xpos">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="adjustment">position_x_adj</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- <signal name="value-changed" handler="_updateSource" 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="GtkSpinButton" id="ypos">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="adjustment">position_y_adj</property>
- <property name="digits">2</property>
- <property name="numeric">True</property>
- <signal name="value-changed" handler="_updateSource" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Vertical alignment:</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="halignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="_updateSource" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="valignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">1</property>
+ <signal name="changed" handler="_updateSource" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="xpos">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">position_x_adj</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="_updateSource" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="ypos">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">position_y_adj</property>
+ <property name="digits">2</property>
+ <property name="numeric">True</property>
+ <signal name="value-changed" handler="_updateSource" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -382,18 +369,6 @@
</packing>
</child>
</object>
- <object class="GtkAdjustment" id="position_x_adj">
- <property name="upper">1</property>
- <property name="value">0.5</property>
- <property name="step_increment">0.050000000000000003</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
- <object class="GtkAdjustment" id="position_y_adj">
- <property name="upper">1</property>
- <property name="value">0.5</property>
- <property name="step_increment">0.050000000000000003</property>
- <property name="page_increment">0.10000000000000001</property>
- </object>
<object class="GtkAdjustment" id="size_h_adj">
<property name="upper">1</property>
<property name="value">0.5</property>
diff --git a/pitivi/project.py b/pitivi/project.py
index 6ec3e5f..46d70e7 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -1193,25 +1193,19 @@ class ProjectSettingsDialog():
# add custom display aspect ratio widget
self.dar_fraction_widget = FractionWidget()
self.video_properties_table.attach(self.dar_fraction_widget,
- 0, 1, 6, 7,
- xoptions=Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
- yoptions=0)
+ 0, 6, 1, 1)
self.dar_fraction_widget.show()
# add custom pixel aspect ratio widget
self.par_fraction_widget = FractionWidget()
self.video_properties_table.attach(self.par_fraction_widget,
- 1, 2, 6, 7,
- xoptions=Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
- yoptions=0)
+ 1, 6, 1, 1)
self.par_fraction_widget.show()
# add custom framerate widget
self.frame_rate_fraction_widget = FractionWidget()
self.video_properties_table.attach(self.frame_rate_fraction_widget,
- 1, 2, 2, 3,
- xoptions=Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
- yoptions=0)
+ 1, 2, 1, 1)
self.frame_rate_fraction_widget.show()
# populate coboboxes with appropriate data
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
