zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

keybindings changes

merge-requests/365/head
oyvang 11 years ago
parent
e2414e0e16
commit
b8e8507fc6
8 changed files with 274 additions and 256 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      juci/CMakeLists.txt
  2. 8
      juci/juci.cc
  3. 5
      juci/juci.h
  4. 21
      juci/keybindings.cc
  5. 28
      juci/keybindings.h
  6. 354
      juci/menu.cc
  7. 87
      juci/menu.h
  8. 23
      juci/window.cc

4
juci/CMakeLists.txt
Unescape View File

@ -63,10 +63,10 @@ endif()
# name of the executable on Windows will be example.exe # name of the executable on Windows will be example.exe
add_executable(${project_name} add_executable(${project_name}
# list of every needed file to create the executable # list of every needed file to create the executable
keybindings.h
menu.h menu.h
keybindings.cc
menu.cc menu.cc
window.cc window.cc
juci.cc juci.cc
) )

8
juci/juci.cc
Unescape View File

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

5
juci/juci.h
Unescape View File

@ -10,16 +10,19 @@
class Window : public Gtk::Window { class Window : public Gtk::Window {
public: public:
Window(); Window();
virtual ~Window(); virtual ~Window();
Gtk::Box window_box_; Gtk::Box window_box_;
private: private:
Keybindings::Controller keybindings;
Menu::Controller menu; Menu::Controller menu;
/*signal handler*/ /*signal handler*/
void onSystemQuit(); void onSystemQuit();
}; };
#endif // JUCI_H #endif // JUCI_H

21
juci/keybindings.cc
Unescape View File

@ -0,0 +1,21 @@
#include "keybindings.h"
Keybindings::Controller::Controller() {
action_group_ = Gtk::ActionGroup::create();
ui_manager_ = Gtk::UIManager::create();
}
Keybindings::Controller::~Controller(){
}
void Keybindings::Controller::set_ui_manager_action_group(Glib::RefPtr<Gtk::ActionGroup> action_group) {
ui_manager_->insert_action_group(action_group);
}
void Keybindings::Controller::set_ui_manger_string(std::string ui_string) {
try {
ui_manager_->add_ui_from_string(ui_string);
}
catch (const Glib::Error &ex) {
std::cerr << "building menus failed: " << ex.what();
}
}

28
juci/keybindings.h
Unescape View File

@ -0,0 +1,28 @@
#include "iostream"
#include "gtkmm.h"
namespace Keybindings {
class Controller {
public:
Controller();
virtual ~Controller();
Glib::RefPtr<Gtk::ActionGroup> action_group() {
return action_group_;
};
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_;
};
}

354
juci/menu.cc
Unescape View File

@ -6,41 +6,41 @@
Menu::Model::Model() { Menu::Model::Model() {
ui_string_ = ui_string_ =
"<ui> " "<ui> "
" <menubar name='MenuBar'> " " <menubar name='MenuBar'> "
" <menu action='FileMenu'> " " <menu action='FileMenu'> "
" <menu action='FileNew'> " " <menu action='FileNew'> "
" <menuitem action='FileNewStandard'/> " " <menuitem action='FileNewStandard'/> "
" <menuitem action='FileNewCC'/> " " <menuitem action='FileNewCC'/> "
" <menuitem action='FileNewH'/> " " <menuitem action='FileNewH'/> "
" </menu> " " </menu> "
" <menuitem action='FileOpenFile'/> " " <menuitem action='FileOpenFile'/> "
" <menuitem action='FileOpenFolder'/> " " <menuitem action='FileOpenFolder'/> "
" <separator/> " " <separator/> "
" <menuitem action='FileQuit'/> " " <menuitem action='FileQuit'/> "
" </menu> " " </menu> "
" <menu action='EditMenu'> " " <menu action='EditMenu'> "
" <menuitem action='EditCopy'/> " " <menuitem action='EditCopy'/> "
" <menuitem action='EditCut'/> " " <menuitem action='EditCut'/> "
" <menuitem action='EditPaste'/> " " <menuitem action='EditPaste'/> "
" <separator/> " " <separator/> "
" <menuitem action='EditFind'/> " " <menuitem action='EditFind'/> "
" </menu> " " </menu> "
" <menu action='WindowMenu'> " " <menu action='WindowMenu'> "
" <menuitem action='WindowCloseTab'/> " " <menuitem action='WindowCloseTab'/> "
" <menuitem action='WindowSplitWindow'/> " " <menuitem action='WindowSplitWindow'/> "
" </menu> " " </menu> "
" <menu action='PluginMenu'> " " <menu action='PluginMenu'> "
" <menu action='PluginSnippet'> " " <menu action='PluginSnippet'> "
" <menuitem action='PluginAddSnippet'/> " " <menuitem action='PluginAddSnippet'/> "
" </menu> " " </menu> "
" </menu> " " </menu> "
" <menu action='HelpMenu'> " " <menu action='HelpMenu'> "
" <menuitem action='HelpAbout'/> " " <menuitem action='HelpAbout'/> "
" </menu> " " </menu> "
" </menubar> " " </menubar> "
"</ui> "; "</ui> ";
} }
@ -53,131 +53,115 @@ Menu::Model::~Model() {
Menu::View::View(Gtk::Orientation orientation) : Menu::View::View(Gtk::Orientation orientation) :
view_(orientation) { view_(orientation) {
action_group_ = Gtk::ActionGroup::create();
ui_manager_ = Gtk::UIManager::create();
}
void Menu::View::set_ui_manger_string(std::string ui_string) {
try {
ui_manager_->add_ui_from_string(ui_string);
}
catch (const Glib::Error &ex) {
std::cerr << "building menus failed: " << ex.what();
}
}
void Menu::View::set_ui_manager_action_group(Glib::RefPtr<Gtk::ActionGroup> action_group) {
ui_manager_->insert_action_group(action_group);
} }
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); view_.pack_start(*ui_manager->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
return view_; return view_;
} }
Menu::View::~View() { Menu::View::~View() {
} }
/***********************************/ /***********************************/
/* CONTROLLER */ /* CONTROLLER */
/***********************************/ /***********************************/
Menu::Controller::Controller() : Menu::Controller::Controller(Keybindings::Controller keybindings) :
menu_view_(Gtk::ORIENTATION_VERTICAL), menu_view_(Gtk::ORIENTATION_VERTICAL),
menu_model_() { menu_model_(),
keybindings_(keybindings){
/* Add action to menues */ /* Add action to menues */
/* START file menu */ /* START file menu */
menu_view_.action_group()->add(Gtk::Action::create("FileMenu", Gtk::Stock::FILE)); keybindings_.action_group()->add(Gtk::Action::create("FileMenu", Gtk::Stock::FILE));
/* File->New files */ /* File->New files */
menu_view_.action_group()->add(Gtk::Action::create("FileNew", "New")); keybindings_.action_group()->add(Gtk::Action::create("FileNew", "New"));
keybindings_.action_group()->add(Gtk::Action::create("FileNewStandard",
menu_view_.action_group()->add(Gtk::Action::create("FileNewStandard", Gtk::Stock::NEW, "New empty file", "Create a new file"),
Gtk::Stock::NEW, "New empty file", "Create a new file"), [this]() {
[this]() { OnFileNewEmptyfile();
onFileNewEmptyfile(); });
}); keybindings_.action_group()->add(Gtk::Action::create("FileNewCC",
menu_view_.action_group()->add(Gtk::Action::create("FileNewCC", Gtk::Stock::NEW, "New cc file", "Create a new cc file"),
Gtk::Stock::NEW, "New cc file", "Create a new cc file"), Gtk::AccelKey("<control><alt>c"),
Gtk::AccelKey("<control><alt>c"), [this]() {
[this]() { OnFileNewCCFile();
onFileNewCCFile(); });
}); keybindings_.action_group()->add(Gtk::Action::create("FileNewH",
menu_view_.action_group()->add(Gtk::Action::create("FileNewH", Gtk::Stock::NEW, "New h file", "Create a new h file"),
Gtk::Stock::NEW, "New h file", "Create a new h file"), Gtk::AccelKey("<control><alt>h"),
Gtk::AccelKey("<control><alt>h"), [this]() {
[this]() { OnFileNewHeaderFile();
onFileNewHeaderFile(); });
}); /* File-> New files end */
/* File-> New files end */ keybindings_.action_group()->add(Gtk::Action::create("FileOpenFile", Gtk::Stock::OPEN),
menu_view_.action_group()->add(Gtk::Action::create("FileOpenFile", Gtk::Stock::OPEN), [this]() {
[this]() { OnFileOpenFile();
onFileOpenFile(); });
}); keybindings_.action_group()->add(Gtk::Action::create("FileOpenFolder", "Open folder"),
menu_view_.action_group()->add(Gtk::Action::create("FileOpenFolder", "Open folder"), [this]() {
[this]() { OnFileOpenFolder();
onFileOpenFolder(); });
}); keybindings_.action_group()->add(Gtk::Action::create("FileQuit", Gtk::Stock::QUIT),
menu_view_.action_group()->add(Gtk::Action::create("FileQuit", Gtk::Stock::QUIT), [this]() {
[this]() { OnSystemQuit();
onSystemQuit(); });
});
/* END file menu */ /* END file menu */
/* START edit menu */ /* START edit menu */
menu_view_.action_group()->add(Gtk::Action::create("EditMenu", Gtk::Stock::EDIT)); keybindings_.action_group()->add(Gtk::Action::create("EditMenu", Gtk::Stock::EDIT));
menu_view_.action_group()->add(Gtk::Action::create("EditCopy", Gtk::Stock::COPY), keybindings_.action_group()->add(Gtk::Action::create("EditCopy", Gtk::Stock::COPY),
[this]() { [this]() {
onEditCopy(); OnEditCopy();
}); });
menu_view_.action_group()->add(Gtk::Action::create("EditCut", Gtk::Stock::CUT), keybindings_.action_group()->add(Gtk::Action::create("EditCut", Gtk::Stock::CUT),
[this]() { [this]() {
onEditCut(); OnEditCut();
}); });
menu_view_.action_group()->add(Gtk::Action::create("EditPaste", Gtk::Stock::PASTE), keybindings_.action_group()->add(Gtk::Action::create("EditPaste", Gtk::Stock::PASTE),
[this]() { [this]() {
onEditPaste(); OnEditPaste();
}); });
menu_view_.action_group()->add(Gtk::Action::create("EditFind", Gtk::Stock::FIND), keybindings_.action_group()->add(Gtk::Action::create("EditFind", Gtk::Stock::FIND),
[this]() { [this]() {
onEditFind(); OnEditFind();
}); });
/* END edit menu */ /* END edit menu */
/* START window menu */ /* START window menu */
menu_view_.action_group()->add(Gtk::Action::create("WindowMenu", "_Window")); keybindings_.action_group()->add(Gtk::Action::create("WindowMenu", "_Window"));
menu_view_.action_group()->add(Gtk::Action::create("WindowCloseTab", "Close tab"), keybindings_.action_group()->add(Gtk::Action::create("WindowCloseTab", "Close tab"),
Gtk::AccelKey("<control>w"), Gtk::AccelKey("<control>w"),
[this]() { [this]() {
onWindowCloseTab(); OnWindowCloseTab();
}); });
menu_view_.action_group()->add(Gtk::Action::create("WindowSplitWindow", "Split window"), keybindings_.action_group()->add(Gtk::Action::create("WindowSplitWindow", "Split window"),
Gtk::AccelKey("<control><alt>S"), Gtk::AccelKey("<control><alt>S"),
[this]() { [this]() {
onWindowSplitWindow(); OnWindowSplitWindow();
}); });
/* END window menu */ /* END window menu */
/* START Plugin menu */ /* START Plugin menu */
menu_view_.action_group()->add(Gtk::Action::create("PluginMenu", "_Plugins")); keybindings_.action_group()->add(Gtk::Action::create("PluginMenu", "_Plugins"));
/*Plugin->snippet*/ /*Plugin->snippet*/
menu_view_.action_group()->add(Gtk::Action::create("PluginSnippet", "Snippet")); keybindings_.action_group()->add(Gtk::Action::create("PluginSnippet", "Snippet"));
menu_view_.action_group()->add(Gtk::Action::create("PluginAddSnippet", "Add snippet"), keybindings_.action_group()->add(Gtk::Action::create("PluginAddSnippet", "Add snippet"),
Gtk::AccelKey("<alt>space"), Gtk::AccelKey("<alt>space"),
[this]() { [this]() {
onPluginAddSnippet(); OnPluginAddSnippet();
}); });
/* End snippet */ /* End snippet */
/* END plugin menu */ /* END plugin menu */
/* START help menu */ /* START help menu */
menu_view_.action_group()->add(Gtk::Action::create("HelpMenu", Gtk::Stock::HELP)); keybindings_.action_group()->add(Gtk::Action::create("HelpMenu", Gtk::Stock::HELP));
menu_view_.action_group()->add(Gtk::Action::create("HelpAbout", Gtk::Stock::ABOUT), keybindings_.action_group()->add(Gtk::Action::create("HelpAbout", Gtk::Stock::ABOUT),
[this]() { [this]() {
onHelpAbout(); OnHelpAbout();
}); });
/* END help menu */ /* END help menu */
menu_view_.set_ui_manager_action_group(menu_view_.action_group()); keybindings_.ui_manager()->add_ui_from_string(menu_model_.ui_string());
menu_view_.set_ui_manger_string(menu_model_.ui_string()); keybindings_.ui_manager()->insert_action_group(keybindings_.action_group());
} }
Menu::Controller::~Controller() { Menu::Controller::~Controller() {
@ -185,63 +169,75 @@ Menu::Controller::~Controller() {
} }
Gtk::Box &Menu::Controller::view() { Gtk::Box &Menu::Controller::view() {
return menu_view_.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
} }
void Menu::Controller::onFileNewCCFile() {
std::cout << "New cc file clicked" << std::endl; void Menu::Controller::OnFileNewCCFile() {
//TODO(Oyvang) Legg til funksjon std::cout << "New cc file clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onFileNewHeaderFile() { void Menu::Controller::OnFileNewHeaderFile() {
std::cout << "New cc file clicked" << std::endl; std::cout << "New cc file clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onSystemQuit(){
//TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting void Menu::Controller::OnSystemQuit() {
/*Quit the system*/ //TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting
Gtk::Main::quit(); //TODO(Oyvang, Zalox, Forgie) methode is depricated, find a better solution. /*Quit the system*/
Gtk::Main::quit(); //TODO(Oyvang, Zalox, Forgie) methode is depricated, find a better solution.
} }
void Menu::Controller::onPluginAddSnippet() {
std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code) void Menu::Controller::OnPluginAddSnippet() {
std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code)
} }
void Menu::Controller::onFileOpenFile() {
std::cout << "Open file clicked" << std::endl; void Menu::Controller::OnFileOpenFile() {
//TODO(Oyvang) Legg til funksjon std::cout << "Open file clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onFileOpenFolder() {
std::cout << "Open folder clicked" << std::endl; void Menu::Controller::OnFileOpenFolder() {
//TODO(Oyvang) Legg til funksjon std::cout << "Open folder clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onWindowCloseTab() {
std::cout << "Closing tab clicked" << std::endl; void Menu::Controller::OnWindowCloseTab() {
//TODO(Oyvang) Legg til funksjon std::cout << "Closing tab clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditCopy() {
std::cout << "Clicked copy" << std::endl; void Menu::Controller::OnEditCopy() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked copy" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditCut() {
std::cout << "Clicked cut" << std::endl; void Menu::Controller::OnEditCut() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked cut" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditPaste() {
std::cout << "Clicked paste" << std::endl; void Menu::Controller::OnEditPaste() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked paste" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditFind() {
std::cout << "Clicked find" << std::endl; void Menu::Controller::OnEditFind() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked find" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onWindowSplitWindow() {
std::cout << "Clicked split window" << std::endl; void Menu::Controller::OnWindowSplitWindow() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked split window" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onHelpAbout() {
std::cout << "Clicked about" << std::endl; void Menu::Controller::OnHelpAbout() {
//TODO(Oyvang) Legg til funksjon std::cout << "Clicked about" << std::endl;
//TODO(Oyvang) Legg til funksjon
} }

87
juci/menu.h
Unescape View File

@ -1,90 +1,69 @@
#include <iostream> #include <iostream>
#include "gtkmm.h" #include "gtkmm.h"
#include "keybindings.h"
namespace Menu { namespace Menu {
class Model { class Model {
public: public:
Model(); Model();
virtual~Model(); virtual~Model();
std::string ui_string() { std::string ui_string() {
return ui_string_; return ui_string_;
}; };
private: private:
std::string ui_string_; std::string ui_string_;
}; };
class View { class View {
public: public:
View(Gtk::Orientation orient); View(Gtk::Orientation orient);
virtual ~View();
virtual ~View(); Gtk::Box &view(Glib::RefPtr<Gtk::UIManager> ui_manager);
Gtk::Box &view();
Glib::RefPtr <Gtk::ActionGroup> action_group() {
return action_group_;
};
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: protected:
Gtk::Box view_; Gtk::Box view_;
Glib::RefPtr <Gtk::UIManager> ui_manager_;
Glib::RefPtr <Gtk::ActionGroup> action_group_;
}; };
class Controller { class Controller {
public: public:
Controller(); Controller(Keybindings::Controller keybindings);
virtual ~Controller();
virtual ~Controller(); Gtk::Box &view();
Gtk::Box &view();
Glib::RefPtr <Gtk::UIManager> ui_manager() {
return menu_view_.ui_manager();
};
private: private:
Menu::View menu_view_; Keybindings::Controller keybindings_;
Menu::Model menu_model_; Menu::View menu_view_;
Menu::Model menu_model_;
/*Signal handlers*/ /*Signal handlers*/
void onFileNewEmptyfile(); void OnFileNewEmptyfile();
void onFileNewCCFile(); void OnFileNewCCFile();
void onFileNewHeaderFile(); void OnFileNewHeaderFile();
void onFileOpenFile(); void OnFileOpenFile();
void onFileOpenFolder(); void OnFileOpenFolder();
void onSystemQuit(); void OnSystemQuit();
void onPluginAddSnippet(); void OnPluginAddSnippet();
void onWindowCloseTab(); void OnWindowCloseTab();
void onEditCopy(); void OnEditCopy();
void onEditCut(); void OnEditCut();
void onEditPaste(); void OnEditPaste();
void onEditFind(); void OnEditFind();
void onWindowSplitWindow(); void OnWindowSplitWindow();
void onHelpAbout(); void OnHelpAbout();
}; };
} }

23
juci/window.cc
Unescape View File

@ -2,23 +2,16 @@
Window::Window() : Window::Window() :
window_box_(Gtk::ORIENTATION_HORIZONTAL), window_box_(Gtk::ORIENTATION_HORIZONTAL),
menu() { keybindings(),
menu(keybindings) {
set_title("example juCi++");
set_title("example juCi++"); set_default_size(600, 600);
set_default_size(600, 600); add(window_box_);
window_box_.pack_start(menu.view());
add(window_box_); add_accel_group(keybindings.ui_manager()->get_accel_group());
show_all_children();
add_accel_group(menu.ui_manager()->get_accel_group());
window_box_.pack_start(menu.view());
show_all_children();
}; };
Window::~Window() { Window::~Window() {
} }

Write Preview
Loading…
Cancel
Save