Author: kitone
Date: Sat Jan 3 17:38:27 2015
New Revision: 877
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=877&view=rev
Log:
Fix bug #22492 : Crash when trying to open external player preferences.
Modified:
trunk/ChangeLog
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=877&r1=876&r2=877&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sat Jan 3 17:38:27 2015
@@ -1,3 +1,8 @@
+2015-01-03 kitone <[email protected]>
+
+ *
plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui:
+ Fix bug #22492 : Crash when trying to open external player preferences.
+
2015-01-02 kitone <[email protected]>
* plugins/actions/wavefrommanagement/waveformmanagement.cc:
Modified:
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui?rev=877&r1=876&r2=877&view=diff
==============================================================================
---
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
(original)
+++
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
Sat Jan 3 17:38:27 2015
@@ -1,51 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
<interface>
- <requires lib="gtk+" version="3.0"/>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="dialog-external-video-player-preferences">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<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">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </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>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkVBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -69,16 +48,19 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkVBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="entry-video-player-command">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -87,23 +69,17 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkTable" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-info</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">
@@ -112,13 +88,9 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">The
following command parameters will
be substituted when launching the action :</property>
- <property name="lines">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- <property name="height">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
</packing>
</child>
<child>
@@ -133,9 +105,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<object class="GtkLabel" id="label4">
@@ -148,8 +121,6 @@
<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>
<child>
@@ -164,9 +135,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<object class="GtkLabel" id="label6">
@@ -179,8 +151,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -195,9 +165,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<object class="GtkLabel" id="label8">
@@ -210,8 +181,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -226,9 +195,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<object class="GtkLabel" id="label10">
@@ -241,8 +211,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -257,9 +225,10 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<object class="GtkLabel" id="label12">
@@ -272,21 +241,7 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ </packing>
</child>
<child>
<placeholder/>
@@ -314,7 +269,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkHBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -335,7 +290,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">True</property>
@@ -369,8 +323,5 @@
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="0">button1</action-widget>
- </action-widgets>
</object>
</interface>
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
