Browse Source

Fixed view pointers to ref

merge-requests/365/head
oyvang 11 years ago
parent
commit
22408b7f22
  1. 3
      juci/juci.h
  2. 8
      juci/menu.cc
  3. 4
      juci/menu.h
  4. 6
      juci/window.cc

3
juci/juci.h

@ -14,7 +14,8 @@ public:
Gtk::Box window_box_; Gtk::Box window_box_;
std::shared_ptr<Source::Controller> source(); std::shared_ptr<Source::Controller> source();
private: private:
Menu::Controller menu; Keybindings::Controller keybindings_;
Menu::Controller menu_;
Source::Controller source_; Source::Controller source_;
/*signal handler*/ /*signal handler*/
void onSystemQuit(); void onSystemQuit();

8
juci/menu.cc

@ -55,10 +55,10 @@ Menu::View::View(Gtk::Orientation orientation) :
} }
Glib::RefPtr<Gtk::Box> Menu::View::view( Gtk::Box& Menu::View::view(
Glib::RefPtr<Gtk::UIManager> ui_manager) { Glib::RefPtr<Gtk::UIManager> ui_manager) {
view_.pack_start(*ui_manager->get_widget("/MenuBar"), Gtk::PACK_SHRINK); view_.pack_start(*ui_manager->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
return Glib::RefPtr<Gtk::Box>(&view_); return view_;
} }
Menu::View::~View() { Menu::View::~View() {
@ -169,6 +169,10 @@ Menu::Controller::Controller(Keybindings::Controller keybindings) :
Menu::Controller::~Controller() { Menu::Controller::~Controller() {
} }
Gtk::Box& Menu::Controller::view() {
return menu_view_.view(keybindings_.ui_manager());
}
void Menu::Controller::OnFileNewEmptyfile() { void Menu::Controller::OnFileNewEmptyfile() {
std::cout << "New file clicked" << std::endl; std::cout << "New file clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon

4
juci/menu.h

@ -19,7 +19,7 @@ namespace Menu {
public: public:
explicit View(Gtk::Orientation orient); explicit View(Gtk::Orientation orient);
virtual ~View(); virtual ~View();
Glib::RefPtr<Gtk::Box> view(Glib::RefPtr<Gtk::UIManager> ui_manager); Gtk::Box& view(Glib::RefPtr<Gtk::UIManager> ui_manager);
protected: protected:
Gtk::Box view_; Gtk::Box view_;
@ -29,7 +29,7 @@ namespace Menu {
public: public:
explicit Controller(Keybindings::Controller keybindings); explicit Controller(Keybindings::Controller keybindings);
virtual ~Controller(); virtual ~Controller();
Gtk::Box& view();
private: private:
Keybindings::Controller keybindings_; Keybindings::Controller keybindings_;
View menu_view_; View menu_view_;

6
juci/window.cc

@ -2,13 +2,13 @@
Window::Window() : Window::Window() :
window_box_(Gtk::ORIENTATION_HORIZONTAL), window_box_(Gtk::ORIENTATION_HORIZONTAL),
menu() { menu_(keybindings_) {
set_title("example juCi++"); set_title("example juCi++");
set_default_size(600, 600); set_default_size(600, 600);
// window_box_.add(*source_.sourceview()); // window_box_.add(*source_.sourceview());
add(window_box_); add(window_box_);
add_accel_group(menu.ui_manager()->get_accel_group()); add_accel_group(keybindings_.ui_manager()->get_accel_group());
window_box_.pack_start(menu.view()); window_box_.pack_start(menu_.view());
show_all_children(); show_all_children();
} }

Loading…
Cancel
Save