From: Duncan C. <dun...@us...> - 2005-03-13 19:34:54
|
Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30354/gtk/Graphics/UI/Gtk/TreeList Modified Files: TreeSelection.chs.pp TreeView.chs.pp TreeViewColumn.chs.pp Log Message: Add properties. For the first round, just the easy properties that are implemented in terms of existing getter/setter functions and where there are no issues with NULL/Maybe types. Add Attributes file to glib package and modify Makefile.am accordingly. Index: TreeSelection.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList/TreeSelection.chs.pp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TreeSelection.chs.pp 27 Feb 2005 19:42:06 -0000 1.3 +++ TreeSelection.chs.pp 13 Mar 2005 19:34:38 -0000 1.4 @@ -91,6 +91,9 @@ treeSelectionUnselectRange, #endif +-- * Properties + treeSelectionMode, + -- * Signals onSelectionChanged, afterSelectionChanged @@ -100,6 +103,7 @@ import System.Glib.FFI import System.Glib.GList (GList, fromGList, toGList) +import System.Glib.Attributes (Attr(..)) import System.Glib.GObject (mkFunPtrDestructor) import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} @@ -327,6 +331,16 @@ #endif -------------------- +-- Properties + +-- | \'mode\' property. See 'treeSelectionGetMode' and 'treeSelectionSetMode' +-- +treeSelectionMode :: Attr TreeSelection SelectionMode +treeSelectionMode = Attr + treeSelectionGetMode + treeSelectionSetMode + +-------------------- -- Signals -- | Emitted each time the user changes the selection. Index: TreeView.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList/TreeView.chs.pp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TreeView.chs.pp 27 Feb 2005 19:42:06 -0000 1.7 +++ TreeView.chs.pp 13 Mar 2005 19:34:38 -0000 1.8 @@ -145,6 +145,13 @@ treeViewSetSearchColumn, treeViewSetSearchEqualFunc, +-- * Properties + treeViewHeadersVisible, + treeViewReorderable, + treeViewRulesHint, + treeViewEnableSearch, + treeViewSearchColumn, + -- * Signals onColumnsChanged, afterColumnsChanged, @@ -170,6 +177,7 @@ import System.Glib.FFI import System.Glib.UTFString import System.Glib.GList (GList, fromGList) +import System.Glib.Attributes (Attr(..)) import System.Glib.GObject (makeNewGObject, mkFunPtrDestructor) import Graphics.UI.Gtk.General.Structs (Point, Rectangle) import Graphics.UI.Gtk.Abstract.Object (makeNewObject) @@ -825,6 +833,56 @@ readNTP ptr = nativeTreePathGetIndices (NativeTreePath (castPtr ptr)) -------------------- +-- Properties + +-- | Show the column header buttons. +-- +-- Default value: @True@ +-- +treeViewHeadersVisible :: Attr TreeView Bool +treeViewHeadersVisible = Attr + treeViewGetHeadersVisible + treeViewSetHeadersVisible + +-- | View is reorderable. +-- +-- Default value: @False@ +-- +treeViewReorderable :: Attr TreeView Bool +treeViewReorderable = Attr + treeViewGetReorderable + treeViewSetReorderable + +-- | Set a hint to the theme engine to draw rows in alternating colors. +-- +-- Default value: @False@ +-- +treeViewRulesHint :: Attr TreeView Bool +treeViewRulesHint = Attr + treeViewGetRulesHint + treeViewSetRulesHint + +-- | View allows user to search through columns interactively. +-- +-- Default value: @True@ +-- +treeViewEnableSearch :: Attr TreeView Bool +treeViewEnableSearch = Attr + treeViewGetEnableSearch + treeViewSetEnableSearch + +-- | Model column to search through when searching through code. +-- +-- Allowed values: >= -1 +-- +-- Default value: -1 +-- +treeViewSearchColumn :: Attr TreeView Int +treeViewSearchColumn = Attr + treeViewGetSearchColumn + treeViewSetSearchColumn + +-------------------- -- Signals -- | The user has dragged a column to another Index: TreeViewColumn.chs.pp =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.chs.pp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TreeViewColumn.chs.pp 25 Feb 2005 22:53:42 -0000 1.3 +++ TreeViewColumn.chs.pp 13 Mar 2005 19:34:38 -0000 1.4 @@ -109,6 +109,22 @@ treeViewColumnGetSortOrder, SortType(..), +-- * Properties + treeViewColumnVisible, + treeViewColumnResizable, + treeViewColumnSpacing, + treeViewColumnSizing, + treeViewColumnFixedWidth, + treeViewColumnMinWidth, + treeViewColumnMaxWidth, + treeViewColumnClickable, + treeViewColumnWidget, + treeViewColumnAlignment, + treeViewColumnReorderable, + treeViewColumnSortIndicator, + treeViewColumnSortOrder, + treeViewColumnSortColumnId, + -- * Signals onColClicked, afterColClicked @@ -118,13 +134,14 @@ import System.Glib.FFI import System.Glib.UTFString +{#import System.Glib.GList#} (fromGList) +import System.Glib.Attributes (Attr(..)) import Graphics.UI.Gtk.Abstract.Object (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.Enums (TreeViewColumnSizing(..), SortType(..)) {#import Graphics.UI.Gtk.TreeList.TreeModel#} import Graphics.UI.Gtk.TreeList.CellRenderer (Attribute(..)) -{#import System.Glib.GList#} {# context lib="gtk" prefix="gtk" #} @@ -497,6 +514,142 @@ {#call unsafe tree_view_column_get_sort_order#} (toTreeViewColumn tvc) -------------------- +-- Properties + +-- | Whether to display the column. +-- +-- Default value: @True@ +-- +treeViewColumnVisible :: Attr TreeViewColumn Bool +treeViewColumnVisible = Attr + treeViewColumnGetVisible + treeViewColumnSetVisible + +-- | Column is user-resizable. +-- +-- Default value: @False@ +-- +treeViewColumnResizable :: Attr TreeViewColumn Bool +treeViewColumnResizable = Attr + treeViewColumnGetResizable + treeViewColumnSetResizable + +-- | Space which is inserted between cells. +-- +-- Allowed values: >= 0 +-- +-- Default value: 0 +-- +treeViewColumnSpacing :: Attr TreeViewColumn Int +treeViewColumnSpacing = Attr + treeViewColumnGetSpacing + treeViewColumnSetSpacing + +-- | Resize mode of the column. +-- +-- Default value: 'TreeViewColumnGrowOnly' +-- +treeViewColumnSizing :: Attr TreeViewColumn TreeViewColumnSizing +treeViewColumnSizing = Attr + treeViewColumnGetSizing + treeViewColumnSetSizing + +-- | Current fixed width of the column. +-- +-- Allowed values: >= 1 +-- +-- Default value: 1 +-- +treeViewColumnFixedWidth :: Attr TreeViewColumn Int +treeViewColumnFixedWidth = Attr + treeViewColumnGetFixedWidth + treeViewColumnSetFixedWidth + +-- | Minimum allowed width of the column. +-- +-- Allowed values: >= -1 +-- +-- Default value: -1 +-- +treeViewColumnMinWidth :: Attr TreeViewColumn Int +treeViewColumnMinWidth = Attr + treeViewColumnGetMinWidth + treeViewColumnSetMinWidth + +-- | Maximum allowed width of the column. +-- +-- Allowed values: >= -1 +-- +-- Default value: -1 +-- +treeViewColumnMaxWidth :: Attr TreeViewColumn Int +treeViewColumnMaxWidth = Attr + treeViewColumnGetMaxWidth + treeViewColumnSetMaxWidth + +-- | Whether the header can be clicked. +-- +-- Default value: @False@ +-- +treeViewColumnClickable :: Attr TreeViewColumn Bool +treeViewColumnClickable = Attr + treeViewColumnGetClickable + treeViewColumnSetClickable + +-- | Widget to put in column header button instead of column title. +-- +treeViewColumnWidget :: Attr TreeViewColumn Widget +treeViewColumnWidget = Attr + treeViewColumnGetWidget + treeViewColumnSetWidget + +-- | X Alignment of the column header text or widget. +-- +-- Allowed values: [0,1] +-- +-- Default value: 0 +-- +treeViewColumnAlignment :: Attr TreeViewColumn Float +treeViewColumnAlignment = Attr + treeViewColumnGetAlignment + treeViewColumnSetAlignment + +-- | Whether the column can be reordered around the headers. +-- +-- Default value: @False@ +-- +treeViewColumnReorderable :: Attr TreeViewColumn Bool +treeViewColumnReorderable = Attr + treeViewColumnGetReorderable + treeViewColumnSetReorderable + +-- | Whether to show a sort indicator. +-- +-- Default value: @False@ +-- +treeViewColumnSortIndicator :: Attr TreeViewColumn Bool +treeViewColumnSortIndicator = Attr + treeViewColumnGetSortIndicator + treeViewColumnSetSortIndicator + +-- | Sort direction the sort indicator should indicate. +-- +-- Default value: 'SortAscending' +-- +treeViewColumnSortOrder :: Attr TreeViewColumn SortType +treeViewColumnSortOrder = Attr + treeViewColumnGetSortOrder + treeViewColumnSetSortOrder + +-- | \'sortColumnId\' property. See 'treeViewColumnGetSortColumnId' and +-- 'treeViewColumnSetSortColumnId' +-- +treeViewColumnSortColumnId :: Attr TreeViewColumn Int +treeViewColumnSortColumnId = Attr + treeViewColumnGetSortColumnId + treeViewColumnSetSortColumnId + +-------------------- -- Signals -- | Emitted when the header of this column has been |