gtg team mailing list archive
-
gtg team
-
Mailing list archive
-
Message #03695
lp:~bertrand-rousseau/gtg/bugfix-1077320-1077321-wrong-icons-location into lp:gtg
Bertrand Rousseau has proposed merging lp:~bertrand-rousseau/gtg/bugfix-1077320-1077321-wrong-icons-location into lp:gtg.
Requested reviews:
Gtg developers (gtg)
Related bugs:
Bug #1077320 in Getting Things GNOME!: "Size mismatch for items-tags.png"
https://bugs.launchpad.net/gtg/+bug/1077320
Bug #1077321 in Getting Things GNOME!: "Icons are installed under "scalable", but aren't vector graphics"
https://bugs.launchpad.net/gtg/+bug/1077321
For more details, see:
https://code.launchpad.net/~bertrand-rousseau/gtg/bugfix-1077320-1077321-wrong-icons-location/+merge/133790
Work for bugs #1077321 and #1077320 (icon improperly placed in data/icons)
- Remove 320x320 png icons from scalable, scale them to 48 and 128 px
and move them to the appropriate icon folder
- Remove items-tags.png from 22x22 since it seems that no code actually
uses it anymore
- Add some padding the backend description label, and remove the useless
centring widget for backend description.
--
https://code.launchpad.net/~bertrand-rousseau/gtg/bugfix-1077320-1077321-wrong-icons-location/+merge/133790
Your team Gtg developers is requested to review the proposed merge of lp:~bertrand-rousseau/gtg/bugfix-1077320-1077321-wrong-icons-location into lp:gtg.
=== modified file 'GTG/gtk/backends_dialog.glade'
--- GTG/gtk/backends_dialog.glade 2012-07-13 17:24:28 +0000
+++ GTG/gtk/backends_dialog.glade 2012-11-10 12:29:20 +0000
@@ -115,27 +115,18 @@
</child>
<child>
<object class="GtkScrolledWindow" id="central_pane_window">
- <property name="width_request">450</property>
+ <property name="width_request">480</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vadjustment">adjustment1</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <object class="GtkViewport" id="central_pane1">
+ <object class="GtkViewport" id="central_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
<child>
- <object class="GtkAlignment" id="central_pane">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">10</property>
- <property name="right_padding">10</property>
- <child>
- <placeholder/>
- </child>
- </object>
+ <placeholder/>
</child>
</object>
</child>
=== modified file 'GTG/gtk/backends_dialog/__init__.py'
--- GTG/gtk/backends_dialog/__init__.py 2012-07-13 17:24:28 +0000
+++ GTG/gtk/backends_dialog/__init__.py 2012-11-10 12:29:20 +0000
@@ -112,7 +112,7 @@
'''
return self.req
- def get_pixbuf_from_icon_name(self, name, height, width):
+ def get_pixbuf_from_icon_name(self, name, height):
'''
Helper function: returns a pixbuf of an icon given its name in the
loaded icon theme
@@ -124,14 +124,11 @@
@returns gtk.gdk.Pixbuf: a pixbuf containing the wanted icon, or None
(if the icon is not present)
'''
- #NOTE: loading icons directly from the theme and scaling them results
- # in blurry icons. So, instead of doing that, I'm loading them
- # directly from file.
- icon_info = self.icon_theme.lookup_icon(name, gtk.ICON_SIZE_MENU, 0)
+ icon_info = self.icon_theme.lookup_icon(name, height, 0)
if icon_info == None:
return None
- pixbuf = gtk.gdk.pixbuf_new_from_file(icon_info.get_filename())
- return pixbuf.scale_simple(width, height, gtk.gdk.INTERP_BILINEAR)
+ else:
+ return gtk.icon_theme_get_default().load_icon(name, height, 0)
def _show_panel(self, panel_name):
'''
=== modified file 'GTG/gtk/backends_dialog/addpanel.py'
--- GTG/gtk/backends_dialog/addpanel.py 2012-07-13 17:24:28 +0000
+++ GTG/gtk/backends_dialog/addpanel.py 2012-11-10 12:29:20 +0000
@@ -94,11 +94,11 @@
self.label_modules.set_line_wrap(True)
self.label_modules.set_alignment(xalign = 0, yalign = 0)
self.image_icon = gtk.Image()
- self.image_icon.set_size_request(100, 100)
+ self.image_icon.set_size_request(128, 128)
align_image = gtk.Alignment(xalign = 1, yalign = 0)
align_image.add(self.image_icon)
labels_vbox = gtk.VBox()
- labels_vbox.pack_start(self.label_description, True, True)
+ labels_vbox.pack_start(self.label_description, True, True, padding=10)
labels_vbox.pack_start(self.label_author, True, True)
labels_vbox.pack_start(self.label_modules, True, True)
low_hbox = gtk.HBox()
@@ -179,6 +179,6 @@
(ngettext("Author", "Authors", len(authors)),
reduce(lambda a, b: a + "\n" + " - " + b, authors))
self.label_author.set_markup(author_txt)
- pixbuf = self.dialog.get_pixbuf_from_icon_name(backend_name, 100, 100)
+ pixbuf = self.dialog.get_pixbuf_from_icon_name(backend_name, 128)
self.image_icon.set_from_pixbuf(pixbuf)
self.show_all()
=== modified file 'GTG/gtk/backends_dialog/backendscombo.py'
--- GTG/gtk/backends_dialog/backendscombo.py 2012-07-13 17:24:28 +0000
+++ GTG/gtk/backends_dialog/backendscombo.py 2012-11-10 12:29:20 +0000
@@ -76,7 +76,7 @@
# See LP bug #940917 (Izidor)
if name == "backend_localfile":
continue
- pixbuf = self.dialog.get_pixbuf_from_icon_name(name, 16, 16)
+ pixbuf = self.dialog.get_pixbuf_from_icon_name(name, 16)
self.liststore.append((name, \
module.Backend.get_human_default_name(), \
pixbuf))
=== modified file 'GTG/gtk/backends_dialog/backendstree.py'
--- GTG/gtk/backends_dialog/backendstree.py 2012-05-23 08:55:31 +0000
+++ GTG/gtk/backends_dialog/backendstree.py 2012-11-10 12:29:20 +0000
@@ -95,7 +95,7 @@
backend_iter = self.liststore.append([ \
backend.get_id(), \
self.dialog.get_pixbuf_from_icon_name(backend.get_name(), \
- 16, 16), \
+ 16), \
backend.get_human_name(), \
self._get_markup_for_tags(backend.get_attached_tags()), \
])
=== modified file 'GTG/gtk/backends_dialog/configurepanel.py'
--- GTG/gtk/backends_dialog/configurepanel.py 2012-07-13 17:24:28 +0000
+++ GTG/gtk/backends_dialog/configurepanel.py 2012-11-10 12:29:20 +0000
@@ -126,7 +126,7 @@
self.refresh_sync_status()
self.parameters_ui.refresh(self.backend)
self.image_icon.set_from_pixbuf(self.dialog.get_pixbuf_from_icon_name(\
- self.backend.get_name(), 48, 48))
+ self.backend.get_name(), 48))
def refresh_title(self, sender = None, data = None):
'''
=== added directory 'data/icons/hicolor/128x128'
=== added directory 'data/icons/hicolor/128x128/apps'
=== added file 'data/icons/hicolor/128x128/apps/backend_evolution.png'
Binary files data/icons/hicolor/128x128/apps/backend_evolution.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_evolution.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_gnote.png'
Binary files data/icons/hicolor/128x128/apps/backend_gnote.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_gnote.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_identica.png'
Binary files data/icons/hicolor/128x128/apps/backend_identica.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_identica.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_launchpad.png'
Binary files data/icons/hicolor/128x128/apps/backend_launchpad.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_launchpad.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_localfile.png'
Binary files data/icons/hicolor/128x128/apps/backend_localfile.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_localfile.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_mantis.png'
Binary files data/icons/hicolor/128x128/apps/backend_mantis.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_mantis.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_rtm.png'
Binary files data/icons/hicolor/128x128/apps/backend_rtm.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_rtm.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_tomboy.png'
Binary files data/icons/hicolor/128x128/apps/backend_tomboy.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_tomboy.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/128x128/apps/backend_twitter.png'
Binary files data/icons/hicolor/128x128/apps/backend_twitter.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/backend_twitter.png 2012-11-10 12:29:20 +0000 differ
=== added directory 'data/icons/hicolor/48x48/apps'
=== added file 'data/icons/hicolor/48x48/apps/backend_evolution.png'
Binary files data/icons/hicolor/48x48/apps/backend_evolution.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_evolution.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_gnote.png'
Binary files data/icons/hicolor/48x48/apps/backend_gnote.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_gnote.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_identica.png'
Binary files data/icons/hicolor/48x48/apps/backend_identica.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_identica.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_launchpad.png'
Binary files data/icons/hicolor/48x48/apps/backend_launchpad.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_launchpad.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_localfile.png'
Binary files data/icons/hicolor/48x48/apps/backend_localfile.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_localfile.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_mantis.png'
Binary files data/icons/hicolor/48x48/apps/backend_mantis.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_mantis.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_rtm.png'
Binary files data/icons/hicolor/48x48/apps/backend_rtm.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_rtm.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_tomboy.png'
Binary files data/icons/hicolor/48x48/apps/backend_tomboy.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_tomboy.png 2012-11-10 12:29:20 +0000 differ
=== added file 'data/icons/hicolor/48x48/apps/backend_twitter.png'
Binary files data/icons/hicolor/48x48/apps/backend_twitter.png 1970-01-01 00:00:00 +0000 and data/icons/hicolor/48x48/apps/backend_twitter.png 2012-11-10 12:29:20 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_evolution.png'
Binary files data/icons/hicolor/scalable/apps/backend_evolution.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_evolution.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_gnote.png'
Binary files data/icons/hicolor/scalable/apps/backend_gnote.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_gnote.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_identica.png'
Binary files data/icons/hicolor/scalable/apps/backend_identica.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_identica.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_launchpad.png'
Binary files data/icons/hicolor/scalable/apps/backend_launchpad.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_launchpad.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_localfile.png'
Binary files data/icons/hicolor/scalable/apps/backend_localfile.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_localfile.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_mantis.png'
Binary files data/icons/hicolor/scalable/apps/backend_mantis.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_mantis.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_rtm.png'
Binary files data/icons/hicolor/scalable/apps/backend_rtm.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_rtm.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_tomboy.png'
Binary files data/icons/hicolor/scalable/apps/backend_tomboy.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_tomboy.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/hicolor/scalable/apps/backend_twitter.png'
Binary files data/icons/hicolor/scalable/apps/backend_twitter.png 2012-05-23 08:55:31 +0000 and data/icons/hicolor/scalable/apps/backend_twitter.png 1970-01-01 00:00:00 +0000 differ
