Merge branch 'master' of bitbucket.org:cppit/juci

juci/api_ext.cc

@@ -1,15 +0,0 @@
-#include "api.h"
-
-BOOST_PYTHON_MODULE(juci_to_python_api) {
-      using namespace boost::python;
-      // plugin inclusion
-      def("addMenuElement", &libjuci::AddMenuElement);
-      def("addSubMenuElement", &libjuci::AddSubMenuElement);
-      def("loadPlugin", &libjuci::LoadPlugin);
-      def("initPlugin", &libjuci::InitPlugin);
-
-      // text editing
-      def("replaceLine", &libjuci::ReplaceLine);
-      def("replaceWord", &libjuci::ReplaceWord);
-      def("getWord", &libjuci::GetWord);
-    }  // module::juci_to_python_api

juci/notebook.cc

@@ -316,9 +316,7 @@ void Notebook::Controller::OnOpenFile(std::string path) {
   Notebook().set_current_page(Pages()-1);
   Notebook().set_focus_child(text_vec_.back()->view());
   OnBufferChange();
-
-  
-  
+  text_vec_.back()->set_is_changed(false);
 }
 
 void Notebook::Controller::OnCreatePage() {
@@ -344,9 +342,10 @@ void Notebook::Controller::OnCreatePage() {
 
 void Notebook::Controller::OnCloseCurrentPage() {
   INFO("Notebook close page");
-  // TODO(oyvang) zalox, forgi)
-  // Save a temp file, in case you close one you dont want to close?
   if (Pages() != 0) {
+    if(text_vec_.back()->is_changed()){
+      AskToSaveDialog();
+    }
     int page = CurrentPage();
     Notebook().remove_page(page);
     delete text_vec_.at(page);
@@ -473,6 +472,7 @@ void Notebook::Controller::OnBufferChange() {
     ScrollEventCallback(scroll);
     delete scroll;
   }
+  text_vec_.at(page)->set_is_changed(true);
 }
 void Notebook::Controller
 ::OnDirectoryNavigation(const Gtk::TreeModel::Path& path,
@@ -644,7 +644,7 @@ void Notebook::Controller:: OnSaveFile() {
 
 std::string Notebook::Controller::OnSaveFileAs(){
   INFO("Notebook save as");
-  Gtk::FileChooserDialog dialog("Please choose a file",
+  Gtk::FileChooserDialog dialog("Please choose a file", 
 				Gtk::FILE_CHOOSER_ACTION_SAVE);
   DEBUG("SET TRANSISTEN FPR");
   dialog.set_transient_for(*window_);
@@ -677,3 +677,38 @@ std::string Notebook::Controller::OnSaveFileAs(){
    return "";
 }
 
+void Notebook::Controller::AskToSaveDialog() {
+  INFO("AskToSaveDialog");
+  DEBUG("AskToSaveDialog: Finding file path");
+  Gtk::MessageDialog dialog(*window_, "Save file!",
+			    false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
+  dialog.set_secondary_text(
+          "Do you want to save: " +
+			    text_vec_.at(CurrentPage())->path()+" ?");
+  DEBUG("AskToSaveDialog: run dialog");
+  int result = dialog.run();
+
+  //Handle the response:
+  DEBUG("AskToSaveDialog: switch response");
+  switch(result)
+  {
+    case(Gtk::RESPONSE_YES):
+    {
+      DEBUG("AskToSaveDialog: save file: yes, trying to save file");
+      OnSaveFile();
+      DEBUG("AskToSaveDialog: save file: yes, saved sucess");
+      break;
+    }
+    case(Gtk::RESPONSE_NO):
+    {
+      DEBUG("AskToSaveDialog: save file: no");
+      break;
+    }
+    default:
+    {
+           DEBUG("AskToSaveDialog: unexpected action: Default switch");
+      break;
+    }
+  }
+}
+

juci/notebook.h

@@ -88,6 +88,7 @@ namespace Notebook {
     void PopupSetSize(Gtk::ScrolledWindow& scroll,
                       int &current_x,
                       int &current_y);
+    void AskToSaveDialog();
     Glib::RefPtr<Gtk::Builder> m_refBuilder;
     Glib::RefPtr<Gio::SimpleActionGroup> refActionGroup;
     Source::Config source_config_;

juci/source.h

@@ -150,8 +150,10 @@ namespace Source {
                                     *suggestions);
     Glib::RefPtr<Gtk::TextBuffer> buffer();
     bool is_saved() { return is_saved_; }
+    bool is_changed() { return is_changed_; }
     std::string path() { return model().file_path(); }
     void set_is_saved(bool isSaved) { is_saved_ = isSaved; }
+    void set_is_changed(bool isChanged) { is_changed_ = isChanged; }
     void set_file_path(std::string path) { model().set_file_path(path); }
     
 
@@ -162,6 +164,7 @@ namespace Source {
     std::mutex parsing;
     bool go = false;
     bool is_saved_ = false;
+    bool is_changed_ = false;
 
   protected:
     View view_;

juci/terminal.cc

@@ -19,6 +19,7 @@ Terminal::Controller::Controller() {
 
 void Terminal::Controller::SetFolderCommand( boost::filesystem::path
 					     CMake_path) {
+  
   path_ = CMake_path.string();
   folder_command_ = "cd "+ path_ + "; ";
 }