Updates to version 0.0.6.1

lettier · Jun 18, 2018 · d1f5877 · d1f5877
1 parent 82d068e
commit d1f5877
Show file tree

Hide file tree

Showing 47 changed files with 3,484 additions and 2,454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,27 @@
 
 -------------------------------------------------------------------------------
 
+### 0.0.6.1
+
+#### Added
+
+- Styling to the about/info dialog
+- System capabilities check
+- UI feedback based on system capabilities
+
+#### Changed
+
+- Info dialog logo
+- File chooser dialog button styling
+- Glade file ID names
+- Shows top controls box on application reset
+
+#### Removed
+
+-
+
+-------------------------------------------------------------------------------
+
 ### 0.0.6.0
 
 #### Added
@@ -147,7 +168,7 @@
 
 #### Added
 
-- Fullscreen mode
+- Full Screen mode
 
 #### Changed
 

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ![Movie Monad](https://i.imgur.com/gdsyIMv.png)
 
-# Movie Monad? Another video player? Really?
+## Is Movie Monad the free video player I've been looking for?
 
-Yes really.  
+Yes.  
 
 Movie Monad is a free and simple to use video player made with Haskell.
 Originally it was a proof of concept to add video playback to
@@ -11,16 +11,16 @@ Nowadays it's a lightweight yet mighty media player used all over the
 [world](https://snapcraft.io/movie-monad#js-snap-map)
 everyday.
 
-Movie Monad is cross platform so you'll never have to compute without it.
-You can play files on your computer or stream videos from the web.
+Movie Monad is cross platform so you'll never have to watch without it.
+Stream videos from the web or play the files stored on your computer.
 Play, pause, seek, repeat, resize, expand, and turn it up—Movie Monad gets out of
 the way so you can watch the videos you love.
 
 So put down your copy of mpv, VLC, or Elmedia and try out Movie Monad—it's FREE!
 
 ## What does Movie Monad look like?
 
-![Movie Monad](https://i.imgur.com/asASjzn.gif)
+![Movie Monad](https://i.imgur.com/1qEidnX.gif)
 
 ## What can I do with Movie Monad?
 
@@ -38,8 +38,8 @@ So put down your copy of mpv, VLC, or Elmedia and try out Movie Monad—it's FRE
 * You can resize the video to a custom size by resizing the window.
     * Movie Monad will responsively adjust the video size to fill the window.
 * You can play videos from the command line.
-    * `movie-monad ./path/to/video/file.mp4`
-    * `movie-monad http://www.domain.tld/path/to/video/file.mp4`
+    * `movie-monad ./path/to/video/file.webm`
+    * `movie-monad http://www.domain.tld/path/to/video/file.webm`
 
 ## What are the keyboard controls?
 
@@ -76,15 +76,15 @@ To find the latest version of Movie Monad, head over to the
 ### I use Linux.
 
 If you use Linux then the easiest way to grab a copy of Movie Monad is by downloading the
-[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.0/movie-monad-0.0.6.0-x86_64.AppImage).
+[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.1/movie-monad-0.0.6.1-x86_64.AppImage).
 After you download the
-[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.0/movie-monad-0.0.6.0-x86_64.AppImage),
+[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.1/movie-monad-0.0.6.1-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 Movie Monad will pop up.
 
 You can also download and install the
-[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.0/movie-monad-0.0.6.0-x86_64.AppImage)
+[AppImage](https://github.com/lettier/movie-monad/releases/download/0.0.6.1/movie-monad-0.0.6.1-x86_64.AppImage)
 using the handy
 [AppImage install script](https://raw.githubusercontent.com/lettier/movie-monad/master/packaging/linux/app-image/movie-monad-install-app-image-script.sh)
 (right click the link and select "Save link as...").
@@ -97,14 +97,12 @@ If you'd rather install Movie Monad via `pacman` then copy the following into yo
 
 ```bash
 cd "$HOME/Downloads"
-sudo pacman -S git
-mkdir -p build-movie-monad
-cd build-movie-monad
+sudo pacman -S git gstreamer gst-plugins-base-libs gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
 git clone https://aur.archlinux.org/movie-monad.git
 cd movie-monad
 makepkg -sic
 cd "$HOME/Downloads"
-rm -rf build-movie-monad
+rm -rf movie-monad
 cd
 movie-monad
 ```
@@ -158,6 +156,7 @@ stack exec -- movie-monad
 
 * [GTK+ >= 3.10](https://www.gtk.org/download/index.php)
 * [GStreamer >= 1.0](https://gstreamer.freedesktop.org/download/)
+    * [GStreamer Base Plug-ins](https://gstreamer.freedesktop.org/modules/gst-plugins-base.html)
     * [GStreamer Good Plug-ins](https://gstreamer.freedesktop.org/modules/gst-plugins-good.html)
     * [GStreamer Bad Plug-ins >= 1.8](https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html)
 

diff --git a/docs/movie-monad.png b/docs/movie-monad.png
diff --git a/docs/screenshot.jpg b/docs/screenshot.jpg
diff --git a/docs/style.css b/docs/style.css
@@ -35,8 +35,8 @@ article a, article a:hover, article a:visited {
 }
 
 .header-image {
-  width: 75%;
-  margin-left: 12.5%;
+  width: 65%;
+  margin-left: 17.5%;
   margin-right: auto;
   box-shadow: 0px 100px 200px -20px rgba(10, 10, 10, 0.5);
 }

diff --git a/makefile b/makefile
@@ -54,15 +54,15 @@ cabal_install: cabal_build
 
 applications_desktop:
   mkdir -p $(_APPLICATIONS_DESKTOP_DIR) && \
-  cp $(_PACKAGING_LINUX_COMMON_DIR)/$(_NAME).desktop $(_APPLICATIONS_DESKTOP_DIR)/
+  cp "$(_PACKAGING_LINUX_COMMON_DIR)/com.lettier.$(_NAME).desktop" $(_APPLICATIONS_DESKTOP_DIR)/
 
 icons_hicolor_scalable_apps:
   mkdir -p $(_ICONS_HICOLOR_SCALABLE_APPS_DIR) && \
-  cp $(_PACKAGING_LINUX_COMMON_DIR)/$(_NAME)-icon.svg $(_ICONS_HICOLOR_SCALABLE_APPS_DIR)/
+  cp "$(_PACKAGING_LINUX_COMMON_DIR)/com.lettier.$(_NAME).svg" $(_ICONS_HICOLOR_SCALABLE_APPS_DIR)/
 
 appdata:
   mkdir -p $(_APPDATA_DIR) && \
-  cp $(_PACKAGING_LINUX_COMMON_DIR)/$(_NAME).appdata.xml $(_APPDATA_DIR)/
+  cp "$(_PACKAGING_LINUX_COMMON_DIR)/com.lettier.$(_NAME).appdata.xml" $(_APPDATA_DIR)/
 
 install: cabal_install appdata applications_desktop icons_hicolor_scalable_apps
 

diff --git a/movie-monad.cabal b/movie-monad.cabal
@@ -1,5 +1,5 @@
 name:                 movie-monad
-version:              0.0.6.0
+version:              0.0.6.1
 synopsis:             Plays videos using GStreamer and GTK+.
 description:          A free and simple to use video player made with Haskell.
 homepage:             https://github.com/lettier/movie-monad
@@ -26,13 +26,14 @@ extra-source-files:     README.md
                       , ./src/data/style-3-20.css
                       , ./src/data/movie-monad-logo.svg
                       , ./src/data/movie-monad-icon.svg
-                      , ./src/data/about-icon.svg
+                      , ./src/data/info-dialog-button-icon.svg
                       , ./src/data/play-icon.svg
                       , ./src/data/pause-icon.svg
                       , ./src/data/repeat-icon.svg
-                      , ./src/data/fullscreen-icon.svg
+                      , ./src/data/full-screen-icon.svg
                       , ./src/Records.hs
                       , ./src/Constants.hs
+                      , ./src/Capabilities.hs
                       , ./src/Reset.hs
                       , ./src/Window.hs
                       , ./src/CommandLine.hs
@@ -44,9 +45,9 @@ extra-source-files:     README.md
                       , ./src/WindowWidthSelector.hs
                       , ./src/VideoSpeedSelector.hs
                       , ./src/SubtitleSelector.hs
-                      , ./src/Fullscreen.hs
+                      , ./src/FullScreen.hs
                       , ./src/ErrorMessage.hs
-                      , ./src/About.hs
+                      , ./src/InfoDialog.hs
                       , ./src/VideoInfo.hs
                       , ./src/Playbin.hs
                       , ./src/Uri.hs
@@ -62,11 +63,11 @@ data-files:             data/gui.glade
                       , data/style-3-20.css
                       , data/movie-monad-logo.svg
                       , data/movie-monad-icon.svg
-                      , data/about-icon.svg
+                      , data/info-dialog-button-icon.svg
                       , data/play-icon.svg
                       , data/pause-icon.svg
                       , data/repeat-icon.svg
-                      , data/fullscreen-icon.svg
+                      , data/full-screen-icon.svg
 data-dir:             ./src/
 
 source-repository     head
@@ -99,6 +100,7 @@ executable            movie-monad
   other-modules:        Paths_movie_monad
                       , Records
                       , Constants
+                      , Capabilities
                       , Reset
                       , Window
                       , CommandLine
@@ -110,9 +112,9 @@ executable            movie-monad
                       , WindowWidthSelector
                       , VideoSpeedSelector
                       , SubtitleSelector
-                      , Fullscreen
+                      , FullScreen
                       , ErrorMessage
-                      , About
+                      , InfoDialog
                       , VideoInfo
                       , Uri
                       , Playbin

diff --git a/packaging/linux/app-image/movie-monad-install-app-image-script.sh b/packaging/linux/app-image/movie-monad-install-app-image-script.sh
@@ -3,12 +3,12 @@
 # (C) 2017 David Lettier
 # lettier.com
 
-_MOVIE_MONAD_VERSION="0.0.6.0"
+_MOVIE_MONAD_VERSION="0.0.6.1"
 _MOVIE_MONAD_RELEASES_DOWNLOAD="https://github.com/lettier/movie-monad/releases/download/$_MOVIE_MONAD_VERSION"
 _MOVIE_MONAD_PACKAGING_LINUX_COMMON="https://raw.githubusercontent.com/lettier/movie-monad/master/packaging/linux/common"
 _MOVIE_MONAD_APP_IMAGE="movie-monad-$_MOVIE_MONAD_VERSION-x86_64.AppImage"
-_MOVIE_MONAD_DESKTOP="movie-monad.desktop"
-_MOVIE_MONAD_ICON="movie-monad-icon.svg"
+_MOVIE_MONAD_DESKTOP="com.lettier.movie-monad.desktop"
+_MOVIE_MONAD_ICON="com.lettier.movie-monad.svg"
 
 echo -e "Installing Movie Monad...\n"
 

diff --git a/packaging/linux/app-image/movie-monad-package-as-app-image-script.sh b/packaging/linux/app-image/movie-monad-package-as-app-image-script.sh
@@ -4,7 +4,7 @@
 # lettier.com
 
 _NAME="movie-monad"
-_VER="0.0.6.0"
+_VER="0.0.6.1"
 _SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"`
 _APP_IMAGE_NAME="$_NAME-$_VER-x86_64.AppImage"
 _APP_IMAGE_PATH="$_SCRIPT_DIR/$_APP_IMAGE_NAME"

diff --git a/packaging/linux/arch-aur/PKGBUILD b/packaging/linux/arch-aur/PKGBUILD
@@ -0,0 +1,29 @@
+_name="movie-monad"
+_ver="0.0.6.1"
+_xrev="0"
+
+pkgname="${_name}"
+pkgver="${_ver}_${_xrev}"
+pkgrel=1
+pkgdesc="A free and simple to use video player made with Haskell."
+url="https://github.com/lettier/${_name}"
+license=("BSD3")
+arch=("x86_64")
+makedepends=()
+depends=("gtk3" "gstreamer" "gst-plugins-base-libs" "gst-plugins-base" "gst-plugins-good")
+options=()
+source=("https://www.github.com/lettier/${_name}/releases/download/${_ver}/${_name}-linux-${_ver}.tar.gz")
+sha256sums=("")
+
+package() {
+  cd "${srcdir}/${_name}-linux-${_ver}"
+  mkdir -p \
+    "${pkgdir}/opt/${_name}-linux-${_ver}/" \
+    "${pkgdir}/usr/bin/" \
+    "${pkgdir}/usr/share/applications/" \
+    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/"
+  cp -RP . "${pkgdir}/opt/${_name}-linux-${_ver}/"
+  cp "./share/applications/com.lettier.${_name}.desktop" "${pkgdir}/usr/share/applications/"
+  cp "./share/icons/hicolor/scalable/apps/com.lettier.${_name}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/"
+  ln -s "/opt/${_name}-linux-${_ver}/bin/${_name}" "${pkgdir}/usr/bin/${_name}"
+}
diff --git a/packaging/linux/common/com.lettier.movie-monad.appdata.xml b/packaging/linux/common/com.lettier.movie-monad.appdata.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 David Lettier -->
+<component type="desktop-application">
+  <id>com.lettier.movie-monad.desktop</id>
+  <metadata_license>CC-BY-SA-3.0</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+  <name>Movie Monad</name>
+  <summary>A Free and Simple to use Video Player made with Haskell</summary>
+  <description>
+    <p>
+      Movie Monad is a free and simple to use video player made with Haskell.
+      You can play files on your computer or stream videos from the web.
+      Movie Monad gets out of the way so you can watch the videos you love.
+      Try it out.
+    </p>
+  </description>
+  <launchable type="desktop-id">com.lettier.movie-monad.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <caption>The main Movie Monad window</caption>
+      <image type="source" width="1024" height="780">https://i.imgur.com/vaXFxS0.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://github.com/lettier/movie-monad</url>
+  <provides>
+    <binary>movie-monad</binary>
+  </provides>
+  <developer_name>David Lettier</developer_name>
+  <categories>
+    <category>AudioVideo</category>
+    <category>Audio</category>
+    <category>Video</category>
+  </categories>
+  <keywords>
+    <keyword>Audio</keyword>
+    <keyword>Video</keyword>
+    <keyword>Player</keyword>
+    <keyword>Multimedia</keyword>
+    <keyword>Haskell</keyword>
+  </keywords>
+  <releases>
+    <release version="0.0.6.1" date="2018-04-30">
+      <description>
+        <p>
+          Additions, changes, and removals:
+          <ul>
+            <li>Styles the info dialog</li>
+            <li>Shows the top controls box when resetting the application</li>
+            <li>Alerts the user about missing capabilities</li>
+          </ul>
+        </p>
+      </description>
+    </release>
+  </releases>
+</component>
diff --git a/packaging/linux/common/movie-monad.desktop → ...ux/common/com.lettier.movie-monad.desktop b/packaging/linux/common/movie-monad.desktop → ...ux/common/com.lettier.movie-monad.desktop
@@ -4,6 +4,6 @@ Name=Movie Monad
 GenericName=Video Player
 Categories=AudioVideo;Audio;Video;Player;
 Comment=Play Videos
-Icon=movie-monad-icon
+Icon=com.lettier.movie-monad
 Terminal=false
 Exec=movie-monad
diff --git a/packaging/linux/common/movie-monad-icon.svg → .../linux/common/com.lettier.movie-monad.svg b/packaging/linux/common/movie-monad-icon.svg → .../linux/common/com.lettier.movie-monad.svg
diff --git a/packaging/linux/common/movie-monad.appdata.xml b/packaging/linux/common/movie-monad.appdata.xml
diff --git a/.../from-source/build-module-dependencies.sh → ...inux/flatpak/build-module-dependencies.sh b/.../from-source/build-module-dependencies.sh → ...inux/flatpak/build-module-dependencies.sh