[pitivi] Remove various Gtk 3.14 deprecations



commit f2f0651bbb23ecbce89b90959ab3d5903d6e0e96
Author: Lubosz Sarnecki <lubosz gmail com>
Date:   Tue Sep 16 13:56:41 2014 +0200

    Remove various Gtk 3.14 deprecations
    
    remove GtkTreeView rules-hint
    https://developer.gnome.org/gtk3/3.13/GtkTreeView.html#GtkTreeView--rules-hint
    
    GtkColorButton needs a GdkRGBA color
    https://developer.gnome.org/gtk3/unstable/GtkColorButton.html#GtkColorButton--color
    
    schema has been deprecated use schema-id
    https://developer.gnome.org/gio/stable/GSettings.html#GSettings--schema
    
    ImageMenuItem has been deprecated in 3.10
    https://developer.gnome.org/gtk3/unstable/GtkImageMenuItem.html#gtk-image-menu-item-set-image
    
    GtkResizeMode GTK_RESIZE_QUEUE has been deprecated
    https://developer.gnome.org/gtk3/unstable/GtkContainer.html#GtkResizeMode

 data/ui/elementsettingsdialog.ui |    1 -
 data/ui/titleeditor.ui           |    2 +-
 pitivi/clipproperties.py         |    1 -
 pitivi/medialibrary.py           |    1 -
 pitivi/timeline/layer.py         |   15 +++++----------
 pitivi/utils/ui.py               |    2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/data/ui/elementsettingsdialog.ui b/data/ui/elementsettingsdialog.ui
index 8e80f8f..067d6ac 100644
--- a/data/ui/elementsettingsdialog.ui
+++ b/data/ui/elementsettingsdialog.ui
@@ -80,7 +80,6 @@
               <object class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
                 <property name="shadow_type">none</property>
               </object>
             </child>
diff --git a/data/ui/titleeditor.ui b/data/ui/titleeditor.ui
index a32750e..8527857 100644
--- a/data/ui/titleeditor.ui
+++ b/data/ui/titleeditor.ui
@@ -190,7 +190,7 @@
                     <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="color">#ffffffffffff</property>
+                    <property name="rgba">rgb(255,255,255)</property>
                     <signal name="color-set" handler="_backgroundColorButtonCb" swapped="no"/>
                   </object>
                 </child>
diff --git a/pitivi/clipproperties.py b/pitivi/clipproperties.py
index 6dfeab6..f0fca32 100644
--- a/pitivi/clipproperties.py
+++ b/pitivi/clipproperties.py
@@ -184,7 +184,6 @@ class EffectProperties(Gtk.Expander, Loggable):
         self.storemodel = Gtk.ListStore(bool, str, str, str, object)
         self.treeview = Gtk.TreeView(model=self.storemodel)
         self.treeview_scrollwin.add(self.treeview)
-        self.treeview.set_property("rules_hint", True)
         self.treeview.set_property("has_tooltip", True)
         self.treeview.set_headers_clickable(False)
         self.treeview.get_selection().set_mode(Gtk.SelectionMode.SINGLE)
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index 1ad558c..4472674 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -181,7 +181,6 @@ class MediaLibraryWidget(Gtk.VBox, Loggable):
         self.treeview.connect("button-press-event", self._treeViewButtonPressEventCb)
         self.treeview.connect("button-release-event", self._treeViewButtonReleaseEventCb)
         self.treeview.connect("row-activated", self._itemOrRowActivatedCb)
-        self.treeview.set_property("rules_hint", True)
         self.treeview.set_headers_visible(False)
         self.treeview.set_property("search_column", COL_SEARCH_TEXT)
         tsel = self.treeview.get_selection()
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 944ba48..df4e767 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -125,21 +125,16 @@ class BaseLayerControl(Gtk.VBox, Loggable):
 
         # Popup Menu
         self.popup = Gtk.Menu()
-        layer_delete = Gtk.ImageMenuItem.new_with_label(_("_Delete layer"))
+        layer_delete = Gtk.MenuItem.new_with_label(_("_Delete layer"))
         layer_delete.connect("activate", self._deleteLayerCb)
-        layer_delete.set_image(Gtk.Image.new_from_icon_name("edit-delete", Gtk.IconSize.MENU))
-        self.layer_up = Gtk.ImageMenuItem.new_with_label(_("Move layer up"))
+        self.layer_up = Gtk.MenuItem.new_with_label(_("Move layer up"))
         self.layer_up.connect("activate", self._moveLayerCb, -1)
-        self.layer_up.set_image(Gtk.Image.new_from_icon_name("go-up", Gtk.IconSize.MENU))
-        self.layer_down = Gtk.ImageMenuItem.new_with_label(_("Move layer down"))
+        self.layer_down = Gtk.MenuItem.new_with_label(_("Move layer down"))
         self.layer_down.connect("activate", self._moveLayerCb, 1)
-        self.layer_down.set_image(Gtk.Image.new_from_icon_name("go-down", Gtk.IconSize.MENU))
-        self.layer_first = Gtk.ImageMenuItem.new_with_label(_("Move layer to top"))
+        self.layer_first = Gtk.MenuItem.new_with_label(_("Move layer to top"))
         self.layer_first.connect("activate", self._moveLayerCb, -2)
-        self.layer_first.set_image(Gtk.Image.new_from_icon_name("go-top", Gtk.IconSize.MENU))
-        self.layer_last = Gtk.ImageMenuItem.new_with_label(_("Move layer to bottom"))
+        self.layer_last = Gtk.MenuItem.new_with_label(_("Move layer to bottom"))
         self.layer_last.connect("activate", self._moveLayerCb, 2)
-        self.layer_last.set_image(Gtk.Image.new_from_icon_name("go-bottom", Gtk.IconSize.MENU))
 
         self.popup.append(self.layer_first)
         self.popup.append(self.layer_up)
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 60b38d5..70c45f2 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -95,7 +95,7 @@ LAYER_CONTROL_TARGET_ENTRY = Gtk.TargetEntry.new("pitivi/layer-control", 0, TYPE
 def _get_settings(schema):
     if schema not in Gio.Settings.list_schemas():
         return None
-    return Gio.Settings(schema=schema)
+    return Gio.Settings(schema_id=schema)
 
 
 def _get_font(font_spec, default):


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