Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: forste/haskellVCSGUI
base: 81e4706761
...
head fork: forste/haskellVCSGUI
compare: 87488fa8e7
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
Commits on Oct 14, 2012
Hamish Mackenzie hamishmack GHC 7.6 fixes and Gtk 3 fixes c922925
Commits on Nov 07, 2012
Stephan Merge pull request #1 from leksah/master
Getting ready for Leksah 0.14
87488fa
2  vcsgui/src/VCSGui/Common/Commit.hs
View
@@ -28,7 +28,7 @@ import Graphics.UI.Gtk
import Control.Monad.Trans(liftIO)
import Control.Monad
import Control.Monad.Reader
-import Maybe
+import Data.Maybe
import Paths_vcsgui(getDataFileName)
--
2  vcsgui/src/VCSGui/Common/GtkHelper.hs
View
@@ -261,7 +261,7 @@ setToListStore (store, view) newList = do
-- | Close a window.
closeWin :: WindowItem -> IO ()
-closeWin win = (Gtk.widgetHideAll (getItem win))
+closeWin win = (Gtk.widgetHide (getItem win))
-- | Close a window if 'Gtk.deleteEvent' occurs on this 'WindowItem'.
registerClose :: WindowItem -> IO ()
18 vcsgui/src/VCSGui/Common/SetupConfig.hs
View
@@ -18,8 +18,8 @@ module VCSGui.Common.SetupConfig (
import Graphics.UI.Gtk hiding (set, get)
import Control.Monad.Trans(liftIO)
import Data.Maybe
-import Monad
-import Directory
+import Control.Monad
+import System.Directory
import System.Directory(doesDirectoryExist)
import Data.List.Utils(elemRIndex)
import Data.List(isInfixOf)
@@ -160,9 +160,9 @@ connectSetupRepoGui callback gui = do
widgetShowAll (H.getItem (entExec gui))
widgetShowAll (H.getItem (btnBrowseExec gui))
else do
- widgetHideAll (H.getItem (lblExec gui))
- widgetHideAll (H.getItem (entExec gui))
- widgetHideAll (H.getItem (btnBrowseExec gui))
+ widgetHide (H.getItem (lblExec gui))
+ widgetHide (H.getItem (entExec gui))
+ widgetHide (H.getItem (btnBrowseExec gui))
on (H.getItem (checkbtAuthor gui)) toggled $ do
putStrLn "checkbtnauthor toogled"
@@ -173,10 +173,10 @@ connectSetupRepoGui callback gui = do
widgetShowAll (H.getItem (lblEmail gui))
widgetShowAll (H.getItem (entEmail gui))
else do
- widgetHideAll (H.getItem (lblAuthor gui))
- widgetHideAll (H.getItem (entAuthor gui))
- widgetHideAll (H.getItem (lblEmail gui))
- widgetHideAll (H.getItem (entEmail gui))
+ widgetHide (H.getItem (lblAuthor gui))
+ widgetHide (H.getItem (entAuthor gui))
+ widgetHide (H.getItem (lblEmail gui))
+ widgetHide (H.getItem (entEmail gui))
return ()
liftIO $ on (H.getItem (actBrowsePathToTool gui)) actionActivated $ do
mbPath <- showFolderChooserDialog "Select executable" (H.getItem $ winSetupRepo gui) FileChooserActionOpen
4 vcsgui/src/VCSGui/Git/Log.hs
View
@@ -49,12 +49,12 @@ showLogGUI = do
askForNewBranchname = do
dialog <- Gtk.dialogNew
Gtk.dialogAddButton dialog "gtk-ok" Gtk.ResponseOk
- upper <- Gtk.dialogGetUpper dialog
+ upper <- Gtk.dialogGetContentArea dialog
inputBranch <- Gtk.entryNew
lblBranch <- Gtk.labelNew $ Just "Enter a new branchname (empty for anonym branch):"
box <- Gtk.hBoxNew False 2
- Gtk.containerAdd upper box
+ Gtk.containerAdd (Gtk.castToBox upper) box
Gtk.containerAdd box lblBranch
Gtk.containerAdd box inputBranch
2  vcsgui/src/VCSGui/Svn/AskPassword.hs
View
@@ -89,7 +89,7 @@ showAskpassGUI handler = do
if active then
widgetShowAll (boxUsePwd gui)
else
- widgetHideAll (boxUsePwd gui)
+ widgetHide (boxUsePwd gui)
-- present window
widgetShowAll $ H.getItem $ windowAskpass gui
return ()
2  vcsgui/src/VCSGui/Svn/Checkout.hs
View
@@ -23,7 +23,7 @@ import Control.Monad.Reader
import qualified VCSWrapper.Svn as Svn
import qualified VCSGui.Common.GtkHelper as H
import Paths_vcsgui(getDataFileName)
-import Maybe
+import Data.Maybe
--
-- glade path and object accessors
--
45 vcsgui/vcsgui.cabal
View
@@ -29,14 +29,13 @@ data-files: LICENSE
data/guiCommonConflictsResolved.glade
data-dir: ""
library
- build-depends: MissingH >=1.1.0.3 && <1.2,
- filepath >=1.2.0.0 && < 1.3,
- base >=4.0.0.0 && <4.4,
- directory >=1.1.0.0 && <1.2,
- haskell98 >=1.1.0.1 && <1.2,
- mtl >=2.0.1.0 && <2.1,
- vcswrapper ==0.0.1,
- process >=1.0.1.5 && <1.1,
+ build-depends: MissingH >=1.1.0.3 && <1.3,
+ filepath >=1.2.0.0 && < 1.4,
+ base >=4.0.0.0 && <4.7,
+ directory >=1.1.0.0 && <1.3,
+ mtl >=2.0.1.0 && <2.2,
+ vcswrapper ==0.0.2,
+ process >=1.0.1.5 && <1.2,
gtk >=0.12.0 && <0.13
exposed-modules: VCSGui.Common VCSGui.Git VCSGui.Svn VCSGui.Mercurial
exposed: True
@@ -56,14 +55,13 @@ library
executable vcsgui
main-is: Main.hs
- build-depends: MissingH >=1.1.0.3 && <1.2,
- filepath >=1.2.0.0 && < 1.3,
- base >=4.0.0.0 && <4.4,
- directory >=1.1.0.0 && <1.2,
- haskell98 >=1.1.0.1 && <1.2,
- mtl >=2.0.1.0 && <2.1,
- vcswrapper ==0.0.1,
- process >=1.0.1.5 && <1.1,
+ build-depends: MissingH >=1.1.0.3 && <1.3,
+ filepath >=1.2.0.0 && < 1.4,
+ base >=4.0.0.0 && <4.7,
+ directory >=1.1.0.0 && <1.3,
+ mtl >=2.0.1.0 && <2.2,
+ vcswrapper ==0.0.2,
+ process >=1.0.1.5 && <1.2,
gtk >=0.12.0 && <0.13
buildable: True
hs-source-dirs: src
@@ -80,14 +78,13 @@ executable vcsgui
executable vcsgui-askpass
main-is: Main.hs
- build-depends: MissingH >=1.1.0.3 && <1.2,
- filepath >=1.2.0.0 && < 1.3,
- base >=4.0.0.0 && <4.4,
- directory >=1.1.0.0 && <1.2,
- haskell98 >=1.1.0.1 && <1.2,
- mtl >=2.0.1.0 && <2.1,
- vcswrapper ==0.0.1,
- process >=1.0.1.5 && <1.1,
+ build-depends: MissingH >=1.1.0.3 && <1.3,
+ filepath >=1.2.0.0 && < 1.4,
+ base >=4.0.0.0 && <4.7,
+ directory >=1.1.0.0 && <1.3,
+ mtl >=2.0.1.0 && <2.2,
+ vcswrapper ==0.0.2,
+ process >=1.0.1.5 && <1.2,
gtk >=0.12.0 && <0.13
buildable: True
hs-source-dirs: src/exe/askpass src

No commit comments for this range

Something went wrong with that request. Please try again.