BAB-37 #time 2h 30m #comment changed to regular pointers

juci/api.cc

@@ -1,7 +1,7 @@
 #include "api.h"
 
-std::shared_ptr<Menu::Controller> PluginApi::menu_;
+Menu::Controller* PluginApi::menu_;
-std::shared_ptr<Notebook::Controller> PluginApi::notebook_;
+Notebook::Controller* PluginApi::notebook_;
 
 /////////////////////////////
 //// API ServiceProvider ////

juci/api.h

@@ -14,8 +14,8 @@ const std::string g_project_root("/home/forgie/app/juci/");
   ////////////////////
   class PluginApi {
   public:
-    static std::shared_ptr<Menu::Controller> menu_;
+    static Menu::Controller* menu_;
-    static std::shared_ptr<Notebook::Controller> notebook_;
+    static Notebook::Controller* notebook_;
     
     static void InitPlugins();
     

juci/plugins.py

@@ -1,20 +1,11 @@
 #!/usr/bin/python
-#snippet plugin
+#plugin handler
-import juci_to_python_api
+import juci_to_python_api as juci, os, glob
-import os
-import glob
 
 def loadplugins():
     cwd = os.getcwd()
     plugin_files = glob.glob(cwd+"/plugins/*.py")
     for current_file in plugin_files:
-        (filepath, filename) = os.path.split(current_file)
+        juci.initPlugin(current_file)
-        (name, extension) = filename.split(".")
-        if filename != "plugins.py":
-            print(filename+" ("+current_file+") loading...")
-            #juci_to_python_api.loadPlugin(current_file)
-#            juci_to_python_api.addMenuElement(name.capitalize())#, current_file)
-            juci_to_python_api.initPlugin(current_file)
-            print(filename+" loaded...")
 
 loadplugins()

juci/plugins/plugins.py

@@ -1,19 +0,0 @@
-#!/usr/bin/python
-#snippet plugin
-import juci_to_python_api
-import os
-import glob
-
-def loadplugins():
-    cwd = os.getcwd()
-    plugin_files = glob.glob(cwd+"/plugins/*.py")
-    for current_file in plugin_files:
-        (filepath, filename) = os.path.split(current_file)
-        (name, extension) = filename.split(".")
-        print(filename+" ("+current_file+") loading...")
-            #juci_to_python_api.loadPlugin(current_file)
-#            juci_to_python_api.addMenuElement(name.capitalize())#, current_file)
-            juci_to_python_api.initPlugin(current_file)
-            print(filename+" loaded...")
-
-loadplugins()

juci/plugins/snippet.py

@@ -1,7 +1,6 @@
 #!/usr/bin/python
 #snippet plugin
-import juci_to_python_api as juci
+import juci_to_python_api as juci, inspect
-import inspect
 
 def initPlugin():
     juci.addMenuElement("Snippet")

juci/window.cc

@@ -17,11 +17,9 @@ Window::Window() :
 					[this]() {
 					  OnOpenFile();
 					});
-  PluginApi::menu_ = std::shared_ptr<Menu::Controller>(&menu_);
+  PluginApi::menu_ = &menu_;
-
+  PluginApi::notebook_ = &notebook_;
-  PluginApi::notebook_ = std::shared_ptr<Notebook::Controller>(&notebook_);
+  PluginApi::InitPlugins();
-
-  PluginApi::InitPlugins();  
 
   add_accel_group(keybindings_.ui_manager_menu()->get_accel_group());
   add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group());