Skip to content

Commit

Permalink
Updates to version 6.0.1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
lettier committed Aug 25, 2020
1 parent 6dbdf34 commit 89237f7
Show file tree
Hide file tree
Showing 16 changed files with 323 additions and 172 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

## Changelog

### 6.0.1.0

#### Added

- GUI
- Loads a file if passed during opening

#### Changed

- GUI
- Reloads the file when reopening the current file
- Adjusts window size to screen size

#### Removed

-

### 6.0.0.0

#### Added
Expand Down
31 changes: 17 additions & 14 deletions Gifcurry.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Gifcurry
version: 6.0.0.0
version: 6.0.1.0
synopsis: GIF creation utility.
description: The open-source, Haskell-built video editor for GIF makers.
homepage: https://github.com/lettier/gifcurry
Expand Down Expand Up @@ -143,31 +143,34 @@ library
executable gifcurry_gui
main-is: Main.hs
build-depends: base == 4.11.*
, haskell-gi == 0.22.6
, haskell-gi-base == 0.22.2
, gi-gobject == 2.0.21
, gi-gio == 2.0.24
, gi-glib == 2.0.22
, gi-pango == 1.0.21
, gi-gdk == 3.0.21
, gi-gdkpixbuf == 2.0.22
, gi-gtk == 3.0.31
, gi-cairo == 1.0.22
, gi-gstbase == 1.0.21
, gi-gst == 1.0.21
, gi-gstvideo == 1.0.21
, haskell-gi == 0.23.0
, haskell-gi-base == 0.23.0
, gi-gobject == 2.0.22
, gi-gio == 2.0.25
, gi-glib == 2.0.23
, gi-pango == 1.0.22
, gi-gdk == 3.0.22
, gi-gdkpixbuf == 2.0.23
, gi-gtk == 3.0.32
, gi-cairo == 1.0.23
, gi-gstbase == 1.0.22
, gi-gst == 1.0.22
, gi-gstvideo == 1.0.22
, cairo == 0.13.*
, pango == 0.13.*
, process >= 1.6.2.0
, temporary >= 1.2 && < 1.3
, directory == 1.3.*
, text == 1.2.*
, time == 1.8.0.2
, filepath == 1.4.*
, filemanip == 0.3.6.*
, transformers == 0.5.*
, pureMD5 == 2.1.*
, bytestring == 0.10.*
, yaml == 0.8.26.*
, system-filepath == 0.4.14
, system-fileio == 0.3.16.4
other-modules: Paths_Gifcurry
, GuiRecords
, GuiCapabilities
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ gifcurry_cli \
          ▀▀▀▀▀▀▀                                                                             
Gifcurry 6.0.0.0
Gifcurry 6.0.1.0
(C) 2016 David Lettier
lettier.com
Expand Down Expand Up @@ -252,23 +252,23 @@ To find the latest version of Gifcurry, head over to the
### I use Linux. :penguin:

If you use Linux then the easiest way to grab a copy of Gifcurry is by downloading the
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-6.0.0.0-x86_64.AppImage).
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-6.0.1.0-x86_64.AppImage).
After you download the
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-6.0.0.0-x86_64.AppImage),
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-6.0.1.0-x86_64.AppImage),
right click on it, select permissions, and check the box near execute.
With that out of the way—you're all set—just double click on the AppImage
and the GUI will fire right up.

You can also download and install the
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-6.0.0.0-x86_64.AppImage)
[AppImage](https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-6.0.1.0-x86_64.AppImage)
using the handy
[AppImage install script](https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/app-image/gifcurry-app-image-install.sh)
(right click and save link as).
Download the script, right click on it, select permissions, check the box near execute, and double click on it.
You should now see Gifcurry listed alongside your other installed programs.

If you want the CLI then download the
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-linux-6.0.0.0.tar.gz)
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-linux-6.0.1.0.tar.gz)
for Linux, extract it, open up your terminal,
`cd` to the bin folder, and then run `gifcurry_cli -?`.
As an added bonus, inside the bin directory is the GUI version
Expand Down Expand Up @@ -312,7 +312,7 @@ The
[Gifcurry snap](https://snapcraft.io/gifcurry)
only comes with the GUI.
If you want the CLI, download the
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-linux-6.0.0.0.tar.gz)
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-linux-6.0.1.0.tar.gz)
for Linux.

### I use Mac. :apple:
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ <h2 class="">
<a href="https://www.imagemagick.org/script/download.php">ImageMagick</a>.
<p>
Linux users can download the
<a href="https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-6.0.0.0-x86_64.AppImage">AppImage</a> or
the <a href="https://github.com/lettier/gifcurry/releases/download/6.0.0.0/gifcurry-linux-6.0.0.0.tar.gz">prebuilt binaries</a>.
<a href="https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-6.0.1.0-x86_64.AppImage">AppImage</a> or
the <a href="https://github.com/lettier/gifcurry/releases/download/6.0.1.0/gifcurry-linux-6.0.1.0.tar.gz">prebuilt binaries</a>.
If you'd rather install it, you can do so via
<a href="https://aur.archlinux.org/packages/gifcurry/">pacman</a> (Arch)
or
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.RECIPEPREFIX != ps

_GIFCURRY_VERSION="6.0.0.0"
_GIFCURRY_VERSION="6.0.1.0"
_STACK=stack --allow-different-user
_GHC_VERSION=`$(_STACK) ghc -- --version | sed 's|The Glorious Glasgow Haskell Compilation System, version ||g'`
_STACK_PATH_LOCAL_BIN=`$(_STACK) path --local-bin`
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/app-image/gifcurry-app-image-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# (C) 2017 David Lettier
# lettier.com

GIFCURRY_VERSION="6.0.0.0"
GIFCURRY_VERSION="6.0.1.0"
GIFCURRY_RELEASES_DOWNLOAD="https://github.com/lettier/gifcurry/releases/download/$GIFCURRY_VERSION"
GIFCURRY_PACKAGING_LINUX_COMMON="https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/common"
GIFCURRY_APP_IMAGE="gifcurry-$GIFCURRY_VERSION-x86_64.AppImage"
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/arch-aur/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Lettier <gifcurry_aur a@@at@t lettier dd.ot..t ccommm>

_name=gifcurry
_ver=6.0.0.0
_ver=6.0.1.0
_xrev=0

pkgname=${_name}
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: gifcurry
version: '6.0.0.0'
version: '6.0.1.0'
summary: The open-source, Haskell-built video editor for GIF makers.
type: app
description: |
Expand Down
4 changes: 2 additions & 2 deletions src/data/gui.glade
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ Author: David Lettier
<property name="can_focus">False</property>
<property name="title">Gifcurry </property>
<property name="window_position">mouse</property>
<property name="default_width">1100</property>
<property name="default_width">1000</property>
<property name="icon">gifcurry-icon.svg</property>
<property name="gravity">center</property>
<child type="titlebar">
Expand Down Expand Up @@ -1587,7 +1587,7 @@ Gifcurry was created by me, David Lettier. For more information visit &lt;a href
&lt;/span&gt;
&lt;big&gt;&lt;big&gt;&lt;b&gt;VERSION&lt;/b&gt;&lt;/big&gt;&lt;/big&gt;
&lt;span font-size="large"&gt;
6.0.0.0
6.0.1.0
&lt;/span&gt;
&lt;big&gt;&lt;big&gt;&lt;b&gt;KEYS&lt;/b&gt;&lt;/big&gt;&lt;/big&gt;
&lt;span font-size="large"&gt;
Expand Down
24 changes: 24 additions & 0 deletions src/gui/GuiMisc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ import System.Process
import System.Directory
import Control.Exception
import Control.Monad
import Filesystem
import Filesystem.Path.CurrentOS
import Text.Read
import Data.Int
import Data.Word
import Data.Maybe
import Data.Char
import Data.Text
import Data.Time
import Data.List
import Data.GI.Base.Overloading
import qualified GI.Gtk
Expand Down Expand Up @@ -242,3 +245,24 @@ toggleToggleButtonLabel
toggleClass
toggleButton
"gifcurry-font-weight-bold"

getEpochTimestamp
:: IO Int
getEpochTimestamp
=
read . formatTime defaultTimeLocale "%s" <$> getCurrentTime

toAbsoluteUri
:: String
-> IO String
toAbsoluteUri
uri
= do
cwd <- getWorkingDirectory
let cwd' =
case toText cwd of
Right x -> x
Left y -> y
if isRelative uri
then return $ normalise $ combine (Data.Text.unpack cwd') uri
else return uri
Loading

0 comments on commit 89237f7

Please sign in to comment.