Skip to content
This repository
Browse code

Merge pull request #1 from leksah/master

Getting ready for Leksah 0.14
  • Loading branch information...
commit 87488fa8e725b860771f28bfcab09998ab055110 2 parents 81e4706 + c922925
Stephan authored November 07, 2012
2  vcsgui/src/VCSGui/Common/Commit.hs
@@ -28,7 +28,7 @@ import Graphics.UI.Gtk
28 28
 import Control.Monad.Trans(liftIO)
29 29
 import Control.Monad
30 30
 import Control.Monad.Reader
31  
-import Maybe
  31
+import Data.Maybe
32 32
 import Paths_vcsgui(getDataFileName)
33 33
 
34 34
 --
2  vcsgui/src/VCSGui/Common/GtkHelper.hs
@@ -261,7 +261,7 @@ setToListStore (store, view) newList = do
261 261
 
262 262
 -- | Close a window.
263 263
 closeWin :: WindowItem -> IO ()
264  
-closeWin win = (Gtk.widgetHideAll (getItem win))
  264
+closeWin win = (Gtk.widgetHide (getItem win))
265 265
 
266 266
 -- | Close a window if 'Gtk.deleteEvent' occurs on this 'WindowItem'.
267 267
 registerClose :: WindowItem -> IO ()
18  vcsgui/src/VCSGui/Common/SetupConfig.hs
@@ -18,8 +18,8 @@ module VCSGui.Common.SetupConfig (
18 18
 import Graphics.UI.Gtk hiding (set, get)
19 19
 import Control.Monad.Trans(liftIO)
20 20
 import Data.Maybe
21  
-import Monad
22  
-import Directory
  21
+import Control.Monad
  22
+import System.Directory
23 23
 import System.Directory(doesDirectoryExist)
24 24
 import Data.List.Utils(elemRIndex)
25 25
 import Data.List(isInfixOf)
@@ -160,9 +160,9 @@ connectSetupRepoGui callback gui = do
160 160
                                                     widgetShowAll (H.getItem (entExec gui))
161 161
                                                     widgetShowAll (H.getItem (btnBrowseExec gui))
162 162
                                                 else do
163  
-                                                    widgetHideAll (H.getItem (lblExec gui))
164  
-                                                    widgetHideAll (H.getItem (entExec gui))
165  
-                                                    widgetHideAll (H.getItem (btnBrowseExec gui))
  163
+                                                    widgetHide (H.getItem (lblExec gui))
  164
+                                                    widgetHide (H.getItem (entExec gui))
  165
+                                                    widgetHide (H.getItem (btnBrowseExec gui))
166 166
 
167 167
         on (H.getItem (checkbtAuthor gui)) toggled $ do
168 168
                                             putStrLn "checkbtnauthor toogled"
@@ -173,10 +173,10 @@ connectSetupRepoGui callback gui = do
173 173
                                                     widgetShowAll (H.getItem (lblEmail gui))
174 174
                                                     widgetShowAll (H.getItem (entEmail gui))
175 175
                                                 else do
176  
-                                                    widgetHideAll (H.getItem (lblAuthor gui))
177  
-                                                    widgetHideAll (H.getItem (entAuthor gui))
178  
-                                                    widgetHideAll (H.getItem (lblEmail gui))
179  
-                                                    widgetHideAll (H.getItem (entEmail gui))
  176
+                                                    widgetHide (H.getItem (lblAuthor gui))
  177
+                                                    widgetHide (H.getItem (entAuthor gui))
  178
+                                                    widgetHide (H.getItem (lblEmail gui))
  179
+                                                    widgetHide (H.getItem (entEmail gui))
180 180
                                             return ()
181 181
         liftIO $ on (H.getItem (actBrowsePathToTool gui)) actionActivated $ do
182 182
             mbPath <- showFolderChooserDialog "Select executable" (H.getItem $ winSetupRepo gui) FileChooserActionOpen
4  vcsgui/src/VCSGui/Git/Log.hs
@@ -49,12 +49,12 @@ showLogGUI = do
49 49
     askForNewBranchname = do
50 50
         dialog <- Gtk.dialogNew
51 51
         Gtk.dialogAddButton dialog "gtk-ok" Gtk.ResponseOk
52  
-        upper <- Gtk.dialogGetUpper dialog
  52
+        upper <- Gtk.dialogGetContentArea dialog
53 53
 
54 54
         inputBranch <- Gtk.entryNew
55 55
         lblBranch <- Gtk.labelNew $ Just "Enter a new branchname (empty for anonym branch):"
56 56
         box <- Gtk.hBoxNew False 2
57  
-        Gtk.containerAdd upper box
  57
+        Gtk.containerAdd (Gtk.castToBox upper) box
58 58
         Gtk.containerAdd box lblBranch
59 59
         Gtk.containerAdd box inputBranch
60 60
 
2  vcsgui/src/VCSGui/Svn/AskPassword.hs
@@ -89,7 +89,7 @@ showAskpassGUI handler = do
89 89
                                             if active then
90 90
                                                     widgetShowAll (boxUsePwd gui)
91 91
                                                 else
92  
-                                                    widgetHideAll (boxUsePwd gui)
  92
+                                                    widgetHide (boxUsePwd gui)
93 93
         -- present window
94 94
         widgetShowAll $ H.getItem $ windowAskpass gui
95 95
         return ()
2  vcsgui/src/VCSGui/Svn/Checkout.hs
@@ -23,7 +23,7 @@ import Control.Monad.Reader
23 23
 import qualified VCSWrapper.Svn as Svn
24 24
 import qualified VCSGui.Common.GtkHelper as H
25 25
 import Paths_vcsgui(getDataFileName)
26  
-import Maybe
  26
+import Data.Maybe
27 27
 --
28 28
 -- glade path and object accessors
29 29
 --
45  vcsgui/vcsgui.cabal
@@ -29,14 +29,13 @@ data-files: LICENSE
29 29
             data/guiCommonConflictsResolved.glade
30 30
 data-dir: ""
31 31
 library
32  
-    build-depends: MissingH >=1.1.0.3 && <1.2,
33  
-               filepath >=1.2.0.0 && < 1.3,
34  
-               base >=4.0.0.0 && <4.4,
35  
-               directory >=1.1.0.0 && <1.2,
36  
-               haskell98 >=1.1.0.1 && <1.2,
37  
-               mtl >=2.0.1.0 && <2.1,
38  
-               vcswrapper ==0.0.1,
39  
-               process >=1.0.1.5 && <1.1,
  32
+    build-depends: MissingH >=1.1.0.3 && <1.3,
  33
+               filepath >=1.2.0.0 && < 1.4,
  34
+               base >=4.0.0.0 && <4.7,
  35
+               directory >=1.1.0.0 && <1.3,
  36
+               mtl >=2.0.1.0 && <2.2,
  37
+               vcswrapper ==0.0.2,
  38
+               process >=1.0.1.5 && <1.2,
40 39
                gtk >=0.12.0 && <0.13
41 40
     exposed-modules: VCSGui.Common VCSGui.Git VCSGui.Svn VCSGui.Mercurial
42 41
     exposed: True
@@ -56,14 +55,13 @@ library
56 55
 
57 56
 executable vcsgui
58 57
     main-is: Main.hs
59  
-    build-depends: MissingH >=1.1.0.3 && <1.2,
60  
-               filepath >=1.2.0.0 && < 1.3,
61  
-               base >=4.0.0.0 && <4.4,
62  
-               directory >=1.1.0.0 && <1.2,
63  
-               haskell98 >=1.1.0.1 && <1.2,
64  
-               mtl >=2.0.1.0 && <2.1,
65  
-               vcswrapper ==0.0.1,
66  
-               process >=1.0.1.5 && <1.1,
  58
+    build-depends: MissingH >=1.1.0.3 && <1.3,
  59
+               filepath >=1.2.0.0 && < 1.4,
  60
+               base >=4.0.0.0 && <4.7,
  61
+               directory >=1.1.0.0 && <1.3,
  62
+               mtl >=2.0.1.0 && <2.2,
  63
+               vcswrapper ==0.0.2,
  64
+               process >=1.0.1.5 && <1.2,
67 65
                gtk >=0.12.0 && <0.13
68 66
     buildable: True
69 67
     hs-source-dirs: src
@@ -80,14 +78,13 @@ executable vcsgui
80 78
 
81 79
 executable vcsgui-askpass
82 80
     main-is: Main.hs
83  
-    build-depends: MissingH >=1.1.0.3 && <1.2,
84  
-               filepath >=1.2.0.0 && < 1.3,
85  
-               base >=4.0.0.0 && <4.4,
86  
-               directory >=1.1.0.0 && <1.2,
87  
-               haskell98 >=1.1.0.1 && <1.2,
88  
-               mtl >=2.0.1.0 && <2.1,
89  
-               vcswrapper ==0.0.1,
90  
-               process >=1.0.1.5 && <1.1,
  81
+    build-depends: MissingH >=1.1.0.3 && <1.3,
  82
+               filepath >=1.2.0.0 && < 1.4,
  83
+               base >=4.0.0.0 && <4.7,
  84
+               directory >=1.1.0.0 && <1.3,
  85
+               mtl >=2.0.1.0 && <2.2,
  86
+               vcswrapper ==0.0.2,
  87
+               process >=1.0.1.5 && <1.2,
91 88
                gtk >=0.12.0 && <0.13
92 89
     buildable: True
93 90
     hs-source-dirs: src/exe/askpass src

0 notes on commit 87488fa

Please sign in to comment.
Something went wrong with that request. Please try again.