Merge pull request #123 from iabem97/development

Komorebi 2.1

.gitignore

@@ -0,0 +1 @@
+build

.travis.yml

@@ -9,7 +9,7 @@ before_install:
   - sudo add-apt-repository ppa:vala-team -y
   - sudo add-apt-repository ppa:gnome3-team/gnome3-staging -y
   - sudo apt update
-  - sudo apt install -y cmake valac libgtk-3-dev libgtop2-dev libgee-0.8-dev libclutter-gtk-1.0-dev libclutter-1.0-dev libclutter-gst-3.0-dev
+  - sudo apt install -y cmake valac libgtk-3-dev libgee-0.8-dev libclutter-gtk-1.0-dev libclutter-1.0-dev libclutter-gst-3.0-dev libwebkit2gtk-4.0-dev
 script:
   - mkdir build
   - cd build

CMakeLists.txt

@@ -5,13 +5,13 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 set (PKGDATADIR "${DATADIR}/komorebi")
 set (RELEASE_NAME "summit")
-set (VERSION "1.0")
+set (VERSION "2.1")
 set (VERSION_INFO "Release")
 set (ARCHIVE_NAME komorebi-${VERSION})
 
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED gtk+-3.0 libgtop-2.0 glib-2.0>=2.38 gee-0.8 clutter-gtk-1.0 clutter-1.0 clutter-gst-3.0)
+pkg_check_modules(DEPS REQUIRED gtk+-3.0 glib-2.0>=2.38 gee-0.8 webkit2gtk-4.0 clutter-gtk-1.0 clutter-1.0 clutter-gst-3.0)
 add_definitions(${DEPS_CFLAGS})
 
 link_directories(${DEPS_LIBRARY_DIRS})
@@ -29,7 +29,6 @@ vala_precompile(VALA_C
 
     src/OnScreen/BackgroundWindow.vala
     src/OnScreen/DateTimeBox.vala
-    src/OnScreen/InfoBox.vala
     src/OnScreen/DesktopIcons.vala
     src/OnScreen/ResponsiveGrid.vala
     src/OnScreen/Icon.vala
@@ -47,10 +46,10 @@ vala_precompile(VALA_C
 
 PACKAGES
     gtk+-3.0
-    glibtop
     gee-0.8
     clutter-gtk-1.0
     clutter-gst-3.0
+    webkit2gtk-4.0
 OPTIONS
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
    	--disable-warnings
@@ -66,9 +65,10 @@ vala_precompile(WALLPAPER_CREATOR
 
 
 PACKAGES
-    gtk+-3.0
     gee-0.8
+    gtk+-3.0
     gstreamer-1.0
+    webkit2gtk-4.0
 OPTIONS
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
     --disable-warnings
@@ -106,17 +106,17 @@ install(CODE "execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/data/Other/pos
 set(CPACK_GENERATOR "DEB")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Komorebi - An awesome desktop manager for Linux")
 set(CPACK_PACKAGE_VENDOR "")
-set(CPACK_PACKAGE_CONTACT "Abraham Masri <[email protected]>")
+set(CPACK_PACKAGE_CONTACT "Abraham Masri @cheesecakeufo")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_ICON screenshots/komorebi-icon.png)
 set(CPACK_PACKAGE_VERSION_MAJOR 2)
-set(CPACK_PACKAGE_VERSION_MINOR 0)
+set(CPACK_PACKAGE_VERSION_MINOR 1)
 set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Komorebi")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/data/Other/postinst;${CMAKE_CURRENT_SOURCE_DIR}/data/Other/postrm;")
 
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 (>= 3.14), libglib2.0-0 (>= 2.38), libgtop2-common, libgee-0.8-2, libclutter-gtk-1.0-0, libclutter-1.0-0, libclutter-gst-3.0-0")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 (>= 3.14), libglib2.0-0 (>= 2.38), libgee-0.8-2, libclutter-gtk-1.0-0, libclutter-1.0-0, libclutter-gst-3.0-0, libwebkit2gtk-4.0-37")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 set(CPACK_DEBIAN_PACKAGE_SECTION "system")
 

README.md

@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/iabem97/komorebi/master/screenshots/komorebi-icon.png" width="130"></p>
-<h2 align="center">Komorebi - Linux Desktop Manager</h2>
+<h2 align="center">Komorebi - Animated Wallpapers for Linux</h2>
 <p align="center">(n) sunlight filtering through trees.</p>
 
 
@@ -18,8 +18,8 @@ alt="Komorebi Demo" width="240" height="180" border="10" /><br>Watch demo</a>
 
 ## What is Komorebi?
 
-Komorebi is an awesome desktop manager for all Linux platforms.
-It provides fully customizeable image and video wallpapers that can be tweaked at any time!
+Komorebi is an awesome animated wallpapers manager for all Linux platforms.
+It provides fully customizeable image, video, and web page wallpapers that can be tweaked at any time!
 
 ![s1](https://raw.githubusercontent.com/iabem97/komorebi/master/screenshots/collage.jpg)
 
@@ -36,11 +36,17 @@ Two ways:
 
 ### Manual Installing (advanced)
 
-1. You need `libgtop2-dev, libgtk-3-dev, gtk+-3.0 libgtop-2.0 glib-2.0>=2.38 gee-0.8 libwnck-3.0 clutter-gtk-1.0 clutter-1.0 clutter-gst-3.0 cmake valac`
-1. `git clone https://github.com/iabem97/komorebi.git`
-2. `cd komorebi`
-3. `mkdir build && cd build`
-4. `cmake .. && sudo make install && ./komorebi`
+Run the following:
+```
+sudo add-apt-repository ppa:gnome3-team/gnome3 -y
+sudo add-apt-repository ppa:vala-team -y
+sudo add-apt-repository ppa:gnome3-team/gnome3-staging -y
+sudo apt install cmake valac libgtk-3-dev libgee-0.8-dev libclutter-gtk-1.0-dev libclutter-1.0-dev libwebkit2gtk-4.0-dev libclutter-gst-3.0-dev
+git clone https://github.com/iabem97/komorebi.git
+cd komorebi
+mkdir build && cd build
+cmake .. && sudo make install && ./komorebi
+```
 
 ## Change Wallpaper & Desktop Preferences
 To change desktop preferences or your wallpaper, right click anywhere on the desktop to show the menu.
@@ -53,7 +59,7 @@ Komorebi provides a simple tool to create your own wallpapers! Simply, open your
 
 ![s1](https://raw.githubusercontent.com/iabem97/komorebi/master/screenshots/wallpaper_creator.jpg)
 
-You can create either an image or a video wallpaper and you have many different options to customize your very own wallpaper!
+You can use either an image, a video, or a web page as a wallpaper and you have many different options to customize your very own wallpaper!
 
 ## Uninstall
 
@@ -68,11 +74,38 @@ You can create either an image or a video wallpaper and you have many different
 2. `cd komorebi/build`
 3. `sudo make uninstall`
 
-## Having issues?
+## Questions? Issues?
+
+### Komorebi is slow. What can I do about it?
+
+Komorebi includes support for video wallpapers that might slow your computer down. You can disable support for video wallpapers in 'Desktop Preferences' → uncheck 'Enable Video Wallpapers'.
+
+_note: you need to quit and re-open Komorebi after changing this option_
+
 
 ### After uninstalling, my desktop isn't working right (blank or no icons)
 
 The latest Komorebi should already have a fix for this issue. If you've already uninstalled Komorebi and would like to fix the issue, simply run this (in the Terminal):
 `curl -s https://raw.githubusercontent.com/iabem97/komorebi/master/data/Other/postrm | bash -s`
 
-If your issue is not listed above, please report it *[`here`](https://github.com/iabem97/komorebi/issues/new)* and I'll try my best to fix them.
+If your issue has not already been reported, please report it *[`here`](https://github.com/iabem97/komorebi/issues/new)* and I'll try my best to fix them.
+
+### Why does Komorebi install files in a macOS-like structure?
+
+Komorebi was originally intended to run on an unreleased OS project. Since many people already use Komorebi, an update could potentially break Komorebi and custom-made wallpapers.
+
+It is possible to change the file structure with code changes and a `postinst` script but I'd rather keep it as is for now or if you have the time to make one, feel free to do so and submit a PR!
+
+
+## Status of Development
+
+Komorebi still receives updates but they are not as frequent due to my involvement in other open-source projects.
+
+
+## Credits:
+
+Komorebi is made by Abraham Masri ([@cheesecakeufo](https://twitter.com/cheesecakeufo))
+
+### Thanks To:
+
+Pete Lewis ([@PJayB](https://github.com/PJayB)) for adding mult-monitor support

data/Other/postrm

@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "[INFO] Ignore any errors"
 echo "[*] Resetting desktop configuration"
-gsettings set org.gnome.desktop.background show-desktop-icons true
-gsettings set org.nemo.desktop show-desktop-icons true
+gsettings set org.gnome.desktop.background show-desktop-icons true || true
+gsettings set org.nemo.desktop show-desktop-icons true || true

data/Wallpapers/direction_to_time/config

@@ -0,0 +1,32 @@
+[Info]
+WallpaperType=image
+
+[DateTime]
+Visible=true
+Parallax=false
+MarginTop=40
+MarginRight=120
+MarginLeft=0
+MarginBottom=0
+RotationX=10
+RotationY=-55
+RotationZ=-14
+Position=center_right
+Alignment=start
+AlwaysOnTop=true
+Color=#edd400
+Alpha=255
+ShadowColor=red
+ShadowAlpha=255
+TimeFont=Lato Bold 120
+DateFont=Lato Medium 0
+
+[Wallpaper]
+Parallax=false
+
+[Asset]
+Visible=false
+AnimationMode=noanimation
+AnimationSpeed=100
+Width=0
+Height=0

data/Wallpapers/graffiti/config

@@ -0,0 +1,32 @@
+[Info]
+WallpaperType=image
+
+[DateTime]
+Visible=true
+Parallax=false
+MarginTop=30
+MarginRight=30
+MarginLeft=-20
+MarginBottom=0
+RotationX=0
+RotationY=0
+RotationZ=0
+Position=center
+Alignment=start
+AlwaysOnTop=false
+Color=#000000
+Alpha=255
+ShadowColor=#dd22dd22dd22
+ShadowAlpha=0
+TimeFont=Lato Light 100
+DateFont=Lato Light 60
+
+[Wallpaper]
+Parallax=false
+
+[Asset]
+Visible=true
+AnimationMode=noanimation
+AnimationSpeed=100
+Width=0
+Height=0

data/Wallpapers/icy_mountains/config

@@ -25,8 +25,10 @@ DateFont=Bubbler One 15
 Parallax=false
 
 [Asset]
-Visible=true
+Visible=false
 AnimationMode=noanimation
 AnimationSpeed=100
+
 Width=0
 Height=0
+

data/Wallpapers/sahara-day-and-night/config

@@ -0,0 +1,32 @@
+[Info]
+WallpaperType=image
+
+[DateTime]
+Visible=true
+Parallax=false
+MarginTop=0
+MarginRight=0
+MarginLeft=0
+MarginBottom=0
+RotationX=0
+RotationY=0
+RotationZ=0
+Position=center
+Alignment=center
+AlwaysOnTop=true
+Color=#dd22dd22dd22
+Alpha=120
+ShadowColor=#dd22dd22dd22
+ShadowAlpha=255
+TimeFont=Lato Light 100
+DateFont=Lato Light 20
+
+[Wallpaper]
+Parallax=false
+
+[Asset]
+Visible=true
+AnimationMode=light
+AnimationSpeed=200
+Width=0
+Height=0

data/Wallpapers/unsplash/config

@@ -0,0 +1,23 @@
+[Info]
+WallpaperType=web_page
+WebPageUrl=https://source.unsplash.com/random/{{screen_width}}x{{screen_height}}
+
+[DateTime]
+Visible=true
+Parallax=false
+MarginTop=0
+MarginRight=0
+MarginLeft=0
+MarginBottom=0
+RotationX=0
+RotationY=0
+RotationZ=0
+Position=center
+Alignment=center
+AlwaysOnTop=true
+Color=#ffffff
+Alpha=128
+ShadowColor=#dd22dd22dd22
+ShadowAlpha=255
+TimeFont=Lato Light 100
+DateFont=Lato Light 50

extra/wallpaper-creator/Main.vala

@@ -1,5 +1,5 @@
 //
-//  Copyright (C) 2016-2017 Abraham Masri
+//  Copyright (C) 2017-2018 Abraham Masri
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -22,9 +22,10 @@ namespace WallpaperCreator {
     string filePath;
     string assetPath;
     string thumbnailPath;
+    string webPageUrl;
 
     string wallpaperName;
-    string wallpaperType; // image/video 
+    string wallpaperType; // image/video/web_page
     bool wallpaperParallax;
 
     // Properties
@@ -58,7 +59,7 @@ namespace WallpaperCreator {
         print("Welcome to Komorebi Wallpaper Creator\n");
 
         if(args[1] == "--version" || args[1] == "version") {
-            print("Version: 1.0 - Summit\nCreated by: Abraham Masri @cheesecakefuo\n\n");
+            print("Version: 1.1 - Summit\nCreated by: Abraham Masri @cheesecakefuo\n\n");
             return;
         }
         Gtk.init (ref args);