Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Duncan C. <dun...@wo...> - 2007-07-28 19:24:35
|
Sat Jul 28 10:33:05 PDT 2007 Duncan Coutts <du...@ha...>
* Be more careful about cleaning split-objs and stub files
And build the code gen tools without using split-objs at all.
hunk ./Makefile.am 89
+tools_hierarchyGen_TypeGenerator_NOSPLITOBJS = yes
hunk ./Makefile.am 109
+tools_callbackGen_HookGenerator_NOSPLITOBJS = yes
hunk ./Makefile.am 128
-tools_c2hs_c2hsLocal_HEADER = [_$_]
-tools_c2hs_c2hsLocal_HCFLAGS = [_$_]
+tools_c2hs_c2hsLocal_NOSPLITOBJS = yes
hunk ./Makefile.am 323
+glib_CLEANFILES_SPLIT = $(libHSglib_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 691
- $(libHSgtk_a_LIBADD) \
- $(libHSgtk_a_LIBADD:.o=_.c) \
- $(libHSgtk_a_LIBADD:.o=_.h)
+ $(libHSgtk_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgtk_a_CHSFILES:.chs=_stub.o) \
+ $(libHSgtk_a_CHSFILES:.chs=_stub.c)
hunk ./Makefile.am 705
+gtk_CLEANFILES_SPLIT = $(libHSgtk_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 819
+glade_CLEANFILES_SPLIT = $(libHSglade_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 940
- $(libHSgconf_a_LIBADD) \
- $(libHSgconf_a_LIBADD:.o=_.c) \
- $(libHSgconf_a_LIBADD:.o=_.h)
+ $(libHSgconf_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgconf_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgconf_a_CHSFILES:.chs=_stub.c)
hunk ./Makefile.am 955
+gconf_CLEANFILES_SPLIT = $(libHSgconf_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1081
+sourceview_CLEANFILES_SPLIT = $(libHSsourceview_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1195
+mozembed_CLEANFILES_SPLIT = $(libHSmozembed_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1329
+cairo_CLEANFILES_SPLIT = $(libHScairo_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1428
+svgcairo_CLEANFILES_SPLIT = $(libHSsvgcairo_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1550
+gtkglext_CLEANFILES_SPLIT = $(libHSgtkglext_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1625
+soegtk_MOSTLYCLEANFILES += $(libHSsoegtk_a_BUILDSOURCES)
hunk ./Makefile.am 1633
+soegtk_CLEANFILES_SPLIT = $(libHSsoegtk_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1983
- rm -f $(c2hs_CLEANFILES)
- rm -f $(glib_CLEANFILES)
- rm -f $(gtk_CLEANFILES)
- rm -f $(glade_CLEANFILES)
- rm -f $(gconf_CLEANFILES)
- rm -f $(sourceview_CLEANFILES)
- rm -f $(mozembed_CLEANFILES)
- rm -f $(cairo_CLEANFILES)
- rm -f $(svgcairo_CLEANFILES)
- rm -f $(gtkglext_CLEANFILES)
- rm -f $(soegtk_CLEANFILES)
- rm -f $(doc_CLEANFILES)
+ rm -f $(c2hs_CLEANFILES)
+ rm -rf $(c2hs_CLEANFILES_SPLIT)
+ rm -f $(glib_CLEANFILES)
+ rm -rf $(glib_CLEANFILES_SPLIT)
+ rm -f $(gtk_CLEANFILES)
+ rm -rf $(gtk_CLEANFILES_SPLIT)
+ rm -f $(glade_CLEANFILES)
+ rm -rf $(glade_CLEANFILES_SPLIT)
+ rm -f $(gconf_CLEANFILES)
+ rm -rf $(gconf_CLEANFILES_SPLIT)
+ rm -f $(sourceview_CLEANFILES)
+ rm -rf $(sourceview_CLEANFILES_SPLIT)
+ rm -f $(mozembed_CLEANFILES)
+ rm -rf $(mozembed_CLEANFILES_SPLIT)
+ rm -f $(cairo_CLEANFILES)
+ rm -rf $(cairo_CLEANFILES_SPLIT)
+ rm -f $(svgcairo_CLEANFILES)
+ rm -rf $(svgcairo_CLEANFILES_SPLIT)
+ rm -f $(gtkglext_CLEANFILES)
+ rm -rf $(gtkglext_CLEANFILES_SPLIT)
+ rm -f $(soegtk_CLEANFILES)
+ rm -rf $(soegtk_CLEANFILES_SPLIT)
+ rm -f $(doc_CLEANFILES)
hunk ./mk/common.mk 62
- rm -rf $@ $*_split/
- mkdir -p $*_split
+ $(if $($(PKG)_NOSPLITOBJS),,rm -rf $@ $*_split/; mkdir -p $*_split)
hunk ./mk/common.mk 64
- -c $< -o $@ -split-objs $(HCFLAGS) $($(PKG)_HCFLAGS) \
+ $(if $($(PKG)_NOSPLITOBJS),,-split-objs) \
+ -c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
|
|
From: Duncan C. <dun...@wo...> - 2007-07-28 19:24:35
|
Sat Jul 28 09:38:00 PDT 2007 Duncan Coutts <du...@ha...>
* Add clean script to win32 scripts bundle
addfile ./tools/win32/clean.sh
hunk ./tools/win32/clean.sh 1
+#!/bin/bash
+
+. ./versions.conf
+
+rm -rf zips/*/
+rm -f zips/*.tar
+
+rm -rf gtk+-${GTK_VERSION}
+rm -f gtk+-${GTK_VERSION}.tar.gz
+
+rm -rf gtk+-dev-${GTK_VERSION}
+rm -f gtk+-dev-${GTK_VERSION}.tar.gz
|
|
From: Duncan C. <dun...@wo...> - 2007-07-28 19:24:33
|
Sat Jul 28 12:24:03 PDT 2007 Duncan Coutts <du...@ha...>
* Merge changes in cleaning split-objs with gnomefvs changes
hunk ./Makefile.am 1796
+gnomevfs_CLEANFILES_SPLIT = $(libHSgnomevfs_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 2153
- rm -f $(c2hs_CLEANFILES)
- rm -f $(glib_CLEANFILES)
- rm -f $(gtk_CLEANFILES)
- rm -f $(glade_CLEANFILES)
- rm -f $(gconf_CLEANFILES)
- rm -f $(sourceview_CLEANFILES)
- rm -f $(mozembed_CLEANFILES)
- rm -f $(cairo_CLEANFILES)
- rm -f $(svgcairo_CLEANFILES)
- rm -f $(gtkglext_CLEANFILES)
- rm -f $(soegtk_CLEANFILES)
- rm -f $(doc_CLEANFILES)
+ rm -f $(c2hs_CLEANFILES)
+ rm -rf $(c2hs_CLEANFILES_SPLIT)
+ rm -f $(glib_CLEANFILES)
+ rm -rf $(glib_CLEANFILES_SPLIT)
+ rm -f $(gtk_CLEANFILES)
+ rm -rf $(gtk_CLEANFILES_SPLIT)
+ rm -f $(glade_CLEANFILES)
+ rm -rf $(glade_CLEANFILES_SPLIT)
+ rm -f $(gconf_CLEANFILES)
+ rm -rf $(gconf_CLEANFILES_SPLIT)
+ rm -f $(sourceview_CLEANFILES)
+ rm -rf $(sourceview_CLEANFILES_SPLIT)
+ rm -f $(mozembed_CLEANFILES)
+ rm -rf $(mozembed_CLEANFILES_SPLIT)
+ rm -f $(cairo_CLEANFILES)
+ rm -rf $(cairo_CLEANFILES_SPLIT)
+ rm -f $(svgcairo_CLEANFILES)
+ rm -rf $(svgcairo_CLEANFILES_SPLIT)
+ rm -f $(gtkglext_CLEANFILES)
+ rm -rf $(gtkglext_CLEANFILES_SPLIT)
+ rm -f $(soegtk_CLEANFILES)
+ rm -rf $(soegtk_CLEANFILES_SPLIT)
+ rm -f $(gnomevfs_CLEANFILES)
+ rm -rf $(gnomevfs_CLEANFILES_SPLIT)
+ rm -f $(doc_CLEANFILES)
|
|
From: Duncan C. <dun...@wo...> - 2007-07-28 19:24:29
|
Sat Jul 28 10:33:05 PDT 2007 Duncan Coutts <du...@ha...>
* Be more careful about cleaning split-objs and stub files
And build the code gen tools without using split-objs at all.
hunk ./Makefile.am 94
+tools_hierarchyGen_TypeGenerator_NOSPLITOBJS = yes
hunk ./Makefile.am 114
+tools_callbackGen_HookGenerator_NOSPLITOBJS = yes
hunk ./Makefile.am 133
-tools_c2hs_c2hsLocal_HEADER = [_$_]
-tools_c2hs_c2hsLocal_HCFLAGS = [_$_]
+tools_c2hs_c2hsLocal_NOSPLITOBJS = yes
hunk ./Makefile.am 329
+glib_CLEANFILES_SPLIT = $(libHSglib_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 695
- $(libHSgtk_a_LIBADD) \
- $(libHSgtk_a_LIBADD:.o=_.c) \
- $(libHSgtk_a_LIBADD:.o=_.h)
+ $(libHSgtk_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgtk_a_CHSFILES:.chs=_stub.o) \
+ $(libHSgtk_a_CHSFILES:.chs=_stub.c)
hunk ./Makefile.am 709
+gtk_CLEANFILES_SPLIT = $(libHSgtk_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 823
+glade_CLEANFILES_SPLIT = $(libHSglade_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 944
- $(libHSgconf_a_LIBADD) \
- $(libHSgconf_a_LIBADD:.o=_.c) \
- $(libHSgconf_a_LIBADD:.o=_.h)
+ $(libHSgconf_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgconf_a_CHSFILES:.chs=_stub.h) \
+ $(libHSgconf_a_CHSFILES:.chs=_stub.c)
hunk ./Makefile.am 959
+gconf_CLEANFILES_SPLIT = $(libHSgconf_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1085
+sourceview_CLEANFILES_SPLIT = $(libHSsourceview_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1199
+mozembed_CLEANFILES_SPLIT = $(libHSmozembed_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1333
+cairo_CLEANFILES_SPLIT = $(libHScairo_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1432
+svgcairo_CLEANFILES_SPLIT = $(libHSsvgcairo_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1554
+gtkglext_CLEANFILES_SPLIT = $(libHSgtkglext_a_HSFILES:.hs=_split/)
hunk ./Makefile.am 1629
+soegtk_MOSTLYCLEANFILES += $(libHSsoegtk_a_BUILDSOURCES)
hunk ./Makefile.am 1637
+soegtk_CLEANFILES_SPLIT = $(libHSsoegtk_a_HSFILES:.hs=_split/)
merger 0.0 (
hunk ./Makefile.am 2163
+ rm -f $(gnomevfs_CLEANFILES)
hunk ./Makefile.am 2152
- rm -f $(c2hs_CLEANFILES)
- rm -f $(glib_CLEANFILES)
- rm -f $(gtk_CLEANFILES)
- rm -f $(glade_CLEANFILES)
- rm -f $(gconf_CLEANFILES)
- rm -f $(sourceview_CLEANFILES)
- rm -f $(mozembed_CLEANFILES)
- rm -f $(cairo_CLEANFILES)
- rm -f $(svgcairo_CLEANFILES)
- rm -f $(gtkglext_CLEANFILES)
- rm -f $(soegtk_CLEANFILES)
- rm -f $(doc_CLEANFILES)
+ rm -f $(c2hs_CLEANFILES)
+ rm -rf $(c2hs_CLEANFILES_SPLIT)
+ rm -f $(glib_CLEANFILES)
+ rm -rf $(glib_CLEANFILES_SPLIT)
+ rm -f $(gtk_CLEANFILES)
+ rm -rf $(gtk_CLEANFILES_SPLIT)
+ rm -f $(glade_CLEANFILES)
+ rm -rf $(glade_CLEANFILES_SPLIT)
+ rm -f $(gconf_CLEANFILES)
+ rm -rf $(gconf_CLEANFILES_SPLIT)
+ rm -f $(sourceview_CLEANFILES)
+ rm -rf $(sourceview_CLEANFILES_SPLIT)
+ rm -f $(mozembed_CLEANFILES)
+ rm -rf $(mozembed_CLEANFILES_SPLIT)
+ rm -f $(cairo_CLEANFILES)
+ rm -rf $(cairo_CLEANFILES_SPLIT)
+ rm -f $(svgcairo_CLEANFILES)
+ rm -rf $(svgcairo_CLEANFILES_SPLIT)
+ rm -f $(gtkglext_CLEANFILES)
+ rm -rf $(gtkglext_CLEANFILES_SPLIT)
+ rm -f $(soegtk_CLEANFILES)
+ rm -rf $(soegtk_CLEANFILES_SPLIT)
+ rm -f $(doc_CLEANFILES)
)
hunk ./mk/common.mk 62
- rm -rf $@ $*_split/
- mkdir -p $*_split
+ $(if $($(PKG)_NOSPLITOBJS),,rm -rf $@ $*_split/; mkdir -p $*_split)
hunk ./mk/common.mk 64
- -c $< -o $@ -split-objs $(HCFLAGS) $($(PKG)_HCFLAGS) \
+ $(if $($(PKG)_NOSPLITOBJS),,-split-objs) \
+ -c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
|
|
From: Duncan C. <dun...@wo...> - 2007-07-28 19:24:27
|
Sat Jul 28 09:38:00 PDT 2007 Duncan Coutts <du...@ha...>
* Add clean script to win32 scripts bundle
addfile ./tools/win32/clean.sh
hunk ./tools/win32/clean.sh 1
+#!/bin/bash
+
+. ./versions.conf
+
+rm -rf zips/*/
+rm -f zips/*.tar
+
+rm -rf gtk+-${GTK_VERSION}
+rm -f gtk+-${GTK_VERSION}.tar.gz
+
+rm -rf gtk+-dev-${GTK_VERSION}
+rm -f gtk+-dev-${GTK_VERSION}.tar.gz
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 19:20:27
|
Fri Jul 27 11:09:33 PDT 2007 Duncan Coutts <du...@ha...> tagged 0.9.12 |
|
From: Duncan C. <dun...@wo...> - 2007-07-27 19:20:26
|
Fri Jul 27 11:08:41 PDT 2007 Duncan Coutts <du...@ha...>
* Bump version to 0.9.12
hunk ./configure.ac 25
-AC_INIT([gtk2hs],[0.9.11.3])
+AC_INIT([gtk2hs],[0.9.12])
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 18:10:02
|
Fri Jul 27 06:27:59 PDT 2007 Duncan Coutts <du...@ha...>
* Update win32 scripts to gtk2hs-0.9.12 + gtk+-2.12.14
And add checkbox to override dll problem to gtk2hs installer script
hunk ./tools/win32/gtk2hs.iss 7
-AppVerName=Gtk2Hs 0.9.11.3[_^M_][_$_]
-AppVersion=0.9.11.3[_^M_][_$_]
+AppVerName=Gtk2Hs 0.9.12[_^M_][_$_]
+AppVersion=0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 15
-OutputBaseFilename=gtk2hs-0.9.11.3[_^M_][_$_]
+OutputBaseFilename=gtk2hs-0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 17
-VersionInfoVersion=0.9.11.3[_^M_][_$_]
+VersionInfoVersion=0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 33
-Source: "gtk+-2.10.13\*"; DestDir: "{app}"; Components: gtk; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-;Source: "gtk2hs-0.9.11.3-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-ghc-6.6.1-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-demo\*"; DestDir: "{app}\demos"; Components: demos; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-docs\*"; DestDir: "{app}\docs"; Components: docs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
-Source: "AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
+Source: "gtk+-2.10.14\*"; DestDir: "{app}"; Components: gtk; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+;Source: "gtk2hs-0.9.12-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-ghc-6.6.1-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-demo\*"; DestDir: "{app}\demos"; Components: demos; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-docs\*"; DestDir: "{app}\docs"; Components: docs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
+Source: "AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 54
-Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.11.3"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.11.3"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.11.3"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.11.3"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.11.3"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
-;Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.11.3"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.11.3"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.11.3"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.12"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.12"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.12"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.12"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.12"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
+;Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.12"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.12"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.12"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 70
+ ErrorContinueBox: TCheckBox;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 284
- 'gspawn-win32-helper.exe', 'iconv.dll', 'intl.dll',[_^M_][_$_]
- 'jpeg62.dll', 'libatk-1.0-0.dll', 'libcairo-2.dll',[_^M_][_$_]
- 'libgdk-win32-2.0-0.dll', 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
+ 'gspawn-win32-helper.exe', 'iconv.dll', 'intl.dll', 'jpeg62.dll',[_^M_][_$_]
+ 'libatk-1.0-0.dll', 'libcairo-2.dll', 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
+ 'libgdkglext-win32-1.0-0.dll', 'libgdk-win32-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 289
- 'libgthread-2.0-0.dll', 'libgtk-win32-2.0-0.dll',[_^M_][_$_]
+ 'libgthread-2.0-0.dll', 'libgtkglext-win32-1.0-0.dll',[_^M_][_$_]
+ 'libgtksourceview-1.0-0.dll', 'libgtk-win32-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 405
- WizardForm.NextButton.Enabled := False;[_^M_][_$_]
- ErrorReportPage.Description := InstallationErrorCaption;[_^M_][_$_]
+ WizardForm.NextButton.Enabled := ErrorContinueBox.Checked;[_^M_][_$_]
+ ErrorReportPage.Description := InstallationErrorCaption;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 414
+ ErrorContinueBox.Show();[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 418
+procedure ErrorContinueClicked(Sender: TObject);[_^M_][_$_]
+begin[_^M_][_$_]
+ WizardForm.NextButton.Enabled := ErrorContinueBox.Checked;[_^M_][_$_]
+end;[_^M_][_$_]
+[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 426
+[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 428
+ ErrorReportPage.RichEditViewer.Height := ErrorReportPage.RichEditViewer.Height - ScaleY(22);[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 431
+[_^M_][_$_]
+ ErrorContinueBox := TCheckBox.Create(ErrorReportPage);[_^M_][_$_]
+ ErrorContinueBox.Parent := ErrorReportPage.Surface;[_^M_][_$_]
+ ErrorContinueBox.Top := ErrorReportPage.RichEditViewer.Height + ErrorReportPage.RichEditViewer.Top + ScaleY(8);[_^M_][_$_]
+ ErrorContinueBox.Width := ErrorReportPage.RichEditViewer.Width;[_^M_][_$_]
+ ErrorContinueBox.Caption := 'Continue anyway. (You will have to fix the DLL search path problem yourself later.)';[_^M_][_$_]
+ ErrorContinueBox.Checked := False;[_^M_][_$_]
+ ErrorContinueBox.OnClick := @ErrorContinueClicked;[_^M_][_$_]
hunk ./tools/win32/versions.conf 1
-GLIB_VERSION=2.12.12
+GLIB_VERSION=2.12.13
hunk ./tools/win32/versions.conf 5
-GTK_VERSION=2.10.13
+GTK_VERSION=2.10.14
hunk ./tools/win32/win32-build.conf 2
-VERSION=0.9.11.3[_^M_][_$_]
+VERSION=0.9.12[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 17
-GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.13"[_^M_][_$_]
+GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.14"[_^M_][_$_]
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 18:10:02
|
Fri Jul 27 06:17:45 PDT 2007 Duncan Coutts <du...@ha...>
* Follow change in name of local cairo header file
hunk ./Makefile.am 19
- cairo/cairo.h \
+ cairo/cairo-gtk2hs.h \
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 18:10:00
|
Fri Jul 27 08:57:28 PDT 2007 Duncan Coutts <du...@ha...>
* Document the 'on' function
hunk ./glib/System/Glib/Signals.chs.pp 62
+-- | Perform an action in response to a signal.
+--
+-- Use it like this:
+--
+-- > on obj sig $ do
+-- > ...
+--
+-- or if the signal handler takes any arguments:
+--
+-- > on obj sig $ \args -> do
+-- > ...
+--
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 18:10:00
|
Fri Jul 27 06:54:08 PDT 2007 Duncan Coutts <du...@ha...>
* Fix comboBoxGetModel, it previously did an unchecked downcast
hunk ./gtk/Graphics/UI/Gtk/ModelView/ComboBox.chs.pp 340
-comboBoxGetModel :: (ComboBoxClass self, TreeModelClass model)
+comboBoxGetModel :: ComboBoxClass self
hunk ./gtk/Graphics/UI/Gtk/ModelView/ComboBox.chs.pp 342
- -> IO (Maybe model) -- ^ returns A 'TreeModel' which was passed during
+ -> IO (Maybe TreeModel) -- ^ returns A 'TreeModel' which was passed during
hunk ./gtk/Graphics/UI/Gtk/ModelView/ComboBox.chs.pp 344
-comboBoxGetModel self = liftM (fmap fromTreeModel) $
+comboBoxGetModel self =
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 18:10:00
|
Fri Jul 27 08:50:53 PDT 2007 Duncan Coutts <du...@ha...>
* Change the class heirarch implementation to avoid coerce
GObjectClass now has two real mothods, toGObject and unsafeCastGObject
(renamed from fromGObject to better reflect the fact that it performs
unchecked down-casts). Sub classes of GObjectClass do not have any
additional methods, so we only carry one dictionary per object.
So it should now be possible to make custom widgets in Haskell and make
them instances of the existing widget classes etc. So this should give
greater consistenncy and better data hiding.
hunk ./glib/System/Glib/GValueTypes.chs 212
- liftM fromGObject $
+ liftM unsafeCastGObject $
hunk ./glib/System/Glib/Types.chs 35
- fromGObject,
+ unsafeCastGObject,
hunk ./glib/System/Glib/Types.chs 40
-import GHC.Base (unsafeCoerce#)
hunk ./glib/System/Glib/Types.chs 48
-class GObjectClass o
-toGObject :: GObjectClass o => o -> GObject
-toGObject = unsafeCoerce#
-fromGObject :: GObjectClass o => GObject -> o
-fromGObject = unsafeCoerce#
+class GObjectClass o where
+ -- | Safe upcast.
+ toGObject :: GObjectClass o => o -> GObject
+ -- | Unchecked downcast.
+ unsafeCastGObject :: GObjectClass o => GObject -> o
+ {-# INLINE toGObject #-}
+ {-# INLINE unsafeCastGObject #-}
hunk ./glib/System/Glib/Types.chs 56
-instance GObjectClass GObject
+instance GObjectClass GObject where
+ toGObject = id
+ unsafeCastGObject = id
hunk ./glib/System/Glib/Types.chs 63
-
hunk ./gnomevfs/System/Gnome/VFS/Types.chs 121
- fromGObject)
+ unsafeCastGObject)
hunk ./gnomevfs/System/Gnome/VFS/Types.chs 138
- -> fromGObject gobj
+ -> unsafeCastGObject gobj
hunk ./tools/callbackGen/HookGenerator.hs 281
- body. ss " (fromGObject ". arg. ss "\')"
+ body. ss " (unsafeCastGObject ". arg. ss "\')"
hunk ./tools/callbackGen/HookGenerator.hs 330
- ss "' <- liftM (fromGObject.mkGObject) $".
+ ss "' <- liftM (unsafeCastGObject.mkGObject) $".
hunk ./tools/hierarchyGen/Hierarchy.chs.template 1
-{-# OPTIONS -fglasgow-exts #-} --due to use of unsafeCoerce#
hunk ./tools/hierarchyGen/Hierarchy.chs.template 35
-import GHC.Base (unsafeCoerce#)
hunk ./tools/hierarchyGen/Hierarchy.chs.template 48
- -> fromGObject gobj
+ -> unsafeCastGObject gobj
hunk ./tools/hierarchyGen/Hierarchy.chs.template 51
-@CASTING_FUNCTIONS@
-
-@CLASS_DECLERATIONS@
+@DECLERATIONS@
hunk ./tools/hierarchyGen/TypeGen.hs 141
- "MODULE_EXPORTS" -> generateExports objs
+ "MODULE_EXPORTS" -> generateExports parentName objs
hunk ./tools/hierarchyGen/TypeGen.hs 147
- "CASTING_FUNCTIONS" -> generateCastFunctions objs specialQueries
- "CLASS_DECLERATIONS" -> generateClassDeclerations prefix objs specialQueries
+ "DECLERATIONS" -> generateDeclerations prefix objs specialQueries
hunk ./tools/hierarchyGen/TypeGen.hs 180
-generateExports :: [[String]] -> ShowS
-generateExports objs =
- tail.
- foldl (\s1 s2 -> s1.ss ", ".s2) id (map (\(n:_) -> [_$_]
- indent 1.ss n.ss "(".ss n.ss "), ".ss n.ss "Class,".
- indent 1.ss "to".ss n.ss ", ".
- indent 1.ss "from".ss n.ss ", ".
- indent 1.ss "mk".ss n.ss ", un".ss n.sc ','.
- indent 1.ss "castTo".ss n) objs)
+generateExports :: String -> [[String]] -> ShowS
+generateExports parent objs =
+ (if null parent
+ then ss ""
+ else ss " module " .ss parent. ss ",").
+ drop 2.
+ foldl (\s1 s2 -> s1.ss ", ".s2) id
+ [ indent 1.ss n.ss "(".ss n.ss "), ".ss n.ss "Class,".
+ indent 1.ss "to".ss n.ss ", ".
+ indent 1.ss "mk".ss n.ss ", un".ss n.sc ','.
+ indent 1.ss "castTo".ss n
+ | (n:_) <- objs
+ , n /= "GObject" ]
hunk ./tools/hierarchyGen/TypeGen.hs 194
-generateCastFunctions :: [[String]] -> TypeTable -> ShowS
-generateCastFunctions objs typeTable = foldl (.) id (map (makeUpcast typeTable) objs)
-
-generateClassDeclerations :: String -> [[String]] -> TypeTable -> ShowS
-generateClassDeclerations prefix objs typeTable = foldl (.) id (map (makeClass prefix typeTable) objs)
+generateDeclerations :: String -> [[String]] -> TypeTable -> ShowS
+generateDeclerations prefix objs typeTable =
+ foldl (.) id
+ [ makeClass prefix typeTable obj
+ . makeUpcast typeTable obj
+ | obj <- objs ]
hunk ./tools/hierarchyGen/TypeGen.hs 253
- indent 0.ss "to".ss name.ss " :: ".ss name.ss "Class o => o -> ".ss name.
- indent 0.ss "to".ss name.ss " = unsafeCoerce#".
- indent 0.ss "from".ss name.ss " :: ".ss name.ss "Class o => ".ss name.ss " -> o".
- indent 0.ss "from".ss name.ss " = unsafeCoerce#".
+ indent 0.ss "to".ss name.ss " :: ".ss name.ss "Class o => o -> ".ss name.
+ indent 0.ss "to".ss name.ss " = unsafeCastGObject . toGObject".
hunk ./tools/hierarchyGen/TypeGen.hs 256
- makeInstance name (name:parents).
+ makeInstance name (name:init parents).
+ makeGObjectInstance name.
hunk ./tools/hierarchyGen/TypeGen.hs 261
-makeInstance name [] = indent 0
+makeInstance name [] = id
hunk ./tools/hierarchyGen/TypeGen.hs 266
+makeGObjectInstance :: String -> ShowS
+makeGObjectInstance name =
+ indent 0.ss "instance GObjectClass ".ss name.ss " where".
+ indent 1.ss "toGObject = mkGObject . castForeignPtr . un".ss name.
+ indent 1.ss "unsafeCastGObject = mk".ss name.ss" . castForeignPtr . unGObject"
+
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 16:01:04
|
Mon Jul 16 05:35:09 PDT 2007 A....@ke...
* Rename the local cairo.h to something less ambiguous.
I can't recall where this became a problem, but I guess it can't hurt to have this name distinct from the real header file.
move ./cairo/cairo.h ./cairo/cairo-gtk2hs.h
hunk ./Makefile.am 1233
-libHScairo_a_HEADER = cairo/cairo.h
+libHScairo_a_HEADER = cairo/cairo-gtk2hs.h
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 16:01:03
|
Fri Jul 27 06:17:45 PDT 2007 Duncan Coutts <du...@ha...>
* Follow change in name of local cairo header file
hunk ./Makefile.am 19
- cairo/cairo.h \
+ cairo/cairo-gtk2hs.h \
|
|
From: Duncan C. <dun...@wo...> - 2007-07-27 16:01:03
|
Fri Jul 27 06:27:59 PDT 2007 Duncan Coutts <du...@ha...>
* Update win32 scripts to gtk2hs-0.9.12 + gtk+-2.12.14
And add checkbox to override dll problem to gtk2hs installer script
hunk ./tools/win32/gtk2hs.iss 7
-AppVerName=Gtk2Hs 0.9.11.3[_^M_][_$_]
-AppVersion=0.9.11.3[_^M_][_$_]
+AppVerName=Gtk2Hs 0.9.12[_^M_][_$_]
+AppVersion=0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 15
-OutputBaseFilename=gtk2hs-0.9.11.3[_^M_][_$_]
+OutputBaseFilename=gtk2hs-0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 17
-VersionInfoVersion=0.9.11.3[_^M_][_$_]
+VersionInfoVersion=0.9.12[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 33
-Source: "gtk+-2.10.13\*"; DestDir: "{app}"; Components: gtk; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-;Source: "gtk2hs-0.9.11.3-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-ghc-6.6.1-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-demo\*"; DestDir: "{app}\demos"; Components: demos; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "gtk2hs-0.9.11.3-docs\*"; DestDir: "{app}\docs"; Components: docs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
-Source: "COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
-Source: "AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
+Source: "gtk+-2.10.14\*"; DestDir: "{app}"; Components: gtk; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+;Source: "gtk2hs-0.9.12-ghc-6.4.2-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs1; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-ghc-6.6.1-gtk-2.10\*"; DestDir: "{app}"; Components: gtk2hs2; Flags: ignoreversion recursesubdirs createallsubdirs; AfterInstall: AfterPkgInstall;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-demo\*"; DestDir: "{app}\demos"; Components: demos; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "gtk2hs-0.9.12-docs\*"; DestDir: "{app}\docs"; Components: docs; Flags: ignoreversion recursesubdirs createallsubdirs;[_^M_][_$_]
+Source: "COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
+Source: "AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 54
-Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.11.3"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.11.3"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.11.3"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.11.3"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.11.3"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
-;Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.11.3"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.11.3"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
-Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.11.3"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister sourceview-0.9.12"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtkglext-0.9.12"; RunOnceId: "gtkglext"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister soegtk-0.9.12"; RunOnceId: "soegtk"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glade-0.9.12"; RunOnceId: "glade"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister gtk-0.9.12"; RunOnceId: "gtk"; Flags: runhidden[_^M_][_$_]
+;Filename: "{code:ghcpkg}"; Parameters: "unregister svgcairo-0.9.12"; RunOnceId: "svgcairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister cairo-0.9.12"; RunOnceId: "cairo"; Flags: runhidden[_^M_][_$_]
+Filename: "{code:ghcpkg}"; Parameters: "unregister glib-0.9.12"; RunOnceId: "glib"; Flags: runhidden[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 70
+ ErrorContinueBox: TCheckBox;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 284
- 'gspawn-win32-helper.exe', 'iconv.dll', 'intl.dll',[_^M_][_$_]
- 'jpeg62.dll', 'libatk-1.0-0.dll', 'libcairo-2.dll',[_^M_][_$_]
- 'libgdk-win32-2.0-0.dll', 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
+ 'gspawn-win32-helper.exe', 'iconv.dll', 'intl.dll', 'jpeg62.dll',[_^M_][_$_]
+ 'libatk-1.0-0.dll', 'libcairo-2.dll', 'libgdk_pixbuf-2.0-0.dll',[_^M_][_$_]
+ 'libgdkglext-win32-1.0-0.dll', 'libgdk-win32-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 289
- 'libgthread-2.0-0.dll', 'libgtk-win32-2.0-0.dll',[_^M_][_$_]
+ 'libgthread-2.0-0.dll', 'libgtkglext-win32-1.0-0.dll',[_^M_][_$_]
+ 'libgtksourceview-1.0-0.dll', 'libgtk-win32-2.0-0.dll',[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 405
- WizardForm.NextButton.Enabled := False;[_^M_][_$_]
- ErrorReportPage.Description := InstallationErrorCaption;[_^M_][_$_]
+ WizardForm.NextButton.Enabled := ErrorContinueBox.Checked;[_^M_][_$_]
+ ErrorReportPage.Description := InstallationErrorCaption;[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 414
+ ErrorContinueBox.Show();[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 418
+procedure ErrorContinueClicked(Sender: TObject);[_^M_][_$_]
+begin[_^M_][_$_]
+ WizardForm.NextButton.Enabled := ErrorContinueBox.Checked;[_^M_][_$_]
+end;[_^M_][_$_]
+[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 426
+[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 428
+ ErrorReportPage.RichEditViewer.Height := ErrorReportPage.RichEditViewer.Height - ScaleY(22);[_^M_][_$_]
hunk ./tools/win32/gtk2hs.iss 431
+[_^M_][_$_]
+ ErrorContinueBox := TCheckBox.Create(ErrorReportPage);[_^M_][_$_]
+ ErrorContinueBox.Parent := ErrorReportPage.Surface;[_^M_][_$_]
+ ErrorContinueBox.Top := ErrorReportPage.RichEditViewer.Height + ErrorReportPage.RichEditViewer.Top + ScaleY(8);[_^M_][_$_]
+ ErrorContinueBox.Width := ErrorReportPage.RichEditViewer.Width;[_^M_][_$_]
+ ErrorContinueBox.Caption := 'Continue anyway. (You will have to fix the DLL search path problem yourself later.)';[_^M_][_$_]
+ ErrorContinueBox.Checked := False;[_^M_][_$_]
+ ErrorContinueBox.OnClick := @ErrorContinueClicked;[_^M_][_$_]
hunk ./tools/win32/versions.conf 1
-GLIB_VERSION=2.12.12
+GLIB_VERSION=2.12.13
hunk ./tools/win32/versions.conf 5
-GTK_VERSION=2.10.13
+GTK_VERSION=2.10.14
hunk ./tools/win32/win32-build.conf 2
-VERSION=0.9.11.3[_^M_][_$_]
+VERSION=0.9.12[_^M_][_$_]
hunk ./tools/win32/win32-build.conf 17
-GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.13"[_^M_][_$_]
+GTK_210_BASEPATH="/d/dcoutts/gtk+-2.10.14"[_^M_][_$_]
|
|
From: Axel S. <A....@ke...> - 2007-07-26 13:15:45
|
Thu Jul 26 06:02:15 PDT 2007 A....@ke...
* Add stock items to reference documentation.
addfile ./docs/reference/images/stock-icons/stock_about_24.png
binary ./docs/reference/images/stock-icons/stock_about_24.png
addfile ./docs/reference/images/stock-icons/stock_add_24.png
binary ./docs/reference/images/stock-icons/stock_add_24.png
addfile ./docs/reference/images/stock-icons/stock_align_center_24.png
binary ./docs/reference/images/stock-icons/stock_align_center_24.png
addfile ./docs/reference/images/stock-icons/stock_align_justify_24.png
binary ./docs/reference/images/stock-icons/stock_align_justify_24.png
addfile ./docs/reference/images/stock-icons/stock_align_left_24.png
binary ./docs/reference/images/stock-icons/stock_align_left_24.png
addfile ./docs/reference/images/stock-icons/stock_align_right_24.png
binary ./docs/reference/images/stock-icons/stock_align_right_24.png
addfile ./docs/reference/images/stock-icons/stock_apply_20.png
binary ./docs/reference/images/stock-icons/stock_apply_20.png
addfile ./docs/reference/images/stock-icons/stock_bottom_24.png
binary ./docs/reference/images/stock-icons/stock_bottom_24.png
addfile ./docs/reference/images/stock-icons/stock_broken_image_24.png
binary ./docs/reference/images/stock-icons/stock_broken_image_24.png
addfile ./docs/reference/images/stock-icons/stock_cancel_20.png
binary ./docs/reference/images/stock-icons/stock_cancel_20.png
addfile ./docs/reference/images/stock-icons/stock_cdrom_24.png
binary ./docs/reference/images/stock-icons/stock_cdrom_24.png
addfile ./docs/reference/images/stock-icons/stock_clear_24.png
binary ./docs/reference/images/stock-icons/stock_clear_24.png
addfile ./docs/reference/images/stock-icons/stock_close_24.png
binary ./docs/reference/images/stock-icons/stock_close_24.png
addfile ./docs/reference/images/stock-icons/stock_color_picker_25.png
binary ./docs/reference/images/stock-icons/stock_color_picker_25.png
addfile ./docs/reference/images/stock-icons/stock_colorselector_24.png
binary ./docs/reference/images/stock-icons/stock_colorselector_24.png
addfile ./docs/reference/images/stock-icons/stock_connect_24.png
binary ./docs/reference/images/stock-icons/stock_connect_24.png
addfile ./docs/reference/images/stock-icons/stock_convert_24.png
binary ./docs/reference/images/stock-icons/stock_convert_24.png
addfile ./docs/reference/images/stock-icons/stock_copy_24.png
binary ./docs/reference/images/stock-icons/stock_copy_24.png
addfile ./docs/reference/images/stock-icons/stock_cut_24.png
binary ./docs/reference/images/stock-icons/stock_cut_24.png
addfile ./docs/reference/images/stock-icons/stock_dialog_authentication_48.png
binary ./docs/reference/images/stock-icons/stock_dialog_authentication_48.png
addfile ./docs/reference/images/stock-icons/stock_dialog_error_48.png
binary ./docs/reference/images/stock-icons/stock_dialog_error_48.png
addfile ./docs/reference/images/stock-icons/stock_dialog_info_48.png
binary ./docs/reference/images/stock-icons/stock_dialog_info_48.png
addfile ./docs/reference/images/stock-icons/stock_dialog_question_48.png
binary ./docs/reference/images/stock-icons/stock_dialog_question_48.png
addfile ./docs/reference/images/stock-icons/stock_dialog_warning_48.png
binary ./docs/reference/images/stock-icons/stock_dialog_warning_48.png
addfile ./docs/reference/images/stock-icons/stock_directory_24.png
binary ./docs/reference/images/stock-icons/stock_directory_24.png
addfile ./docs/reference/images/stock-icons/stock_disconnect_24.png
binary ./docs/reference/images/stock-icons/stock_disconnect_24.png
addfile ./docs/reference/images/stock-icons/stock_dnd_32.png
binary ./docs/reference/images/stock-icons/stock_dnd_32.png
addfile ./docs/reference/images/stock-icons/stock_dnd_multiple_32.png
binary ./docs/reference/images/stock-icons/stock_dnd_multiple_32.png
addfile ./docs/reference/images/stock-icons/stock_down_arrow_24.png
binary ./docs/reference/images/stock-icons/stock_down_arrow_24.png
addfile ./docs/reference/images/stock-icons/stock_edit_24.png
binary ./docs/reference/images/stock-icons/stock_edit_24.png
addfile ./docs/reference/images/stock-icons/stock_exec_24.png
binary ./docs/reference/images/stock-icons/stock_exec_24.png
addfile ./docs/reference/images/stock-icons/stock_exit_24.png
binary ./docs/reference/images/stock-icons/stock_exit_24.png
addfile ./docs/reference/images/stock-icons/stock_file_24.png
binary ./docs/reference/images/stock-icons/stock_file_24.png
addfile ./docs/reference/images/stock-icons/stock_first_24.png
binary ./docs/reference/images/stock-icons/stock_first_24.png
addfile ./docs/reference/images/stock-icons/stock_font_24.png
binary ./docs/reference/images/stock-icons/stock_font_24.png
addfile ./docs/reference/images/stock-icons/stock_fullscreen_24.png
binary ./docs/reference/images/stock-icons/stock_fullscreen_24.png
addfile ./docs/reference/images/stock-icons/stock_harddisk_24.png
binary ./docs/reference/images/stock-icons/stock_harddisk_24.png
addfile ./docs/reference/images/stock-icons/stock_help_24.png
binary ./docs/reference/images/stock-icons/stock_help_24.png
addfile ./docs/reference/images/stock-icons/stock_home_24.png
binary ./docs/reference/images/stock-icons/stock_home_24.png
addfile ./docs/reference/images/stock-icons/stock_index_24.png
binary ./docs/reference/images/stock-icons/stock_index_24.png
addfile ./docs/reference/images/stock-icons/stock_info_24.png
binary ./docs/reference/images/stock-icons/stock_info_24.png
addfile ./docs/reference/images/stock-icons/stock_jump_to_24.png
binary ./docs/reference/images/stock-icons/stock_jump_to_24.png
addfile ./docs/reference/images/stock-icons/stock_last_24.png
binary ./docs/reference/images/stock-icons/stock_last_24.png
addfile ./docs/reference/images/stock-icons/stock_leave_fullscreen_24.png
binary ./docs/reference/images/stock-icons/stock_leave_fullscreen_24.png
addfile ./docs/reference/images/stock-icons/stock_left_arrow_24.png
binary ./docs/reference/images/stock-icons/stock_left_arrow_24.png
addfile ./docs/reference/images/stock-icons/stock_media_forward_24.png
binary ./docs/reference/images/stock-icons/stock_media_forward_24.png
addfile ./docs/reference/images/stock-icons/stock_media_next_24.png
binary ./docs/reference/images/stock-icons/stock_media_next_24.png
addfile ./docs/reference/images/stock-icons/stock_media_pause_24.png
binary ./docs/reference/images/stock-icons/stock_media_pause_24.png
addfile ./docs/reference/images/stock-icons/stock_media_play_24.png
binary ./docs/reference/images/stock-icons/stock_media_play_24.png
addfile ./docs/reference/images/stock-icons/stock_media_previous_24.png
binary ./docs/reference/images/stock-icons/stock_media_previous_24.png
addfile ./docs/reference/images/stock-icons/stock_media_record_24.png
binary ./docs/reference/images/stock-icons/stock_media_record_24.png
addfile ./docs/reference/images/stock-icons/stock_media_rewind_24.png
binary ./docs/reference/images/stock-icons/stock_media_rewind_24.png
addfile ./docs/reference/images/stock-icons/stock_media_stop_24.png
binary ./docs/reference/images/stock-icons/stock_media_stop_24.png
addfile ./docs/reference/images/stock-icons/stock_network_24.png
binary ./docs/reference/images/stock-icons/stock_network_24.png
addfile ./docs/reference/images/stock-icons/stock_new_24.png
binary ./docs/reference/images/stock-icons/stock_new_24.png
addfile ./docs/reference/images/stock-icons/stock_no_20.png
binary ./docs/reference/images/stock-icons/stock_no_20.png
addfile ./docs/reference/images/stock-icons/stock_ok_20.png
binary ./docs/reference/images/stock-icons/stock_ok_20.png
addfile ./docs/reference/images/stock-icons/stock_open_24.png
binary ./docs/reference/images/stock-icons/stock_open_24.png
addfile ./docs/reference/images/stock-icons/stock_paste_24.png
binary ./docs/reference/images/stock-icons/stock_paste_24.png
addfile ./docs/reference/images/stock-icons/stock_preferences_24.png
binary ./docs/reference/images/stock-icons/stock_preferences_24.png
addfile ./docs/reference/images/stock-icons/stock_print_24.png
binary ./docs/reference/images/stock-icons/stock_print_24.png
addfile ./docs/reference/images/stock-icons/stock_print_preview_24.png
binary ./docs/reference/images/stock-icons/stock_print_preview_24.png
addfile ./docs/reference/images/stock-icons/stock_properties_24.png
binary ./docs/reference/images/stock-icons/stock_properties_24.png
addfile ./docs/reference/images/stock-icons/stock_redo_24.png
binary ./docs/reference/images/stock-icons/stock_redo_24.png
addfile ./docs/reference/images/stock-icons/stock_refresh_24.png
binary ./docs/reference/images/stock-icons/stock_refresh_24.png
addfile ./docs/reference/images/stock-icons/stock_remove_24.png
binary ./docs/reference/images/stock-icons/stock_remove_24.png
addfile ./docs/reference/images/stock-icons/stock_revert_24.png
binary ./docs/reference/images/stock-icons/stock_revert_24.png
addfile ./docs/reference/images/stock-icons/stock_right_arrow_24.png
binary ./docs/reference/images/stock-icons/stock_right_arrow_24.png
addfile ./docs/reference/images/stock-icons/stock_save_24.png
binary ./docs/reference/images/stock-icons/stock_save_24.png
addfile ./docs/reference/images/stock-icons/stock_save_as_24.png
binary ./docs/reference/images/stock-icons/stock_save_as_24.png
addfile ./docs/reference/images/stock-icons/stock_search_24.png
binary ./docs/reference/images/stock-icons/stock_search_24.png
addfile ./docs/reference/images/stock-icons/stock_search_replace_24.png
binary ./docs/reference/images/stock-icons/stock_search_replace_24.png
addfile ./docs/reference/images/stock-icons/stock_sort_ascending_24.png
binary ./docs/reference/images/stock-icons/stock_sort_ascending_24.png
addfile ./docs/reference/images/stock-icons/stock_sort_descending_24.png
binary ./docs/reference/images/stock-icons/stock_sort_descending_24.png
addfile ./docs/reference/images/stock-icons/stock_spellcheck_24.png
binary ./docs/reference/images/stock-icons/stock_spellcheck_24.png
addfile ./docs/reference/images/stock-icons/stock_stop_24.png
binary ./docs/reference/images/stock-icons/stock_stop_24.png
addfile ./docs/reference/images/stock-icons/stock_text_bold_24.png
binary ./docs/reference/images/stock-icons/stock_text_bold_24.png
addfile ./docs/reference/images/stock-icons/stock_text_indent_24.png
binary ./docs/reference/images/stock-icons/stock_text_indent_24.png
addfile ./docs/reference/images/stock-icons/stock_text_italic_24.png
binary ./docs/reference/images/stock-icons/stock_text_italic_24.png
addfile ./docs/reference/images/stock-icons/stock_text_strikethrough_24.png
binary ./docs/reference/images/stock-icons/stock_text_strikethrough_24.png
addfile ./docs/reference/images/stock-icons/stock_text_underline_24.png
binary ./docs/reference/images/stock-icons/stock_text_underline_24.png
addfile ./docs/reference/images/stock-icons/stock_text_unindent_24.png
binary ./docs/reference/images/stock-icons/stock_text_unindent_24.png
addfile ./docs/reference/images/stock-icons/stock_top_24.png
binary ./docs/reference/images/stock-icons/stock_top_24.png
addfile ./docs/reference/images/stock-icons/stock_trash_24.png
binary ./docs/reference/images/stock-icons/stock_trash_24.png
addfile ./docs/reference/images/stock-icons/stock_undelete_24.png
binary ./docs/reference/images/stock-icons/stock_undelete_24.png
addfile ./docs/reference/images/stock-icons/stock_undo_24.png
binary ./docs/reference/images/stock-icons/stock_undo_24.png
addfile ./docs/reference/images/stock-icons/stock_up_arrow_24.png
binary ./docs/reference/images/stock-icons/stock_up_arrow_24.png
addfile ./docs/reference/images/stock-icons/stock_yes_20.png
binary ./docs/reference/images/stock-icons/stock_yes_20.png
addfile ./docs/reference/images/stock-icons/stock_zoom_1_24.png
binary ./docs/reference/images/stock-icons/stock_zoom_1_24.png
addfile ./docs/reference/images/stock-icons/stock_zoom_fit_24.png
binary ./docs/reference/images/stock-icons/stock_zoom_fit_24.png
addfile ./docs/reference/images/stock-icons/stock_zoom_in_24.png
binary ./docs/reference/images/stock-icons/stock_zoom_in_24.png
addfile ./docs/reference/images/stock-icons/stock_zoom_out_24.png
binary ./docs/reference/images/stock-icons/stock_zoom_out_24.png
|
|
From: Axel S. <A....@ke...> - 2007-07-26 13:11:09
|
Thu Jul 26 06:07:48 PDT 2007 A....@ke...
* Add authors name to author's file.
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 4
--- Author : [Insert your full name here]
+-- Author : Andrea Vezzosi
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:13:08
|
Wed Jul 25 07:52:45 PDT 2007 Duncan Coutts <du...@ha...>
* Add Bulat Ziganshin to AUTHORS for dirlist contributions
hunk ./AUTHORS 45
+
+Bulat Ziganshin <bul...@gm...>
+(DirList demo improvements)
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:13:04
|
Wed Jul 25 07:49:51 PDT 2007 Duncan Coutts <du...@ha...>
* Change gtkmozembed provider preference to put xulrunner first
Apparently xulrunner is now in vogue again so put it first
So ther order of prefernece has changed from/to:
-seamonkey, firefox, xulrunner, mozilla
+xulrunner, seamonkey, firefox, mozilla
hunk ./configure.ac 301
-dnl Use in this order of preference: seamonkey, firefox, xulrunner, mozilla
-dnl If we have xulrunner, use it instead of firefox or mozilla
-if test "$ENABLE_SEAMONKEY_MOZEMBED" = "yes"; then
+dnl Use in this order of preference: xulrunner, seamonkey, firefox, mozilla
+if test "$ENABLE_XULRUNNER_MOZEMBED" = "yes"; then
+ ENABLE_MOZEMBED="yes"
+ MOZEMBED_CFLAGS="$XULRUNNER_MOZEMBED_CFLAGS"
+ MOZEMBED_LIBS="$XULRUNNER_MOZEMBED_LIBS"
+ MOZEMBED_LIBDIR="$XULRUNNER_MOZEMBED_LIBDIR"
+elif test "$ENABLE_SEAMONKEY_MOZEMBED" = "yes"; then
hunk ./configure.ac 317
-elif test "$ENABLE_XULRUNNER_MOZEMBED" = "yes"; then
- ENABLE_MOZEMBED="yes"
- MOZEMBED_CFLAGS="$XULRUNNER_MOZEMBED_CFLAGS"
- MOZEMBED_LIBS="$XULRUNNER_MOZEMBED_LIBS"
- MOZEMBED_LIBDIR="$XULRUNNER_MOZEMBED_LIBDIR"
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:29
|
Wed Jul 25 07:53:18 PDT 2007 Duncan Coutts <du...@ha...>
* Make treeList demos build again
hunk ./demo/treeList/ListDemo.hs 42
- New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellActive := marked row ]
+ New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellToggleActive := marked row ]
hunk ./demo/treeList/ListTest.hs 49
- onClicked appendButton $ getValues >>= New.listStoreAppend store
+ onClicked appendButton $ getValues >>= New.listStoreAppend store >> return ()
hunk ./demo/treeList/ListTest.hs 92
- New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellActive := marked row ]
+ New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellToggleActive := marked row ]
hunk ./demo/treeList/TreeDemo.hs 41
- New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellActive := marked row ]
+ New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellToggleActive := marked row ]
hunk ./demo/treeList/TreeTest.hs 90
- New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellActive := marked row ]
+ New.cellLayoutSetAttributes col3 renderer3 model $ \row -> [ New.cellToggleActive := marked row ]
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:26
|
Wed Jul 25 07:52:45 PDT 2007 Duncan Coutts <du...@ha...>
* Add Bulat Ziganshin to AUTHORS for dirlist contributions
hunk ./AUTHORS 45
+
+Bulat Ziganshin <bul...@gm...>
+(DirList demo improvements)
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:26
|
Wed Jul 25 07:52:02 PDT 2007 Duncan Coutts <du...@ha...>
* Add HAVE_GTK_VERSION_2_12 makefile conditional
hunk ./configure.ac 378
+HAVE_GTK_VERSION_2_12=`$PKG_CONFIG gtk+-2.0 --atleast-version=2.12 && echo yes || echo no`
hunk ./configure.ac 385
+AM_CONDITIONAL(HAVE_GTK_VERSION_2_12, test "$HAVE_GTK_VERSION_2_12" = "yes")
hunk ./configure.ac 392
+CREATE_TYPES="$CREATE_TYPES `test "$HAVE_GTK_VERSION_2_12" = "yes" && echo gtk-2.12`"
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:25
|
Wed Jul 25 07:49:51 PDT 2007 Duncan Coutts <du...@ha...>
* Change gtkmozembed provider preference to put xulrunner first
Apparently xulrunner is now in vogue again so put it first
So ther order of prefernece has changed from/to:
-seamonkey, firefox, xulrunner, mozilla
+xulrunner, seamonkey, firefox, mozilla
hunk ./configure.ac 301
-dnl Use in this order of preference: seamonkey, firefox, xulrunner, mozilla
-dnl If we have xulrunner, use it instead of firefox or mozilla
-if test "$ENABLE_SEAMONKEY_MOZEMBED" = "yes"; then
+dnl Use in this order of preference: xulrunner, seamonkey, firefox, mozilla
+if test "$ENABLE_XULRUNNER_MOZEMBED" = "yes"; then
+ ENABLE_MOZEMBED="yes"
+ MOZEMBED_CFLAGS="$XULRUNNER_MOZEMBED_CFLAGS"
+ MOZEMBED_LIBS="$XULRUNNER_MOZEMBED_LIBS"
+ MOZEMBED_LIBDIR="$XULRUNNER_MOZEMBED_LIBDIR"
+elif test "$ENABLE_SEAMONKEY_MOZEMBED" = "yes"; then
hunk ./configure.ac 317
-elif test "$ENABLE_XULRUNNER_MOZEMBED" = "yes"; then
- ENABLE_MOZEMBED="yes"
- MOZEMBED_CFLAGS="$XULRUNNER_MOZEMBED_CFLAGS"
- MOZEMBED_LIBS="$XULRUNNER_MOZEMBED_LIBS"
- MOZEMBED_LIBDIR="$XULRUNNER_MOZEMBED_LIBDIR"
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:25
|
Tue Jul 24 20:34:33 PDT 2007 Andrea Vezzosi <san...@gm...>
* Add GtkStatusIcon bindings
hunk ./Makefile.am 420
+ gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp \
hunk ./gtk/Graphics/UI/Gtk.hs 73
+ module Graphics.UI.Gtk.Display.StatusIcon,
hunk ./gtk/Graphics/UI/Gtk.hs 249
+import Graphics.UI.Gtk.Display.StatusIcon hiding (onActivate,afterActivate,onPopupMenu,afterPopupMenu)
addfile ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 1
+-- -*-haskell-*-
+-- GIMP Toolkit (GTK) Widget StatusIcon
+--
+-- Author : [Insert your full name here]
+--
+-- Created: 19 July 2007
+--
+-- Copyright (C) 2007 [Insert your full name here]
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- |
+-- Maintainer : gtk...@li...
+-- Stability : provisional
+-- Portability : portable (depends on GHC)
+--
+-- Display an icon in the system tray
+--
+-- * Module available since Gtk+ version 2.10
+--
+module Graphics.UI.Gtk.Display.StatusIcon (
+
+-- * Detail
+--
+-- | The \"system tray\" or notification area is normally used for transient
+-- icons that indicate some special state. For example, a system tray icon
+-- might appear to tell the user that they have new mail, or have an incoming
+-- instant message, or something along those lines. The basic idea is that
+-- creating an icon in the notification area is less annoying than popping up a
+-- dialog.
+--
+-- A 'StatusIcon' object can be used to display an icon in a \"system
+-- tray\". The icon can have a tooltip, and the user can interact with it by
+-- activating it or popping up a context menu. Critical information should not
+-- solely be displayed in a 'StatusIcon', since it may not be visible (e.g.
+-- when the user doesn't have a notification area on his panel). This can be
+-- checked with 'statusIconIsEmbedded'.
+--
+-- On X11, the implementation follows the freedesktop.org \"System Tray\"
+-- specification. Implementations of the \"tray\" side of this specification
+-- can be found e.g. in the GNOME and KDE panel applications.
+--
+-- Note that a 'StatusIcon' is /not/ a widget, but just a 'GObject'. Making
+-- it a widget would be impractical, since the system tray on Win32 doesn't
+-- allow to embed arbitrary widgets.
+
+-- * Class Hierarchy
+--
+-- |
+-- @
+-- | 'GObject'
+-- | +----StatusIcon
+-- @
+
+#if GTK_CHECK_VERSION(2,10,0)
+-- * Types
+ StatusIcon,
+ StatusIconClass,
+ castToStatusIcon,
+ toStatusIcon,
+
+-- * Constructors
+ statusIconNew,
+ statusIconNewFromPixbuf,
+ statusIconNewFromFile,
+ statusIconNewFromStock,
+ statusIconNewFromIconName,
+
+-- * Methods
+ statusIconSetFromPixbuf,
+ statusIconSetFromFile,
+ statusIconSetFromStock,
+ statusIconSetFromIconName,
+ statusIconGetStorageType,
+ statusIconGetPixbuf,
+ statusIconGetStock,
+ statusIconGetIconName,
+ statusIconGetSize,
+ statusIconSetTooltip,
+ statusIconSetVisible,
+ statusIconGetVisible,
+ statusIconSetBlinking,
+ statusIconGetBlinking,
+ statusIconIsEmbedded,
+ statusIconPositionMenu,
+ statusIconGetGeometry,
+
+-- * Attributes
+ statusIconPixbuf,
+ statusIconFile,
+ statusIconStock,
+ statusIconIconName,
+ statusIconStorageType,
+ statusIconSize,
+ statusIconBlinking,
+ statusIconVisible,
+
+-- * Signals
+ sizeChanged,
+ activate,
+ popupMenu,
+
+-- * Deprecated
+#ifndef DISABLE_DEPRECATED
+ onActivate,
+ afterActivate,
+ onPopupMenu,
+ afterPopupMenu,
+ onSizeChanged,
+ afterSizeChanged,
+#endif
+#endif
+ ) where
+
+import Control.Monad (liftM)
+
+import System.Glib.FFI
+import System.Glib.UTFString
+import System.Glib.Attributes
+import System.Glib.Properties
+import System.Glib.GObject (constructNewGObject,makeNewGObject)
+{#import Graphics.UI.Gtk.Types#}
+{#import Graphics.UI.Gtk.General.Enums#}
+import Graphics.UI.Gtk.General.Structs
+{#import Graphics.UI.Gtk.Display.Image#} (ImageType)
+{#import Graphics.UI.Gtk.Signals#}
+import Graphics.UI.Gtk.General.StockItems
+import Graphics.UI.Gtk.Gdk.Events
+
+
+{# context lib="gtk" prefix="gtk" #}
+
+#if GTK_CHECK_VERSION(2,10,0)
+--------------------
+-- Constructors
+
+-- %hash c:2fb1 d:9bd6
+-- | Creates an empty status icon object.
+--
+statusIconNew :: IO StatusIcon
+statusIconNew =
+ constructNewGObject mkStatusIcon $
+ {# call gtk_status_icon_new #}
+
+-- %hash c:3318 d:cd70
+-- | Creates a status icon displaying @pixbuf@.
+--
+-- The image will be scaled down to fit in the available space in the
+-- notification area, if necessary.
+--
+statusIconNewFromPixbuf ::
+ Pixbuf -- ^ @pixbuf@ - a 'Pixbuf'
+ -> IO StatusIcon
+statusIconNewFromPixbuf pixbuf =
+ constructNewGObject mkStatusIcon $
+ {# call gtk_status_icon_new_from_pixbuf #}
+ pixbuf
+
+-- %hash c:325a d:6c24
+-- | Creates a status icon displaying the file @filename@.
+--
+-- The image will be scaled down to fit in the available space in the
+-- notification area, if necessary.
+--
+statusIconNewFromFile ::
+ String -- ^ @filename@ - a filename
+ -> IO StatusIcon
+statusIconNewFromFile filename =
+ constructNewGObject mkStatusIcon $
+ withUTFString filename $ \filenamePtr ->
+ {# call gtk_status_icon_new_from_file #}
+ filenamePtr
+
+-- %hash c:784f d:88a3
+-- | Creates a status icon displaying a stock icon. Sample stock icon names
+-- are 'stockOpen', 'stockQuit'. You can register your own stock icon names, see
+-- 'iconFactoryAddDefault' and 'iconFactoryAdd'.
+--
+statusIconNewFromStock ::
+ StockId -- ^ @stockId@ - a stock icon id
+ -> IO StatusIcon
+statusIconNewFromStock stockId =
+ constructNewGObject mkStatusIcon $
+ withUTFString stockId $ \stockIdPtr ->
+ {# call gtk_status_icon_new_from_stock #}
+ stockIdPtr
+
+-- %hash c:6e1b d:8731
+-- | Creates a status icon displaying an icon from the current icon theme. If
+-- the current icon theme is changed, the icon will be updated appropriately.
+--
+statusIconNewFromIconName ::
+ String -- ^ @iconName@ - an icon name
+ -> IO StatusIcon
+statusIconNewFromIconName iconName =
+ constructNewGObject mkStatusIcon $
+ withUTFString iconName $ \iconNamePtr ->
+ {# call gtk_status_icon_new_from_icon_name #}
+ iconNamePtr
+
+--------------------
+-- Methods
+
+-- %hash c:2256 d:12b2
+-- | Makes @statusIcon@ display @pixbuf@. See 'statusIconNewFromPixbuf' for
+-- details.
+--
+statusIconSetFromPixbuf :: StatusIconClass self => self
+ -> Pixbuf -- ^ @pixbuf@ - a 'Pixbuf'
+ -> IO ()
+statusIconSetFromPixbuf self pixbuf =
+ {# call gtk_status_icon_set_from_pixbuf #}
+ (toStatusIcon self)
+ pixbuf
+
+-- %hash c:c2c0 d:c0f8
+-- | Makes @statusIcon@ display the file @filename@. See
+-- 'statusIconNewFromFile' for details.
+--
+statusIconSetFromFile :: StatusIconClass self => self
+ -> String -- ^ @filename@ - a filename
+ -> IO ()
+statusIconSetFromFile self filename =
+ withUTFString filename $ \filenamePtr ->
+ {# call gtk_status_icon_set_from_file #}
+ (toStatusIcon self)
+ filenamePtr
+
+-- %hash c:d755 d:8fa3
+-- | Makes @statusIcon@ display the stock icon with the id @stockId@. See
+-- 'statusIconNewFromStock' for details.
+--
+statusIconSetFromStock :: StatusIconClass self => self
+ -> StockId -- ^ @stockId@ - a stock icon id
+ -> IO ()
+statusIconSetFromStock self stockId =
+ withUTFString stockId $ \stockIdPtr ->
+ {# call gtk_status_icon_set_from_stock #}
+ (toStatusIcon self)
+ stockIdPtr
+
+-- %hash c:b501 d:3ded
+-- | Makes @statusIcon@ display the icon named @iconName@ from the current
+-- icon theme. See 'statusIconNewFromIconName' for details.
+--
+statusIconSetFromIconName :: StatusIconClass self => self
+ -> String -- ^ @iconName@ - an icon name
+ -> IO ()
+statusIconSetFromIconName self iconName =
+ withUTFString iconName $ \iconNamePtr ->
+ {# call gtk_status_icon_set_from_icon_name #}
+ (toStatusIcon self)
+ iconNamePtr
+
+-- %hash c:6317 d:d3c5
+-- | Gets the type of representation being used by the 'StatusIcon' to store
+-- image data. If the 'StatusIcon' has no image data, the return value will be
+-- 'ImageEmpty'.
+--
+statusIconGetStorageType :: StatusIconClass self => self
+ -> IO ImageType -- ^ returns the image representation being used
+statusIconGetStorageType self =
+ liftM (toEnum . fromIntegral) $
+ {# call gtk_status_icon_get_storage_type #}
+ (toStatusIcon self)
+
+-- %hash c:cd8a d:9fed
+-- | Gets the 'Pixbuf' being displayed by the 'StatusIcon'. The storage type
+-- of the status icon must be 'ImageEmpty' or 'ImagePixbuf' (see
+-- 'statusIconGetStorageType'). The caller of this function does not own a
+-- reference to the returned pixbuf.
+--
+statusIconGetPixbuf :: StatusIconClass self => self
+ -> IO (Maybe Pixbuf) -- ^ returns the displayed pixbuf, or @Nothing@ if the
+ -- image is empty.
+statusIconGetPixbuf self = do
+ ptr <- {# call gtk_status_icon_get_pixbuf #}
+ (toStatusIcon self)
+ maybePeek (makeNewGObject mkPixbuf . return) ptr
+ [_$_]
+
+-- %hash c:ecce d:448
+-- | Gets the id of the stock icon being displayed by the 'StatusIcon'. The
+-- storage type of the status icon must be 'ImageEmpty' or 'ImageStock' (see
+-- 'statusIconGetStorageType'). The returned string is owned by the
+-- 'StatusIcon' and should not be freed or modified.
+--
+statusIconGetStock :: StatusIconClass self => self
+ -> IO (Maybe StockId) -- ^ returns stock id of the displayed stock icon, or @Nothing@
+ -- if the image is empty.
+statusIconGetStock self =
+ {# call gtk_status_icon_get_stock #}
+ (toStatusIcon self)
+ >>= maybePeek peekUTFString
+
+-- %hash c:6e6b d:273e
+-- | Gets the name of the icon being displayed by the 'StatusIcon'. The
+-- storage type of the status icon must be 'ImageEmpty' or 'ImageIconName' (see
+-- 'statusIconGetStorageType'). The returned string is owned by the
+-- 'StatusIcon' and should not be freed or modified.
+--
+statusIconGetIconName :: StatusIconClass self => self
+ -> IO (Maybe String) -- ^ returns name of the displayed icon, or @Nothing@
+ -- if the image is empty.
+statusIconGetIconName self =
+ {# call gtk_status_icon_get_icon_name #}
+ (toStatusIcon self)
+ >>= maybePeek peekUTFString
+
+-- %hash c:b1db d:b874
+-- | Gets the size in pixels that is available for the image. Stock icons and
+-- named icons adapt their size automatically if the size of the notification
+-- area changes. For other storage types, the size-changed signal can be used
+-- to react to size changes.
+--
+statusIconGetSize :: StatusIconClass self => self
+ -> IO Int -- ^ returns the size that is available for the image
+statusIconGetSize self =
+ liftM fromIntegral $
+ {# call gtk_status_icon_get_size #}
+ (toStatusIcon self)
+
+-- %hash c:7644 d:d87b
+-- | Sets the tooltip of the status icon.
+--
+statusIconSetTooltip :: StatusIconClass self => self
+ -> String -- ^ @tooltipText@ - the tooltip text
+ -> IO ()
+statusIconSetTooltip self tooltipText =
+ withUTFString tooltipText $ \tooltipTextPtr ->
+ {# call gtk_status_icon_set_tooltip #}
+ (toStatusIcon self)
+ tooltipTextPtr
+
+-- %hash c:7bd8 d:74fd
+-- | Shows or hides a status icon.
+--
+statusIconSetVisible :: StatusIconClass self => self
+ -> Bool -- ^ @visible@ - @True@ to show the status icon, @False@ to hide it
+ -> IO ()
+statusIconSetVisible self visible =
+ {# call gtk_status_icon_set_visible #}
+ (toStatusIcon self)
+ (fromBool visible)
+
+-- %hash c:e90c d:6c0b
+-- | Returns whether the status icon is visible or not. Note that being
+-- visible does not guarantee that the user can actually see the icon, see also
+-- 'statusIconIsEmbedded'.
+--
+statusIconGetVisible :: StatusIconClass self => self
+ -> IO Bool -- ^ returns @True@ if the status icon is visible
+statusIconGetVisible self =
+ liftM toBool $
+ {# call gtk_status_icon_get_visible #}
+ (toStatusIcon self)
+
+-- %hash c:aa47 d:3980
+-- | Makes the status icon start or stop blinking. Note that blinking user
+-- interface elements may be problematic for some users, and thus may be turned
+-- off, in which case this setting has no effect.
+--
+statusIconSetBlinking :: StatusIconClass self => self
+ -> Bool -- ^ @blinking@ - @True@ to turn blinking on, @False@ to turn it off
+ -> IO ()
+statusIconSetBlinking self blinking =
+ {# call gtk_status_icon_set_blinking #}
+ (toStatusIcon self)
+ (fromBool blinking)
+
+-- %hash c:2168 d:3189
+-- | Returns whether the icon is blinking, see 'statusIconSetBlinking'.
+--
+statusIconGetBlinking :: StatusIconClass self => self
+ -> IO Bool -- ^ returns @True@ if the icon is blinking
+statusIconGetBlinking self =
+ liftM toBool $
+ {# call gtk_status_icon_get_blinking #}
+ (toStatusIcon self)
+
+-- %hash c:ffa d:8c83
+-- | Returns whether the status icon is embedded in a notification area.
+--
+statusIconIsEmbedded :: StatusIconClass self => self
+ -> IO Bool -- ^ returns @True@ if the status icon is embedded in a
+ -- notification area.
+statusIconIsEmbedded self =
+ liftM toBool $
+ {# call gtk_status_icon_is_embedded #}
+ (toStatusIcon self)
+
+-- %hash c:6a16 d:99ad
+-- | Menu positioning function to use with 'menuPopup' to position @menu@
+-- aligned to the status icon @userData@.
+--
+statusIconPositionMenu :: (MenuClass menu, StatusIconClass self) =>
+ menu -- ^ @menu@ - the 'Menu'
+ -> self -- ^ @userData@ - the status icon to position the
+ -- menu on
+ -> IO (Int,Int,Bool) -- ^ @(x,y,pushIn)@ -
+ -- @(x,y)@ - coordinates.
+ -- @pushIn@ - whether the menu should be
+ -- pushed in to be completely inside the screen
+ -- instead of just clamped to the size to the
+ -- screen.
+statusIconPositionMenu menu userData =
+ alloca $ \xPtr ->
+ alloca $ \yPtr ->
+ alloca $ \pushInPtr -> do
+ {# call gtk_status_icon_position_menu #}
+ (toMenu menu)
+ xPtr
+ yPtr
+ pushInPtr
+ (castPtr . unsafeForeignPtrToPtr . unStatusIcon $ toStatusIcon userData)
+ x <- peek xPtr [_$_]
+ y <- peek yPtr
+ pushIn <- peek pushInPtr
+ return (fromIntegral x, fromIntegral y, toBool pushIn)
+
+-- FIXME: it's a partial binding, the potentially returned Screen is ignored
+-- %hash c:7939 d:5ea
+-- | Obtains information about the location of the status icon on screen. This
+-- information can be used to e.g. position popups like notification bubbles.
+--
+-- Note that some platforms do not allow Gtk+ to provide this information,
+-- and even on platforms that do allow it, the information is not reliable
+-- unless the status icon is embedded in a notification area, see
+-- 'statusIconIsEmbedded'.
+--
+statusIconGetGeometry :: StatusIconClass self => self -> IO (Maybe (Rectangle,Orientation))
+statusIconGetGeometry self =
+ alloca $ \recPtr ->
+ alloca $ \orPtr -> [_$_]
+ (liftM toBool $ {# call gtk_status_icon_get_geometry #}
+ (toStatusIcon self) nullPtr (castPtr recPtr) orPtr) >>= \b ->
+ if b [_$_]
+ then do
+ rec <- peek recPtr
+ or <- peek orPtr
+ return $ Just (rec,toEnum $ fromIntegral or)
+ else return Nothing
+
+
+--------------------
+-- Attributes
+
+-- %hash c:575d d:54e3
+-- | A 'Pixbuf' to display.
+--
+statusIconPixbuf :: StatusIconClass self => Attr self Pixbuf
+statusIconPixbuf = newAttrFromObjectProperty "pixbuf"
+ {# call pure unsafe gdk_pixbuf_get_type #}
+
+-- %hash c:6783 d:d235
+-- | Filename to load and display.
+--
+-- Default value: @Nothing@
+--
+statusIconFile :: StatusIconClass self => WriteAttr self (Maybe String)
+statusIconFile = writeAttrFromMaybeStringProperty "file"
+
+-- %hash c:3fc3 d:7ec1
+-- | Stock ID for a stock image to display.
+--
+-- Default value: @Nothing@
+--
+statusIconStock :: StatusIconClass self => Attr self (Maybe String)
+statusIconStock = newAttrFromMaybeStringProperty "stock"
+
+-- %hash c:3502 d:9b7a
+-- | The name of the icon from the icon theme.
+--
+-- Default value: @Nothing@
+--
+statusIconIconName :: StatusIconClass self => Attr self (Maybe String)
+statusIconIconName = newAttrFromMaybeStringProperty "icon-name"
+
+-- %hash c:570e d:983f
+-- | The representation being used for image data.
+--
+-- Default value: 'ImageEmpty'
+--
+statusIconStorageType :: StatusIconClass self => ReadAttr self ImageType
+statusIconStorageType = readAttrFromEnumProperty "storage-type"
+ {# call pure unsafe gtk_image_type_get_type #}
+
+-- %hash c:10be d:4621
+-- | The size of the icon.
+--
+-- Allowed values: >= 0
+--
+-- Default value: 0
+--
+statusIconSize :: StatusIconClass self => ReadAttr self Int
+statusIconSize = readAttrFromIntProperty "size"
+
+-- %hash c:eb d:655d
+-- | Whether or not the status icon is blinking.
+--
+-- Default value: @False@
+--
+statusIconBlinking :: StatusIconClass self => Attr self Bool
+statusIconBlinking = newAttrFromBoolProperty "blinking"
+
+-- %hash c:4e2b d:7712
+-- | Whether or not the status icon is visible.
+--
+-- Default value: @True@
+--
+statusIconVisible :: StatusIconClass self => Attr self Bool
+statusIconVisible = newAttrFromBoolProperty "visible"
+
+--------------------
+-- Signals
+
+-- %hash c:969a d:71d0
+-- | Gets emitted when the size available for the image changes, e.g. because
+-- the notification area got resized.
+--
+sizeChanged :: StatusIconClass self => Signal self (Int -> IO Bool)
+sizeChanged = Signal (connect_INT__BOOL "size_changed")
+
+-- | Gets emitted when the user activates the status icon. [_$_]
+-- If and how status icons can activated is platform-dependent.
+activate :: StatusIconClass self => Signal self (IO ())
+activate = Signal (connect_NONE__NONE "activate")
+ [_$_]
+-- | Gets emitted when the user brings up the context menu
+-- of the status icon. Whether status icons can have context [_$_]
+-- menus and how these are activated is platform-dependent.
+--
+-- The 'MouseButton' and 'TimeStamp' parameters should be [_$_]
+-- passed as the last to arguments to 'Graphics.UI.Gtk.menuPopup'.
+popupMenu :: StatusIconClass self => Signal self (Maybe MouseButton -> TimeStamp -> IO ())
+popupMenu = Signal wrap
+
+wrap flag self f = connect_WORD_WORD__NONE "popup_menu" flag self (\m t -> f (toMB m) (fromIntegral t))
+ where toMB 0 = Nothing
+ toMB n = Just . toEnum . fromIntegral $ n
+
+--------------------
+-- Deprecated Signals
+
+#ifndef DISABLE_DEPRECATED
+-- %hash c:bd32
+onActivate :: StatusIconClass self => self
+ -> IO ()
+ -> IO (ConnectId self)
+onActivate = connect_NONE__NONE "activate" False
+{-# DEPRECATED onActivate "instead of 'onActivate obj' use 'on obj activate'" #-}
+
+-- %hash c:a571
+afterActivate :: StatusIconClass self => self
+ -> IO ()
+ -> IO (ConnectId self)
+afterActivate = connect_NONE__NONE "activate" True
+{-# DEPRECATED afterActivate "instead of 'afterActivate obj' use 'after obj activate'" #-}
+
+-- %hash c:44a5
+onPopupMenu :: StatusIconClass self => self
+ -> (Maybe MouseButton -> TimeStamp -> IO ())
+ -> IO (ConnectId self)
+onPopupMenu = wrap False [_$_]
+{-# DEPRECATED onPopupMenu "instead of 'onPopupMenu obj' use 'on obj popupMenu'" #-}
+
+-- %hash c:1904
+afterPopupMenu :: StatusIconClass self => self
+ -> (Maybe MouseButton -> TimeStamp -> IO ())
+ -> IO (ConnectId self)
+afterPopupMenu = wrap True
+{-# DEPRECATED afterPopupMenu "instead of 'afterPopupMenu obj' use 'after obj popupMenu'" #-}
+
+-- %hash c:e226
+onSizeChanged :: StatusIconClass self => self
+ -> (Int -> IO Bool)
+ -> IO (ConnectId self)
+onSizeChanged = connect_INT__BOOL "size_changed" False
+{-# DEPRECATED onSizeChanged "instead of 'onSizeChanged obj' use 'on obj sizeChanged'" #-}
+
+-- %hash c:ec65
+afterSizeChanged :: StatusIconClass self => self
+ -> (Int -> IO Bool)
+ -> IO (ConnectId self)
+afterSizeChanged = connect_INT__BOOL "size_changed" True
+{-# DEPRECATED afterSizeChanged "instead of 'afterSizeChanged obj' use 'after obj sizeChanged'" #-}
+#endif
+#endif
hunk ./tools/callbackGen/gtkmarshal.list 26
-
+ [_$_]
hunk ./tools/callbackGen/gtkmarshal.list 30
+BOOLEAN:INT
hunk ./tools/callbackGen/gtkmarshal.list 97
-#VOID:UINT,UINT
+VOID:UINT,UINT
hunk ./tools/hierarchyGen/hierarchy.list 175
+ GtkStatusIcon if gtk-2.10
|
|
From: Duncan C. <dun...@wo...> - 2007-07-25 15:10:23
|
Wed Jul 25 02:49:36 PDT 2007 Andrea Vezzosi <san...@gm...>
* StatusIcon demo
adddir ./demo/statusicon
addfile ./demo/statusicon/Makefile
hunk ./demo/statusicon/Makefile 1
+
+PROG = statusIcon
+SOURCES = StatusIcon.hs
+
+$(PROG) : $(SOURCES)
+ $(HC) --make $< -o $@ $(HCFLAGS)
+
+clean:
+ rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)
+
+HC=ghc
addfile ./demo/statusicon/StatusIcon.hs
hunk ./demo/statusicon/StatusIcon.hs 1
+-- Simple StatusIcon example
+import Graphics.UI.Gtk
+import qualified Graphics.UI.Gtk.Display.StatusIcon as I
+
+
+main = do
+ initGUI
+ icon <- statusIconNewFromStock stockQuit
+ statusIconSetVisible icon True
+ statusIconSetTooltip icon "This is a test"
+ menu <- mkmenu icon
+ I.onPopupMenu icon $ \b a -> do [_$_]
+ widgetShowAll menu
+ print (b,a)
+ menuPopup menu $ maybe Nothing (\b' -> Just (b',a)) b
+ I.onActivate icon $ do
+ putStrLn "'activate' signal triggered"
+ mainGUI
+
+mkmenu s = do [_$_]
+ m <- menuNew
+ mapM_ (mkitem m) [("Let's blink!",statusIconSetBlinking s True)
+ ,("Let's stop blink!",statusIconSetBlinking s False)
+ ,("Quit",mainQuit)] [_$_]
+ return m
+ where
+ mkitem menu (label,act) = [_$_]
+ do i <- menuItemNewWithLabel label
+ menuShellAppend menu i
+ i `onActivateLeaf` act
|
2 messages has been excluded from this view by a project administrator.
