From 16032902cf6fc16d69846707679c20539a6fcf69 Mon Sep 17 00:00:00 2001
From: tedjk <tedjohan@gmail.com>
Date: Thu, 12 Mar 2015 14:01:29 +0100
Subject: [PATCH] BAB-37 #time 2h 30m #comment changed to regular pointers

---
 juci/api.cc             |  4 ++--
 juci/api.h              |  4 ++--
 juci/plugins.py         | 15 +++------------
 juci/plugins/plugins.py | 19 -------------------
 juci/plugins/snippet.py |  3 +--
 juci/window.cc          |  8 +++-----
 6 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 juci/plugins/plugins.py

diff --git a/juci/api.cc b/juci/api.cc
index d8277c8..b15b15e 100644
--- a/juci/api.cc
+++ b/juci/api.cc
@@ -1,7 +1,7 @@
 #include "api.h"
 
-std::shared_ptr<Menu::Controller> PluginApi::menu_;
-std::shared_ptr<Notebook::Controller> PluginApi::notebook_;
+Menu::Controller* PluginApi::menu_;
+Notebook::Controller* PluginApi::notebook_;
 
 /////////////////////////////
 //// API ServiceProvider ////
diff --git a/juci/api.h b/juci/api.h
index 6965817..8d5f012 100644
--- a/juci/api.h
+++ b/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 std::shared_ptr<Notebook::Controller> notebook_;
+    static Menu::Controller* menu_;
+    static Notebook::Controller* notebook_;
     
     static void InitPlugins();
     
diff --git a/juci/plugins.py b/juci/plugins.py
index 9f4f39a..70bbf5b 100644
--- a/juci/plugins.py
+++ b/juci/plugins.py
@@ -1,20 +1,11 @@
 #!/usr/bin/python
-#snippet plugin
-import juci_to_python_api
-import os
-import glob
+#plugin handler
+import juci_to_python_api as juci, os, 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(".")
-        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...")
+        juci.initPlugin(current_file)
 
 loadplugins()
diff --git a/juci/plugins/plugins.py b/juci/plugins/plugins.py
deleted file mode 100644
index b5bbf4d..0000000
--- a/juci/plugins/plugins.py
+++ /dev/null
@@ -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()
diff --git a/juci/plugins/snippet.py b/juci/plugins/snippet.py
index 4451424..32b0f01 100644
--- a/juci/plugins/snippet.py
+++ b/juci/plugins/snippet.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 #snippet plugin
-import juci_to_python_api as juci
-import inspect
+import juci_to_python_api as juci, inspect
 
 def initPlugin():
     juci.addMenuElement("Snippet")
diff --git a/juci/window.cc b/juci/window.cc
index 9df4db5..05014e1 100644
--- a/juci/window.cc
+++ b/juci/window.cc
@@ -17,11 +17,9 @@ Window::Window() :
 					[this]() {
 					  OnOpenFile();
 					});
-  PluginApi::menu_ = std::shared_ptr<Menu::Controller>(&menu_);
-
-  PluginApi::notebook_ = std::shared_ptr<Notebook::Controller>(&notebook_);
-
-  PluginApi::InitPlugins();  
+  PluginApi::menu_ = &menu_;
+  PluginApi::notebook_ = &notebook_;
+  PluginApi::InitPlugins();
 
   add_accel_group(keybindings_.ui_manager_menu()->get_accel_group());
   add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group());