First compilable version

jeremypw · jeremypw · commit 09b30dc47047 · 2024-12-25T14:19:33.000Z
diff --git a/meson.build b/meson.build
@@ -33,8 +33,8 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.6.0')
 granite_dep = dependency('granite', version: '>=6.0.0')
 handy_dep = dependency('libhandy-1', version: '>=0.90.0')
 gtksourceview_dep = dependency('gtksourceview-4')
-peas_dep = dependency('libpeas-1.0')
-peasgtk_dep = dependency('libpeas-gtk-1.0')
+peas_dep = dependency('libpeas-2')
+# peasgtk_dep = dependency('libpeas-gtk-1.0')
 git_dep = dependency('libgit2-glib-1.0')
 fontconfig_dep = dependency('fontconfig')
 pangofc_dep = dependency('pangoft2')
@@ -59,7 +59,7 @@ dependencies = [
     handy_dep,
     gtksourceview_dep,
     peas_dep,
-    peasgtk_dep,
+    # peasgtk_dep,
     git_dep,
     fontconfig_dep,
     pangofc_dep,
diff --git a/plugins/brackets-completion/brackets-completion.vala b/plugins/brackets-completion/brackets-completion.vala
@@ -18,7 +18,7 @@
   END LICENSE
 ***/
 
-public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Gee.HashMap<string, string> brackets;
     Gee.HashMap<uint, string> keys;
     const string[] VALID_NEXT_CHARS = {
@@ -278,6 +278,6 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Peas.Activ
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Scratch.Plugins.BracketsCompletion));
 }
diff --git a/plugins/detect-indent/detect-indent.vala b/plugins/detect-indent/detect-indent.vala
@@ -1,4 +1,4 @@
-public class Scratch.Plugins.DetectIndent: Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.DetectIndent: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     const int MAX_LINES = 500;
 
     Scratch.Services.Interface plugins;
@@ -79,7 +79,7 @@ public class Scratch.Plugins.DetectIndent: Peas.ExtensionBase, Peas.Activatable
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (
-        typeof (Peas.Activatable),
+        typeof (Scratch.Services.ActivatablePlugin),
         typeof (Scratch.Plugins.DetectIndent)
     );
 }
diff --git a/plugins/editorconfig/editorconfig.vala b/plugins/editorconfig/editorconfig.vala
@@ -17,7 +17,7 @@
 * Boston, MA 02110-1301 USA
 */
 
-public class Scratch.Plugins.EditorConfigPlugin: Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.EditorConfigPlugin: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Scratch.Services.Interface plugins;
     public Object object { owned get; construct; }
     private Code.FormatBar format_bar;
@@ -91,5 +91,5 @@ public class Scratch.Plugins.EditorConfigPlugin: Peas.ExtensionBase, Peas.Activa
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable), typeof (Scratch.Plugins.EditorConfigPlugin));
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin), typeof (Scratch.Plugins.EditorConfigPlugin));
 }
diff --git a/plugins/fuzzy-search/fuzzy-search.vala b/plugins/fuzzy-search/fuzzy-search.vala
@@ -6,7 +6,7 @@
  */
 
 
-public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     public Object object { owned get; construct; }
     private const uint ACCEL_KEY = Gdk.Key.F;
     private const Gdk.ModifierType ACCEL_MODTYPE = Gdk.ModifierType.MOD1_MASK;
@@ -158,7 +158,7 @@ public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Peas.Activatable {
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (
-        typeof (Peas.Activatable),
+        typeof (Scratch.Services.ActivatablePlugin),
         typeof (Scratch.Plugins.FuzzySearch)
     );
 }
diff --git a/plugins/highlight-word-selection/highlight-word-selection.vala b/plugins/highlight-word-selection/highlight-word-selection.vala
@@ -18,7 +18,7 @@
   END LICENSE
 ***/
 
-public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Scratch.Widgets.SourceView current_source;
     Scratch.MainWindow? main_window = null;
     Gtk.SourceSearchContext? current_search_context = null;
@@ -151,6 +151,6 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.A
 [ModuleInit]
 public void peas_register_types (TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Scratch.Plugins.HighlightSelectedWords));
 }
diff --git a/plugins/markdown-actions/markdown-actions.vala b/plugins/markdown-actions/markdown-actions.vala
@@ -18,7 +18,7 @@
   END LICENSE
 ***/
 
-public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Peas.Activatable {
+public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     Scratch.Widgets.SourceView current_source;
     Scratch.Services.Interface plugins;
 
@@ -243,6 +243,6 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Peas.Activatable
 [ModuleInit]
 public void peas_register_types (TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Code.Plugins.MarkdownActions));
 }
diff --git a/plugins/pastebin/pastebin.vala b/plugins/pastebin/pastebin.vala
@@ -68,7 +68,7 @@ namespace Scratch.Services {
     }
 }
 
-public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     GLib.MenuItem? menuitem = null;
     GLib.Menu? share_menu = null;
     public Object object { owned get; construct; }
@@ -147,6 +147,6 @@ public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Peas.Activatable {
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Scratch.Plugins.Pastebin));
 }
diff --git a/plugins/preserve-indent/preserve-indent.vala b/plugins/preserve-indent/preserve-indent.vala
@@ -18,7 +18,7 @@
   END LICENSE
 ***/
 
-public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
 
     private Scratch.Services.Interface plugins;
     private Gee.TreeSet<weak Services.Document> documents;
@@ -244,6 +244,6 @@ public class Scratch.Plugins.PreserveIndent : Peas.ExtensionBase, Peas.Activatab
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Scratch.Plugins.PreserveIndent));
 }
diff --git a/plugins/spell/spell.vala b/plugins/spell/spell.vala
@@ -13,7 +13,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-public class Scratch.Plugins.Spell: Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.Spell: Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
 
     Scratch.Services.Interface plugins;
 
@@ -160,7 +160,7 @@ public class Scratch.Plugins.Spell: Peas.ExtensionBase, Peas.Activatable {
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (
-        typeof (Peas.Activatable),
+        typeof (Scratch.Services.ActivatablePlugin),
         typeof (Scratch.Plugins.Spell)
     );
 }
diff --git a/plugins/vim-emulation/vim-emulation.vala b/plugins/vim-emulation/vim-emulation.vala
@@ -18,7 +18,7 @@
   END LICENSE
 ***/
 
-public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     public enum Mode {
         COMMAND,
         INSERT,
@@ -298,6 +298,6 @@ public class Scratch.Plugins.VimEmulation : Peas.ExtensionBase, Peas.Activatable
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                      typeof (Scratch.Plugins.VimEmulation));
 }
diff --git a/plugins/word-completion/plugin.vala b/plugins/word-completion/plugin.vala
@@ -18,7 +18,7 @@
  *
  */
 
-public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
+public class Scratch.Plugins.Completion : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {
     public Object object { owned get; construct; }
 
     private List<Gtk.SourceView> text_view_list = new List<Gtk.SourceView> ();
@@ -185,6 +185,6 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
 [ModuleInit]
 public void peas_register_types (GLib.TypeModule module) {
     var objmodule = module as Peas.ObjectModule;
-    objmodule.register_extension_type (typeof (Peas.Activatable),
+    objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),
                                        typeof (Scratch.Plugins.Completion));
 }
diff --git a/src/Dialogs/PreferencesDialog.vala b/src/Dialogs/PreferencesDialog.vala
@@ -146,7 +146,7 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog {
 
         plugins.hook_preferences_dialog (this);
 
-        if (Peas.Engine.get_default ().get_plugin_list ().length () > 0) {
+        if (plugins.get_n_plugins () > 0) {
             var pbox = plugins.get_view ();
             pbox.vexpand = true;
 
diff --git a/src/Services/PluginManager.vala b/src/Services/PluginManager.vala
@@ -19,10 +19,17 @@
 ***/
 
 namespace Scratch.Services {
-    public class Interface : GLib.Object {
-
-        public PluginsManager manager;
+    // Interface implemented by all plugins
+    public interface ActivatablePlugin : Object {
+        // Migrated from Peas.Activatable
+        public virtual void activate () {}
+        public virtual void deactivate () {}
+        public virtual void update_state () {}
+        public abstract GLib.Object object { owned get; construct; }
+    }
 
+    // Object shared with plugins providing signals and methods to interface with application
+    public class Interface : GLib.Object {
         // Signals
         public signal void hook_window (Scratch.MainWindow window);
         public signal void hook_share_menu (GLib.MenuModel menu);
@@ -32,6 +39,7 @@ namespace Scratch.Services {
         public signal void hook_folder_item_change (File file, File? other_file, FileMonitorEvent event_type);
 
         public Scratch.TemplateManager template_manager { private set; get; }
+        public Scratch.Services.PluginsManager manager { private set; get; }
 
         public Interface (PluginsManager manager) {
             this.manager = manager;
@@ -50,7 +58,6 @@ namespace Scratch.Services {
         }
     }
 
-
     public class PluginsManager : GLib.Object {
         Peas.Engine engine;
         Peas.ExtensionSet exts;
@@ -86,19 +93,24 @@ namespace Scratch.Services {
             Scratch.settings.bind ("plugins-enabled", engine, "loaded-plugins", SettingsBindFlags.DEFAULT);
 
             /* Our extension set */
-            exts = new Peas.ExtensionSet (engine, typeof (Peas.Activatable), "object", plugin_iface, null);
+            exts = new Peas.ExtensionSet.with_properties (
+                engine,
+                typeof (ActivatablePlugin),
+                {"object"},
+                {plugin_iface}
+            );
 
             exts.extension_added.connect ((info, ext) => {
-                ((Peas.Activatable)ext).activate ();
+                ((ActivatablePlugin)ext).activate ();
                 extension_added (info);
             });
 
             exts.extension_removed.connect ((info, ext) => {
-                ((Peas.Activatable)ext).deactivate ();
+                ((ActivatablePlugin)ext).deactivate ();
                 extension_removed (info);
             });
 
-            exts.foreach (on_extension_foreach);
+            exts.@foreach ((Peas.ExtensionSetForeachFunc) on_extension_foreach, null);
 
             // Connect managers signals to interface's signals
             this.hook_window.connect ((w) => {
@@ -126,15 +138,41 @@ namespace Scratch.Services {
             });
         }
 
-        void on_extension_foreach (Peas.ExtensionSet set, Peas.PluginInfo info, Peas.Extension extension) {
-            ((Peas.Activatable)extension).activate ();
+        void on_extension_foreach (Peas.ExtensionSet exts, Peas.PluginInfo info, Object ext, void* data) {
+            ((ActivatablePlugin)ext).activate ();
         }
 
         public Gtk.Widget get_view () {
-            var view = new PeasGtk.PluginManager (engine);
-            var bottom_box = view.get_children ().nth_data (1);
-            bottom_box.no_show_all = true;
-            return view;
+            // var view = new PeasGtk.PluginManager (engine);
+            // var bottom_box = view.get_children ().nth_data (1);
+            // bottom_box.no_show_all = true;
+            // return view;
+            var list_box = new Gtk.ListBox ();
+            var index = 0;
+            while (index < engine.get_n_items ()) {
+                var info = (Peas.PluginInfo) engine.get_item (index);
+                var row = new Gtk.ListBoxRow ();
+                var content = new Gtk.Box (HORIZONTAL, 6);
+                var checkbox = new Gtk.CheckButton ();
+                var image = new Gtk.Image.from_icon_name (info.get_icon_name (), MENU);
+                var description_box = new Gtk.Box (VERTICAL, 0);
+                var name_label = new Gtk.Label (info.get_name ());
+                var description_label = new Gtk.Label (info.get_description ());
+                description_box.add (name_label);
+                description_box.add (description_label);
+                content.add (checkbox);
+                content.add (image);
+                content.add (description_box);
+                row.child = content;
+
+                index++;
+            }
+
+            return list_box;
+        }
+
+        public uint get_n_plugins () {
+            return engine.get_n_items ();
         }
     }
 }
diff --git a/vapi/libpeas-2.vapi b/vapi/libpeas-2.vapi

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace Scratch.Services {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Peas.Activatable {`
	`71`	`+public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Scratch.Services.ActivatablePlugin {`
`72`	`72`	`GLib.MenuItem? menuitem = null;`
`73`	`73`	`GLib.Menu? share_menu = null;`
`74`	`74`	`public Object object { owned get; construct; }`
`@@ -147,6 +147,6 @@ public class Scratch.Plugins.Pastebin : Peas.ExtensionBase, Peas.Activatable {`
`147`	`147`	`[ModuleInit]`
`148`	`148`	`public void peas_register_types (GLib.TypeModule module) {`
`149`	`149`	`var objmodule = module as Peas.ObjectModule;`
`150`		`- objmodule.register_extension_type (typeof (Peas.Activatable),`
	`150`	`+ objmodule.register_extension_type (typeof (Scratch.Services.ActivatablePlugin),`
`151`	`151`	`typeof (Scratch.Plugins.Pastebin));`
`152`	`152`	`}`