[Fencommits] fenfire-hs: twids to the property item in the toolbar -- not sure how it should be

[Benja Fallenstein]

Wed Feb 28 15:37:15 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * twids to the property item in the toolbar -- not sure how it should be
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2007-02-28 15:37:34.000000000 +0200
+++ new-fenfire-hs/Fenfire.fhs	2007-02-28 15:37:34.000000000 +0200
@@ -151,13 +151,12 @@
 vanishingView depth maxnodes bgColor blurBgColor focusColor blurColor 
               textColor blurTextColor
               state@(FenState {fsGraph=graph, fsPath=path, fsMark=mark,
-                               fsHasFocus=focus, fsProperty=property}) =
+                               fsHasFocus=focus}) =
     let ?graph = graph in result where
     startRotation :: (?graph :: Graph) => Rotation
     startRotation = fsRotation state
     result :: (?graph :: Graph) => Vob Node
-    result = currentProp & runVanishing depth maxnodes view where
-    currentProp = ownSize $ rectBox $ pad 5 $ nodeView property
+    result = runVanishing depth maxnodes view where
     -- place the center of the view and all subtrees in both directions
     view = do placeNode (if focus then Just (bgColor, focusColor, textColor) 
                              else Just (blurBgColor, blurColor, blurTextColor))
@@ -753,7 +752,7 @@
                 return (castToMenuItem item)
 
 makeToolbarItems actionGroup toolbar = do
-    forM_ ["new", "open", "save", "", "undo", "redo","","addprop"] $ \name -> 
+    forM_ ["new", "open", "save", "", "undo", "redo",""] $ \name -> 
         if name == "" then do 
             item <- separatorToolItemNew
             toolbarInsert toolbar item (-1)
@@ -948,11 +947,27 @@
                 state' <- readIORef stateRef
                 writeIORef stateRef $ state' {fsProperty=prop}
                 when (fsProperty state' /= prop) $ updateCanvas False
+                
+    comboLabel <- labelNew (Just "Property:  ")
+                
+    comboVBox <- hBoxNew False 0
+    boxPackStart comboVBox comboLabel PackNatural 0
+    boxPackStart comboVBox combo PackNatural 0
+
+    comboAlign <- alignmentNew 0.5 0.5 1 0
+    containerAdd comboAlign comboVBox
 
     combotool <- toolItemNew
-    containerAdd combotool combo
+    containerAdd combotool comboAlign
     toolbarInsert toolbar combotool (-1)
 
+    sepItem <- separatorToolItemNew
+    toolbarInsert toolbar sepItem (-1)
+    
+    Just addpropAction <- actionGroupGetAction actionGroup "addprop"
+    addpropItem <- actionCreateToolItem addpropAction
+    toolbarInsert toolbar (castToToolItem addpropItem) (-1)
+
     -- layout:
 
     canvasFrame <- frameNew