Author: kitone
Date: Fri Apr 10 22:44:22 2015
New Revision: 888
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=888&view=rev
Log:
Fix bug #23456 : GTK3 regression: add or remove encoding dialog is broken.
Modified:
trunk/ChangeLog
trunk/share/ui/dialog-character-codings.ui
trunk/src/gui/comboboxencoding.cc
trunk/src/gui/dialogcharactercodings.cc
trunk/src/gui/dialogcharactercodings.h
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=888&r1=887&r2=888&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Fri Apr 10 22:44:22 2015
@@ -1,3 +1,11 @@
+2015-04-10 kitone <[email protected]>
+
+ * share/ui/dialog-character-codings.ui:
+ * src/gui/comboboxencoding.cc:
+ * src/gui/dialogcharactercodings.cc:
+ * src/gui/dialogcharactercodings.h:
+ Fix bug #23456 : GTK3 regression: add or remove encoding dialog is
broken.
+
2015-01-10 kitone <[email protected]>
*
plugins/actions/configurekeyboardshortcuts/dialog-configure-keyboard-shortcuts.ui:
Modified: trunk/share/ui/dialog-character-codings.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/share/ui/dialog-character-codings.ui?rev=888&r1=887&r2=888&view=diff
==============================================================================
--- trunk/share/ui/dialog-character-codings.ui (original)
+++ trunk/share/ui/dialog-character-codings.ui Fri Apr 10 22:44:22 2015
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="dialog-character-codings">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Character Codings</property>
+ <property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">640</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="visible">True</property>
<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="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
@@ -29,22 +29,20 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="spacing">6</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkVBox" id="vbox1">
+ <child>
+ <object class="GtkBox" 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="GtkLabel" id="label1">
@@ -83,7 +81,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">start</property>
@@ -96,8 +94,8 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -116,9 +114,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="box3">
<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="label2">
@@ -138,7 +137,7 @@
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">etched-in</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview-displayed">
<property name="visible">True</property>
@@ -158,7 +157,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox2">
+ <object class="GtkButtonBox" id="buttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">start</property>
@@ -171,8 +170,8 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -192,7 +191,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
Modified: trunk/src/gui/comboboxencoding.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/comboboxencoding.cc?rev=888&r1=887&r2=888&view=diff
==============================================================================
--- trunk/src/gui/comboboxencoding.cc (original)
+++ trunk/src/gui/comboboxencoding.cc Fri Apr 10 22:44:22 2015
@@ -173,7 +173,7 @@
if(activated == size-1)
{
- std::auto_ptr<DialogCharacterCodings> dialog =
DialogCharacterCodings::create();
+ std::auto_ptr<DialogCharacterCodings> dialog =
DialogCharacterCodings::create(*dynamic_cast<Gtk::Window*>(get_toplevel()));
if(dialog->run() == Gtk::RESPONSE_OK)
{
init_encodings();
Modified: trunk/src/gui/dialogcharactercodings.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/dialogcharactercodings.cc?rev=888&r1=887&r2=888&view=diff
==============================================================================
--- trunk/src/gui/dialogcharactercodings.cc (original)
+++ trunk/src/gui/dialogcharactercodings.cc Fri Apr 10 22:44:22 2015
@@ -32,8 +32,6 @@
DialogCharacterCodings::DialogCharacterCodings(BaseObjectType* cobject, const
Glib::RefPtr<Gtk::Builder>& builder)
:Gtk::Dialog(cobject)
{
- utility::set_transient_parent(*this);
-
builder->get_widget("treeview-available", treeviewAvailable);
builder->get_widget("treeview-displayed", m_treeviewDisplayed);
builder->get_widget("button-add", m_buttonAdd);
@@ -213,11 +211,11 @@
{
std::vector<Gtk::TreeModel::Path> rows;
- Glib::RefPtr<Gtk::TreeSelection> selection =
m_treeviewDisplayed->get_selection();
-
- while(!(rows = selection->get_selected_rows()).empty())
- {
- Gtk::TreeIter it = m_storeDisplayed->get_iter(rows[0]);
+ rows = m_treeviewDisplayed->get_selection()->get_selected_rows();
+
+ for(std::vector<Gtk::TreeModel::Path>::reverse_iterator iter =
rows.rbegin(); iter!= rows.rend(); ++iter)
+ {
+ Gtk::TreeIter it = m_storeDisplayed->get_iter(*iter);
m_storeDisplayed->erase(it);
}
}
@@ -298,13 +296,13 @@
* Create an instance of the dialog .ui file)
* If the response is OK the config is saved.
*/
-std::auto_ptr<DialogCharacterCodings> DialogCharacterCodings::create()
+std::auto_ptr<DialogCharacterCodings>
DialogCharacterCodings::create(Gtk::Window &parent)
{
std::auto_ptr<DialogCharacterCodings> ptr(
gtkmm_utility::get_widget_derived<DialogCharacterCodings>(
SE_DEV_VALUE(PACKAGE_UI_DIR,
PACKAGE_UI_DIR_DEV),
"dialog-character-codings.ui",
"dialog-character-codings") );
-
+ ptr->set_transient_for(parent);
return ptr;
}
Modified: trunk/src/gui/dialogcharactercodings.h
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/dialogcharactercodings.h?rev=888&r1=887&r2=888&view=diff
==============================================================================
--- trunk/src/gui/dialogcharactercodings.h (original)
+++ trunk/src/gui/dialogcharactercodings.h Fri Apr 10 22:44:22 2015
@@ -58,7 +58,7 @@
* Create an instance of the dialog .ui file)
* If the response is OK the config is saved.
*/
- static std::auto_ptr<DialogCharacterCodings> create();
+ static std::auto_ptr<DialogCharacterCodings> create(Gtk::Window
&parent);
protected:
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
