Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge gui branch into master #9

Merged
merged 26 commits into from Aug 9, 2020
Merged

Merge gui branch into master #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d267937
Add GUI skeleton based on gi-gtk-declarative.
rgleichman Jun 11, 2020
2c5796c
Add GUI skeleton based on gi-gtk-declarative.
rgleichman Jun 11, 2020
1779176
Merge branch 'gui' of github.com:rgleichman/glance into gui
rgleichman Jun 13, 2020
d0a1a59
Update stackage and add diagrams-gtk dependency.
rgleichman Jun 21, 2020
1398388
Revert "Update stackage and add diagrams-gtk dependency."
rgleichman Jun 21, 2020
826a845
GUI mouse experiment.
rgleichman Jun 22, 2020
c278d9a
Add Drag.hs.
rgleichman Jun 28, 2020
9a859fc
Use motionNotifyEvent on the Layout for Drag.hs.
rgleichman Jun 29, 2020
e6faa23
In the GUI, Nodes are created by right clicking. Nodes can can be mov…
rgleichman Jul 3, 2020
d02e376
Add Cairo example from haskell-gi.
rgleichman Jul 5, 2020
26d18e0
Add Cairo drawing to Drag.hs. Make GtkPerfTest to demonstrate Gtk per…
rgleichman Jul 12, 2020
a4a7e6d
Add ListBox of InBtn, MoveBtn & OutBtn
pel-daniel Jul 12, 2020
59ee011
Put code in gui/Main.hs. Use Cairo for graphics.
rgleichman Jul 19, 2020
49964e0
Draw node with Cairo (#6)
pel-daniel Jul 19, 2020
50d9c2e
Add FPS counter.
rgleichman Aug 2, 2020
4a6d95a
Print elementId when left clicked (#7)
pel-daniel Aug 2, 2020
a412fec
Add comment that z is unused and fix warning.
rgleichman Aug 9, 2020
523aab0
Move findElementsByPosition
rgleichman Aug 9, 2020
8fcd96a
Add dummy updateState function.
rgleichman Aug 9, 2020
cabc258
Rename state IO ref to stateRef.
rgleichman Aug 9, 2020
d74a40f
Move the _asMovingNode to the mouse position.
rgleichman Aug 9, 2020
1faf77d
Fix hlint warnings.
rgleichman Aug 9, 2020
5a0e602
Drag node at the middle
pel-daniel Aug 9, 2020
6452458
Toggle _asMovingNode when clicked
pel-daniel Aug 9, 2020
ea67d5a
Extract mousePosition & time from appState
pel-daniel Aug 9, 2020
6194cb9
Extract timeoutCallback function
pel-daniel Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ sudo apt install graphviz

Then build and execute glance:
```
stack build
stack build :glance-exe
stack exec glance-exe -- examples/fact.hs images/fact.svg 500
```
To see the command line options run
Expand Down
28 changes: 27 additions & 1 deletion glance.cabal
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ license: Apache-2.0
license-file: LICENSE
author: Robbie Gleichman
maintainer: rgleichman@gmail.com
copyright: 2018 Robbie Gleichman
copyright: 2020 Robbie Gleichman
category: Visual Programming
build-type: Simple
-- extra-source-files:
Expand Down Expand Up @@ -57,6 +57,32 @@ executable glance-exe
, SimplifySyntax
, Constants

executable glance-gui
hs-source-dirs: gui
main-is: Main.hs
ghc-options: -threaded -rtsopts -with-rtsopts=-N
-Wall
-Wincomplete-record-updates
-Wmissing-export-lists
-Widentities
-Wpartial-fields
build-depends: base
, gi-glib
, gi-gtk
, gi-gdk
, gi-cairo
, gi-gdkpixbuf
, cairo
, haskell-gi-base
, gi-gio
, text
, transformers
, old-time
, containers
, time
default-language: Haskell2010
Other-modules:

test-suite glance-test
type: exitcode-stdio-1.0
hs-source-dirs: test, app
Expand Down