From 8c42813bbe3efa7773e70d52a233a7977ccf6d36 Mon Sep 17 00:00:00 2001
From: oyvang <gm.larsen@oyvang.org>
Date: Mon, 13 Apr 2015 15:16:21 +0200
Subject: [PATCH] fixed merge bug with tedsky

---
 juci/CMakeLists.txt |  2 ++
 juci/notebook.cc    |  2 ++
 juci/notebook.h     |  6 +++---
 juci/terminal.cc    |  6 ++++++
 juci/terminal.h     | 27 +++++++++++++++++++++++++++
 juci/window.cc      |  1 -
 6 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 juci/terminal.cc
 create mode 100644 juci/terminal.h

diff --git a/juci/CMakeLists.txt b/juci/CMakeLists.txt
index 2f3755a..e4869d0 100644
--- a/juci/CMakeLists.txt
+++ b/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
diff --git a/juci/notebook.cc b/juci/notebook.cc
index ba983fd..ad6362b 100644
--- a/juci/notebook.cc
+++ b/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
diff --git a/juci/notebook.h b/juci/notebook.h
index c726748..1d5783c 100644
--- a/juci/notebook.h
+++ b/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 {
diff --git a/juci/terminal.cc b/juci/terminal.cc
new file mode 100644
index 0000000..e96a21a
--- /dev/null
+++ b/juci/terminal.cc
@@ -0,0 +1,6 @@
+#include "terminal.h"
+
+
+
+
+ 
diff --git a/juci/terminal.h b/juci/terminal.h
new file mode 100644
index 0000000..83d0738
--- /dev/null
+++ b/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_
diff --git a/juci/window.cc b/juci/window.cc
index 99485c2..73f72eb 100644
--- a/juci/window.cc
+++ b/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