{"thread":{"id":"31067","subject":"[PATCH] gitk: Use an external icon file on Windows","startedAt":"2012-07-22T21:29:18Z","lastAt":"2012-08-09T16:13:15Z","messageCount":7,"participants":["Sebastian Schuberth","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"195462","messageId":"500C70AE.6050400@gmail.com","threadId":"31067","inReplyTo":null,"subject":"[PATCH] gitk: Use an external icon file on Windows","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-07-22T21:29:18Z","receivedAt":"2012-07-22T21:29:18Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Git for Windows now ships with the new Git icon from git-scm.com. Use that\nicon file instead of the old procedurally drawn one.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n gitk-git/gitk | 49 ++++++++++++++++++++++++++-----------------------\n 1 file changed, 26 insertions(+), 23 deletions(-)\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex 59693c0..bf2492e 100755\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -11664,7 +11664,6 @@ if { [info exists ::env(GITK_MSGSDIR)] } {\n     set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]\n     set gitk_libdir [file join $gitk_prefix share gitk lib]\n     set gitk_msgsdir [file join $gitk_libdir msgs]\n-    unset gitk_prefix\n }\n \n ## Internationalization (i18n) through msgcat and gettext. See\n@@ -11821,28 +11820,32 @@ if {[expr {[exec git rev-parse --is-inside-work-tree] == \"true\"}]} {\n set worktree [exec git rev-parse --show-toplevel]\n setcoords\n makewindow\n-catch {\n-    image create photo gitlogo      -width 16 -height 16\n-\n-    image create photo gitlogominus -width  4 -height  2\n-    gitlogominus put #C00000 -to 0 0 4 2\n-    gitlogo copy gitlogominus -to  1 5\n-    gitlogo copy gitlogominus -to  6 5\n-    gitlogo copy gitlogominus -to 11 5\n-    image delete gitlogominus\n-\n-    image create photo gitlogoplus  -width  4 -height  4\n-    gitlogoplus  put #008000 -to 1 0 3 4\n-    gitlogoplus  put #008000 -to 0 1 4 3\n-    gitlogo copy gitlogoplus  -to  1 9\n-    gitlogo copy gitlogoplus  -to  6 9\n-    gitlogo copy gitlogoplus  -to 11 9\n-    image delete gitlogoplus\n-\n-    image create photo gitlogo32    -width 32 -height 32\n-    gitlogo32 copy gitlogo -zoom 2 2\n-\n-    wm iconphoto . -default gitlogo gitlogo32\n+if {$::tcl_platform(platform) eq {windows}} {\n+    wm iconbitmap . -default $gitk_prefix/etc/git.ico\n+} else {\n+    catch {\n+        image create photo gitlogo      -width 16 -height 16\n+\n+        image create photo gitlogominus -width  4 -height  2\n+        gitlogominus put #C00000 -to 0 0 4 2\n+        gitlogo copy gitlogominus -to  1 5\n+        gitlogo copy gitlogominus -to  6 5\n+        gitlogo copy gitlogominus -to 11 5\n+        image delete gitlogominus\n+\n+        image create photo gitlogoplus  -width  4 -height  4\n+        gitlogoplus  put #008000 -to 1 0 3 4\n+        gitlogoplus  put #008000 -to 0 1 4 3\n+        gitlogo copy gitlogoplus  -to  1 9\n+        gitlogo copy gitlogoplus  -to  6 9\n+        gitlogo copy gitlogoplus  -to 11 9\n+        image delete gitlogoplus\n+\n+        image create photo gitlogo32    -width 32 -height 32\n+        gitlogo32 copy gitlogo -zoom 2 2\n+\n+        wm iconphoto . -default gitlogo gitlogo32\n+    }\n }\n # wait for the window to become visible\n tkwait visibility .\n-- \n1.7.11.msysgit.2\n"},{"id":"195500","messageId":"500CEF06.2030501@gmail.com","threadId":"31067","inReplyTo":"500C70AE.6050400@gmail.com","subject":"[PATCH v2] gitk: Use an external icon file on Windows","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-07-23T06:28:22Z","receivedAt":"2012-07-23T06:28:22Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Git for Windows now ships with the new Git icon from git-scm.com. Use that\nicon file instead of the old procedurally drawn one if it exists.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n gitk-git/gitk | 49 ++++++++++++++++++++++++++-----------------------\n 1 file changed, 26 insertions(+), 23 deletions(-)\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex 59693c0..5127e55 100755\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -11664,7 +11664,6 @@ if { [info exists ::env(GITK_MSGSDIR)] } {\n     set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]\n     set gitk_libdir [file join $gitk_prefix share gitk lib]\n     set gitk_msgsdir [file join $gitk_libdir msgs]\n-    unset gitk_prefix\n }\n \n ## Internationalization (i18n) through msgcat and gettext. See\n@@ -11821,28 +11820,32 @@ if {[expr {[exec git rev-parse --is-inside-work-tree] == \"true\"}]} {\n set worktree [exec git rev-parse --show-toplevel]\n setcoords\n makewindow\n-catch {\n-    image create photo gitlogo      -width 16 -height 16\n-\n-    image create photo gitlogominus -width  4 -height  2\n-    gitlogominus put #C00000 -to 0 0 4 2\n-    gitlogo copy gitlogominus -to  1 5\n-    gitlogo copy gitlogominus -to  6 5\n-    gitlogo copy gitlogominus -to 11 5\n-    image delete gitlogominus\n-\n-    image create photo gitlogoplus  -width  4 -height  4\n-    gitlogoplus  put #008000 -to 1 0 3 4\n-    gitlogoplus  put #008000 -to 0 1 4 3\n-    gitlogo copy gitlogoplus  -to  1 9\n-    gitlogo copy gitlogoplus  -to  6 9\n-    gitlogo copy gitlogoplus  -to 11 9\n-    image delete gitlogoplus\n-\n-    image create photo gitlogo32    -width 32 -height 32\n-    gitlogo32 copy gitlogo -zoom 2 2\n-\n-    wm iconphoto . -default gitlogo gitlogo32\n+if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.ico]} {\n+    wm iconbitmap . -default $gitk_prefix/etc/git.ico\n+} else {\n+    catch {\n+        image create photo gitlogo      -width 16 -height 16\n+\n+        image create photo gitlogominus -width  4 -height  2\n+        gitlogominus put #C00000 -to 0 0 4 2\n+        gitlogo copy gitlogominus -to  1 5\n+        gitlogo copy gitlogominus -to  6 5\n+        gitlogo copy gitlogominus -to 11 5\n+        image delete gitlogominus\n+\n+        image create photo gitlogoplus  -width  4 -height  4\n+        gitlogoplus  put #008000 -to 1 0 3 4\n+        gitlogoplus  put #008000 -to 0 1 4 3\n+        gitlogo copy gitlogoplus  -to  1 9\n+        gitlogo copy gitlogoplus  -to  6 9\n+        gitlogo copy gitlogoplus  -to 11 9\n+        image delete gitlogoplus\n+\n+        image create photo gitlogo32    -width 32 -height 32\n+        gitlogo32 copy gitlogo -zoom 2 2\n+\n+        wm iconphoto . -default gitlogo gitlogo32\n+    }\n }\n # wait for the window to become visible\n tkwait visibility .\n-- \n1.7.11.msysgit.2\n"},{"id":"196699","messageId":"5022CDFC.4090900@gmail.com","threadId":"31067","inReplyTo":"500CEF06.2030501@gmail.com","subject":"[PATCH v2 resend] gitk: Use an external icon file on Windows","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-08-08T20:37:16Z","receivedAt":"2012-08-08T20:37:16Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Git for Windows now ships with the new Git icon from git-scm.com. Use that\nicon file instead of the old procedurally drawn one if it exists.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n gitk-git/gitk | 49 ++++++++++++++++++++++++++-----------------------\n 1 file changed, 26 insertions(+), 23 deletions(-)\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex 59693c0..5127e55 100755\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -11664,7 +11664,6 @@ if { [info exists ::env(GITK_MSGSDIR)] } {\n     set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]\n     set gitk_libdir [file join $gitk_prefix share gitk lib]\n     set gitk_msgsdir [file join $gitk_libdir msgs]\n-    unset gitk_prefix\n }\n \n ## Internationalization (i18n) through msgcat and gettext. See\n@@ -11821,28 +11820,32 @@ if {[expr {[exec git rev-parse --is-inside-work-tree] == \"true\"}]} {\n set worktree [exec git rev-parse --show-toplevel]\n setcoords\n makewindow\n-catch {\n-    image create photo gitlogo      -width 16 -height 16\n-\n-    image create photo gitlogominus -width  4 -height  2\n-    gitlogominus put #C00000 -to 0 0 4 2\n-    gitlogo copy gitlogominus -to  1 5\n-    gitlogo copy gitlogominus -to  6 5\n-    gitlogo copy gitlogominus -to 11 5\n-    image delete gitlogominus\n-\n-    image create photo gitlogoplus  -width  4 -height  4\n-    gitlogoplus  put #008000 -to 1 0 3 4\n-    gitlogoplus  put #008000 -to 0 1 4 3\n-    gitlogo copy gitlogoplus  -to  1 9\n-    gitlogo copy gitlogoplus  -to  6 9\n-    gitlogo copy gitlogoplus  -to 11 9\n-    image delete gitlogoplus\n-\n-    image create photo gitlogo32    -width 32 -height 32\n-    gitlogo32 copy gitlogo -zoom 2 2\n-\n-    wm iconphoto . -default gitlogo gitlogo32\n+if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.ico]} {\n+    wm iconbitmap . -default $gitk_prefix/etc/git.ico\n+} else {\n+    catch {\n+        image create photo gitlogo      -width 16 -height 16\n+\n+        image create photo gitlogominus -width  4 -height  2\n+        gitlogominus put #C00000 -to 0 0 4 2\n+        gitlogo copy gitlogominus -to  1 5\n+        gitlogo copy gitlogominus -to  6 5\n+        gitlogo copy gitlogominus -to 11 5\n+        image delete gitlogominus\n+\n+        image create photo gitlogoplus  -width  4 -height  4\n+        gitlogoplus  put #008000 -to 1 0 3 4\n+        gitlogoplus  put #008000 -to 0 1 4 3\n+        gitlogo copy gitlogoplus  -to  1 9\n+        gitlogo copy gitlogoplus  -to  6 9\n+        gitlogo copy gitlogoplus  -to 11 9\n+        image delete gitlogoplus\n+\n+        image create photo gitlogo32    -width 32 -height 32\n+        gitlogo32 copy gitlogo -zoom 2 2\n+\n+        wm iconphoto . -default gitlogo gitlogo32\n+    }\n }\n # wait for the window to become visible\n tkwait visibility .\n-- \n1.7.11.msysgit.2\n"},{"id":"196708","messageId":"7v628trsry.fsf@alter.siamese.dyndns.org","threadId":"31067","inReplyTo":"5022CDFC.4090900@gmail.com","subject":"Re: [PATCH v2 resend] gitk: Use an external icon file on Windows","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-08T21:13:53Z","receivedAt":"2012-08-08T21:13:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sebastian Schuberth <sschuberth@gmail.com> writes:\n\n> Git for Windows now ships with the new Git icon from git-scm.com. Use that\n> icon file instead of the old procedurally drawn one if it exists.\n>\n> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n> ---\n\nForwarding a misdirected patch to the maintainer who is free to pick\nor ignore.\n\nPersonally I am negative on it (nobody on the list asked for the\n\"new\" Git icon as far as I recall), but my voice on this counts just\nas little as others.\n\nThanks.\n\n>  gitk-git/gitk | 49 ++++++++++++++++++++++++++-----------------------\n>  1 file changed, 26 insertions(+), 23 deletions(-)\n>\n> diff --git a/gitk-git/gitk b/gitk-git/gitk\n> index 59693c0..5127e55 100755\n> --- a/gitk-git/gitk\n> +++ b/gitk-git/gitk\n> @@ -11664,7 +11664,6 @@ if { [info exists ::env(GITK_MSGSDIR)] } {\n>      set gitk_prefix [file dirname [file dirname [file normalize $argv0]]]\n>      set gitk_libdir [file join $gitk_prefix share gitk lib]\n>      set gitk_msgsdir [file join $gitk_libdir msgs]\n> -    unset gitk_prefix\n>  }\n>  \n>  ## Internationalization (i18n) through msgcat and gettext. See\n> @@ -11821,28 +11820,32 @@ if {[expr {[exec git rev-parse --is-inside-work-tree] == \"true\"}]} {\n>  set worktree [exec git rev-parse --show-toplevel]\n>  setcoords\n>  makewindow\n> -catch {\n> -    image create photo gitlogo      -width 16 -height 16\n> -\n> -    image create photo gitlogominus -width  4 -height  2\n> -    gitlogominus put #C00000 -to 0 0 4 2\n> -    gitlogo copy gitlogominus -to  1 5\n> -    gitlogo copy gitlogominus -to  6 5\n> -    gitlogo copy gitlogominus -to 11 5\n> -    image delete gitlogominus\n> -\n> -    image create photo gitlogoplus  -width  4 -height  4\n> -    gitlogoplus  put #008000 -to 1 0 3 4\n> -    gitlogoplus  put #008000 -to 0 1 4 3\n> -    gitlogo copy gitlogoplus  -to  1 9\n> -    gitlogo copy gitlogoplus  -to  6 9\n> -    gitlogo copy gitlogoplus  -to 11 9\n> -    image delete gitlogoplus\n> -\n> -    image create photo gitlogo32    -width 32 -height 32\n> -    gitlogo32 copy gitlogo -zoom 2 2\n> -\n> -    wm iconphoto . -default gitlogo gitlogo32\n> +if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.ico]} {\n> +    wm iconbitmap . -default $gitk_prefix/etc/git.ico\n> +} else {\n> +    catch {\n> +        image create photo gitlogo      -width 16 -height 16\n> +\n> +        image create photo gitlogominus -width  4 -height  2\n> +        gitlogominus put #C00000 -to 0 0 4 2\n> +        gitlogo copy gitlogominus -to  1 5\n> +        gitlogo copy gitlogominus -to  6 5\n> +        gitlogo copy gitlogominus -to 11 5\n> +        image delete gitlogominus\n> +\n> +        image create photo gitlogoplus  -width  4 -height  4\n> +        gitlogoplus  put #008000 -to 1 0 3 4\n> +        gitlogoplus  put #008000 -to 0 1 4 3\n> +        gitlogo copy gitlogoplus  -to  1 9\n> +        gitlogo copy gitlogoplus  -to  6 9\n> +        gitlogo copy gitlogoplus  -to 11 9\n> +        image delete gitlogoplus\n> +\n> +        image create photo gitlogo32    -width 32 -height 32\n> +        gitlogo32 copy gitlogo -zoom 2 2\n> +\n> +        wm iconphoto . -default gitlogo gitlogo32\n> +    }\n>  }\n>  # wait for the window to become visible\n>  tkwait visibility .\n"},{"id":"196726","messageId":"CAHGBnuOKsPJoRADfukCJ8abSVVKUy5vbuh18S7UD8rLScVq=GQ@mail.gmail.com","threadId":"31067","inReplyTo":"7v628trsry.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 resend] gitk: Use an external icon file on Windows","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-08-09T06:54:29Z","receivedAt":"2012-08-09T06:54:29Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On Wed, Aug 8, 2012 at 11:13 PM, Junio C Hamano <gitster@pobox.com> wrote:\n\n> Forwarding a misdirected patch to the maintainer who is free to pick\n> or ignore.\n\nHow am I supposed to know if a patch has been ignored as an oversight\n(in which case I would resend), or because the maintainer decided not\nto include it (in which case I would not resend in order to not annoy\nthe maintainer)?\n\n> Personally I am negative on it (nobody on the list asked for the\n> \"new\" Git icon as far as I recall), but my voice on this counts just\n> as little as others.\n\nI guess most patches on the list come in unasked, so I cannot follow\nyour negative attitude because of this. Also, the patch does not\nenforce the new icon on any platform. From a user's perspective, [1]\nas mentioned on [2] is the official Git homepage, thus the icon used\non the homepage can be regarded as the official Git icon. In Git for\nWindows, we try to have a consistent user experience, and we had a\nreport about gitk still using the \"old\" icon [3]. This patch fixes\nthat, and I'm sending it upstream in an effort to not let msysgit's\nfork of git diverge too much from upstream.\n\n[1] http://git-scm.com/\n[2] http://en.wikipedia.org/wiki/Git_%28software%29#External_links\n[3] https://github.com/msysgit/msysgit/issues/44\n\n-- \nSebastian Schuberth\n"},{"id":"196735","messageId":"7vmx24oybg.fsf@alter.siamese.dyndns.org","threadId":"31067","inReplyTo":"CAHGBnuOKsPJoRADfukCJ8abSVVKUy5vbuh18S7UD8rLScVq=GQ@mail.gmail.com","subject":"Re: [PATCH v2 resend] gitk: Use an external icon file on Windows","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-09T15:54:43Z","receivedAt":"2012-08-09T15:54:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sebastian Schuberth <sschuberth@gmail.com> writes:\n\n> On Wed, Aug 8, 2012 at 11:13 PM, Junio C Hamano <gitster@pobox.com> wrote:\n>\n>> Forwarding a misdirected patch to the maintainer who is free to pick\n>> or ignore.\n>\n> How am I supposed to know if a patch has been ignored as an oversight\n> (in which case I would resend), or because the maintainer decided not\n> to include it (in which case I would not resend in order to not annoy\n> the maintainer)?\n\nBy hearing from Paul (or asking directly), perhaps?\n\n>> Personally I am negative on it (nobody on the list asked for the\n>> \"new\" Git icon as far as I recall), but my voice on this counts just\n>> as little as others.\n>\n> I guess most patches on the list come in unasked, so I cannot follow\n> your negative attitude because of this.\n\nMany patches do come after a thread of discussion, and at the end of\nsuch a discussion I do not often explicitly ask \"yeah, that sounds\nlike a good way to go, please make it so\", so technically it is\ncorrect that many patches come unasked, but my \"nobody asked for\"\nwas not about your patch.  It was about the \"new logo\".\n\n  Cf. http://thread.gmane.org/gmane.comp.version-control.git/197082\n\nThe site may be called \"official\", but Scott exercises fairly large\namount of editorial discretion without community input on occasions,\nand because he is such a nice guy, we let some questionable things\ngo from time to time.  Some things on that site are not always the\ncommunity concensus, not necessarily in the sense that Scott decided\nagainst community concensus but in the sense that the community did\nnot feel a need to even have a concensus and Scott chose to go one\nway.  The new logo is one of these things.  Some in the community\nmay not be enthusiastic about it and prefer the original, but they\ndo not feel strongly enough to send in patches and gather the\ncommunity support to \"fix\" it.\n\nAnd that goes both ways.  If the logo of the \"official\" site is not\nsomething so important that git-scm.com can change without gaining\ncommunity consensus first, then it equally is within the editorial\ndiscretion of individual git package's maintainer to keep using the\noriginal not the updated logo.\n"},{"id":"196738","messageId":"CAHGBnuOwtkHMAUgY8r=9PiWT0MUH83FRQQ8eJuzRV43T5Oyduw@mail.gmail.com","threadId":"31067","inReplyTo":"7vmx24oybg.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 resend] gitk: Use an external icon file on Windows","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2012-08-09T16:13:15Z","receivedAt":"2012-08-09T16:13:15Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On Thu, Aug 9, 2012 at 5:54 PM, Junio C Hamano <gitster@pobox.com> wrote:\n\n>>> Forwarding a misdirected patch to the maintainer who is free to pick\n>>> or ignore.\n>>\n>> How am I supposed to know if a patch has been ignored as an oversight\n>> (in which case I would resend), or because the maintainer decided not\n>> to include it (in which case I would not resend in order to not annoy\n>> the maintainer)?\n>\n> By hearing from Paul (or asking directly), perhaps?\n\nI did that, in a private mail due to some temporary mailing list\nproblems, but did not get an answer. So my question was referring to\nPaul. How I should know whether Paul ignores my patch due to an\noversight, or because he is not interested? And because of this\nambiguity in ignoring a patch I think an explicit NACK should be\nmandatory if a maintainer is not interested in a patch.\n\n> And that goes both ways.  If the logo of the \"official\" site is not\n> something so important that git-scm.com can change without gaining\n> community consensus first, then it equally is within the editorial\n> discretion of individual git package's maintainer to keep using the\n> original not the updated logo.\n\nI admit that I was assuming community consensus on the new logo\nexactly *because* I saw it on git-scm.com. On the other hand, from my\nexperience the Git community is not exactly one where is it\nparticularly easy to get consensus on something, so I completely\nunderstand and support Scott's habit to sometimes go one way without\nconsulting the community first.\n\nAnyway, I'll include the patch into Git for Windows, because that's\nwhat our users ask for.\n\n-- \nSebastian Schuberth\n"}]}