summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-27 04:18:29 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-28 02:15:54 (GMT)
commit1bdd8a153528b539fdaed23c18e87a374b1f3ff8 (patch)
tree01c99b7bef07d0e9fdcf13a0e295ebcc0e2b420e
parentcbf13d9e0c4fc7ac4f2f52f88cff94f1fc311971 (diff)
downloadgit-1bdd8a153528b539fdaed23c18e87a374b1f3ff8.zip
git-1bdd8a153528b539fdaed23c18e87a374b1f3ff8.tar.gz
git-1bdd8a153528b539fdaed23c18e87a374b1f3ff8.tar.bz2
git-gui: Use Henrik Nyh's git logo icon on Windows systems
Rather than displaying the stock red "Tk" icon in our window title bars and on the task bar we now show a Git specific logo. This is Henrik Nyh's logo that we also use in the startup wizard, scaled to a 16x16 image for Windows task bar usage with a proper transparent background. Signed-off-by: Shawn O. Pearce <shawn.o.pearce@bankofamerica.com>
-rw-r--r--Makefile2
-rwxr-xr-xgit-gui.sh4
-rw-r--r--lib/git-gui.icobin0 -> 318 bytes
3 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0ab3351..ea83263 100644
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,7 @@ install: all
$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
+ $(QUIET)$(INSTALL_R0)lib/git-gui.ico $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
$(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
@@ -203,6 +204,7 @@ uninstall:
$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
+ $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.ico $(REMOVE_F1)
$(QUIET)$(foreach p,$(ALL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
diff --git a/git-gui.sh b/git-gui.sh
index 37da8fd..843191a 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -527,6 +527,10 @@ bind . <Visibility> {
set root_exists 1
}
+if {[is_Windows]} {
+ wm iconbitmap . -default $oguilib/git-gui.ico
+}
+
######################################################################
##
## config defaults
diff --git a/lib/git-gui.ico b/lib/git-gui.ico
new file mode 100644
index 0000000..563dd66
--- /dev/null
+++ b/lib/git-gui.ico
Binary files differ