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
tedjk 11 years ago
parent
8b2698cfa5 9087f660ca
commit
8be6c06353
7 changed files with 141 additions and 103 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. 17
      juci/directories.cc
  2. 32
      juci/notebook.cc
  3. 3
      juci/source.cc
  4. 48
      juci/terminal.cc
  5. 6
      juci/terminal.h
  6. 31
      juci/window.cc
  7. 3
      juci/window.h

17
juci/directories.cc
Unescape View File

@ -101,6 +101,22 @@ int Directories::Controller::count(const std::string path) {
project_name_var = line.substr(variable_start+1,
(variable_end)-variable_start-1);
boost::algorithm::trim(project_name_var);
if (variable_start == std::string::npos) { // not a variabel
variable_start = line.find("(", 0);
variable_end = line.find(' ', variable_start);
if(variable_end != std::string::npos){
return line.substr(variable_start+1,
(variable_end)-variable_start-1);
}
variable_end = line.find("#", variable_start);
if(variable_end != std::string::npos){
return line.substr(variable_start+1,
(variable_end)-variable_start-1);
}
variable_end = line.find(")", variable_start);
return line.substr(variable_start+1,
(variable_end)-variable_start-1);
if (variable_start == std::string::npos) { // not a variable
variable_start = line.find("(", 0);
variable_end = line.find(")", variable_start);
@ -111,6 +127,7 @@ int Directories::Controller::count(const std::string path) {
break;
}
}
}
std::ifstream ifs2(itr->path().string());
while (std::getline(ifs2, line)) {
if (line.find("set(", 0) != std::string::npos

32
juci/notebook.cc
Unescape View File

@ -1,5 +1,6 @@
#include "notebook.h"
#include <fstream>
#include "notebook.h"
#include "logging.h"
Notebook::Model::Model() {
cc_extension_ = ".cc";
@ -24,11 +25,13 @@ Notebook::Controller::Controller(Gtk::Window* window, Keybindings::Controller& k
ispopup = false;
view().pack1(directories_.widget(), true, true);
CreateKeybindings(keybindings);
INFO("Notebook Controller Sucsess");
} // Constructor
void Notebook::Controller::CreateKeybindings(Keybindings::Controller
&keybindings) {
INFO("Notebook create signal handlers");
directories().m_TreeView.signal_row_activated()
.connect(sigc::mem_fun(*this,
&Notebook::Controller::OnDirectoryNavigation));
@ -138,6 +141,7 @@ void Notebook::Controller::CreateKeybindings(Keybindings::Controller
[this]() {
Search(false);
});
INFO("Notebook signal handlers sucsess");
}
bool Notebook::Controller:: OnMouseRelease(GdkEventButton* button) {
@ -153,6 +157,7 @@ bool Notebook::Controller::OnKeyRelease(GdkEventKey* key) {
}
bool Notebook::Controller::GeneratePopup(int key_id) {
INFO("Notebook genereate popup, getting iters");
// Get function to fill popup with suggests item vector under is for testing
Gtk::TextIter beg = CurrentTextView().get_buffer()->get_insert()->get_iter();
Gtk::TextIter end = CurrentTextView().get_buffer()->get_insert()->get_iter();
@ -165,6 +170,7 @@ bool Notebook::Controller::GeneratePopup(int key_id) {
end.backward_search("\"", Gtk::TEXT_SEARCH_VISIBLE_ONLY, tmp, tmp1, line)
||
end.backward_search("//", Gtk::TEXT_SEARCH_VISIBLE_ONLY, tmp, tmp1, line);
INFO("Notebook genereate popup, checking key_id");
if (illegal_chars) {
return false;
}
@ -187,6 +193,7 @@ bool Notebook::Controller::GeneratePopup(int key_id) {
} else {
return false;
}
INFO("Notebook genereate popup, getting autocompletions");
std::vector<Source::AutoCompleteData> acdata;
text_vec_.at(CurrentPage())->
GetAutoCompleteSuggestions(beg.get_line()+1,
@ -229,16 +236,19 @@ bool Notebook::Controller::GeneratePopup(int key_id) {
popup_.get_vbox()->pack_start(popup_scroll_);
popup_.set_transient_for(*window_);
popup_.show_all();
INFO("Notebook genereate popup, moving popup");
int popup_x = popup_.get_width();
int popup_y = items.size() * 20;
PopupSetSize(popup_scroll_, popup_x, popup_y);
int x, y;
FindPopupPosition(CurrentTextView(), popup_x, popup_y, x, y);
popup_.move(x, y+15);
INFO("Notebook genereate popup, create handler");
PopupSelectHandler(popup_, listview_, &items);
ispopup = true;
INFO("Notebook genereate popup, run popup");
popup_.run();
INFO("Notebook genereate popup, hide popup");
popup_.hide();
ispopup = false;
return true;
@ -261,6 +271,7 @@ bool Notebook::Controller::ScrollEventCallback(GdkEventScroll* scroll_event) {
return true;
}
Notebook::Controller::~Controller() {
INFO("Notebook destructor");
for (auto &i : text_vec_) delete i;
for (auto &i : linenumbers_vec_) delete i;
for (auto &i : editor_vec_) delete i;
@ -276,6 +287,7 @@ Gtk::Box& Notebook::Controller::entry_view() {
}
void Notebook::Controller::OnNewPage(std::string name) {
INFO("Notebook Generate new page");
OnCreatePage();
text_vec_.back()->OnNewEmptyFile();
Notebook().append_page(*editor_vec_.back(), name);
@ -294,6 +306,7 @@ MapBuffers(std::map<std::string, std::string> *buffers) {
}
void Notebook::Controller::OnOpenFile(std::string path) {
INFO("Notebook open file");
OnCreatePage();
text_vec_.back()->OnOpenFile(path);
text_vec_.back()->set_is_saved(true);
@ -309,6 +322,7 @@ void Notebook::Controller::OnOpenFile(std::string path) {
}
void Notebook::Controller::OnCreatePage() {
INFO("Notebook create page");
text_vec_.push_back(new Source::Controller(source_config(), this));
linenumbers_vec_.push_back(new Source::Controller(source_config(), this));
scrolledline_vec_.push_back(new Gtk::ScrolledWindow());
@ -329,6 +343,7 @@ void Notebook::Controller::OnCreatePage() {
}
void Notebook::Controller::OnCloseCurrentPage() {
INFO("Notebook close page");
// TODO(oyvang) zalox, forgi)
// Save a temp file, in case you close one you dont want to close?
if (Pages() != 0) {
@ -372,6 +387,7 @@ void Notebook::Controller::OnEditCut() {
}
std::string Notebook::Controller::GetCursorWord() {
INFO("Notebook get cursor word");
int page = CurrentPage();
std::string word;
Gtk::TextIter start, end;
@ -399,6 +415,7 @@ void Notebook::Controller::OnEditSearch() {
}
void Notebook::Controller::Search(bool forward) {
INFO("Notebook search");
int page = CurrentPage();
std::string search_word;
search_word = entry_.text();
@ -460,6 +477,7 @@ void Notebook::Controller::OnBufferChange() {
void Notebook::Controller
::OnDirectoryNavigation(const Gtk::TreeModel::Path& path,
Gtk::TreeViewColumn* column) {
INFO("Notebook directory navigation");
Gtk::TreeModel::iterator iter = directories().m_refTreeModel->get_iter(path);
if (iter) {
Gtk::TreeModel::Row row = *iter;
@ -539,6 +557,7 @@ void Notebook::Controller::PopupSelectHandler(Gtk::Dialog &popup,
void Notebook::Controller::PopupSetSize(Gtk::ScrolledWindow &scroll,
int &current_x,
int &current_y) {
INFO("Notebook popup set size");
int textview_x = CurrentTextView().get_width();
int textview_y = 150;
bool is_never_scroll_x = true;
@ -573,6 +592,7 @@ void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview,
int popup_y,
int &x,
int &y) {
INFO("Notebook popup find position");
Gdk::Rectangle temp1, temp2;
textview.get_cursor_locations(
CurrentTextView().
@ -602,6 +622,7 @@ void Notebook::Controller::FindPopupPosition(Gtk::TextView& textview,
}
void Notebook::Controller:: OnSaveFile() {
INFO("Notebook save file");
if (text_vec_.at(CurrentPage())->is_saved()) {
std::ofstream file;
file.open (text_vec_.at(CurrentPage())->path());
@ -622,16 +643,23 @@ void Notebook::Controller:: OnSaveFile() {
std::string Notebook::Controller::OnSaveFileAs(){
INFO("Notebook save as");
Gtk::FileChooserDialog dialog("Please choose a file",
Gtk::FILE_CHOOSER_ACTION_SAVE);
DEBUG("SET TRANSISTEN FPR");
dialog.set_transient_for(*window_);
dialog.set_position(Gtk::WindowPosition::WIN_POS_CENTER_ALWAYS);
dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
dialog.add_button("_Save", Gtk::RESPONSE_OK);
//dialog.set_current_name("Untitled");
DEBUG("RUN DIALOG");
int result = dialog.run();
DEBUG("DIALOG RUNNING");
switch (result) {
case(Gtk::RESPONSE_OK): {
DEBUG("get_filename()");
std::string path = dialog.get_filename();
DEBUG_VAR(path);
unsigned pos = path.find_last_of("/\\");
std::cout << path<< std::endl;
//notebook_.OnSaveFile(path);

3
juci/source.cc
Unescape View File

@ -356,7 +356,7 @@ void Source::Controller::OnOpenFile(const string &filepath) {
notebook_->index());
view().OnUpdateSyntax(model().ExtractTokens(start_offset, end_offset),
model().config());
}
buffer()->signal_end_user_action().connect([this]() {
if (!go) {
@ -396,6 +396,7 @@ void Source::Controller::OnOpenFile(const string &filepath) {
syntax.unlock();
}
});
}
}
Glib::RefPtr<Gtk::TextBuffer> Source::Controller::buffer() {
return view().get_buffer();

48
juci/terminal.cc
Unescape View File

@ -1,6 +1,8 @@
#include "terminal.h"
#include <iostream>
#include <thread>
// #include <pstream.h>
// #include <string>
Terminal::View::View(){
@ -21,32 +23,17 @@ void Terminal::Controller::SetFolderCommand( boost::filesystem::path
folder_command_ = "cd "+ path_ + "; ";
}
bool Terminal::Controller::Compile(){
if (running.try_lock()) {
std::thread execute([=]() {
void Terminal::Controller::Compile(){
Terminal().get_buffer()->set_text("");
ExecuteCommand("cmake .");
ExecuteCommand("cmake .", "r");
if (ExistInConsole(cmake_sucsess)){
ExecuteCommand("make");
ExecuteCommand("make", "r");
}
});
execute.detach();
running.unlock();
if (ExistInConsole(make_built)) return true;
}
PrintMessage("juCi++ ERROR: Failed to compile project in directory"
+ path_ + "\n");
return false;
}
void Terminal::Controller::Run(std::string executable) {
if (running.try_lock()) {
std::thread execute([=]() {
ExecuteCommand("./"+executable);
});
execute.detach();
running.unlock();
}
PrintMessage("juCi++ execute: " + executable + "\n");
ExecuteCommand("./"+executable, "r");
}
void Terminal::Controller::PrintMessage(std::string message){
@ -54,22 +41,6 @@ void Terminal::Controller::PrintMessage(std::string message){
insert(Terminal().get_buffer()-> end(),"> "+message);
}
// bool Terminal::Controller::FindExecutable(std::string executable) {
// std::string build = Terminal().get_buffer()->get_text();
// double pos = build.find(make_built);
// Gtk::TextIter start = Terminal().get_buffer()->get_iter_at_offset(pos);
// Gtk::TextIter end = Terminal().get_buffer()->get_iter_at_offset(pos);
// while (!end.ends_line()) {
// end.forward_char();
// }
// build = Terminal().get_buffer()->get_text(start, end);
// pos = build.find_last_of(" ");
// build = build.substr(pos+1);
// std::cout << "DEBUG: BUILD TARGET = "<< build << std::endl;
// std::cout << "EDEBUG: ECUTABLE FILE = "<< executable << std::endl;
// if(build != executable) return false;
// return true;
// }
bool Terminal::Controller::ExistInConsole(std::string string) {
double pos = Terminal().get_buffer()->
@ -78,10 +49,11 @@ bool Terminal::Controller::ExistInConsole(std::string string) {
return true;
}
void Terminal::Controller::ExecuteCommand(std::string command) {
void Terminal::Controller::ExecuteCommand(std::string command, std::string mode) {
command = folder_command_+command;
std::cout << "EXECUTE COMMAND: "<< command << std::endl;
FILE* p = popen(command.c_str(), "r");
FILE* p = popen(command.c_str(), mode.c_str());
if (p == NULL) {
PrintMessage("juCi++ ERROR: Failed to run command" + command + "\n");
}else {

6
juci/terminal.h
Unescape View File

@ -25,17 +25,15 @@ namespace Terminal {
Gtk::TextView& Terminal(){return view_.textview();}
void SetFolderCommand(boost::filesystem::path CMake_path);
void Run(std::string executable);
bool Compile();
void Compile();
private:
void ExecuteCommand(std::string command);
void ExecuteCommand(std::string command, std::string mode);
bool OnButtonRealeaseEvent(GdkEventKey* key);
bool ExistInConsole(std::string string);
// bool FindExecutable(std::string executable);
void PrintMessage(std::string message);
Terminal::View view_;
std::string folder_command_;
std::string path_;
std::mutex running;
const std::string cmake_sucsess = "Build files have been written to:";
const std::string make_built = "Built target";
const std::string make_executable = "Linking CXX executable";

31
juci/window.cc
Unescape View File

@ -55,12 +55,21 @@ Window::Window() :
.key_map()["compile_and_run"]),
[this]() {
notebook_.OnSaveFile();
if (running.try_lock()) {
std::thread execute([=]() {
std::string path = notebook_.CurrentPagePath();
int pos = path.find_last_of("/\\");
if(pos != std::string::npos){
path.erase(path.begin()+pos,path.end());
terminal_.SetFolderCommand(path);
if(terminal_.Compile()) {
}
terminal_.Compile();
std::string executable = notebook_.directories().
GetCmakeVarValue(path,"add_executable");
terminal_.Run(executable);
});
execute.detach();
running.unlock();
}
});
@ -72,11 +81,20 @@ Window::Window() :
.key_map()["compile"]),
[this]() {
notebook_.OnSaveFile();
std::string path =
notebook_.CurrentPagePath();
if (running.try_lock()) {
std::thread execute([=]() {
std::string path = notebook_.CurrentPagePath();
int pos = path.find_last_of("/\\");
if(pos != std::string::npos){
path.erase(path.begin()+pos,path.end());
terminal_.SetFolderCommand(path);
}
terminal_.Compile();
});
execute.detach();
running.unlock();
}
});
this->signal_button_release_event().
connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false);
@ -88,9 +106,12 @@ Window::Window() :
keybindings_.BuildMenu();
window_box_.pack_start(menu_.view(), Gtk::PACK_SHRINK);
window_box_.pack_start(notebook_.entry_view(), Gtk::PACK_SHRINK);
window_box_.pack_start(notebook_.view());
window_box_.pack_end(terminal_.view(),Gtk::PACK_SHRINK);
paned_.set_position(300);
paned_.pack1(notebook_.view(), true, false);
paned_.pack2(terminal_.view(), true, true);
window_box_.pack_end(paned_);
show_all_children();
INFO("Window created");
} // Window constructor

3
juci/window.h
Unescape View File

@ -26,11 +26,12 @@ public:
Keybindings::Controller& keybindings() { return keybindings_; }
private:
std::mutex running;
Gtk::VPaned paned_;
//signal handlers
void OnWindowHide();
void OnOpenFile();
void OnFileOpenFolder();
bool OnMouseRelease(GdkEventButton* button);
};

Write Preview
Loading…
Cancel
Save