[PATCH] More icon sizes and use all of them for windows
the.li...@gmail.com
* Added three more sizes (smaller ones still need some manual fine-tuning to
look great, as they were just rendered out of the SVG)
* Changed gtk_window_set_default_icon_from() file to a list of icons passed
to gtk_window_set_default_icon_list()
---
data/icons/hicolor/16x16/apps/frogr.png | Bin 0 -> 887 bytes
data/icons/hicolor/32x32/apps/frogr.png | Bin 0 -> 2346 bytes
data/icons/hicolor/64x64/apps/frogr.png | Bin 0 -> 6059 bytes
src/frogr-main-window.c | 22 ++++++++++++++++++++--
4 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 data/icons/hicolor/16x16/apps/frogr.png
create mode 100644 data/icons/hicolor/32x32/apps/frogr.png
create mode 100644 data/icons/hicolor/64x64/apps/frogr.png
diff --git a/data/icons/hicolor/16x16/apps/frogr.png b/data/icons/hicolor/16x16/apps/frogr.png
new file mode 100644
index 0000000000000000000000000000000000000000..551f97df3ee335bdff1adf0a9d76a9fe518ddd33
GIT binary patch
literal 887
zcmV--1Bm>IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000D?000D?0em!Tp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`y5lK~y-6rBg|06JZ#A^JgZLWRhv7Vq+3pYc*|Y?cxeW+|z@h
zw73-X;zg~3coU%@h)^hqHxa=Kf*#yZRM3kS6)6$gRIO4C-AuJ6ZPLw|Oft#L{9de}
zf*$%#-{F1l@D_$rip79kIL<uZe6`Tw+wgMWQN!l9ou{mlxpA!O_9z8K+2Db)+$`zs
zsc*lqt+qKlqkik_*wJ$Y0N9o;-csUUajvdpTPVw>yxw<Bd&+B9pLN*m77uYCr{y5}
z%HXPYghqRsMyy-(x>BL4=;V{~j`4}uS;ASZ>l!LU?TYQQmoO|cQY=m_Itn~4<arr+
z`y2|Ex?nImGEyuK0E+Fix1loB&RMPNEP)Uv<y?|25$Xekqb@^CFZEW5<w-;t|9TP5
zQeZqAL4NsHCM|s_DlC)&c5PX_Z{*p<*}0jU%z}xR-W+;oh{;+HUk;A&;E4c_BY><S
zV^SSLj;hej9Hz7p*p%Xd6Kk*6{bpixqW_pUFSezO_s)$KJ6Z?7^ulH5K&gS@>_=4i
zHXt(e;;u<@ik$Ahg0+975Q`7>12_+0WzDKht%L*Q{1gBNEXN{mXc!oMeGR}EfYHBV
z+*;H0n0K2&D{(+Y5<1Z^LuNogK&cLm%%OSv!6zAG9@-pv2A~lD$btZG<9&o>kX6hm
zH5n>rQc&_K$oe$o>@<kU(u{0G3Cn=D@xFyW($d9Co#EYKQE>ZBouWH(f1fh1j@TrM
zyqbcpPQxJ)$Z~r8Y2?m+Q>PFGx4$#IJKWO6ON8Tz*X>+VtuTp#pQ6Ta;_YS041Bj2
zm%+BY6mD~6CYJnk2Y?O$3X>>sJC{^*Jn=G=QnYmOp2qe2yEy?BdO`~Bt2mSG9=p0}
zSm_A@jKycIi3CfI_l6U<c)9Sy?YzoFpZ49|`S7SV`Kt$qA9!0=xYz7ztGsbdQIuju
zQT*w2x=7b`2g|amAP7@Vr*q<7{PbQ~OTOp`zPbVc%wpF_{!jTgegGUyM5WzMMd1Jd
N002ovPDHLkV1hWlo=X4#
literal 0
HcmV?d00001
diff --git a/data/icons/hicolor/32x32/apps/frogr.png b/data/icons/hicolor/32x32/apps/frogr.png
new file mode 100644
index 0000000000000000000000000000000000000000..074f92320b0ef364874bd628f7fb4d81e86329cd
GIT binary patch
literal 2346
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
Qp8x;=07*qoM6N<$f(lqvLjV8(
literal 0
HcmV?d00001
diff --git a/data/icons/hicolor/64x64/apps/frogr.png b/data/icons/hicolor/64x64/apps/frogr.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5720e51b8ee09c654402ef006cd1a3b37f07aa1
GIT binary patch
literal 6059
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
literal 0
HcmV?d00001
diff --git a/src/frogr-main-window.c b/src/frogr-main-window.c
index b9ab137..ccfd5a1 100644
--- a/src/frogr-main-window.c
+++ b/src/frogr-main-window.c
@@ -38,7 +38,8 @@
#define GTKBUILDER_FILE \
APP_DATA_DIR "/gtkbuilder/frogr-main-window.xml"
-#define MAIN_WINDOW_ICON PIXMAP_DIR "/frogr.xpm"
+#define MAIN_WINDOW_ICON(_s) PIXMAP_DIR "/hicolor/" _s "/apps/frogr.png"
+
enum {
FILEPATH_COL,
@@ -328,6 +329,7 @@ frogr_main_window_init (FrogrMainWindow *fmainwin)
GtkWidget *icon_view;
GtkWidget *progress_bar;
gboolean authorized;
+ GList *icons;
/* Save a reference to the controller */
priv -> controller = frogr_controller_get_instance ();
@@ -359,7 +361,23 @@ frogr_main_window_init (FrogrMainWindow *fmainwin)
gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), -1);
gtk_icon_view_set_item_width (GTK_ICON_VIEW (icon_view), ITEM_WIDTH);
- gtk_window_set_icon_from_file(GTK_WINDOW (fmainwin), MAIN_WINDOW_ICON, NULL);
+ /* Provide a default icon list in several sizes */
+ icons = g_list_prepend (NULL,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("128x128"), NULL));
+ icons = g_list_prepend (icons,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("64x64"), NULL));
+ icons = g_list_prepend (icons,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("48x48"), NULL));
+ icons = g_list_prepend (icons,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("32x32"), NULL));
+ icons = g_list_prepend (icons,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("24x24"), NULL));
+ icons = g_list_prepend (icons,
+ gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("16x16"), NULL));
+ gtk_window_set_default_icon_list (icons);
+ g_list_foreach (icons, (GFunc) g_object_unref, NULL);
+ g_list_free (icons);
+
gtk_window_set_default_size (GTK_WINDOW (fmainwin),
MINIMUM_WINDOW_WIDTH,
MINIMUM_WINDOW_HEIGHT);
--
1.6.3.1
Mario Sanchez Prada
Just see some nitpicking below... :-)
the.li...@gmail.com wrote:
> From: Adrian Perez <ape...@igalia.com>
First line of commit log should be a short, one-line descriptive
statement of what the patch does. Something like "Use a list of properly
sized icons instead of just the .xpm" would be ok.
Don't be worried because of the authorship: I'll always mention who is
the autor, either in the log message or as the "Author" of the commit
(if you send me a patch to be applied).
Btw, in your case which mail address you want me to put in the about
dialog -> artwork? Igalia or gmail?
> * Added three more sizes (smaller ones still need some manual fine-tuning to
> look great, as they were just rendered out of the SVG)
>
> * Changed gtk_window_set_default_icon_from() file to a list of icons passed
> to gtk_window_set_default_icon_list()
Great!
> [...]
> diff --git a/src/frogr-main-window.c b/src/frogr-main-window.c
> index b9ab137..ccfd5a1 100644
> --- a/src/frogr-main-window.c
> +++ b/src/frogr-main-window.c
> @@ -38,7 +38,8 @@
> #define GTKBUILDER_FILE \
> APP_DATA_DIR "/gtkbuilder/frogr-main-window.xml"
>
> -#define MAIN_WINDOW_ICON PIXMAP_DIR "/frogr.xpm"
> +#define MAIN_WINDOW_ICON(_s) PIXMAP_DIR "/hicolor/" _s "/apps/frogr.png"
> +
>
> enum {
> FILEPATH_COL,
> @@ -328,6 +329,7 @@ frogr_main_window_init (FrogrMainWindow *fmainwin)
> GtkWidget *icon_view;
> GtkWidget *progress_bar;
> gboolean authorized;
> + GList *icons;
I do not see the point of storing the list of icons in the private
structure. Any particular reason?
Btw, you don't use any "priv -> icons = ..." statement later on, so I
guess it's safe to remove.
> /* Save a reference to the controller */
> priv -> controller = frogr_controller_get_instance ();
> @@ -359,7 +361,23 @@ frogr_main_window_init (FrogrMainWindow *fmainwin)
> gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), -1);
> gtk_icon_view_set_item_width (GTK_ICON_VIEW (icon_view), ITEM_WIDTH);
>
> - gtk_window_set_icon_from_file(GTK_WINDOW (fmainwin), MAIN_WINDOW_ICON, NULL);
> + /* Provide a default icon list in several sizes */
> + icons = g_list_prepend (NULL,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("128x128"), NULL));
> + icons = g_list_prepend (icons,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("64x64"), NULL));
> + icons = g_list_prepend (icons,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("48x48"), NULL));
> + icons = g_list_prepend (icons,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("32x32"), NULL));
> + icons = g_list_prepend (icons,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("24x24"), NULL));
> + icons = g_list_prepend (icons,
> + gdk_pixbuf_new_from_file (MAIN_WINDOW_ICON("16x16"), NULL));
> + gtk_window_set_default_icon_list (icons);
Ok.
> + g_list_foreach (icons, (GFunc) g_object_unref, NULL);
> + g_list_free (icons);
Had some doubts at first with this but watching the code of
gtk_window_set_icon_list (): it copies the GList structure and adds
additional refs to every object in the list, so it's safe to free. :-)
At last, just a humble request: if possible I would rather you to send
patches as an attachment instead of inline. I guess just using the
--attach option together with git-format-patch should be enough.
Thanks!
Mario
Adrian Perez de Castro
>
> Thanks! Looks good.
>
> Just see some nitpicking below... :-)
Comments are welcome, of course!
> the.li...@gmail.com wrote:
> > From: Adrian Perez <ape...@igalia.com>
>
> First line of commit log should be a short, one-line descriptive
> statement of what the patch does. Something like "Use a list of properly
> sized icons instead of just the .xpm" would be ok.
>
> Don't be worried because of the authorship: I'll always mention who is
> the autor, either in the log message or as the "Author" of the commit
> (if you send me a patch to be applied).
Agree. I think this is because I tried to use ”git format-patch” and
“git send-email” without tweaking their options beforehand. I have just
found a web page which talks about them needing some tweaking for
real-world usage :)
I have just changed the Git config and will send it again. I have tried
myself applying patches with “git am” and the tool will happily extract
the one-line commit message from “Subject:” headers. I am resending the
patch in while :P
> Btw, in your case which mail address you want me to put in the about
> dialog -> artwork? Igalia or gmail?
I would prefer to use the Igalia address, “the.lightman” does not look
serious... and I understand that Frogr is something “serious” ;)
> > * Added three more sizes (smaller ones still need some manual fine-tuning to
> > look great, as they were just rendered out of the SVG)
> >
> > * Changed gtk_window_set_default_icon_from() file to a list of icons passed
> > to gtk_window_set_default_icon_list()
>
> Great!
> I do not see the point of storing the list of icons in the private
> structure. Any particular reason?
It is not being stored in the private structure: “icons” is a local
variable of frogr_main_window_init(), because there is no need to keep
the list after passing it to gtk_window_set_default_icon_list() -- or
maybe I am not understanding what you are trying to tell me here.
> > + g_list_foreach (icons, (GFunc) g_object_unref, NULL);
> > + g_list_free (icons);
>
> Had some doubts at first with this but watching the code of
> gtk_window_set_icon_list (): it copies the GList structure and adds
> additional refs to every object in the list, so it's safe to free. :-)
Haha, I did the same and skimmed through its code, because I am not very
used to manually do reference counting. It looks that they use the same
conventions as the Objective-C folks: if you create the object and you
do not need it anymore, you have to “unref” it; if you get an object
from elsewhere and you plan to use it, you have to “ref” it :-)
> At last, just a humble request: if possible I would rather you to send
> patches as an attachment instead of inline. I guess just using the
> --attach option together with git-format-patch should be enough.
Of course, I will be using attachments from now on.
Thanks for your comments!
--
Adrian Perez de Castro <ape...@igalia.com>
Igalia - Free Software Engineering
Adrian Perez
* Added three more sizes (smaller ones still need some manual fine-tuning to
look great, as they were just rendered out of the SVG)
* Changed gtk_window_set_default_icon_from() file to a list of icons passed
to gtk_window_set_default_icon_list()
Adrian Perez de Castro
> I have just changed the Git config and will send it again. I have tried
> myself applying patches with “git am” and the tool will happily extract
> the one-line commit message from “Subject:” headers [...]
For the sake of completeness: you can just save the full e-mail and
pass it to “git am” (note: “am” stands for “apply mail”), so there is
no need to manually re-enter any data ;)
Mario Sanchez Prada
> [...]
> Agree. I think this is because I tried to use ”git format-patch” and
> “git send-email” without tweaking their options beforehand. I have just
> found a web page which talks about them needing some tweaking for
> real-world usage :)
>
> I have just changed the Git config and will send it again. I have tried
> myself applying patches with “git am” and the tool will happily extract
> the one-line commit message from “Subject:” headers. I am resending the
> patch in while :P
Just in case it could be helpful for you, I usually use the following
parameters for formatting and sending patches, depending on whether it's
a single patch or a set of patches:
- For a single patch (against master):
git format-patch -M -C --attach master
git send-email mypatch.patch
- For a set of patches (against master):
git format-patch -M -C --attach -n --cover-letter -o patches/ master
(and then properly fill the content of the cover letter)
git send-email --no-chain-reply patches/*patch
>> Btw, in your case which mail address you want me to put in the about
>> dialog -> artwork? Igalia or gmail?
>
> I would prefer to use the Igalia address, “the.lightman” does not look
> serious... and I understand that Frogr is something “serious” ;)
Ok
>>> * Added three more sizes (smaller ones still need some manual fine-tuning to
>>> look great, as they were just rendered out of the SVG)
>>>
>>> * Changed gtk_window_set_default_icon_from() file to a list of icons passed
>>> to gtk_window_set_default_icon_list()
>> Great!
>
>> I do not see the point of storing the list of icons in the private
>> structure. Any particular reason?
>
> It is not being stored in the private structure: “icons” is a local
> variable of frogr_main_window_init(), because there is no need to keep
> the list after passing it to gtk_window_set_default_icon_list() -- or
> maybe I am not understanding what you are trying to tell me here.
Forget it... too early in the morning to see the private structure where
it was just the local declararion inside the function X'D.
It's ok, of course.
>>> + g_list_foreach (icons, (GFunc) g_object_unref, NULL);
>>> + g_list_free (icons);
>> Had some doubts at first with this but watching the code of
>> gtk_window_set_icon_list (): it copies the GList structure and adds
>> additional refs to every object in the list, so it's safe to free. :-)
>
> Haha, I did the same and skimmed through its code, because I am not very
> used to manually do reference counting. It looks that they use the same
> conventions as the Objective-C folks: if you create the object and you
> do not need it anymore, you have to “unref” it; if you get an object
> from elsewhere and you plan to use it, you have to “ref” it :-)
Yep, that's the reason, although I still like to dive into the actual
code to make sure when I have some doubts, as it was the case. :-)
>> At last, just a humble request: if possible I would rather you to send
>> patches as an attachment instead of inline. I guess just using the
>> --attach option together with git-format-patch should be enough.
>
> Of course, I will be using attachments from now on.
It's kind of personal preference, nothing bad on it, but thanks for your
effort and disposition.
> Thanks for your comments!
Thank you for give something to coment on ;-)
Mario
Mario Sanchez Prada
>
>> I have just changed the Git config and will send it again. I have tried
>> myself applying patches with “git am” and the tool will happily extract
>> the one-line commit message from “Subject:” headers [...]
>
> For the sake of completeness: you can just save the full e-mail and
> pass it to “git am” (note: “am” stands for “apply mail”), so there is
> no need to manually re-enter any data ;)
Yep I knew, but thanks for pointing it out anyway
Mario