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

merged

merge-requests/365/head
oyvang 11 years ago
parent
78b2de3924 d93b864fdb
commit
aff0c95553
6 changed files with 70 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      juci/api_ext.cc
  2. 17
      juci/config.json
  3. 2
      juci/menu.cc
  4. 2
      juci/menu.xml
  5. 29
      juci/notebook.cc
  6. 23
      juci/window.cc

15
juci/api_ext.cc
Unescape View File

@ -0,0 +1,15 @@
#include "api.h"
BOOST_PYTHON_MODULE(juci_to_python_api) {
using namespace boost::python;
// plugin inclusion
def("addMenuElement", &libjuci::AddMenuElement);
def("addSubMenuElement", &libjuci::AddSubMenuElement);
def("loadPlugin", &libjuci::LoadPlugin);
def("initPlugin", &libjuci::InitPlugin);
// text editing
def("replaceLine", &libjuci::ReplaceLine);
def("replaceWord", &libjuci::ReplaceWord);
def("getWord", &libjuci::GetWord);
} // module::juci_to_python_api

17
juci/config.json
Unescape View File

@ -31,14 +31,23 @@
]
},
"keybindings": {
"split_window": "<control><alt>s",
"new_file": "<control>n",
"new_h_file": "<control><alt>h",
"new_cc_file": "<alt>c",
"close_tab": "<control>w",
"new_cc_file": "<control><alt>c",
"open_folder": "<control><alt>o",
"edit_undo": "<control>z",
"open_file": "<control>o",
"save": "<control>s",
"save_as": "<control><shift>s",
"quit": "<control>q",
"split_window": "<control><alt>s",
"close_tab": "<control>w",
"edit_copy": "<control>c",
"edit_cut": "<control>x",
"edit_paste": "<control>v",
"edit_undo": "<control>z",
"edit_find": "<control>f",
"compile_and_run": "<control><alt>r",
"compile": "<control>r"
},

2
juci/menu.cc
Unescape View File

@ -15,7 +15,7 @@ Menu::Controller::Controller(Keybindings::Controller& keybindings) :
menu_view_(Gtk::ORIENTATION_VERTICAL),
keybindings_(keybindings) {
keybindings_.action_group_menu()->add(Gtk::Action::create("FileNew",
Gtk::Stock::FILE));
"New File"));
keybindings_.action_group_menu()->add(Gtk::Action::create("EditMenu",
Gtk::Stock::EDIT));
keybindings_.action_group_menu()->add(Gtk::Action::create("WindowMenu",

2
juci/menu.xml
Unescape View File

@ -6,7 +6,7 @@
<menuitem action='FileNewCC'/>
<menuitem action='FileNewH'/>
</menu>
<menuitem action='FileOpenFile'/>
<menuitem action='FileOpenFile'/>
<menuitem action='FileOpenFolder'/>
<menuitem action='FileSave'/>
<menuitem action='FileSaveAs'/>

29
juci/notebook.cc
Unescape View File

@ -42,17 +42,17 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
Gtk::Stock::FILE));
keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewStandard",
Gtk::Stock::NEW,
"New empty file",
"Create a new file"),
add(Gtk::Action::create("FileNewStandard",
"New empty file"),
Gtk::AccelKey(keybindings.config_
.key_map()["new_file"]),
[this]() {
is_new_file_ = true;
OnFileNewEmptyfile();
});
keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewCC",
"New cc file"),
"New source file"),
Gtk::AccelKey(keybindings.config_
.key_map()["new_cc_file"]),
[this]() {
@ -61,7 +61,7 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
});
keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewH",
"New h file"),
"New header file"),
Gtk::AccelKey(keybindings.config_
.key_map()["new_h_file"]),
[this]() {
@ -78,7 +78,9 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
});
keybindings.action_group_menu()->
add(Gtk::Action::create("EditFind",
Gtk::Stock::FIND),
"Find"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_find"]),
[this]() {
is_new_file_ = false;
OnEditSearch();
@ -86,19 +88,26 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
});
keybindings.action_group_menu()->
add(Gtk::Action::create("EditCopy",
Gtk::Stock::COPY),
"Copy"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_copy"]),
[this]() {
OnEditCopy();
});
keybindings.action_group_menu()->
add(Gtk::Action::create("EditCut",
Gtk::Stock::CUT),
"Cut"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_cut"]),
[this]() {
OnEditCut();
});
keybindings.action_group_menu()->
add(Gtk::Action::create("EditPaste",
Gtk::Stock::PASTE),
"Paste"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_paste"]),
[this]() {
OnEditPaste();
});

23
juci/window.cc
Unescape View File

@ -16,12 +16,16 @@ Window::Window() :
set_default_size(600, 400);
add(window_box_);
keybindings_.action_group_menu()->add(Gtk::Action::create("FileQuit",
Gtk::Stock::QUIT),
"Quit juCi++"),
Gtk::AccelKey(keybindings_.config_
.key_map()["quit"]),
[this]() {
OnWindowHide();
});
keybindings_.action_group_menu()->add(Gtk::Action::create("FileOpenFile",
Gtk::Stock::OPEN),
"Open file"),
Gtk::AccelKey(keybindings_.config_
.key_map()["open_file"]),
[this]() {
OnOpenFile();
});
@ -33,6 +37,21 @@ Window::Window() :
OnFileOpenFolder();
});
keybindings_.action_group_menu()->add(Gtk::Action::create("FileSaveAs",
"Save as"),
Gtk::AccelKey(keybindings_.config_
.key_map()["save_as"]),
[this]() {
notebook_.OnSaveFile();
});
keybindings_.action_group_menu()->add(Gtk::Action::create("FileSave",
"Save file"),
Gtk::AccelKey(keybindings_.config_
.key_map()["save"]),
[this]() {
notebook_.OnSaveFile();
});
keybindings_.
action_group_menu()->
add(Gtk::Action::create("FileSaveAs",

Write Preview
Loading…
Cancel
Save