Merge branch 'v1.17-dev'

.travis/cirp/install.sh

@@ -28,7 +28,7 @@ else
   python3 --version || true
   pyenv versions || true
 
-  pyenv global 3.6
+  pyenv global 3.7
 fi
 
 pip install --upgrade pip

CMakeLists.txt

@@ -526,9 +526,6 @@ set(${PROJECT_NAME}_SOURCES
   src/widget/splitterrestorer.h
   src/widget/style.cpp
   src/widget/style.h
-  src/widget/systemtrayicon.cpp
-  src/widget/systemtrayicon.h
-  src/widget/systemtrayicon_private.h
   src/widget/tool/activatedialog.cpp
   src/widget/tool/activatedialog.h
   src/widget/tool/adjustingscrollarea.cpp
@@ -628,59 +625,12 @@ if (NOT DEFINED ENABLE_STATUSNOTIFIER AND UNIX AND NOT APPLE)
   set(ENABLE_STATUSNOTIFIER True)
 endif()
 
-if(${ENABLE_STATUSNOTIFIER})
-  search_dependency(GDK_PIXBUF  PACKAGE gdk-pixbuf-2.0   OPTIONAL)
-  search_dependency(GLIB        PACKAGE glib-2.0         OPTIONAL)
-  search_dependency(GTK         PACKAGE gtk+-2.0         OPTIONAL)
-
-  if(GDK_PIXBUF_FOUND AND GLIB_FOUND AND GTK_FOUND)
-      set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
-        src/platform/statusnotifier/closures.c
-        src/platform/statusnotifier/closures.h
-        src/platform/statusnotifier/enums.c
-        src/platform/statusnotifier/enums.h
-        src/platform/statusnotifier/interfaces.h
-        src/platform/statusnotifier/statusnotifier.c
-        src/platform/statusnotifier/statusnotifier.h)
-      add_definitions(-DENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=1)
-  endif()
-endif()
-
 if(AVFOUNDATION_FOUND)
   set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
     src/platform/camera/avfoundation.mm
     src/platform/camera/avfoundation.h)
 endif()
 
-if (NOT DEFINED ENABLE_APPINDICATOR AND UNIX AND NOT APPLE)
-  set(ENABLE_APPINDICATOR False)
-endif()
-
-if(${ENABLE_APPINDICATOR})
-  search_dependency(APPINDICATOR PACKAGE appindicator-0.1)
-  search_dependency(GDK_PIXBUF   PACKAGE gdk-pixbuf-2.0)
-  search_dependency(GLIB         PACKAGE glib-2.0)
-  search_dependency(GTK          PACKAGE gtk+-2.0)
-
-  if(APPINDICATOR_FOUND)
-    add_definitions(-DENABLE_SYSTRAY_UNITY_BACKEND=1)
-  endif()
-endif()
-
-if (NOT DEFINED ENABLE_GTK_SYSTRAY AND UNIX AND NOT APPLE)
-  set(ENABLE_GTK_SYSTRAY True)
-endif()
-
-if(${ENABLE_GTK_SYSTRAY})
-  if(NOT GTK_FOUND)
-    search_dependency(GTK       PACKAGE gtk+-2.0         OPTIONAL)
-  endif()
-
-  if(GTK_FOUND)
-    add_definitions(-DENABLE_SYSTRAY_GTK_BACKEND=1)
-  endif()
-endif()
-
 if(${USE_FILTERAUDIO})
     search_dependency(FILTERAUDIO LIBRARY filteraudio HEADER filter_audio.h OPTIONAL)
     if(${FILTERAUDIO_FOUND})

INSTALL.md

@@ -87,36 +87,6 @@ of spell check).
 
 Disabled if dependencies are missing during compilation.
 
-#### KDE Status Notifier / GTK tray backend
-
-| Name        | Version |
-|-------------|---------|
-| [Atk]       | >= 2.14 |
-| [Cairo]     |         |
-| [GdkPixbuf] | >= 2.31 |
-| [GLib]      | >= 2.0  |
-| [GTK+]      | >= 2.0  |
-| [Pango]     | >= 1.18 |
-
-To disable: `-DENABLE_STATUSNOTIFIER=False -DENABLE_GTK_SYSTRAY=False`
-
-#### Unity tray backend
-
-Disabled by default.
-
-| Name              | Version   |
-|-------------------|-----------|
-| [Atk]             | >= 2.14   |
-| [Cairo]           |           |
-| [DBus Menu]       | >= 0.6    |
-| [GdkPixbuf]       | >= 2.31   |
-| [GLib]            | >= 2.0    |
-| [GTK+]            | >= 2.0    |
-| [libappindicator] | >= 0.4.92 |
-| [Pango]           | >= 1.18   |
-
-To enable: `-DENABLE_APPINDICATOR=True`
-
 #### Snorenotify desktop notification backend
 
 Disabled by default
@@ -772,10 +742,6 @@ Switches:
 [DBus Menu]: https://launchpad.net/libdbusmenu
 [FFmpeg]: https://www.ffmpeg.org/
 [GCC]: https://gcc.gnu.org/
-[GdkPixbuf]: https://developer.gnome.org/gdk-pixbuf/
-[GLib]: https://wiki.gnome.org/Projects/GLib
-[GTK+]: https://www.gtk.org/
-[libappindicator]: https://launchpad.net/libappindicator
 [libX11]: https://www.x.org/wiki/
 [libXScrnSaver]: https://www.x.org/wiki/Releases/ModuleVersions/
 [MinGW]: http://www.mingw.org/