diff --git a/.gitignore b/.gitignore index 67bba59..9b9b20a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,10 @@ *.stack* .upload_docs_to_hackage dist/* -docs/* +haddock/* cabal.sandbox.config *gui.glade~ *~ Gifcurry-*-docs* -!docs/.gitkeep +!haddock/.gitkeep diff --git a/README.md b/README.md index 68d2e1f..f386878 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Is Gifcurry another Electron app? No way! Gifcurry is 100% #electronfree. No need to download more RAM, Gifcurry is light as a feather. Run it all day, run it all year—you'll never notice. -I know what your thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong. +I know what your're thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong. Gifcurry hides all the goofy details so you can concentrate on what matters—the almighty GIF. Making GIFs with Gifcurry is fun so try it out! diff --git a/docs/favicon.ico b/docs/favicon.ico new file mode 100644 index 0000000..e9a20bc Binary files /dev/null and b/docs/favicon.ico differ diff --git a/docs/gifcurry-logo.svg b/docs/gifcurry-logo.svg new file mode 100644 index 0000000..1dd1fac --- /dev/null +++ b/docs/gifcurry-logo.svg @@ -0,0 +1,224 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/gifcurry-video.mp4 b/docs/gifcurry-video.mp4 new file mode 100644 index 0000000..19cb9f8 Binary files /dev/null and b/docs/gifcurry-video.mp4 differ diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 0000000..7ef32e1 --- /dev/null +++ b/docs/index.html @@ -0,0 +1,218 @@ + + + + + + Gifcurry - lettier.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + + + +
+
+
+ +
+
+
+ Your open source video to GIF maker built with Haskell. +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

+ What is Gifcurry? +

+
+
+
+
+
+

+ Gifcurry is an open-source, video-to-GIF maker. + It's built with Haskell and works on Linux, + Mac, and most likely Windows. + There is both a graphical and command line interface. +

+
+
+ +
+
+
+
+ +
+
+

+ What can Gifcurry do? +

+
+
+
+
+
+

+ Gifcurry takes your videos and makes them into GIFs. + You can crop, trim, seek, add text, pick a font, + alter the duration, change the size, set the quality, + and save your creation as a GIF or a video. +

+
+
+ +
+
+
+
+ +
+
+

+ Where can I download Gifcurry? +

+
+
+
+
+
+

+ Before you download Gifcurry, make sure your machine has + GTK+, + GStreamer, + FFMpeg, and + ImageMagick. +

+ Linux users can download the + AppImage or + the prebuilt binaries. + If you'd rather install it, you can do so via + pacman (Arch) + or + snap. + If you're really courageous, you can build it from + source. +

+

+ For Mac users, head over to the + read me page + and follow the instructions. Eventually those instructions will become a + Homebrew formula so installing Gifcurry on the Mac will be super easy. +

+

+ Gifcurry hasn't been tested on Windows yet but there's no reason it shouldn't work. + If you know how to build Haskell programs, go to the + read me page + and follow the instructions. + Please let me know if you get it to run. +

+
+
+ +
+
+
+
+ +
+
+

+ Where can I get help? +

+
+
+
+
+
+

+ Found a bug? + Need a feature? + Can't install it? + No worries. + Point your browser to the issues page. +

+
+
+ +
+
+
+
+
+
+
+
+
+

+ Copyright 2018 David Lettier +
+ lettier.com +

+
+
+
+
+ + diff --git a/docs/screenshot-clip-0.png b/docs/screenshot-clip-0.png new file mode 100644 index 0000000..7b20e27 Binary files /dev/null and b/docs/screenshot-clip-0.png differ diff --git a/docs/screenshot-clip-1.png b/docs/screenshot-clip-1.png new file mode 100644 index 0000000..3edceda Binary files /dev/null and b/docs/screenshot-clip-1.png differ diff --git a/docs/screenshot-clip-2.png b/docs/screenshot-clip-2.png new file mode 100644 index 0000000..6bb9b81 Binary files /dev/null and b/docs/screenshot-clip-2.png differ diff --git a/docs/screenshot-clip-3.png b/docs/screenshot-clip-3.png new file mode 100644 index 0000000..b288b83 Binary files /dev/null and b/docs/screenshot-clip-3.png differ diff --git a/docs/screenshot.png b/docs/screenshot.png new file mode 100644 index 0000000..0163829 Binary files /dev/null and b/docs/screenshot.png differ diff --git a/docs/style.css b/docs/style.css new file mode 100644 index 0000000..158fb9d --- /dev/null +++ b/docs/style.css @@ -0,0 +1,88 @@ +/* +Copyright 2018 David Lettier +lettier.com +*/ + +html, body { + background-color: #5294e2; + font-family: "Roboto", sans-serif; +} + +p { + margin-bottom: 20px; +} + +a, a:hover, a:visited { + color: white; + text-decoration: underline; +} + +div > p:first-child { + margin-top: 20px; +} + +.video-header { +} + +.video-container { + position: relative; + top: 0; + bottom: 0; + width :100%; +} + +.video { + position: relative; + z-index: 0; + width: 100%; + height: auto; +} + +.video-overlay { + position: absolute; + z-index: 2; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + height: 100%; + background-color: rgba(30, 62, 101, 0.83); +} + +.logo-wrapper { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + border: 0; +} + +.logo-wrapper td { + vertical-align: middle; + text-align: left; +} + +@media (max-width: 1023px) { + .logo { + padding-left: 10px; + padding-right: 10px; + } +} + +.height-100-percent { + height: 100%; +} + +.fi-border { + border-color: white; +} + +.border-left-white { + border-left: 2px solid white; +} + +.center-text-vertical { + display: flex; + align-items: center; +} diff --git a/docs/.gitkeep b/haddock/.gitkeep similarity index 100% rename from docs/.gitkeep rename to haddock/.gitkeep diff --git a/icon/icon-1.svg b/icon/icon-1-0.svg similarity index 100% rename from icon/icon-1.svg rename to icon/icon-1-0.svg diff --git a/icon/icon-1-1.svg b/icon/icon-1-1.svg new file mode 100644 index 0000000..8edb9c3 --- /dev/null +++ b/icon/icon-1-1.svg @@ -0,0 +1,184 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + (C) DAVID LETTIER + + diff --git a/icon/icon-1.png b/icon/icon-1.png deleted file mode 100644 index 36394e8..0000000 Binary files a/icon/icon-1.png and /dev/null differ diff --git a/icon/icon-1.xcf b/icon/icon-1.xcf deleted file mode 100644 index cf31870..0000000 Binary files a/icon/icon-1.xcf and /dev/null differ diff --git a/icon/icon-2.png b/icon/icon-2.png deleted file mode 100644 index ac353d7..0000000 Binary files a/icon/icon-2.png and /dev/null differ diff --git a/icon/icon-2.svg b/icon/icon-2.svg index 8edb9c3..5b1cbde 100644 --- a/icon/icon-2.svg +++ b/icon/icon-2.svg @@ -1,38 +1,20 @@ - - - - - - image/svg+xml - - - - - - + id="svg8" + sodipodi:docname="icon-3.svg" + inkscape:version="0.92.1 r"> - - - - - + inkscape:current-layer="svg8" /> + + + + + image/svg+xml + + + + + + transform="translate(-2.857145,-2.6012127)" + style="display:inline" + id="g4638"> - - - - - - - - + id="path4679" + d="M 31.59652,4.9971347 A 25.513393,25.513393 0 0 0 15.533936,11.126475 c 3.454616,4.79733 5.736982,9.58836 8.496639,23.93859 l 7.284826,-24.57937 0.451135,0.11162 0.02223,-0.11162 c 7.861179,1.46742 10.534349,4.71687 12.525849,13.20694 3.15251,13.38741 5.09705,18.65842 7.79436,22.62188 a 25.513393,25.513393 0 0 0 5.50095,-16.28997 l -5.3e-4,-0.031 A 25.513393,25.513393 0 0 0 31.59652,4.9971347 Z M 12.254549,14.474595 a 25.513393,25.513393 0 0 0 -5.662186,16.52767 25.513393,25.513393 0 0 0 25.997379,25.01191 25.513393,25.513393 0 0 0 16.268773,-6.304 c -3.38483,-4.74042 -5.64381,-9.58763 -8.370031,-23.76393 l -7.28431,24.57938 -0.451652,-0.11162 -0.02222,0.11162 c -7.861171,-1.46742 -10.534351,-4.71687 -12.52585,-13.20695 -3.212296,-13.64125 -5.171564,-18.85363 -7.949903,-22.84408 z m 22.52679,0.85214 -7.606255,23.40684 H 25.02638 c 0.8393,3.5098 2.013317,5.65789 4.711855,6.95152 l 7.605739,-23.40736 h 2.149221 c -0.839229,-3.50953 -2.013754,-5.65733 -4.711856,-6.951 z" + style="display:inline;opacity:1;fill:#1b59a2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" + inkscape:connector-curvature="0" /> + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke" + d="M 31.067353,4.9971347 A 25.513393,25.513393 0 0 0 15.004769,11.126475 c 3.454616,4.79733 5.736982,9.58836 8.496639,23.93859 l 7.284826,-24.57937 0.451135,0.11162 0.02223,-0.11162 c 7.861179,1.46742 10.534346,4.71687 12.525846,13.20694 3.15251,13.38741 5.09705,18.65842 7.79436,22.62188 a 25.513393,25.513393 0 0 0 5.50095,-16.28997 l -5.3e-4,-0.031 A 25.513393,25.513393 0 0 0 31.067353,4.9971347 Z M 11.725382,14.474595 a 25.513393,25.513393 0 0 0 -5.662186,16.52767 25.513393,25.513393 0 0 0 25.997379,25.01191 25.513393,25.513393 0 0 0 16.26877,-6.304 c -3.38483,-4.74042 -5.64381,-9.58763 -8.370028,-23.76393 l -7.28431,24.57938 -0.451652,-0.11162 -0.02222,0.11162 c -7.861171,-1.46742 -10.534351,-4.71687 -12.52585,-13.20695 -3.212296,-13.64125 -5.171564,-18.85363 -7.949903,-22.84408 z m 22.52679,0.85214 -7.606255,23.40684 h -2.148704 c 0.8393,3.5098 2.013317,5.65789 4.711855,6.95152 l 7.605739,-23.40736 h 2.149221 c -0.839229,-3.50953 -2.013754,-5.65733 -4.711856,-6.951 z" + id="path4648" + inkscape:connector-curvature="0" /> + + + Gifcurr + λ + Gifcurr + λ + λ + Gifcurr + + + style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1107.35998535;stroke-opacity:0" + d="M 23.810702,55.129827 C 17.778485,53.503104 9.0148866,48.566654 5.6981798,36.315722" + id="path4614" + inkscape:connector-curvature="0" /> (C) DAVID LETTIER + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#e8e8e8;fill-opacity:1;stroke:none;stroke-width:0.26458335px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="text4587" + transform="translate(-0.40960069,0.2054888)">© 2018 David Lettier diff --git a/logo/logo-0.png b/logo/logo-0.png deleted file mode 100644 index 7080be1..0000000 Binary files a/logo/logo-0.png and /dev/null differ diff --git a/logo/logo-1.png b/logo/logo-1.png deleted file mode 100644 index 374b333..0000000 Binary files a/logo/logo-1.png and /dev/null differ diff --git a/icon/icon-3.svg b/logo/logo-2-dark-theme.svg similarity index 54% rename from icon/icon-3.svg rename to logo/logo-2-dark-theme.svg index 5b1cbde..1c12957 100644 --- a/icon/icon-3.svg +++ b/logo/logo-2-dark-theme.svg @@ -8,15 +8,18 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="57mm" - height="57mm" - viewBox="0 0 57.000001 57" - version="1.1" id="svg8" - sodipodi:docname="icon-3.svg" - inkscape:version="0.92.1 r"> + version="1.1" + viewBox="0 0 190.297 54.21814" + height="54.21814mm" + width="190.297mm" + sodipodi:docname="logo-2-dark-theme.svg" + inkscape:version="0.92.1 r" + inkscape:export-filename="/home/lettier/github/gifcurry/logo/logo-2.png" + inkscape:export-xdpi="119.93034" + inkscape:export-ydpi="119.93034"> + inkscape:current-layer="svg8" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-bottom="1" + fit-margin-right="1" /> + transform="translate(-3.1131187,-3.9921436)"> + Gifcurr + λ + Gifcurr + λ + λ + Gifcurr - Gifcurr - λ - Gifcurr - λ - λ - Gifcurr - - + id="g4644" + transform="translate(-3.1131187,-3.9921436)"> + d="M 23.810702,55.129827 C 17.778485,53.503104 9.0148866,48.566654 5.6981798,36.315722" + style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1107.35998535;stroke-opacity:0" /> © 2018 David Lettier + dy="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0">© 2018 David Lettier diff --git a/logo/logo-2.png b/logo/logo-2.png deleted file mode 100644 index b832155..0000000 Binary files a/logo/logo-2.png and /dev/null differ diff --git a/makefile b/makefile index d8cb31c..dda69a6 100644 --- a/makefile +++ b/makefile @@ -70,8 +70,8 @@ build_docs: setup $(CABAL) haddock --hyperlink-source \ --html-location='http://hackage.haskell.org/package/Gifcurry/docs' \ --contents-location='http://hackage.haskell.org/package/Gifcurry' && \ - cp -R ./dist/doc/html/Gifcurry/ ./docs/Gifcurry-$(VERSION)-docs && \ - cd ./docs && \ + cp -R ./dist/doc/html/Gifcurry/ ./haddock/Gifcurry-$(VERSION)-docs && \ + cd ./haddock && \ tar --format=ustar -cvf ./Gifcurry-$(VERSION)-docs.tar Gifcurry-$(VERSION)-docs # Begin Arch Linux Specific