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

BAB-22 #comment Merged with master #time 10m

merge-requests/365/head
forgie 11 years ago
parent
8b1bbdd1f9 0a9971910a
commit
8f2ab05f26
10 changed files with 392 additions and 320 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. 17
      juci/CMakeLists.txt
  2. 10
      juci/juci.cc
  3. 16
      juci/juci.h
  4. 21
      juci/keybindings.cc
  5. 28
      juci/keybindings.h
  6. 152
      juci/menu.cc
  7. 103
      juci/menu.h
  8. 47
      juci/source.cc
  9. 31
      juci/source.h
  10. 17
      juci/window.cc

17
juci/CMakeLists.txt
Unescape View File

@ -66,15 +66,16 @@ 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
menu.h keybindings
menu.cc menu
source
window.cc window
juci.cc juci
api
#there is no need for extentions
)
api.h
)
add_library(${module} SHARED add_library(${module} SHARED

10
juci/juci.cc
Unescape View File

@ -1,9 +1,9 @@
#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(
Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(argc, argv, "no.sout.juci"); argc,
argv,
"no.sout.juci");
Window window; Window window;
return app->run(window);
return app->run(window);;
} }

16
juci/juci.h
Unescape View File

@ -1,25 +1,23 @@
/*juCi++ main header file*/ /*juCi++ main header file*/
#ifndef JUCI_H #ifndef JUCI_JUCI_H_
#define JUCI_H #define JUCI_JUCI_H_
#include <iostream> #include <iostream>
#include "gtkmm.h" #include "gtkmm.h"
#include "menu.h" #include "menu.h"
#include "source.h"
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_;
std::shared_ptr<Source::Controller> source();
private: private:
Menu::Controller menu; Menu::Controller menu;
Source::Controller source_;
/*signal handler*/ /*signal handler*/
void onSystemQuit(); void onSystemQuit();
}; };
#endif // JUCI_H #endif // JUCI_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_;
};
}

152
juci/menu.cc
Unescape View File

@ -53,195 +53,187 @@ 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) { Glib::RefPtr<Gtk::Box> Menu::View::view(
ui_manager_->insert_action_group(action_group); Glib::RefPtr<Gtk::UIManager> ui_manager) {
view_.pack_start(*ui_manager->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
return Glib::RefPtr<Gtk::Box>(&view_);
} }
Gtk::Box &Menu::View::view() {
view_.pack_start(*ui_manager_->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
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();
}); });
menu_view_.action_group()->add(Gtk::Action::create("FileNewCC", keybindings_.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();
}); });
menu_view_.action_group()->add(Gtk::Action::create("FileNewH", keybindings_.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 */
menu_view_.action_group()->add(Gtk::Action::create("FileOpenFile", Gtk::Stock::OPEN), keybindings_.action_group()->add(Gtk::Action::create("FileOpenFile", Gtk::Stock::OPEN),
[this]() { [this]() {
onFileOpenFile(); OnFileOpenFile();
}); });
menu_view_.action_group()->add(Gtk::Action::create("FileOpenFolder", "Open folder"), keybindings_.action_group()->add(Gtk::Action::create("FileOpenFolder", "Open folder"),
[this]() { [this]() {
onFileOpenFolder(); OnFileOpenFolder();
}); });
menu_view_.action_group()->add(Gtk::Action::create("FileQuit", Gtk::Stock::QUIT), keybindings_.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 */
menu_view_.set_ui_manager_action_group(menu_view_.action_group()); /* END help menu */
menu_view_.set_ui_manger_string(menu_model_.ui_string());
}
Menu::Controller::~Controller() {
keybindings_.ui_manager()->add_ui_from_string(menu_model_.ui_string());
keybindings_.ui_manager()->insert_action_group(keybindings_.action_group());
} }
Gtk::Box &Menu::Controller::view() { Menu::Controller::~Controller() {
return menu_view_.view();
} }
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() {
void Menu::Controller::OnFileNewCCFile() {
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::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(){
void Menu::Controller::OnSystemQuit() {
//TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting //TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting
/*Quit the system*/ /*Quit the system*/
Gtk::Main::quit(); //TODO(Oyvang, Zalox, Forgie) methode is depricated, find a better solution. Gtk::Main::quit(); //TODO(Oyvang, Zalox, Forgie) methode is depricated, find a better solution.
} }
void Menu::Controller::onPluginAddSnippet() {
void Menu::Controller::OnPluginAddSnippet() {
std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code) std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code)
} }
void Menu::Controller::onFileOpenFile() {
void Menu::Controller::OnFileOpenFile() {
std::cout << "Open file clicked" << std::endl; std::cout << "Open file clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onFileOpenFolder() {
void Menu::Controller::OnFileOpenFolder() {
std::cout << "Open folder clicked" << std::endl; std::cout << "Open folder clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onWindowCloseTab() {
void Menu::Controller::OnWindowCloseTab() {
std::cout << "Closing tab clicked" << std::endl; std::cout << "Closing tab clicked" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditCopy() {
void Menu::Controller::OnEditCopy() {
std::cout << "Clicked copy" << std::endl; std::cout << "Clicked copy" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditCut() {
void Menu::Controller::OnEditCut() {
std::cout << "Clicked cut" << std::endl; std::cout << "Clicked cut" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditPaste() {
void Menu::Controller::OnEditPaste() {
std::cout << "Clicked paste" << std::endl; std::cout << "Clicked paste" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onEditFind() {
void Menu::Controller::OnEditFind() {
std::cout << "Clicked find" << std::endl; std::cout << "Clicked find" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onWindowSplitWindow() {
void Menu::Controller::OnWindowSplitWindow() {
std::cout << "Clicked split window" << std::endl; std::cout << "Clicked split window" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }
void Menu::Controller::onHelpAbout() {
void Menu::Controller::OnHelpAbout() {
std::cout << "Clicked about" << std::endl; std::cout << "Clicked about" << std::endl;
//TODO(Oyvang) Legg til funksjon //TODO(Oyvang) Legg til funksjon
} }

103
juci/menu.h
Unescape View File

@ -1,90 +1,53 @@
#ifndef JUCI_MENU_H_
#define JUCI_MENU_H_
#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() { return ui_string_; }
std::string ui_string() {
return ui_string_;
};
private: private:
std::string ui_string_; std::string ui_string_;
}; }; // class Model
class View { class View {
public: public:
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::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_; }; // class View
Glib::RefPtr <Gtk::ActionGroup> action_group_; // controller
};
class Controller { class Controller {
public: public:
Controller(); explicit Controller(Keybindings::Controller keybindings);
virtual ~Controller(); virtual ~Controller();
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_; View menu_view_;
Model menu_model_;
/*Signal handlers*/ void OnFileNewEmptyfile(); /*Signal handlers*/
void onFileNewEmptyfile(); void OnFileNewCCFile();
void OnFileNewHeaderFile();
void onFileNewCCFile(); void OnFileOpenFile();
void OnFileOpenFolder();
void onFileNewHeaderFile(); void OnSystemQuit();
void OnPluginAddSnippet();
void onFileOpenFile(); void OnWindowCloseTab();
void OnEditCopy();
void onFileOpenFolder(); void OnEditCut();
void OnEditPaste();
void onSystemQuit(); void OnEditFind();
void OnWindowSplitWindow();
void onPluginAddSnippet(); void OnHelpAbout();
}; // class Controller
void onWindowCloseTab(); } // namespace Menu
#endif // JUCI_MENU_H_
void onEditCopy();
void onEditCut();
void onEditPaste();
void onEditFind();
void onWindowSplitWindow();
void onHelpAbout();
};
}

47
juci/source.cc
Unescape View File

@ -0,0 +1,47 @@
#include "source.h"
#include <iostream>
using namespace std;
//////////////
//// View ////
//////////////
Source::View::View() {
cout << "View construktor run" << endl;
}
void Source::View::UpdateLine(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {
cout << "Update line called. linum: " << mark->get_iter().get_line() << endl;
}
///////////////
//// Model ////
///////////////
Source::Model::Model(){
cout << "Model construktor run" << endl;
}
////////////////////
//// Controller ////
////////////////////
/**
*
*/
Source::Controller::Controller() {
cout << "Controller construktor run" << endl;
}
/**
*
*/
std::shared_ptr<Source::View> Source::Controller::sourceview() {
sourceview();
return std::shared_ptr<Source::View>(&sourceview_);
}
/**
*
*/
void Source::Controller::OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark){
}

31
juci/source.h
Unescape View File

@ -0,0 +1,31 @@
#ifndef JUCI_SOURCE_H_
#define JUCI_SOURCE_H_
#include <iostream>
#include "gtkmm.h"
namespace Source {
class View : public Gtk::TextView {
public:
View();
void UpdateLine(Glib::RefPtr<Gtk::TextBuffer::Mark> mark);
private:
void UpdateSyntaxHighlighting(int line_number);
};
class Model{
public:
Model();
};
class Controller {
public:
Controller();
std::shared_ptr<Source::View> sourceview();
private:
void OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark);
protected:
View sourceview_;
}; // class Controller
} // namespace Source
#endif // JUCI_SOURCE_H_

17
juci/window.cc
Unescape View File

@ -3,24 +3,15 @@
Window::Window() : Window::Window() :
window_box_(Gtk::ORIENTATION_HORIZONTAL), window_box_(Gtk::ORIENTATION_HORIZONTAL),
menu() { menu() {
set_title("example juCi++"); set_title("example juCi++");
set_default_size(600, 600); set_default_size(600, 600);
// window_box_.add(*source_.sourceview());
add(window_box_); add(window_box_);
add_accel_group(menu.ui_manager()->get_accel_group()); add_accel_group(menu.ui_manager()->get_accel_group());
window_box_.pack_start(menu.view()); window_box_.pack_start(menu.view());
show_all_children(); show_all_children();
};
Window::~Window() {
} }
std::shared_ptr<Source::Controller> Window::source() {
return std::shared_ptr<Source::Controller>(&source_);
}

Write Preview
Loading…
Cancel
Save