Merge pull request #20 from alainm23/master

Update for elementary 8

Author: alainm23

data/Indicator.css

@@ -0,0 +1,4 @@
+button:selected {
+    background: @selected_bg_color;
+    color: @selected_fg_color;
+}

data/com.github.tom95.indicator-synapse.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/github/tom95/indicator-synapse/">
+    <file alias="Indicator.css">Indicator.css</file>
+  </gresource>
+</gresources>

meson.build

@@ -1,27 +1,37 @@
 project('synapse', 'vala', 'c')
 
-gettext_name = meson.project_name() + '-indicator'
 gnome = import('gnome')
 i18n = import('i18n')
+gettext_name = meson.project_name() + '-indicator'
 
-add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(gettext_name), language:'c')
+prefix = get_option('prefix')
+libdir = prefix / get_option('libdir')
 
-#asresources = gnome.compile_resources(
-    #'as-resources', 'data/com.github.tom95.indicator-synapse.gresource.xml',
-    #source_dir: 'data',
-    #c_name: 'as'
-#)
+add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(gettext_name), language:'c')
 
-wingpanel_dep = dependency('wingpanel-2.0')
+wingpanel_dep = dependency('wingpanel')
+wingpanel_indicatorsdir = wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])
 
 add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
 
+gresource = gnome.compile_resources(
+    'as-resources',
+    'data' / 'com.github.tom95.indicator-synapse.gresource.xml',
+    source_dir: 'data'
+)
+
+config_data = configuration_data()
+config_data.set_quoted('LOCALEDIR', prefix / get_option('localedir'))
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name() + '-indicator')
+config_data.set_quoted('DATADIR', prefix / get_option('datadir') / meson.project_name())
+
 shared_module(
     meson.project_name(),
     'src/indicator/main.vala',
     'src/indicator/menu.vala',
     'src/indicator/match-item.vala',
     'src/indicator/selectable-list.vala',
+    'src/indicator/AutomaticScrollBox.vala',
 
     'src/core/common-actions.vala',
     'src/core/config-service.vala',
@@ -53,7 +63,7 @@ shared_module(
     'src/plugins/gnome-session-plugin.vala',
     'src/plugins/hello-world-plugin.vala',
     'src/plugins/hybrid-search-plugin.vala',
-    'src/plugins/imgur-plugin.vala',
+    # 'src/plugins/imgur-plugin.vala',
     'src/plugins/launchpad-plugin.vala',
     'src/plugins/locate-plugin.vala',
     'src/plugins/opensearch.vala',
@@ -68,21 +78,22 @@ shared_module(
     'src/plugins/xnoise-media-player-plugin.vala',
     'src/plugins/zeitgeist-plugin.vala',
     'src/plugins/zeitgeist-related.vala',
-
-    #asresources,
+    gresource,
     dependencies: [
         dependency('zeitgeist-2.0'),
         dependency('json-glib-1.0'),
-        dependency('rest-0.7'),
+        # dependency('rest-0.9'),
         dependency('libnotify'),
         dependency('glib-2.0'),
         dependency('gobject-2.0'),
         dependency('gtk+-3.0'),
         dependency('gio-2.0'),
         dependency('gio-unix-2.0'),
+        dependency('libsoup-3.0'),
+        dependency('granite', version: '>=6.0.0'),
         wingpanel_dep
     ],
     install: true,
-    install_dir : get_option('libdir') + '/wingpanel' #'/usr/lib/x86_64-linux-gnu/wingpanel' #wingpanel_dep.get_pkgconfig_variable('indicatorsdir')
+    install_dir : wingpanel_indicatorsdir
 )
 

src/indicator/AutomaticScrollBox.vala

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * 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 the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * A scroll box that takes its child's height, unless that height is more than max_height.
+ * If it is actually higher than max_height, then it will stick to max_height.
+ */
+ public class AutomaticScrollBox : Gtk.ScrolledWindow {
+    /**
+     * The maximal height of the scroll box before it starts scrolling.
+     */
+    public int max_height { default = 512; get; set; }
+
+    /**
+     * The adjustments are here to ensure the compatibility with Gtk.ScrolledWindow,
+     * but you should probably not use them, as the height of this widget is dynamic.
+     */
+    public AutomaticScrollBox (Gtk.Adjustment? hadj = null, Gtk.Adjustment? vadj = null) {
+        Object (hadjustment : hadj, vadjustment : vadj);
+    }
+
+    construct {
+        notify["max-height"].connect (queue_resize);
+    }
+
+    public override void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height) {
+        unowned Gtk.Widget child = get_child ();
+
+        if (child != null) {
+            child.get_preferred_height_for_width (width, out minimum_height, out natural_height);
+
+            minimum_height = int.min (max_height, minimum_height);
+            natural_height = int.min (max_height, natural_height);
+        } else {
+            minimum_height = natural_height = 0;
+        }
+    }
+
+    public override void get_preferred_height (out int minimum_height, out int natural_height) {
+        unowned Gtk.Widget child = get_child ();
+
+        if (child != null) {
+            child.get_preferred_height (out minimum_height, out natural_height);
+
+            minimum_height = int.min (max_height, minimum_height);
+            natural_height = int.min (max_height, natural_height);
+        } else {
+            minimum_height = natural_height = 0;
+        }
+    }
+}

src/indicator/main.vala

@@ -51,34 +51,48 @@ public class Main : Wingpanel.Indicator
 
 	public static SynapseIndicator.DataSink sink;
 
-	private Wingpanel.Widgets.OverlayIcon? indicator_icon = null;
+	private Gtk.Image? indicator_icon = null;
 	private Menu? popover_widget = null;
 
 	const string CODE_NAME = "com.github.tom95.indicator-synapse";
 
 	Cancellable? current_search = null;
 
 	public Main (Wingpanel.IndicatorManager.ServerType server_type) {
-		Object (code_name: CODE_NAME,
-			display_name: _("Synapse"),
-			description: _("Synapse Search Indicator"));
+		Object (
+			code_name: CODE_NAME
+		);
 
 		sink = new SynapseIndicator.DataSink ();
 		foreach (var plugin in plugins) {
 			sink.register_static_plugin (plugin);
 		}
+
+		visible = true;
 	}
 
 	public override Gtk.Widget get_display_widget () {
 		if (indicator_icon == null) {
-			indicator_icon = new Wingpanel.Widgets.OverlayIcon ("edit-find-symbolic");
-		}
+            indicator_icon = new Gtk.Image () {
+                icon_name = "edit-find-symbolic",
+                pixel_size = 16
+            }; 
+        }
 
-		return indicator_icon;
+        return indicator_icon;
 	}
 
 	public override Gtk.Widget? get_widget () {
 		if (popover_widget == null) {
+			var provider = new Gtk.CssProvider ();
+            provider.load_from_resource ("com/github/tom95/indicator-synapse/Indicator.css");
+            
+            Gtk.StyleContext.add_provider_for_screen (
+                Gdk.Screen.get_default (),
+                provider,
+                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+            );
+
 			popover_widget = new Menu ();
 			popover_widget.close.connect (() => {close (); print("restuqest close\n"); });
 
@@ -97,8 +111,6 @@ public class Main : Wingpanel.Indicator
 			});
 		}
 
-		visible = true;
-
 		return popover_widget;
 	}
 

src/indicator/match-item.vala

@@ -18,7 +18,7 @@
  *
  */
 
-public class MatchItem : Wingpanel.Widgets.Container
+public class MatchItem : Gtk.Button
 {
 	public SynapseIndicator.Match? match { get; private set; }
 	public SynapseIndicator.Match? target { get; private set; }
@@ -76,7 +76,12 @@ public class MatchItem : Wingpanel.Widgets.Container
 	{
 		this ();
 
-		get_content_widget ().add (get_box (action.description, action.icon_name, large));
+		add (get_box (action.description, action.icon_name, large));
+
+		var style_context = this.get_style_context ();
+        style_context.add_class (Gtk.STYLE_CLASS_FLAT);
+		hexpand = true;
+
 		match = action;
 		target = _target;
 	}
@@ -96,7 +101,11 @@ public class MatchItem : Wingpanel.Widgets.Container
 		outer_box.pack_start (category, false);
 		outer_box.pack_start (inner_box);
 		outer_box.margin_right = 12;
-		get_content_widget ().add (outer_box);
+		add (outer_box);
+
+		var style_context = this.get_style_context ();
+        style_context.add_class (Gtk.STYLE_CLASS_FLAT);
+		hexpand = true;
 
 		if (no_hover) {
 			leave_notify_event.connect (() => { return true; });

src/indicator/menu.vala

@@ -39,7 +39,10 @@ public class Menu : Gtk.Grid
 	{
 		orientation = Gtk.Orientation.VERTICAL;
 
-		stack = new Gtk.Stack ();
+		stack = new Gtk.Stack () {
+			hexpand = true,
+			hhomogeneous = true
+		};
 		stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
 
 		entry = new Gtk.Entry ();
@@ -108,16 +111,18 @@ public class Menu : Gtk.Grid
 		});
 
 		results = new SelectableList ();
-		var scroll = new Wingpanel.Widgets.AutomaticScrollBox ();
+		
+		var scroll = new AutomaticScrollBox ();
 		results.scroll = scroll;
+		
 		scroll.add (results);
 
 		context_results = new SelectableList ();
 
 		stack.add_named (scroll, SEARCH_VIEW);
 		stack.add_named (context_results, CONTEXT_VIEW);
-		add (stack);
 
+		add (stack);
 		width_request = 480;
 	}
 

src/plugins/chromium-plugin.vala

@@ -189,7 +189,7 @@ namespace SynapseIndicator
       UNWANTED_SCHEME.add ("place");
       UNWANTED_SCHEME.add ("javascript");
 
-      List<unowned Json.Node> folders = new List<Json.Node> ();
+      List<unowned Json.Node> folders = new List<unowned Json.Node> ();
 
       try
       {

src/plugins/hybrid-search-plugin.vala

@@ -278,7 +278,7 @@ namespace SynapseIndicator
       }
       else
       {
-        var sort_array = new Gee.ArrayList<Gee.Map.Entry<unowned string, int>> ();
+        var sort_array = new Gee.ArrayList<Gee.Map.Entry<string, int>> ();
         int min_hit = int.MAX;
         foreach (var entry in directory_hits.entries)
         {

src/plugins/wolframalpha-plugin.vala

@@ -52,7 +52,7 @@ namespace SynapseIndicator
       {
         try
         {
-          AppInfo.launch_default_for_uri ("https://www.wolframalpha.com/input/?i=" + (Soup.URI.encode (match.title, "+").replace (" ", "+")),
+          AppInfo.launch_default_for_uri ("https://www.wolframalpha.com/input/?i=" + (GLib.Uri.escape_string (match.title, "+").replace (" ", "+")),
             Gdk.Display.get_default ().get_app_launch_context ());
         }
         catch (Error err)