Merged

juci/CMakeLists.txt

@@ -132,8 +132,8 @@ link_directories(
   ${LIBCLANG_LIBRARY_DIRS}
   )
 #module:
-set_target_properties(${module} PROPERTIES PREFIX ""
+set_target_properties(${module} PROPERTIES PREFIX "")
- LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/")
+# LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/")
 target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
 #executable:
 target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})

juci/api.cc

@@ -5,6 +5,20 @@ Notebook::Controller* PluginApi::notebook_;
 /////////////////////////////
 //// API ServiceProvider ////
 /////////////////////////////
+PluginApi::PluginApi(Menu::Controller& menu_ctl_,
+                     Notebook::Controller& notebook_ctl_) {
+  menu_ = &menu_ctl_;
+  notebook_ = &notebook_ctl_;
+  InitPlugins();
+}
+
+PluginApi::~PluginApi() {
+  delete menu_;
+  delete notebook_;
+  menu_ = NULL;
+  notebook_ = NULL;
+}
+
 std::string PluginApi::ProjectPath() {
   int MAXPATHLEN = 50;
   char temp[MAXPATHLEN];
@@ -107,7 +121,7 @@ void libjuci::ReplaceWord(const std::string word) {
 }
 
 void libjuci::ReplaceLine(const std::string line) {
-  std::cout << "unimplemented function: 'libjuci::ReplaceLine()' called"
+  std::cout << "unimplemented: " << __func__ << " called"
             << std::endl;
 }
 std::string libjuci::GetWord() {
@@ -201,16 +215,7 @@ void libjuci::IterToWordEnd(Gtk::TextIter &iter) {
 }
 
 Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
-  // finding focused view
-  // int i = 0;
-  // while (!PluginApi::notebook_->source_vec_.at(i)->view().has_focus()) {
-  //   i++;
-  // while(!PluginApi::notebook_->CurrentTextView().has_focus()) {
-  //   i++;
-  // }
   return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_
-                                       // ->source_vec_.at(i)
-                                       // ->view().get_buffer());
                                        ->CurrentTextView().get_buffer());
 }
 

juci/api.h

@@ -12,6 +12,8 @@
 ////////////////////
 class PluginApi {
 public:
+  PluginApi(Menu::Controller&, Notebook::Controller&);
+  ~PluginApi();
   static Menu::Controller* menu_;
   static Notebook::Controller* notebook_;
   static void InitPlugins();
@@ -25,7 +27,6 @@ public:
                                 const std::string menu_func_name,
                                 const std::string plugin_path,
                                 const std::string menu_keybinding);
-  // text-buffer functions
   static void ReplaceWord(const std::string word);
   static void ReplaceLine(const std::string line);
 protected:
@@ -64,11 +65,10 @@ namespace libjuci {
   namespace bp = boost::python;
   bp::api::object OpenPythonScript(const std::string path,
                                    bp::api::object python_name_space);
-
   void LoadPlugin(const std::string& plugin_name);
   void LoadPluginFunction(const std::string &function_name,
                           const std::string &plugin_path);
 
   void InitPlugin(const std::string& plugin_path);
-}  // libjuci
+}  // namespace libjuci
 #endif  // JUCI_API_H_

juci/api_ext.cc

@@ -12,7 +12,4 @@ BOOST_PYTHON_MODULE(juci_to_python_api) {
       def("replaceLine", &libjuci::ReplaceLine);
       def("replaceWord", &libjuci::ReplaceWord);
       def("getWord", &libjuci::GetWord);
-      
-      
-      //something more
     }  // module::juci_to_python_api

juci/config.cc

@@ -6,9 +6,6 @@ MainConfig::MainConfig() :
   GenerateSource();
   GenerateKeybindings();
   GenerateDirectoryFilter();
-  //    keybindings_cfg_ = cfg_.get_child("keybindings");
-  //    notebook_cfg_ = cfg_.get_child("notebook");
-  //    menu_cfg_ = cfg_.get_child("menu");
 }
 
 void MainConfig::GenerateSource() {

juci/directories.cc

@@ -11,7 +11,7 @@ open_folder(const boost::filesystem::path& dir_path) {
   m_refTreeModel = Gtk::TreeStore::create(view());
   m_TreeView.set_model(m_refTreeModel);
   m_TreeView.remove_all_columns();
-  std::string project_name = get_project_name(dir_path);
+  std::string project_name = GetCmakeVarValue(dir_path, "project");
   m_TreeView.append_column(project_name, view().m_col_name);
   int row_id = 0;
   Gtk::TreeModel::Row row;
@@ -77,8 +77,9 @@ int Directories::Controller::count(const std::string path) {
     if (path[i] == '/') count++;
   return count;
 }
+
   std::string Directories::Controller::
-get_project_name(const boost::filesystem::path& dir_path) {
+  GetCmakeVarValue(const boost::filesystem::path& dir_path, std::string command_name) {
     std::string project_name;
     std::string project_name_var;
     boost::filesystem::directory_iterator end_itr;
@@ -89,18 +90,18 @@ get_project_name(const boost::filesystem::path& dir_path) {
         std::ifstream ifs(itr->path().string());
         std::string line;
         while (std::getline(ifs, line)) {
-        if (line.find("project(", 0) != std::string::npos
+          if (line.find(command_name+"(", 0) != std::string::npos
-            || line.find("project (", 0) != std::string::npos ) {
+              || line.find(command_name+" (", 0) != std::string::npos ) {
-          size_t variabel_start = line.find("{", 0);
+            size_t variable_start = line.find("{", 0);
-          size_t variabel_end = line.find("}", variabel_start);
+            size_t variable_end = line.find("}", variable_start);
-          project_name_var = line.substr(variabel_start+1,
+            project_name_var = line.substr(variable_start+1,
-                                         (variabel_end)-variabel_start-1);
+                                           (variable_end)-variable_start-1);
             boost::algorithm::trim(project_name_var);
-          if (variabel_start == std::string::npos) { //  not a variabel
+            if (variable_start == std::string::npos) { //  not a variable
-            variabel_start = line.find("(", 0);
+              variable_start = line.find("(", 0);
-            variabel_end = line.find(")", variabel_start);
+              variable_end = line.find(")", variable_start);
-            return line.substr(variabel_start+1,
+              return line.substr(variable_start+1,
-                                         (variabel_end)-variabel_start-1);
+                                 (variable_end)-variable_start-1);
             }
             break;
           }
@@ -110,11 +111,11 @@ get_project_name(const boost::filesystem::path& dir_path) {
           if (line.find("set(", 0) != std::string::npos
               || line.find("set (", 0) != std::string::npos) {
             if( line.find(project_name_var, 0) != std::string::npos) {
-          size_t variabel_start = line.find(project_name_var, 0)
+              size_t variable_start = line.find(project_name_var, 0)
                 +project_name_var.length();
-          size_t variabel_end = line.find(")", variabel_start);
+              size_t variable_end = line.find(")", variable_start);
-          project_name = line.substr(variabel_start+1,
+              project_name = line.substr(variable_start+1,
-                                     variabel_end-variabel_start-1);
+                                         variable_end-variable_start-1);
               boost::algorithm::trim(project_name);
               return project_name;
             }

juci/directories.h

@@ -51,7 +51,7 @@ namespace Directories {
     void open_folder(const boost::filesystem::path& dir_path);
     void list_dirs(const boost::filesystem::path& dir_path,
                    Gtk::TreeModel::Row &row, unsigned depth);
-    std::string get_project_name(const boost::filesystem::path& dir_path);
+    std::string GetCmakeVarValue(const boost::filesystem::path& dir_path, std::string command_name);
     int count(const std::string path);
 
     // Child widgets:

juci/notebook.cc

@@ -564,6 +564,10 @@ void Notebook::Controller::PopupSetSize(Gtk::ScrolledWindow &scroll,
   }
 }
 
+std::string Notebook::Controller::CurrentPagePath(){
+  return text_vec_.at(CurrentPage())->path();
+}
+
 void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview,
                                              int popup_x,
                                              int popup_y,

juci/notebook.h

@@ -40,6 +40,7 @@ namespace Notebook {
     int CurrentPage();
     Gtk::Box& entry_view();
     Gtk::Notebook& Notebook();
+    std::string CurrentPagePath();
     void OnBufferChange();
     void BufferChangeHandler(Glib::RefPtr<Gtk::TextBuffer>
                                                buffer);

juci/plugins.py

@@ -1,9 +1,11 @@
 #!/usr/bin/python
 #plugin handler
-import juci_to_python_api as juci, os, glob
+import sys, os, glob
+cwd = os.getcwd()
+sys.path.append(cwd)
 
+import juci_to_python_api as juci
 def loadplugins():
-    cwd = os.getcwd()
     plugin_files = glob.glob(cwd+"/plugins/*.py")
     for current_file in plugin_files:
         juci.initPlugin(current_file)

juci/terminal.cc

@@ -2,14 +2,12 @@
 #include <iostream>
 #include <thread>
 
+
 Terminal::View::View(){
   scrolledwindow_.add(textview_);
   scrolledwindow_.set_size_request(-1,150);
   view_.add(scrolledwindow_);
   textview_.set_editable(false);
-  //Pango::TabArray tabsize;
-  //tabsize.set_tab(200,Pango::TAB_LEFT, 200);                                  
-  //textview_.set_tabs(tabsize);
 }
 
 
@@ -17,59 +15,61 @@ Terminal::Controller::Controller() {
   folder_command_ = "";
 }
 
-void Terminal::Controller::SetFolderCommand(std::string path) {
+void Terminal::Controller::SetFolderCommand( boost::filesystem::path
-  int pos = path.find_last_of("/\\");
+					     CMake_path) {
-  path.erase(path.begin()+pos,path.end());
+  path_ = CMake_path.string();
-  folder_command_ = "cd "+ path + "; ";
+  folder_command_ = "cd "+ path_ + "; ";
 }
 
-void Terminal::Controller::CompileAndRun(std::string project_name) {
+bool Terminal::Controller::Compile(){
-   if (folder_command_=="") {
-     PrintMessage("juCi++ ERROR: Can not find project's CMakeList.txt\n");
-   } else {
   if (running.try_lock()) {
     std::thread execute([=]() {
 	Terminal().get_buffer()->set_text("");
 	ExecuteCommand("cmake .");
 	if (ExistInConsole(cmake_sucsess)){
 	  ExecuteCommand("make");
-	     if (ExistInConsole(make_built)){
-	       if (FindExecutable(project_name)) {
-		 ExecuteCommand("./"+project_name);
-	       } else {
-		 PrintMessage("juCi++ ERROR: Can not find Executable\n");
 	}
+      });
+    execute.detach();
+    running.unlock();
+    if (ExistInConsole(make_built)) return true;
   }
+  PrintMessage("juCi++ ERROR: Failed to compile project in directory"
+	       + path_ + "\n");
+  return false;
 }
+
+void Terminal::Controller::Run(std::string executable) {
+  if (running.try_lock()) {
+    std::thread execute([=]() {
+	ExecuteCommand("./"+executable);
       });
     execute.detach();
     running.unlock();
   }
 }
-}
 
 void Terminal::Controller::PrintMessage(std::string message){
   Terminal().get_buffer()->
     insert(Terminal().get_buffer()-> end(),"> "+message);
 }
 
-bool Terminal::Controller::FindExecutable(std::string executable) {
+// bool Terminal::Controller::FindExecutable(std::string executable) {
-  std::string build = Terminal().get_buffer()->get_text();
+//   std::string build = Terminal().get_buffer()->get_text();
-  double pos = build.find(make_built);
+//   double pos = build.find(make_built);
-  Gtk::TextIter start = Terminal().get_buffer()->get_iter_at_offset(pos);
+//   Gtk::TextIter start = Terminal().get_buffer()->get_iter_at_offset(pos);
-  Gtk::TextIter end = Terminal().get_buffer()->get_iter_at_offset(pos);
+//   Gtk::TextIter end = Terminal().get_buffer()->get_iter_at_offset(pos);
-  while (!end.ends_line())  {
+//   while (!end.ends_line())  {
-    end.forward_char();
+//     end.forward_char();
-  }
+//   }
-  build = Terminal().get_buffer()->get_text(start, end);
+//   build = Terminal().get_buffer()->get_text(start, end);
-  pos = build.find_last_of(" ");
+//   pos = build.find_last_of(" ");
-    std::cout << "FINNER NY POS" << std::endl;
+//   build = build.substr(pos+1);
-  build = build.substr(pos+1);
+//   std::cout << "DEBUG: BUILD TARGET = "<< build << std::endl;
-  std::cout <<"BUILD TARGET = "<< build << std::endl;
+//   std::cout << "EDEBUG: ECUTABLE FILE = "<< executable << std::endl;
-  std::cout << "EXECUTABLE FILE = "<< executable << std::endl;
+//   if(build != executable) return false;
-  if(build != executable) return false;
+//   return true;
-  return true;
+// }
-}
 
 bool Terminal::Controller::ExistInConsole(std::string string) {
   double pos = Terminal().get_buffer()->

juci/terminal.h

@@ -3,6 +3,7 @@
 
 #include <mutex>
 #include "gtkmm.h"
+#include <boost/filesystem.hpp>
 
 namespace Terminal {
 
@@ -22,16 +23,18 @@ namespace Terminal {
     Controller();
     Gtk::HBox& view() {return view_.view();}
     Gtk::TextView& Terminal(){return view_.textview();}
-    void SetFolderCommand(std::string path);
+    void SetFolderCommand(boost::filesystem::path CMake_path);
-    void CompileAndRun(std::string project_name);
+    void Run(std::string executable);
+    bool Compile();
   private:
     void ExecuteCommand(std::string command);
     bool OnButtonRealeaseEvent(GdkEventKey* key);
     bool ExistInConsole(std::string string);
-    bool FindExecutable(std::string executable);
+    //  bool FindExecutable(std::string executable);
     void PrintMessage(std::string message);
     Terminal::View view_;
     std::string folder_command_;
+    std::string path_;
     std::mutex running;
     const std::string cmake_sucsess = "Build files have been written to:";
     const std::string make_built = "Built target";

juci/window.cc

@@ -5,9 +5,12 @@ Window::Window() :
   window_box_(Gtk::ORIENTATION_VERTICAL),
   main_config_(),
   keybindings_(main_config_.keybindings_cfg()),
-  notebook_(this,keybindings(), main_config_.source_cfg(), main_config_.dir_cfg()),
+  notebook_(this,keybindings(),
-  menu_(keybindings())  {
+            main_config_.source_cfg(),
-  INFO("Creating window");
+            main_config_.dir_cfg()),
+  menu_(keybindings()),
+  api_(menu_, notebook_) {
+  INFO("Create Window");
   set_title("juCi++");
   set_default_size(600, 400);
   add(window_box_);
@@ -44,27 +47,35 @@ Window::Window() :
                                         [this]() {
                                           notebook_.OnSaveFile();
                                         });
-  
+  keybindings_.
-   keybindings_.action_group_menu()->add(Gtk::Action::create("ProjectCompileAndRun",
+    action_group_menu()->
+    add(Gtk::Action::create("ProjectCompileAndRun",
                             "Compile And Run"),
         Gtk::AccelKey(keybindings_.config_
                       .key_map()["compile_and_run"]),
         [this]() {
-					   terminal_.
+          notebook_.OnSaveFile();
-					     SetFolderCommand("/home/gm/ClionProjects/testi/CM.txt");
+          std::string path = notebook_.CurrentPagePath();
-					   std::string p = notebook_.directories().get_project_name("/home/gm/ClionProjects/testi");
+          terminal_.SetFolderCommand(path);
-   					  terminal_.CompileAndRun(p);
+          if(terminal_.Compile()) {
+            std::string executable = notebook_.directories().
+              GetCmakeVarValue(path,"add_executable");
+            terminal_.Run(executable);
+          }
         });
 
-   keybindings_.action_group_menu()->add(Gtk::Action::create("ProjectCompile",
+  keybindings_.
+    action_group_menu()->
+    add(Gtk::Action::create("ProjectCompile",
                             "Compile"),
         Gtk::AccelKey(keybindings_.config_
                       .key_map()["compile"]),
         [this]() {
-					   terminal_.
+          notebook_.OnSaveFile();
-					     SetFolderCommand("/home/gm/ClionProjects/testi/CM.txt");
+          std::string path =
-					   std::string p = notebook_.directories().get_project_name("/home/gm/ClionProjects/testi");
+            notebook_.CurrentPagePath();
-					   terminal_.CompileAndRun(p);
+          terminal_.SetFolderCommand(path);
+          terminal_.Compile();
         });
 
   this->signal_button_release_event().
@@ -72,10 +83,6 @@ Window::Window() :
   terminal_.Terminal().signal_button_release_event().
     connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false);
 
-  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());
   keybindings_.BuildMenu();
@@ -179,4 +186,3 @@ void Window::OnOpenFile() {
 bool Window::OnMouseRelease(GdkEventButton *button){
   return notebook_.OnMouseRelease(button);
 }
-

juci/window.h

@@ -22,6 +22,7 @@ public:
   Menu::Controller menu_;
   Notebook::Controller notebook_;
   Terminal::Controller terminal_;
+  PluginApi api_;
   
   Keybindings::Controller& keybindings() { return keybindings_; }
  private: