fixed quit_system bug

juci/juci.cc

@@ -1,9 +1,14 @@
 #include "juci.h"
+
+
+
 int main(int argc, char *argv[]) {
   Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(
                                                                 argc,
                                                                 argv,
                                                                 "no.sout.juci");
+  // app->set_flags(Gio::APPLICATION_NON_UNIQUE);
+
   Window window;
   return app->run(window);
 }

juci/juci.h

@@ -10,15 +10,20 @@
 class Window : public Gtk::Window {
 public:
   Window();
-  virtual ~Window() {}
-  Gtk::Box window_box_;
+
+  virtual ~Window() {
+  }
+
   std::shared_ptr<Source::Controller> source();
+
 private:
   Keybindings::Controller keybindings_;
   Menu::Controller menu_;
   Source::Controller source_;
+  Gtk::Box window_box_;
+
   /*signal handler*/
-  void onSystemQuit();
+  void OnSystemQuit();
 };
 
 #endif  // JUCI_JUCI_H_

juci/keybindings.h

@@ -2,10 +2,10 @@
 #include "gtkmm.h"
 
 namespace Keybindings {
-
     class Controller {
     public:
       Controller();
+
       virtual ~Controller();
 
       Glib::RefPtr<Gtk::ActionGroup> action_group() {
@@ -15,11 +15,11 @@ namespace Keybindings {
       Glib::RefPtr<Gtk::UIManager> ui_manager() {
         return ui_manager_;
       };
+
       void set_ui_manger_string(std::string ui_string);
 
       void set_ui_manager_action_group(Glib::RefPtr<Gtk::ActionGroup> action_group);
 
-
     protected:
       Glib::RefPtr<Gtk::UIManager> ui_manager_;
       Glib::RefPtr<Gtk::ActionGroup> action_group_;

juci/menu.cc

@@ -55,7 +55,7 @@ Menu::View::View(Gtk::Orientation orientation) :
 
 }
 
-Gtk::Box& Menu::View::view(
+Gtk::Box &Menu::View::view(
         Glib::RefPtr<Gtk::UIManager> ui_manager) {
   view_.pack_start(*ui_manager->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
   return view_;
@@ -70,7 +70,7 @@ Menu::View::~View() {
 Menu::Controller::Controller(Keybindings::Controller keybindings) :
         menu_view_(Gtk::ORIENTATION_VERTICAL),
         menu_model_(),
-        keybindings_(keybindings){
+        keybindings_(keybindings) {
 /* Add action to menues */
 /* START file menu */
   keybindings_.action_group()->add(Gtk::Action::create("FileMenu", Gtk::Stock::FILE));
@@ -87,7 +87,6 @@ Menu::Controller::Controller(Keybindings::Controller keybindings) :
           [this]() {
               OnFileNewCCFile();
           });
-
   keybindings_.action_group()->add(Gtk::Action::create("FileNewH",
                   Gtk::Stock::NEW, "New h file", "Create a new h file"),
           Gtk::AccelKey("<control><alt>h"),
@@ -103,10 +102,6 @@ Menu::Controller::Controller(Keybindings::Controller keybindings) :
           [this]() {
               OnFileOpenFolder();
           });
-  keybindings_.action_group()->add(Gtk::Action::create("FileQuit", Gtk::Stock::QUIT),
-          [this]() {
-              OnSystemQuit();
-          });
 /* END file menu */
 /* START edit menu */
   keybindings_.action_group()->add(Gtk::Action::create("EditMenu", Gtk::Stock::EDIT));
@@ -169,7 +164,7 @@ Menu::Controller::Controller(Keybindings::Controller keybindings) :
 Menu::Controller::~Controller() {
 }
 
-Gtk::Box& Menu::Controller::view() {
+Gtk::Box &Menu::Controller::view() {
   return menu_view_.view(keybindings_.ui_manager());
 }
 
@@ -188,12 +183,6 @@ void Menu::Controller::OnFileNewHeaderFile() {
   //TODO(Oyvang) Legg til funksjon
 }
 
-void Menu::Controller::OnSystemQuit() {
-  //TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting
-  /*Quit the system*/
-
-}
-
 void Menu::Controller::OnPluginAddSnippet() {
   std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code)
 }

juci/menu.h

@@ -9,8 +9,13 @@ namespace Menu {
     class Model {
     public:
       Model();
+
       virtual ~Model();
-    std::string ui_string() { return ui_string_; }
+
+      std::string ui_string() {
+        return ui_string_;
+      }
+
     private:
       std::string ui_string_;
     };  // class Model
@@ -18,8 +23,10 @@ namespace Menu {
     class View {
     public:
       explicit View(Gtk::Orientation orient);
+
       virtual ~View();
-    Gtk::Box& view(Glib::RefPtr<Gtk::UIManager> ui_manager);
+
+      Gtk::Box &view(Glib::RefPtr<Gtk::UIManager> ui_manager);
 
     protected:
       Gtk::Box view_;
@@ -28,25 +35,41 @@ namespace Menu {
     class Controller {
     public:
       explicit Controller(Keybindings::Controller keybindings);
+
       virtual ~Controller();
-    Gtk::Box& view();
+
+      Gtk::Box &view();
+
     private:
       Keybindings::Controller keybindings_;
       View menu_view_;
       Model menu_model_;
-    void OnFileNewEmptyfile();    /*Signal handlers*/
+
+      void OnFileNewEmptyfile();
+
+      /*Signal handlers*/
       void OnFileNewCCFile();
+
       void OnFileNewHeaderFile();
+
       void OnFileOpenFile();
+
       void OnFileOpenFolder();
-    void OnSystemQuit();
+
       void OnPluginAddSnippet();
+
       void OnWindowCloseTab();
+
       void OnEditCopy();
+
       void OnEditCut();
+
       void OnEditPaste();
+
       void OnEditFind();
+
       void OnWindowSplitWindow();
+
       void OnHelpAbout();
     };  // class Controller
 }  // namespace Menu

juci/window.cc

@@ -1,18 +1,26 @@
 #include "juci.h"
-
 Window::Window() :
         window_box_(Gtk::ORIENTATION_HORIZONTAL),
         menu_(keybindings_) {
-  set_title("example juCi++");
+  set_title("juCi++");
   set_default_size(600, 600);
   //  window_box_.add(*source_.sourceview());
   add(window_box_);
+  keybindings_.action_group()->add(Gtk::Action::create("FileQuit",
+                  Gtk::Stock::QUIT),
+          [this]() {
+              OnSystemQuit();
+          });
   add_accel_group(keybindings_.ui_manager()->get_accel_group());
+  //Add views under here
   window_box_.pack_start(menu_.view());
   show_all_children();
-  
 }
 
 std::shared_ptr<Source::Controller> Window::source() {
   return std::shared_ptr<Source::Controller>(&source_);
 }
+
+void Window::OnSystemQuit() {
+  hide();
+}