Merge lp:~larsu/indicator-power/lp845037 into lp:indicator-power/12.10

[Lars Karlitski]

Request menu-sized icons. This should go along with the ubuntu-mono patch which removes the padding around the battery icons.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:140
http://s-jenkins:8080/job/indicator-power-ci/1/

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Wow, this one has been sitting around for a long time.

Lars, I gave this a spin and it makes the device icons in the menu =really= tiny compared to the ones in the spec.

[Charles Kerr (charlesk)]

I don't see a way to attach files to a merge proposal, but here's what this patch looks like on my computer: http://i.imgur.com/fF25Y.png

The spec's drawing's look like this:
https://wiki.ubuntu.com/Power?action=AttachFile&do=get&target=power-menu.png

[Lars Karlitski (larsu)]

Thanks for taking a look.

I haven't looked into it yet, but maybe the icons still have padding around them? Maybe it's just that something is wrong with GTK_ICON_SIZE_MENU. I really want to use it instead of _BUTTON, though. They are used in menus after all.

Please don't merge it yet until we've resolved this.

[Matthew Paul Thomas (mpt)]

Icons and text should have the same size relationship to each other, in menu items as they do in menu titles.

For example, if menu title text and menu item text use the same font size, menu title icons and menu item icons should be the same size as each other too.

Maybe here the battery icon looks tiny because it is trying to fit (a) a narrow shape into (b) square proportions. Either of those would be okay by itself, but the combination is bad.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=amd64/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=i386/9/console

review: Approve (continuous-integration)

[Adolfo Jayme Barrientos (fitojb)]

What stopped this branch from landing? If the icon was the problem, we should fix that.

Unmerged revisions

140. By Lars Karlitski on 2012-04-11

Request menu-sized icons

=== modified file 'src/indicator-power.c'
--- src/indicator-power.c	2012-04-15 14:23:24 +0000
+++ src/indicator-power.c	2012-05-21 15:29:20 +0000
@@ -584,7 +584,7 @@
   /* Process the data */
   device_gicons = get_device_icon (kind, state, time, device_icon);
   icon = gtk_image_new_from_gicon (device_gicons,
-                                   GTK_ICON_SIZE_SMALL_TOOLBAR);
+                                   GTK_ICON_SIZE_MENU);
   g_clear_object (&device_gicons);
 
   device_name = device_kind_to_localised_string (kind);
@@ -807,7 +807,7 @@
   device_gicons = get_device_icon (kind, state, time, device_icon);
   gtk_image_set_from_gicon (self->status_image,
                             device_gicons,
-                            GTK_ICON_SIZE_LARGE_TOOLBAR);
+                            GTK_ICON_SIZE_MENU);
   g_clear_object (&device_gicons);
   gtk_widget_show (GTK_WIDGET (self->status_image));
 
@@ -984,7 +984,7 @@
     /* Will create the status icon if it doesn't exist already */
     gicon = g_themed_icon_new (DEFAULT_ICON);
     self->status_image = GTK_IMAGE (gtk_image_new_from_gicon (gicon,
-                                                              GTK_ICON_SIZE_LARGE_TOOLBAR));
+                                                              GTK_ICON_SIZE_MENU));
   }
 
   return self->status_image;