fixed merge bug with tedsky

juci/CMakeLists.txt

@@ -106,6 +106,8 @@ add_executable(${project_name}
   entry.cc
   directories.h
   directories.cc
+  terminal.h
+  terminal.cc
   )
 
 add_library(${module} SHARED

juci/notebook.cc

@@ -16,7 +16,9 @@ Notebook::Controller::Controller(Keybindings::Controller& keybindings,
   source_config_(source_cfg) { 
   OnNewPage("juCi++");
   refClipboard_ = Gtk::Clipboard::get();
+  view().pack1(directories_.widget(),true,true);
   CreateKeybindings(keybindings);
+ 
 }//  Constructor
 
 void Notebook::Controller::CreateKeybindings(Keybindings::Controller

juci/notebook.h

@@ -8,10 +8,10 @@
 
 #include "directories.h"
 
- // #include <boost/algorithm/string/case_conv.hpp>
+  #include <boost/algorithm/string/case_conv.hpp>
 
- // #include <type_traits>
- // #include <sigc++/sigc++.h>
+  #include <type_traits>
+  #include <sigc++/sigc++.h>
 
 
 namespace Notebook {

juci/terminal.cc

@@ -0,0 +1,6 @@
+#include "terminal.h"
+
+
+
+
+ 

juci/terminal.h

@@ -0,0 +1,27 @@
+ 
+#ifndef JUCI_NOTEBOOK_H_
+#define JUCI_NOTEBOOK_H_
+
+#include <iostream>
+#include "gtkmm.h"
+
+namespace Terminal {
+
+  class View {
+  public:
+    View();   
+    //Gtk::HBox view() {return view_;}
+  private:
+    Gtk::HBox view_;
+    Gtk::TextBuffer buffer_;
+    Gtk::TextView textview_;
+  };  // class view
+  
+  class Controller {
+  public:
+
+
+  };  // class controller
+}  // namespace Terminal
+
+#endif  // JUCI_NOTEBOOK_H_

juci/window.cc

@@ -37,7 +37,6 @@ Window::Window() :
   window_box_.pack_start(menu_.view(), Gtk::PACK_SHRINK);
   window_box_.pack_start(notebook_.entry_view(), Gtk::PACK_SHRINK);
   window_box_.pack_start(notebook_.view());
-
   show_all_children();
   } // Window constructor