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...@us...> - 2004-07-29 12:16:05
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24331/gtk/layout Modified Files: Alignment.chs Log Message: implement missing functions or ones that are new in gtk-2.4 Index: Alignment.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Alignment.chs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Alignment.chs 23 May 2004 16:02:58 -0000 1.4 +++ Alignment.chs 29 Jul 2004 12:15:55 -0000 1.5 @@ -1,3 +1,4 @@ +{-# OPTIONS -cpp #-} -- -*-haskell-*- -- GIMP Toolkit (GTK) Widget Alignment -- @@ -21,6 +22,7 @@ -- -- | -- +#include <gtk/gtkversion.h> module Alignment( Alignment, @@ -28,6 +30,10 @@ castToAlignment, alignmentNew, alignmentSet +#if GTK_CHECK_VERSION(2,4,0) + ,alignmentSetPadding, + alignmentGetPadding +#endif ) where import Monad (liftM) @@ -50,8 +56,7 @@ (realToFrac yalign) (realToFrac xscale) (realToFrac yscale) --- | Change the space use behaviour of an --- 'Alignment'. +-- | Change the space use behaviour of an 'Alignment'. -- alignmentSet :: AlignmentClass al => al -> Float -> Float -> Float -> Float -> IO () @@ -59,3 +64,29 @@ (toAlignment al) (realToFrac xalign) (realToFrac yalign) (realToFrac xscale) (realToFrac yscale) +#if GTK_CHECK_VERSION(2,4,0) +-- | Sets the padding on the different sides of the widget. +-- +alignmentSetPadding :: AlignmentClass al => al -> Int -> Int -> Int -> Int -> + IO () +alignmentSetPadding al top bottom left right = + {# call gtk_alignment_set_padding #} (toAlignment al) + (fromIntegral top) (fromIntegral bottom) + (fromIntegral left) (fromIntegral right) + +-- | Gets the padding on the different sides of the widget. +-- +alignmentGetPadding :: AlignmentClass al => al -> IO (Int, Int, Int, Int) +alignmentGetPadding al = + alloca $ \topPtr -> alloca $ \bottomPtr -> + alloca $ \leftPtr -> alloca $ \rightPtr -> do + {# call gtk_alignment_get_padding #} (toAlignment al) + topPtr bottomPtr leftPtr rightPtr + top <- peek topPtr + bottom <- peek bottomPtr + left <- peek leftPtr + right <- peek rightPtr + return (fromIntegral top, fromIntegral bottom + ,fromIntegral left, fromIntegral right) + +#endif |
|
From: Duncan C. <dun...@us...> - 2004-07-29 12:16:04
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/abstract In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24331/gtk/abstract Modified Files: Box.chs Log Message: implement missing functions or ones that are new in gtk-2.4 Index: Box.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/Box.chs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Box.chs 23 May 2004 15:46:02 -0000 1.8 +++ Box.chs 29 Jul 2004 12:15:55 -0000 1.9 @@ -34,6 +34,7 @@ boxPackEnd, boxPackStartDefaults, boxPackEndDefaults, + boxGetHomogeneous, boxSetHomogeneous, boxGetSpacing, boxSetSpacing, @@ -100,12 +101,18 @@ {#call box_pack_end_defaults#} (toBox b) (toWidget w) -- | Set if all children should be spread homogeneous --- withing the box. +-- within the box. -- boxSetHomogeneous :: BoxClass b => b -> Bool -> IO () boxSetHomogeneous b homo = {#call box_set_homogeneous#} (toBox b) (fromBool homo) +-- | Get whether the box is homogeneous. +-- +boxGetHomogeneous :: BoxClass b => b -> IO Bool +boxGetHomogeneous b = + liftM toBool $ {#call box_get_homogeneous#} (toBox b) + -- | Set the standard spacing between two children. -- -- * This space is in addition to the padding parameter that is given for each |
|
From: Duncan C. <dun...@us...> - 2004-07-29 12:16:04
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24331/gtk/misc Modified Files: Adjustment.chs Log Message: implement missing functions or ones that are new in gtk-2.4 Index: Adjustment.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/misc/Adjustment.chs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Adjustment.chs 23 May 2004 16:07:53 -0000 1.4 +++ Adjustment.chs 29 Jul 2004 12:15:55 -0000 1.5 @@ -31,6 +31,7 @@ castToAdjustment, adjustmentNew, adjustmentSetValue, + adjustmentGetValue, adjustmentClampPage, onAdjChanged, afterAdjChanged, @@ -69,8 +70,14 @@ -- | Set the current value of the Adjustment object. -- adjustmentSetValue :: Adjustment -> Double -> IO () -adjustmentSetValue a value = - {#call adjustment_set_value#} (toAdjustment a) (realToFrac value) +adjustmentSetValue adj value = + {#call adjustment_set_value#} adj (realToFrac value) + +-- | Get the current value of the Adjustment object. +-- +adjustmentGetValue :: Adjustment -> IO Double +adjustmentGetValue adj = + liftM realToFrac $ {#call adjustment_get_value#} adj -- | Ensure that the alignment is within these -- bounds. |
|
From: Duncan C. <dun...@us...> - 2004-07-29 12:16:04
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24331 Modified Files: ChangeLog Log Message: implement missing functions or ones that are new in gtk-2.4 Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.193 retrieving revision 1.194 diff -u -d -r1.193 -r1.194 --- ChangeLog 29 Jul 2004 00:53:40 -0000 1.193 +++ ChangeLog 29 Jul 2004 12:15:55 -0000 1.194 @@ -5,6 +5,11 @@ * demo/filechooser/Makefile: FileChooserDemo.glade in EXTRA_TARFILES. + * gtk/abstract/FileChooser.chs: instance FileChooserError GErrorClass + + * gtk2hs/gtk/abstract/Box.chs, gtk/misc/Adjustment.chs, + gtk/layout/Alignment.chs: implement missing functions + 2004-07-28 Duncan Coutts <du...@co...> * Makefile: only build filechooser demo with gtk-2.4 |
|
From: Duncan C. <dun...@us...> - 2004-07-29 12:14:32
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/abstract In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23957/gtk/abstract Modified Files: FileChooser.chs Log Message: make FileChooserError an instance of GErrorClass so users can catch exceptions nicely using the FileChooserError enum. Index: FileChooser.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/FileChooser.chs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- FileChooser.chs 24 Jul 2004 02:31:05 -0000 1.6 +++ FileChooser.chs 29 Jul 2004 12:14:23 -0000 1.7 @@ -93,13 +93,19 @@ import Object (makeNewObject) import Signal {#import GList#} -import GError (propagateGError) +import GError (propagateGError, GErrorDomain, GErrorClass(..)) {# context lib="gtk" prefix ="gtk" #} {# enum FileChooserAction {underscoreToCase} #} {# enum FileChooserError {underscoreToCase} #} +fileChooserErrorDomain :: GErrorDomain +fileChooserErrorDomain = unsafePerformIO {#call unsafe file_chooser_error_quark#} + +instance GErrorClass FileChooserError where + gerrorDomain _ = fileChooserErrorDomain + fileChooserSetAction :: FileChooserClass chooser => chooser -> FileChooserAction -> IO () fileChooserSetAction chooser action = {# call gtk_file_chooser_set_action #} (toFileChooser chooser) |
|
From: Duncan C. <dun...@us...> - 2004-07-29 00:53:51
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2969/gtk/general Modified Files: General.chs Log Message: don't use depreciated gtk main loop functions to install timout and idle handlers, use glib equivalents instead. Index: General.chs =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/General.chs,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- General.chs 23 May 2004 15:58:48 -0000 1.12 +++ General.chs 29 Jul 2004 00:53:40 -0000 1.13 @@ -175,9 +175,9 @@ grabRemove :: WidgetClass w => w -> IO () grabRemove = {#call grab_remove#} . toWidget -{#pointer Function#} +{#pointer GSourceFunc as Function#} -{#pointer DestroyNotify#} +{#pointer GDestroyNotify as DestroyNotify#} #if __GLASGOW_HASKELL__>=600 @@ -216,14 +216,14 @@ timeoutAdd :: IO Bool -> Int -> IO HandlerId timeoutAdd fun msec = do (funPtr, dPtr) <- makeCallback (liftM fromBool fun) - {#call unsafe timeout_add_full#} (fromIntegral msec) funPtr nullFunPtr - nullPtr dPtr + {#call unsafe g_timeout_add_full#} (fromIntegral priorityDefault) + (fromIntegral msec) funPtr nullPtr dPtr -- | Remove a previously added timeout handler by its -- 'TimeoutId'. -- timeoutRemove :: HandlerId -> IO () -timeoutRemove = {#call unsafe timeout_remove#} +timeoutRemove id = {#call unsafe g_source_remove#} id >> return () -- | Add a callback that is called whenever the system is -- idle. @@ -236,12 +236,12 @@ idleAdd :: IO Bool -> Int -> IO HandlerId idleAdd fun pri = do (funPtr, dPtr) <- makeCallback (liftM fromBool fun) - {#call unsafe idle_add_full#} (fromIntegral pri) funPtr nullFunPtr + {#call unsafe g_idle_add_full#} (fromIntegral pri) funPtr nullPtr dPtr -- | Remove a previously added idle handler by its -- 'TimeoutId'. -- idleRemove :: HandlerId -> IO () -idleRemove = {#call unsafe idle_remove#} +idleRemove id = {#call unsafe g_source_remove#} id >> return () |
|
From: Duncan C. <dun...@us...> - 2004-07-29 00:53:49
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2969 Modified Files: ChangeLog Log Message: don't use depreciated gtk main loop functions to install timout and idle handlers, use glib equivalents instead. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.192 retrieving revision 1.193 diff -u -d -r1.192 -r1.193 --- ChangeLog 28 Jul 2004 11:13:40 -0000 1.192 +++ ChangeLog 29 Jul 2004 00:53:40 -0000 1.193 @@ -1,3 +1,10 @@ +2004-07-29 Duncan Coutts <du...@co...> + + * gtk/general/General.chs: don't use depreciated gtk main loop + functions to install timout and idle handlers, use glib equivalents. + + * demo/filechooser/Makefile: FileChooserDemo.glade in EXTRA_TARFILES. + 2004-07-28 Duncan Coutts <du...@co...> * Makefile: only build filechooser demo with gtk-2.4 |
|
From: Duncan C. <dun...@us...> - 2004-07-29 00:51:35
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/filechooser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698/demo/filechooser Modified Files: Makefile Log Message: include FileChooserDemo.glade in EXTRA_TARFILES Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/demo/filechooser/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 30 Apr 2004 20:52:42 -0000 1.1 +++ Makefile 29 Jul 2004 00:51:27 -0000 1.2 @@ -8,4 +8,6 @@ NEEDPACKAGES = gtk2 glade +EXTRA_TARFILES += FileChooserDemo.glade + include $(TOP)/mk/common.mk |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 11:13:50
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23610 Modified Files: ChangeLog Log Message: Revert this change since it doesn't give up anything and not preserving the timestamp break MacOS: * mk/library.mk (installfiles): Install lib.a as is, ie not mod 644 and don't reset timestamp. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -d -r1.191 -r1.192 --- ChangeLog 28 Jul 2004 09:52:31 -0000 1.191 +++ ChangeLog 28 Jul 2004 11:13:40 -0000 1.192 @@ -8,9 +8,6 @@ * demo/glade/Makefile (EXTRA_TARFILES): Include simple.glade. - * mk/library.mk (installfiles): Install lib.a as is, ie not mod - 644 and don't reset timestamp. - * mk/common.mk: Define INST_HIDIR, INST_LIBDIR, INST_INCLDIR and INST_BINDIR directly as normal make variables, so that lib packages get installed in separate subdirs. |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 11:13:50
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23610/mk Modified Files: library.mk Log Message: Revert this change since it doesn't give up anything and not preserving the timestamp break MacOS: * mk/library.mk (installfiles): Install lib.a as is, ie not mod 644 and don't reset timestamp. Index: library.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- library.mk 28 Jul 2004 02:38:53 -0000 1.23 +++ library.mk 28 Jul 2004 11:13:40 -0000 1.24 @@ -64,7 +64,8 @@ installfiles : $(PACKAGENAME).conf for file in $(ALLHSFILES:.hs=.hi); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(INST_HIDIR); done; - $(INSTALL) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR) + $(INSTALL_DATA) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR) + $(TOUCH) -r $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)/$(TARGETOK) ifneq ($(strip $(STUBHFILES) $(EXTRA_HFILESOK)),) for file in $(STUBHFILES) $(EXTRA_HFILESOK); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(INST_INCLDIR); done; |
|
From: Duncan C. <dun...@us...> - 2004-07-28 09:52:42
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935 Modified Files: ChangeLog Makefile Log Message: added filechooser demo's glade file also make building filechoser demo conditional on gtk-2.4 Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile 27 Jul 2004 12:41:06 -0000 1.30 +++ Makefile 28 Jul 2004 09:52:32 -0000 1.31 @@ -29,7 +29,11 @@ MAKE_LIBS += mogul MAKE_APPS = demo/concurrent demo/treeList demo/graphic demo/unicode \ - demo/hello demo/buttonbox demo/filechooser + demo/hello demo/buttonbox + +ifeq ($(GTK_VERSION_2_4),yes) +MAKE_APPS += demo/filechooser +endif ifeq ($(strip $(ENABLE_LIBGLADE)),yes) MAKE_APPS += demo/glade Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.190 retrieving revision 1.191 diff -u -d -r1.190 -r1.191 --- ChangeLog 28 Jul 2004 08:19:48 -0000 1.190 +++ ChangeLog 28 Jul 2004 09:52:31 -0000 1.191 @@ -1,3 +1,9 @@ +2004-07-28 Duncan Coutts <du...@co...> + + * Makefile: only build filechooser demo with gtk-2.4 + + * demo/filechooser/FileChooserDemo.glade: add demo's glade file + 2004-07-28 Jens Petersen <pet...@ha...> * demo/glade/Makefile (EXTRA_TARFILES): Include simple.glade. |
|
From: Duncan C. <dun...@us...> - 2004-07-28 09:52:42
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/filechooser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935/demo/filechooser Added Files: FileChooserDemo.glade Log Message: added filechooser demo's glade file also make building filechoser demo conditional on gtk-2.4 --- NEW FILE: FileChooserDemo.glade --- <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> <widget class="GtkWindow" id="mainWindow"> <property name="border_width">10</property> <property name="visible">True</property> <property name="title" translatable="yes">File Chooser Demo</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes">This is a demo of the GtkFileChooser that was intoduced in Gtk+ 2.4 The dialog has four modes: * open file (selects existing file) * save file (select existing or new file) * select folder (select existing folder) * create folder (selects existing or bew folder) The last demo show how you can install extra widgets or a preview widget in the file open dialog</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="xpad">10</property> <property name="ypad">10</property> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_EDGE</property> <property name="spacing">5</property> <child> <widget class="GtkButton" id="openFileButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <child> <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <widget class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <widget class="GtkImage" id="image2"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="label" translatable="yes">Open File</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkButton" id="saveFileButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <child> <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <widget class="GtkImage" id="image1"> <property name="visible">True</property> <property name="stock">gtk-save-as</property> <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes">Save File</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkButton" id="selectFolderButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <child> <widget class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <widget class="GtkHBox" id="hbox4"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <widget class="GtkImage" id="image4"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="label" translatable="yes">Select Folder</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkButton" id="createFolderButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <child> <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <widget class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <widget class="GtkImage" id="image3"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="label" translatable="yes">Create Folder</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> </widget> </child> </widget> <packing> <property name="padding">5</property> <property name="expand">False</property> <property name="fill">True</property> </packing> </child> <child> <widget class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <property name="spacing">5</property> <child> <widget class="GtkButton" id="openFilePreviewButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <child> <widget class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> <child> <widget class="GtkHBox" id="hbox5"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <widget class="GtkImage" id="image5"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> <widget class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="label" translatable="yes">Open File (with preview)</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkButton" id="quitButton"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-quit</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> </widget> </child> </widget> <packing> <property name="padding">0</property> <property name="expand">True</property> <property name="fill">True</property> </packing> </child> </widget> </child> </widget> </glade-interface> |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 08:20:29
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30744 Modified Files: ChangeLog Log Message: Include simple.glade in EXTRA_TARFILES. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.189 retrieving revision 1.190 diff -u -d -r1.189 -r1.190 --- ChangeLog 28 Jul 2004 02:41:21 -0000 1.189 +++ ChangeLog 28 Jul 2004 08:19:48 -0000 1.190 @@ -1,5 +1,7 @@ 2004-07-28 Jens Petersen <pet...@ha...> + * demo/glade/Makefile (EXTRA_TARFILES): Include simple.glade. + * mk/library.mk (installfiles): Install lib.a as is, ie not mod 644 and don't reset timestamp. |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 08:20:07
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/glade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30744/demo/glade Modified Files: Makefile Log Message: Include simple.glade in EXTRA_TARFILES. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/demo/glade/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 2 May 2004 13:13:26 -0000 1.4 +++ Makefile 28 Jul 2004 08:19:49 -0000 1.5 @@ -8,4 +8,6 @@ NEEDPACKAGES = gtk2 glade +EXTRA_TARFILES += simple.glade + include $(TOP)/mk/common.mk |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 02:41:29
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15007 Modified Files: ChangeLog Log Message: entries for library.mk (installfiles) and common.mk install dirs. Also fix previous /config.mk.in entry. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -d -r1.188 -r1.189 --- ChangeLog 27 Jul 2004 12:41:05 -0000 1.188 +++ ChangeLog 28 Jul 2004 02:41:21 -0000 1.189 @@ -1,3 +1,12 @@ +2004-07-28 Jens Petersen <pet...@ha...> + + * mk/library.mk (installfiles): Install lib.a as is, ie not mod + 644 and don't reset timestamp. + + * mk/common.mk: Define INST_HIDIR, INST_LIBDIR, INST_INCLDIR and + INST_BINDIR directly as normal make variables, so that lib + packages get installed in separate subdirs. + 2004-07-27 Duncan Coutts <du...@co...> * demo/gconf/GConfDemo.hs, demo/gconf/Makefile: new gconf demo/test @@ -6,7 +15,7 @@ 2004-07-27 Jens Petersen <pet...@ha...> - * mk/config.mk.in (INSTALL_DIR): Define ABS_TOP. No longer define CPP. + * mk/config.mk.in: Define ABS_TOP. No longer define CPP. * mk/common.mk: Sedpipe ABS_TOP and use it for TARDIR to fix tarsource target. |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 02:40:17
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14863/mk Modified Files: common.mk Log Message: Define INST_HIDIR, INST_LIBDIR, INST_INCLDIR and INST_BINDIR directly as normal make variables, so that lib packages get installed in separate subdirs. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- common.mk 27 Jul 2004 08:22:58 -0000 1.28 +++ common.mk 28 Jul 2004 02:40:07 -0000 1.29 @@ -20,15 +20,10 @@ /$(patsubst %/,%,$(dir $(INSTALLDIR)/)))) # directories of installation -INST_HIDIR ?= $(addsuffix $(INSTALLDIROK)/hi,$(libdir)) -INST_LIBDIR ?= $(addsuffix $(INSTALLDIROK),$(libdir)) -INST_INCLDIR ?= $(INST_HIDIR) -INST_BINDIR ?= $(addsuffix $(INSTALLDIROK),$(bindir)) - -INST_HIDIR := $(shell echo $(INST_HIDIR) | $(SEDPIPE)) -INST_LIBDIR := $(shell echo $(INST_LIBDIR) | $(SEDPIPE)) -INST_INCLDIR := $(shell echo $(INST_INCLDIR) | $(SEDPIPE)) -INST_BINDIR := $(shell echo $(INST_BINDIR) | $(SEDPIPE)) +INST_LIBDIR = $(shell echo $(addsuffix $(INSTALLDIROK),$(libdir)) | $(SEDPIPE)) +INST_HIDIR = $(INST_LIBDIR)/hi +INST_INCLDIR = $(INST_HIDIR) +INST_BINDIR = $(shell echo $(addsuffix $(INSTALLDIROK),$(bindir)) | $(SEDPIPE)) # these values are used for building a library in-place INPL_HIDIR := $(sort $(patsubst %/.,%,$(patsubst %/,%,\ |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-28 02:39:04
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14618/mk Modified Files: library.mk Log Message: Install lib.a as is, ie not mod 644 and don't reset timestamp. Index: library.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- library.mk 17 Nov 2003 17:32:29 -0000 1.22 +++ library.mk 28 Jul 2004 02:38:53 -0000 1.23 @@ -64,8 +64,7 @@ installfiles : $(PACKAGENAME).conf for file in $(ALLHSFILES:.hs=.hi); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(INST_HIDIR); done; - $(INSTALL_DATA) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR) - $(TOUCH) -r $(TARGETOK) $(DESTDIR)$(INST_LIBDIR)/$(TARGETOK) + $(INSTALL) $(TARGETOK) $(DESTDIR)$(INST_LIBDIR) ifneq ($(strip $(STUBHFILES) $(EXTRA_HFILESOK)),) for file in $(STUBHFILES) $(EXTRA_HFILESOK); do \ $(INSTALL_DATA) $$file $(DESTDIR)$(INST_INCLDIR); done; |
|
From: Duncan C. <dun...@us...> - 2004-07-27 12:41:15
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17785 Modified Files: ChangeLog Makefile Log Message: new gconf demo/test app Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Makefile 26 Jul 2004 12:14:46 -0000 1.29 +++ Makefile 27 Jul 2004 12:41:06 -0000 1.30 @@ -36,7 +36,7 @@ endif ifeq ($(strip $(ENABLE_GNOME)),yes) -MAKE_APPS += demo/sourceview +MAKE_APPS += demo/sourceview demo/gconf endif EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \ Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.187 retrieving revision 1.188 diff -u -d -r1.187 -r1.188 --- ChangeLog 27 Jul 2004 08:39:59 -0000 1.187 +++ ChangeLog 27 Jul 2004 12:41:05 -0000 1.188 @@ -1,3 +1,9 @@ +2004-07-27 Duncan Coutts <du...@co...> + + * demo/gconf/GConfDemo.hs, demo/gconf/Makefile: new gconf demo/test + + * Makefile: build gconf demo + 2004-07-27 Jens Petersen <pet...@ha...> * mk/config.mk.in (INSTALL_DIR): Define ABS_TOP. No longer define CPP. |
|
From: Duncan C. <dun...@us...> - 2004-07-27 12:41:15
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/gconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17785/demo/gconf Added Files: GConfDemo.hs Makefile Log Message: new gconf demo/test app --- NEW FILE: Makefile --- TOP = ../.. include $(TOP)/mk/config.mk MAIN = GConfDemo.hs APPNAME = gconfDemo NEEDPACKAGES = gconf include $(TOP)/mk/common.mk --- NEW FILE: GConfDemo.hs --- module Main where import Gtk (initGUI, mainGUI) import System.Gnome.GConf import Monad (when) import System.Exit (exitFailure) import List (intersperse) main = do -- connect to gconf conf <- gconfGetDefault -- for the purposes of this demo check for key and display usage message exists <- conf `gconfDirExists` "/apps/gtk2hs-gconf-demo" when (not exists) (do putStrLn usageMessage exitFailure) -- get and print initial values (intValue :: Int) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/intValue" (boolValue :: Maybe Bool) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/boolValue" (floatValue :: Double) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/floatValue" (stringValue :: String) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/stringValue" (pairValue :: (Int,Bool)) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/pairValue" (listValue :: [Int]) <- conf `gconfGet` "/apps/gtk2hs-gconf-demo/listValue" print intValue print boolValue print floatValue print stringValue print pairValue print listValue -- register for notification of changes conf `gconfAddDir` "/apps/gtk2hs-gconf-demo" -- using the prefered API which allows you to specify the key/dir of interest. -- This is usuall what you want because you'll do different things in response -- to changes in different keys. Also, it allows you to use native types rather -- than converting from a dynamic type. gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/intValue" doSomethingWhenIntValueChanges gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/boolValue" doSomethingWhenBoolValueChanges gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/floatValue" doSomethingWhenFloatValueChanges gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/stringValue" doSomethingWhenStringValueChanges gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/pairValue" doSomethingWhenPairValueChanges gconfNotifyAdd conf "/apps/gtk2hs-gconf-demo/listValue" doSomethingWhenListValueChanges -- and the other API (which gives you notifications on everything) conf `afterValueChanged` doSomethingWhenAnyKeyChanges -- run the glib main loop otherwise we wouldn't wait for changes putStrLn $ "waiting for any changes in the gconf dir" ++ "\"/apps/gtk2hs-gconf-demo\"" initGUI mainGUI -- Our various doSomething* functions -- doSomethingWhenIntValueChanges :: String -> Int -> IO () doSomethingWhenIntValueChanges key value = putStrLn $ "[method1] intValue changed to " ++ show value -- This one is designed to cope with the key being unset doSomethingWhenBoolValueChanges :: String -> Maybe Bool -> IO () doSomethingWhenBoolValueChanges key (Just value) = putStrLn $ "[method1] boolValue changed to " ++ show value doSomethingWhenBoolValueChanges key Nothing = putStrLn $ "[method1] boolValue was unset" doSomethingWhenFloatValueChanges :: String -> Double -> IO () doSomethingWhenFloatValueChanges key value = putStrLn $ "[method1] floatValue changed to " ++ show value doSomethingWhenStringValueChanges :: String -> String -> IO () doSomethingWhenStringValueChanges key value = putStrLn $ "[method1] stringValue changed to " ++ show value doSomethingWhenPairValueChanges :: String -> (Int, Bool) -> IO () doSomethingWhenPairValueChanges key value = putStrLn $ "[method1] pairValue changed to " ++ show value doSomethingWhenListValueChanges :: String -> [Int] -> IO () doSomethingWhenListValueChanges key value = putStrLn $ "[method1] listValue changed to " ++ show value doSomethingWhenAnyKeyChanges :: String -> Maybe GConfValueDyn -> IO () doSomethingWhenAnyKeyChanges key (Just value) = putStrLn $ "[method2] the key " ++ key ++ " changed to " ++ showGConfValue value doSomethingWhenAnyKeyChanges key Nothing = putStrLn $ "[method2] the key " ++ key ++ " was unset" -- Helper function to display a value and its type -- This is not an important part of the demo -- showGConfValue :: GConfValueDyn -> String showGConfValue value = showGConfValue_ValueOnly value ++ " :: " ++ showGConfValue_Type value showGConfValue_ValueOnly :: GConfValueDyn -> String showGConfValue_ValueOnly (GConfValueString s) = show s showGConfValue_ValueOnly (GConfValueInt n) = show n showGConfValue_ValueOnly (GConfValueBool b) = show b showGConfValue_ValueOnly (GConfValueFloat f) = show f showGConfValue_ValueOnly (GConfValueList as) = "[" ++ (concat $ intersperse "," $ map showGConfValue_ValueOnly as) ++ "]" showGConfValue_ValueOnly (GConfValuePair (a,b)) = "(" ++ showGConfValue_ValueOnly a ++ ", " ++ showGConfValue_ValueOnly b ++ ")" showGConfValue_Type :: GConfValueDyn -> String showGConfValue_Type (GConfValueString s) = "String" showGConfValue_Type (GConfValueInt n) = "Int" showGConfValue_Type (GConfValueBool b) = "Bool" showGConfValue_Type (GConfValueFloat f) = "Double" -- gconf does type empty lists too but our GConfValueDyn cannot represent -- them using the GConfValueClass is preferable in this sense as it can type -- all the GConfValue stuff exactly (so long as that type is known statically) showGConfValue_Type (GConfValueList []) = "[unknown]" showGConfValue_Type (GConfValueList (a:_)) = "[" ++ showGConfValue_Type a ++ "]" showGConfValue_Type (GConfValuePair (a,b)) = "(" ++ showGConfValue_Type a ++ ", " ++ showGConfValue_Type b ++ ")" usageMessage = "To use this gconf demo program, first create the required gconf entrys.\n" ++ "Use the following commands:\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/intValue --type int 3\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/boolValue --type bool false\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/floatValue --type float 3.141592\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/stringValue --type string foo\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/pairValue --type pair \\\n" ++ " --car-type int --cdr-type bool \"(3,false)\"\n" ++ " gconftool-2 --set /apps/gtk2hs-gconf-demo/listValue --type list \\\n" ++ " --list-type int \"[0,1,2,3,4]\"\n" ++ "This demo will display the values of these keys and then watch them for\n" ++ "changes. Use the gconf-editor program to change the values of these keys.\n" ++ "Hit ^C when you get bored.\n" ++ "To delete the keys when you're finnished with this demo use:\n" ++ " gconftool-2 --recursive-unset /apps/gtk2hs-gconf-demo" |
|
From: Duncan C. <dun...@us...> - 2004-07-27 12:35:32
|
Update of /cvsroot/gtk2hs/gtk2hs/demo/gconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16910/gconf Log Message: Directory /cvsroot/gtk2hs/gtk2hs/demo/gconf added to the repository |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-27 08:40:08
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10760 Modified Files: ChangeLog Log Message: Mention dropping of CPP in config.mk.in. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.186 retrieving revision 1.187 diff -u -d -r1.186 -r1.187 --- ChangeLog 27 Jul 2004 08:25:00 -0000 1.186 +++ ChangeLog 27 Jul 2004 08:39:59 -0000 1.187 @@ -1,6 +1,6 @@ 2004-07-27 Jens Petersen <pet...@ha...> - * mk/config.mk.in (INSTALL_DIR): Define ABS_TOP. + * mk/config.mk.in (INSTALL_DIR): Define ABS_TOP. No longer define CPP. * mk/common.mk: Sedpipe ABS_TOP and use it for TARDIR to fix tarsource target. |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-27 08:25:09
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8315 Modified Files: ChangeLog Log Message: tarsource fixes to config.mk.in, common.mk and {doc,glade}/Makefile. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.185 retrieving revision 1.186 diff -u -d -r1.185 -r1.186 --- ChangeLog 26 Jul 2004 16:12:43 -0000 1.185 +++ ChangeLog 27 Jul 2004 08:25:00 -0000 1.186 @@ -1,3 +1,18 @@ +2004-07-27 Jens Petersen <pet...@ha...> + + * mk/config.mk.in (INSTALL_DIR): Define ABS_TOP. + + * mk/common.mk: Sedpipe ABS_TOP and use it for TARDIR to fix + tarsource target. + + * glade/Makefile: Use TOP. Generate GladeType.chs with the same + invocation used by sourceview and gtk. + + * doc/Makefile: Use common.mk and EXTRA_TARFILES, drop own + tarsource target and no longer set CURDIR and TARDIR. + + * VERSION: Up to 0.9.5.50 + 2004-07-26 Axel Simon <A....@ke...> * gtk/abstract/ButtonBox.chs: Remove buttonBoxGetChildSecondary |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-27 08:23:09
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8134/mk Modified Files: common.mk Log Message: Use ABS_TOP for TARDIR to fix tarsource target. Index: common.mk =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- common.mk 16 Nov 2003 13:30:55 -0000 1.27 +++ common.mk 27 Jul 2004 08:22:58 -0000 1.28 @@ -6,9 +6,9 @@ SEDPIPE := $(SED) -e $(SEDNOUP) -e $(SEDNOID) -e $(PATHSED) # directories of interest -#TOP := $(shell echo $(TOP) | $(SEDPIPE)) +ABS_TOP := $(shell echo $(ABS_TOP) | $(SEDPIPE)) CURDIR := $(shell $(PWD) | $(SEDPIPE)) -TARDIR := $(subst $(TOP),$(TARNAME),$(CURDIR))/ +TARDIR := $(subst $(ABS_TOP),$(TARNAME),$(CURDIR))/ # directories of source files SUBDIRS ?= . |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-27 08:22:24
|
Update of /cvsroot/gtk2hs/gtk2hs/mk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7974/mk Modified Files: config.mk.in Log Message: Define ABS_TOP, the absolute path to the top of the src tree. Index: config.mk.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- config.mk.in 26 Jul 2004 12:14:47 -0000 1.25 +++ config.mk.in 27 Jul 2004 08:22:16 -0000 1.26 @@ -2,6 +2,8 @@ # # This Makefile contains all configuration data. +ABS_TOP = @TOP@ + AR = @AR@ LN = @LN_S@ PWD = @PWD@ @@ -14,7 +16,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL@ -d -CPP = @CPP@ +#CPP = @CPP@ CC = @CC@ PATHSED = '@PATHSED@' |
|
From: Jens-Ulrik P. <ju...@us...> - 2004-07-27 08:21:24
|
Update of /cvsroot/gtk2hs/gtk2hs/glade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7830/glade Modified Files: Makefile Log Message: Use TOP. Generate GladeType.chs with the same invocation used by sourceview and gtk. Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/glade/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 30 Apr 2004 12:50:15 -0000 1.4 +++ Makefile 27 Jul 2004 08:21:15 -0000 1.5 @@ -10,11 +10,11 @@ MAIN = Glade.hs -# In order for ghc and c2hs to find .chi and .hi files in ../gtk/* we +# In order for ghc and c2hs to find .chi and .hi files in $(TOP)/gtk/* we # need to set these directories here. Note that this list is different # from SUBDIRS in that the directories given here are not searched for # compilable files. -HIDIRS = ../gtk/glib ../gtk/abstract ../gtk/general +HIDIRS = $(TOP)/gtk/glib $(TOP)/gtk/abstract $(TOP)/gtk/general HEADER = glade/glade.h #EXTRA_HFILES = @@ -41,11 +41,10 @@ EXTRA_CLEANFILES+= GladeType.chs NEEDCHI = GladeType -GladeType.chs : ../tools/hierarchyGen/hierarchy.list - $(CPP) $(GTK_CFLAGS) - < $(TOP)/tools/hierarchyGen/hierarchy.list | \ - $(strip ../tools/hierarchyGen/TypeGenerator - \ - GladeType.chs \ - $(addprefix --tag=,$(TYPE_TAGS))) --lib=glade --prefix=glade +GladeType.chs : $(TOP)/tools/hierarchyGen/hierarchy.list + $(strip $(TOP)/tools/hierarchyGen/TypeGenerator \ + $(TOP)/tools/hierarchyGen/hierarchy.list \ + GladeType.chs $(addprefix --tag=,$(TYPE_TAGS))) --lib=glade --prefix=glade include $(TOP)/mk/common.mk |
2 messages has been excluded from this view by a project administrator.
