diff --git a/gui/hsudoku.ui b/gui/hsudoku.ui new file mode 100644 --- /dev/null +++ b/gui/hsudoku.ui @@ -0,0 +1,2968 @@ + + + + + + + inputPopover + False + box1 + False + + + True + False + vertical + + + True + False + + + 1 + inputPopover + True + True + True + True + True + + + 0 + 0 + + + + + 4 + inputPopover + True + True + True + True + True + + + 0 + 1 + + + + + 7 + inputPopover + True + True + True + True + True + + + 0 + 2 + + + + + 2 + inputPopover + True + True + True + True + True + + + 1 + 0 + + + + + 5 + inputPopover + True + True + True + True + True + + + 1 + 1 + + + + + 8 + inputPopover + True + True + True + True + True + + + 1 + 2 + + + + + 3 + inputPopover + True + True + True + True + True + + + 2 + 0 + + + + + 6 + inputPopover + True + True + True + True + True + + + 2 + 1 + + + + + 9 + inputPopover + True + True + True + True + True + + + 2 + 2 + + + + + False + True + 0 + + + + + Clear + True + True + True + + + False + True + 1 + + + + + Cheat + True + True + True + + + False + True + 2 + + + + + + + False + Hsudoku + center + icon.png + + + True + False + True + True + + + container + True + False + True + True + vertical + + + mainGrid + True + False + True + True + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell1 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell10 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell19 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell2 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell11 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell20 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell3 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell12 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell21 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 0 + 0 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell28 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell37 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell46 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell29 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell38 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell47 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell30 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell39 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell48 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 0 + 1 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell55 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell64 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell73 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell56 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell65 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell74 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell57 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell66 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell75 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 0 + 2 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell4 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell13 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell22 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell5 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell14 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell23 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell6 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell15 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell24 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 1 + 0 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell31 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell40 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell49 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell32 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell41 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell50 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell33 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell42 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell51 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 1 + 1 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell58 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell67 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell76 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell59 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell68 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell77 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell60 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + cell69 + True + False + True + True + vertical + + + + cell69 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell78 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 1 + 2 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell7 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell16 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell25 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell8 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell17 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell26 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell9 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell18 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell27 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 2 + 0 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell34 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell43 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell52 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell35 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell44 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell53 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell36 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell45 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell54 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 2 + 1 + + + + + True + False + True + True + + + True + False + True + True + vertical + + + + cell61 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + cell70 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 1 + + + + + True + False + True + True + vertical + + + + cell79 + True + True + True + True + True + none + + + False + True + 0 + + + + + 0 + 2 + + + + + True + False + True + True + vertical + + + + cell62 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 0 + + + + + True + False + True + True + vertical + + + + cell71 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 1 + + + + + True + False + True + True + vertical + + + + cell80 + True + True + True + True + True + none + + + False + True + 0 + + + + + 1 + 2 + + + + + True + False + True + True + vertical + + + + cell63 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + True + True + vertical + + + + cell72 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 1 + + + + + True + False + True + True + vertical + + + + cell81 + True + True + True + True + True + none + + + False + True + 0 + + + + + 2 + 2 + + + + + 2 + 2 + + + + + True + True + 0 + + + + + statusBar + True + False + 20 + True + True + + + Abort + True + True + True + + + 0 + 0 + + + + + Cheat + True + True + True + + + 1 + 0 + + + + + Check + True + True + True + + + 2 + 0 + + + + + False + True + 1 + + + + + -1 + + + + + menu + True + False + + + backdrop + True + False + True + True + vertical + + + + + + -1 + + + + + menu-text + True + False + True + True + vertical + + + title + True + False + λsudoku + + + False + True + 0 + + + + + copyright + True + False + © Marcel Moosbrugger, 2017 + + + + False + True + 1 + + + + + True + False + New game: + + + + False + True + 2 + + + + + True + False + True + False + 10 + 10 + True + True + + + Easy + True + True + True + True + + + 0 + 0 + + + + + Medium + True + True + True + + + 1 + 0 + + + + + Hard + True + True + True + + + 2 + 0 + + + + + Evil + True + True + True + + + 3 + 0 + + + + + False + True + 3 + + + + + + + + + + + + + diff --git a/gui/icon.png b/gui/icon.png new file mode 100644 Binary files /dev/null and b/gui/icon.png differ diff --git a/gui/theme.css b/gui/theme.css new file mode 100644 --- /dev/null +++ b/gui/theme.css @@ -0,0 +1,131 @@ +#mainWindow { + background: #ECF0F1; +} + +#container { + padding: 15px; +} + +#menu #backdrop { + background: #2C3E50; + opacity: 0.8; +} + +#menu #title { + font-size: 58px; + margin-top: 50px; + margin-bottom: 5px; + color: #E74C3C; + text-shadow: 0px 0px 5px #2C3E50; +} + +#menu .light { + color: #ECF0F1; + font-size: 10px; + margin-bottom: 10px; +} + +#menu #copyright { + margin-bottom: 125px; +} + +#menu #menu-text { + padding: 20px; +} + +#mainGrid { + border: 2px solid #999; +} + +#mainGrid > grid:nth-child(2n+1) { + background: #E1E5E5; +} + +#mainGrid > grid:nth-child(4), +#mainGrid > grid:nth-child(5), +#mainGrid > grid:nth-child(6) { + border-style: solid; + border-color: #999; + border-left-width: 2px; + border-right-width: 2px; +} + + +#mainGrid > grid:nth-child(2), +#mainGrid > grid:nth-child(5), +#mainGrid > grid:nth-child(8) { + border-style: solid; + border-color: #999; + border-top-width: 2px; + border-bottom-width: 2px; +} + +#mainGrid > grid > *:nth-child(4) , +#mainGrid > grid > *:nth-child(5) , +#mainGrid > grid > *:nth-child(6) { + border-style: solid; + border-color: #bbb; + border-left-width: 1px; + border-right-width: 1px; +} + +#mainGrid > grid > *:nth-child(2), +#mainGrid > grid > *:nth-child(5), +#mainGrid > grid > *:nth-child(8) { + border-style: solid; + border-color: #bbb; + border-top-width: 1px; + border-bottom-width: 1px; +} + +#mainGrid box label { + min-width: 60px; + min-height: 60px; + font-size: 18px; +} + +#mainGrid button { + border-radius: 0; + border: 0; + background: transparent; +} + +#mainGrid button:hover { + background: #3498DB; +} + +#mainGrid button:active { + background: #2980B9; +} + +#mainGrid button:focus { + background: #E74C3C; +} + +#mainGrid button.correct { + animation: correct 0.75s ease-out; +} + +#mainGrid button.incorrect { + animation: incorrect 0.75s ease-out; +} + +#inputPopover grid button { + min-width: 20px; + min-height: 20px; +} + +#statusBar { + padding-top: 15px; +} + + +@keyframes correct { + 0% {background-color: #6AE765;} + 100% {background-color: transparent;} +} + +@keyframes incorrect { + 0% {background-color: #E74C3C;} + 100% {background-color: transparent;} +} diff --git a/hsudoku.cabal b/hsudoku.cabal --- a/hsudoku.cabal +++ b/hsudoku.cabal @@ -1,5 +1,5 @@ name: hsudoku -version: 0.1.0.0 +version: 0.1.0.1 synopsis: Sudoku game with a GTK3 interface description: This package realizes a graphical GTK3 sudoku game. Moreover it provides modules for loading and solving sudoku grids. @@ -13,7 +13,12 @@ bug-reports: https://github.com/marcelmoosbrugger/hsudoku/issues build-type: Simple cabal-version: >=1.10 +Tested-with: GHC == 8.0.2 +extra-source-files: gui/hsudoku.ui + gui/icon.png, + gui/theme.css + source-repository head type: git location: git@github.com:marcelmoosbrugger/hsudoku.git @@ -73,12 +78,42 @@ , hxt>=9.3 && <9.4 , haskell-gi-base>=0.20 && <0.21 , gi-gtk>=3.0 && <3.1 - , hspec>=2.4 && <2.5 + , hspec>=2.2 && <2.5 , QuickCheck>=2.9 && <2.10 , hsudoku other-modules: UtilSpec , UserInterfaceSpec + , Sudoku.TypeSpec + , Sudoku.SolverSpec + , Sudoku.LoaderSpec + , TestData + + default-language: Haskell2010 + default-extensions: OverloadedStrings, OverloadedLabels + +-- Travis does not support ubuntu 16.04 yet and therefore +-- GTK+ 3.20 cannot be installed. As the user interface +-- uses new features from GTK+ 3.20, these cannot be tested on travis +test-suite travis + type: exitcode-stdio-1.0 + ghc-options: -Wall + main-is: Travis.hs + hs-source-dirs: test + build-depends: base >=4.9 && <4.10 + , text >=1.2 && <1.3 + , bytestring>=0.10 && <0.11 + , http-client>=0.5 && <0.6 + , http-client-tls>= 0.3 && <0.4 + , HandsomeSoup>=0.4 && <0.5 + , hxt>=9.3 && <9.4 + , haskell-gi-base>=0.20 && <0.21 + , gi-gtk>=3.0 && <3.1 + , hspec>=2.2 && <2.5 + , QuickCheck>=2.9 && <2.10 + , hsudoku + + other-modules: UtilSpec , Sudoku.TypeSpec , Sudoku.SolverSpec , Sudoku.LoaderSpec diff --git a/test/Travis.hs b/test/Travis.hs new file mode 100644 --- /dev/null +++ b/test/Travis.hs @@ -0,0 +1,20 @@ +-- Travis does not support ubuntu 16.04 yet and therefore +-- GTK+ 3.20 cannot be installed. As the user interface +-- uses new features from GTK+ 3.20, these cannot be tested on travis +import Test.Hspec + +import qualified Sudoku.LoaderSpec +import qualified Sudoku.SolverSpec +import qualified Sudoku.TypeSpec +import qualified UtilSpec + +main :: IO () +main = hspec spec + +spec :: Spec +spec = do + describe "UtilSpec" UtilSpec.spec + describe "Sudoku.LoaderSpec" Sudoku.LoaderSpec.spec + describe "Sudoku.SolverSpec" Sudoku.SolverSpec.spec + describe "Sudoku.TypeSpec" Sudoku.TypeSpec.spec +