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

Merge branch 'master' of bitbucket.org:cppit/juci

merge-requests/365/head
Jørgen Lien Sellæg 11 years ago
parent
f7da02341c 765b28cf35
commit
fd0047e415
9 changed files with 128 additions and 62 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. 15
      juci/api_ext.cc
  2. 17
      juci/config.json
  3. 2
      juci/menu.cc
  4. 76
      juci/notebook.cc
  5. 3
      juci/notebook.h
  6. 2
      juci/terminal.h
  7. 67
      juci/window.cc
  8. 2
      juci/window.h

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": { "keybindings": {
"split_window": "<control><alt>s", "new_file": "<control>n",
"new_h_file": "<control><alt>h", "new_h_file": "<control><alt>h",
"new_cc_file": "<alt>c", "new_cc_file": "<control><alt>c",
"close_tab": "<control>w",
"open_folder": "<control><alt>o", "open_folder": "<control><alt>o",
"edit_undo": "<control>z", "open_file": "<control>o",
"save": "<control>s", "save": "<control>s",
"save_as": "<control><shift>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_and_run": "<control><alt>r",
"compile": "<control>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), menu_view_(Gtk::ORIENTATION_VERTICAL),
keybindings_(keybindings) { keybindings_(keybindings) {
keybindings_.action_group_menu()->add(Gtk::Action::create("FileNew", keybindings_.action_group_menu()->add(Gtk::Action::create("FileNew",
Gtk::Stock::FILE)); "New File"));
keybindings_.action_group_menu()->add(Gtk::Action::create("EditMenu", keybindings_.action_group_menu()->add(Gtk::Action::create("EditMenu",
Gtk::Stock::EDIT)); Gtk::Stock::EDIT));
keybindings_.action_group_menu()->add(Gtk::Action::create("WindowMenu", keybindings_.action_group_menu()->add(Gtk::Action::create("WindowMenu",

76
juci/notebook.cc
Unescape View File

@ -44,16 +44,16 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewStandard", add(Gtk::Action::create("FileNewStandard",
Gtk::Stock::NEW, "New empty file"),
"New empty file", Gtk::AccelKey(keybindings.config_
"Create a new file"), .key_map()["new_file"]),
[this]() { [this]() {
is_new_file_ = true; is_new_file_ = true;
OnFileNewEmptyfile(); OnFileNewEmptyfile();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewCC", add(Gtk::Action::create("FileNewCC",
"New cc file"), "New source file"),
Gtk::AccelKey(keybindings.config_ Gtk::AccelKey(keybindings.config_
.key_map()["new_cc_file"]), .key_map()["new_cc_file"]),
[this]() { [this]() {
@ -62,7 +62,7 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("FileNewH", add(Gtk::Action::create("FileNewH",
"New h file"), "New header file"),
Gtk::AccelKey(keybindings.config_ Gtk::AccelKey(keybindings.config_
.key_map()["new_h_file"]), .key_map()["new_h_file"]),
[this]() { [this]() {
@ -79,7 +79,9 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditFind", add(Gtk::Action::create("EditFind",
Gtk::Stock::FIND), "Find"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_find"]),
[this]() { [this]() {
is_new_file_ = false; is_new_file_ = false;
OnEditSearch(); OnEditSearch();
@ -87,19 +89,26 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditCopy", add(Gtk::Action::create("EditCopy",
Gtk::Stock::COPY), "Copy"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_copy"]),
[this]() { [this]() {
OnEditCopy(); OnEditCopy();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditCut", add(Gtk::Action::create("EditCut",
Gtk::Stock::CUT), "Cut"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_cut"]),
[this]() { [this]() {
OnEditCut(); OnEditCut();
}); });
keybindings.action_group_menu()-> keybindings.action_group_menu()->
add(Gtk::Action::create("EditPaste", add(Gtk::Action::create("EditPaste",
Gtk::Stock::PASTE), "Paste"),
Gtk::AccelKey(keybindings.config_
.key_map()["edit_paste"]),
[this]() { [this]() {
OnEditPaste(); OnEditPaste();
}); });
@ -623,15 +632,21 @@ void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview,
} }
} }
void Notebook::Controller:: OnSaveFile() { bool Notebook::Controller:: OnSaveFile() {
INFO("Notebook save file"); INFO("Notebook save file");
if (text_vec_.at(CurrentPage())->is_saved()) { if (text_vec_.at(CurrentPage())->is_saved()) {
std::ofstream file; std::ofstream file;
file.open (text_vec_.at(CurrentPage())->path()); file.open (text_vec_.at(CurrentPage())->path());
file << CurrentTextView().get_buffer()->get_text(); file << CurrentTextView().get_buffer()->get_text();
file.close(); file.close();
return true;
} else { } else {
std::string path = OnSaveFileAs(); return OnSaveFile(OnSaveFileAs());
}
return false;
}
bool Notebook::Controller:: OnSaveFile(std::string path) {
INFO("Notebook save file with path");
if (path != "") { if (path != "") {
std::ofstream file; std::ofstream file;
file.open (path); file.open (path);
@ -639,8 +654,9 @@ void Notebook::Controller:: OnSaveFile() {
file.close(); file.close();
text_vec_.at(CurrentPage())->set_file_path(path); text_vec_.at(CurrentPage())->set_file_path(path);
text_vec_.at(CurrentPage())->set_is_saved(true); text_vec_.at(CurrentPage())->set_is_saved(true);
return true;
} }
} return false;
} }
@ -657,26 +673,22 @@ std::string Notebook::Controller::OnSaveFileAs(){
DEBUG("RUN DIALOG"); DEBUG("RUN DIALOG");
int result = dialog.run(); int result = dialog.run();
DEBUG("DIALOG RUNNING"); DEBUG("DIALOG RUNNING");
switch (result) { switch (result) {
case(Gtk::RESPONSE_OK): { case(Gtk::RESPONSE_OK): {
DEBUG("get_filename()"); DEBUG("get_filename()");
std::string path = dialog.get_filename(); std::string path = dialog.get_filename();
DEBUG_VAR(path); unsigned pos = path.find_last_of("/\\");
unsigned pos = path.find_last_of("/\\"); return path;
std::cout << path<< std::endl; }
//notebook_.OnSaveFile(path); case(Gtk::RESPONSE_CANCEL): {
return path; break;
break; }
} default: {
case(Gtk::RESPONSE_CANCEL): { DEBUG("Unexpected button clicked.");
break; break;
} }
default: { }
std::cout << "Unexpected button clicked." << std::endl; return "";
break;
}
}
return "";
} }
void Notebook::Controller::AskToSaveDialog() { void Notebook::Controller::AskToSaveDialog() {

3
juci/notebook.h
Unescape View File

@ -54,7 +54,8 @@ namespace Notebook {
void OnFileNewEmptyfile(); void OnFileNewEmptyfile();
void OnFileNewHeaderFile(); void OnFileNewHeaderFile();
void OnFileOpenFolder(); void OnFileOpenFolder();
void OnSaveFile(); bool OnSaveFile();
bool OnSaveFile(std::string path);
void OnDirectoryNavigation(const Gtk::TreeModel::Path& path, void OnDirectoryNavigation(const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn* column); Gtk::TreeViewColumn* column);
void OnNewPage(std::string name); void OnNewPage(std::string name);

2
juci/terminal.h
Unescape View File

@ -40,12 +40,12 @@ namespace Terminal {
void Run(std::string executable); void Run(std::string executable);
void Compile(); void Compile();
Terminal::Config& config() { return config_; } Terminal::Config& config() { return config_; }
void PrintMessage(std::string message);
private: private:
Terminal::Config config_; Terminal::Config config_;
void ExecuteCommand(std::string command, std::string mode); void ExecuteCommand(std::string command, std::string mode);
bool OnButtonRealeaseEvent(GdkEventKey* key); bool OnButtonRealeaseEvent(GdkEventKey* key);
bool ExistInConsole(std::string string); bool ExistInConsole(std::string string);
void PrintMessage(std::string message);
Terminal::View view_; Terminal::View view_;
std::string folder_command_; std::string folder_command_;
std::string path_; std::string path_;

67
juci/window.cc
Unescape View File

@ -16,12 +16,16 @@ Window::Window() :
set_default_size(600, 400); set_default_size(600, 400);
add(window_box_); add(window_box_);
keybindings_.action_group_menu()->add(Gtk::Action::create("FileQuit", keybindings_.action_group_menu()->add(Gtk::Action::create("FileQuit",
Gtk::Stock::QUIT), "Quit juCi++"),
Gtk::AccelKey(keybindings_.config_
.key_map()["quit"]),
[this]() { [this]() {
OnWindowHide(); OnWindowHide();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("FileOpenFile", keybindings_.action_group_menu()->add(Gtk::Action::create("FileOpenFile",
Gtk::Stock::OPEN), "Open file"),
Gtk::AccelKey(keybindings_.config_
.key_map()["open_file"]),
[this]() { [this]() {
OnOpenFile(); OnOpenFile();
}); });
@ -32,30 +36,34 @@ Window::Window() :
[this]() { [this]() {
OnFileOpenFolder(); OnFileOpenFolder();
}); });
keybindings_.
action_group_menu()->
add(Gtk::Action::create("FileSaveAs",
"Save as"),
Gtk::AccelKey(keybindings_.config_
.key_map()["save_as"]),
[this]() {
SaveFileAs();
});
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"),
Gtk::AccelKey(keybindings_.config_
.key_map()["save"]),
[this]() {
notebook_.OnSaveFile();
});
keybindings_. keybindings_.
action_group_menu()-> action_group_menu()->
add(Gtk::Action::create("FileSave",
"Save"),
Gtk::AccelKey(keybindings_.config_
.key_map()["save"]),
[this]() {
SaveFile();
});
keybindings_.
action_group_menu()->
add(Gtk::Action::create("ProjectCompileAndRun", add(Gtk::Action::create("ProjectCompileAndRun",
"Compile And Run"), "Compile And Run"),
Gtk::AccelKey(keybindings_.config_ Gtk::AccelKey(keybindings_.config_
.key_map()["compile_and_run"]), .key_map()["compile_and_run"]),
[this]() { [this]() {
notebook_.OnSaveFile(); SaveFile();
if (running.try_lock()) { if (running.try_lock()) {
std::thread execute([=]() { std::thread execute([=]() {
std::string path = notebook_.CurrentPagePath(); std::string path = notebook_.CurrentPagePath();
@ -81,7 +89,7 @@ Window::Window() :
Gtk::AccelKey(keybindings_.config_ Gtk::AccelKey(keybindings_.config_
.key_map()["compile"]), .key_map()["compile"]),
[this]() { [this]() {
notebook_.OnSaveFile(); SaveFile();
if (running.try_lock()) { if (running.try_lock()) {
std::thread execute([=]() { std::thread execute([=]() {
std::string path = notebook_.CurrentPagePath(); std::string path = notebook_.CurrentPagePath();
@ -206,3 +214,22 @@ void Window::OnOpenFile() {
bool Window::OnMouseRelease(GdkEventButton *button){ bool Window::OnMouseRelease(GdkEventButton *button){
return notebook_.OnMouseRelease(button); return notebook_.OnMouseRelease(button);
} }
bool Window::SaveFile() {
if(notebook_.OnSaveFile()) {
terminal_.PrintMessage("File saved to: " +
notebook_.CurrentPagePath()+"\n");
return true;
}
terminal_.PrintMessage("File not saved");
return false;
}
bool Window::SaveFileAs() {
if(notebook_.OnSaveFile(notebook_.OnSaveFileAs())){
terminal_.PrintMessage("File saved to: " +
notebook_.CurrentPagePath()+"\n");
return true;
}
terminal_.PrintMessage("File not saved");
return false;
}

2
juci/window.h
Unescape View File

@ -33,6 +33,8 @@ public:
void OnOpenFile(); void OnOpenFile();
void OnFileOpenFolder(); void OnFileOpenFolder();
bool OnMouseRelease(GdkEventButton* button); bool OnMouseRelease(GdkEventButton* button);
bool SaveFile();
bool SaveFileAs();
}; };
#endif // JUCI_WINDOW_H #endif // JUCI_WINDOW_H

Write Preview
Loading…
Cancel
Save