fix obscure GtkBuilder bug with parameter inheritance issues for iconview - issue #338

Esse commit está contido em:
fossfreedom
2014-10-18 10:01:24 +01:00
commit 6a02d3b74a
5 arquivos alterados com 4 adições e 24 exclusões
-1
Ver Arquivo
@@ -13,7 +13,6 @@ intltool-extract --local --type=gettext/glade ui/coverart_browser.ui
intltool-extract --local --type=gettext/glade ui/coverart_entryview_compact_pop_rb3.ui
intltool-extract --local --type=gettext/glade ui/coverart_entryview_full_pop_rb3.ui
intltool-extract --local --type=gettext/glade ui/coverart_exportembed.ui
intltool-extract --local --type=gettext/glade ui/coverart_iconview.ui
intltool-extract --local --type=gettext/glade ui/coverart_leftsidebar.ui
intltool-extract --local --type=gettext/glade ui/coverart_listwindow.ui
intltool-extract --local --type=gettext/glade ui/coverart_play_pop_rb3.ui
+1 -3
Ver Arquivo
@@ -1263,9 +1263,7 @@ class ViewManager(GObject.Object):
# initialize views
self._views = {}
ui = Gtk.Builder()
ui.add_from_file(rb.find_plugin_file(source.plugin,
'ui/coverart_iconview.ui'))
self._views[CoverIconView.name] = ui.get_object('covers_view')
self._views[CoverIconView.name] = CoverIconView()
self._views[CoverFlowView.name] = CoverFlowView()
self._views[ListView.name] = ListView()
self._views[QueueView.name] = QueueView()
+3 -6
Ver Arquivo
@@ -237,12 +237,7 @@ class CoverIconView(EnhancedIconView, AbstractView):
def __init__(self, *args, **kwargs):
if not rb3compat.compare_pygobject_version("3.9"):
super(CoverIconView, self).__init__(cell_area=AlbumArtCellArea(), *args, **kwargs)
else:
# this works in trusty but not in earlier versions - define in the super above
super(CoverIconView, self).__init__(*args, **kwargs)
self.props.cell_area = AlbumArtCellArea()
super(CoverIconView, self).__init__(cell_area=AlbumArtCellArea(), *args, **kwargs)
self.gs = GSetting()
# custom text renderer
@@ -252,6 +247,8 @@ class CoverIconView(EnhancedIconView, AbstractView):
self._has_initialised = False
self._last_path = None
self._calc_motion_step = 0
self.set_selection_mode(Gtk.SelectionMode.MULTIPLE)
self.object_column = AlbumsModel.columns['album']
def initialise(self, source):
if self._has_initialised:
-1
Ver Arquivo
@@ -6,7 +6,6 @@ tmp/coverart_browser.ui.h
tmp/coverart_entryview_compact_pop_rb3.ui.h
tmp/coverart_entryview_full_pop_rb3.ui.h
tmp/coverart_exportembed.ui.h
tmp/coverart_iconview.ui.h
tmp/coverart_leftsidebar.ui.h
tmp/coverart_listwindow.ui.h
tmp/coverart_play_pop_rb3.ui.h
-13
Ver Arquivo
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires coverart_widgets 1.0 -->
<object class="CoverIconView" id="covers_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="selection_mode">multiple</property>
<property name="tooltip_column">0</property>
<property name="object_column">2</property>
</object>
</interface>