zalox
/
juci-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

merged with master

master
oyvang 11 years ago
parent
de2c64ee60 e49aa2e635
commit
c247a25c88
14 changed files with 202 additions and 176 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. 7
      juci/CMakeLists.txt
  2. 24
      juci/api.cc
  3. 6
      juci/api.h
  4. 5
      juci/api_ext.cc
  5. 13
      juci/config.cc
  6. 1
      juci/config.json
  7. 55
      juci/directories.cc
  8. 5
      juci/juci.cc
  9. 22
      juci/logging.h
  10. 6
      juci/plugins.py
  11. 8
      juci/source.cc
  12. 42
      juci/terminal.cc
  13. 175
      juci/window.cc
  14. 1
      juci/window.h

7
juci/CMakeLists.txt
Unescape View File

@ -3,6 +3,7 @@ set(project_name juci)
set(module juci_to_python_api) set(module juci_to_python_api)
project (${project_name}) project (${project_name})
add_definitions(-DBOOST_LOG_DYN_LINK)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/")
@ -52,7 +53,7 @@ endif()
#Boost_INCLUDE_DIRS - Boost include directories #Boost_INCLUDE_DIRS - Boost include directories
#Boost_LIBRARY_DIRS - Link directories for Boost libraries #Boost_LIBRARY_DIRS - Link directories for Boost libraries
#Boost_LIBRARIES - Boost component libraries to be linked #Boost_LIBRARIES - Boost component libraries to be linked
find_package(Boost 1.5 REQUIRED COMPONENTS python timer system filesystem) find_package(Boost 1.55 COMPONENTS python thread log system filesystem REQUIRED)
#If boost is not found #If boost is not found
if(${Boost_FOUND}) if(${Boost_FOUND})
@ -131,8 +132,8 @@ link_directories(
${LIBCLANG_LIBRARY_DIRS} ${LIBCLANG_LIBRARY_DIRS}
) )
#module: #module:
set_target_properties(${module} PROPERTIES PREFIX "" set_target_properties(${module} PROPERTIES PREFIX "")
LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/") # LIBRARY_OUTPUT_DIRECTORY "/usr/lib/python2.7/dist-packages/")
target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
#executable: #executable:
target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) target_link_libraries(${project_name} ${LIVCLANG_LIBRARIES} ${LCL_LIBRARIES} ${GTKMM_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})

24
juci/api.cc
Unescape View File

@ -1,10 +1,23 @@
#include "api.h" #include "api.h"
#include "logging.h"
Menu::Controller* PluginApi::menu_; Menu::Controller* PluginApi::menu_;
Notebook::Controller* PluginApi::notebook_; Notebook::Controller* PluginApi::notebook_;
///////////////////////////// /////////////////////////////
//// API ServiceProvider //// //// API ServiceProvider ////
///////////////////////////// /////////////////////////////
PluginApi::PluginApi(Menu::Controller& menu_ctl_,
Notebook::Controller& notebook_ctl_) {
menu_ = &menu_ctl_;
notebook_ = &notebook_ctl_;
InitPlugins();
}
PluginApi::~PluginApi() {
menu_ = NULL;
notebook_ = NULL;
}
std::string PluginApi::ProjectPath() { std::string PluginApi::ProjectPath() {
int MAXPATHLEN = 50; int MAXPATHLEN = 50;
char temp[MAXPATHLEN]; char temp[MAXPATHLEN];
@ -107,7 +120,7 @@ void libjuci::ReplaceWord(const std::string word) {
} }
void libjuci::ReplaceLine(const std::string line) { void libjuci::ReplaceLine(const std::string line) {
std::cout << "unimplemented function: 'libjuci::ReplaceLine()' called" std::cout << "unimplemented: " << __func__ << " called"
<< std::endl; << std::endl;
} }
std::string libjuci::GetWord() { std::string libjuci::GetWord() {
@ -201,16 +214,7 @@ void libjuci::IterToWordEnd(Gtk::TextIter &iter) {
} }
Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() { Glib::RefPtr<Gtk::TextBuffer> libjuci::BufferFromNotebook() {
// finding focused view
// int i = 0;
// while (!PluginApi::notebook_->source_vec_.at(i)->view().has_focus()) {
// i++;
// while(!PluginApi::notebook_->CurrentTextView().has_focus()) {
// i++;
// }
return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_ return Glib::RefPtr<Gtk::TextBuffer>(PluginApi::notebook_
// ->source_vec_.at(i)
// ->view().get_buffer());
->CurrentTextView().get_buffer()); ->CurrentTextView().get_buffer());
} }

6
juci/api.h
Unescape View File

@ -12,6 +12,8 @@
//////////////////// ////////////////////
class PluginApi { class PluginApi {
public: public:
PluginApi(Menu::Controller&, Notebook::Controller&);
~PluginApi();
static Menu::Controller* menu_; static Menu::Controller* menu_;
static Notebook::Controller* notebook_; static Notebook::Controller* notebook_;
static void InitPlugins(); static void InitPlugins();
@ -25,7 +27,6 @@ public:
const std::string menu_func_name, const std::string menu_func_name,
const std::string plugin_path, const std::string plugin_path,
const std::string menu_keybinding); const std::string menu_keybinding);
// text-buffer functions
static void ReplaceWord(const std::string word); static void ReplaceWord(const std::string word);
static void ReplaceLine(const std::string line); static void ReplaceLine(const std::string line);
protected: protected:
@ -64,11 +65,10 @@ namespace libjuci {
namespace bp = boost::python; namespace bp = boost::python;
bp::api::object OpenPythonScript(const std::string path, bp::api::object OpenPythonScript(const std::string path,
bp::api::object python_name_space); bp::api::object python_name_space);
void LoadPlugin(const std::string& plugin_name); void LoadPlugin(const std::string& plugin_name);
void LoadPluginFunction(const std::string &function_name, void LoadPluginFunction(const std::string &function_name,
const std::string &plugin_path); const std::string &plugin_path);
void InitPlugin(const std::string& plugin_path); void InitPlugin(const std::string& plugin_path);
} // libjuci } // namespace libjuci
#endif // JUCI_API_H_ #endif // JUCI_API_H_

5
juci/api_ext.cc
Unescape View File

@ -12,7 +12,4 @@ BOOST_PYTHON_MODULE(juci_to_python_api) {
def("replaceLine", &libjuci::ReplaceLine); def("replaceLine", &libjuci::ReplaceLine);
def("replaceWord", &libjuci::ReplaceWord); def("replaceWord", &libjuci::ReplaceWord);
def("getWord", &libjuci::GetWord); def("getWord", &libjuci::GetWord);
} // module::juci_to_python_api
//something more
}// module::juci_to_python_api

13
juci/config.cc
Unescape View File

@ -1,4 +1,5 @@
#include "config.h" #include "config.h"
#include "logging.h"
MainConfig::MainConfig() : MainConfig::MainConfig() :
keybindings_cfg_(), source_cfg_() { keybindings_cfg_(), source_cfg_() {
@ -6,34 +7,36 @@ MainConfig::MainConfig() :
GenerateSource(); GenerateSource();
GenerateKeybindings(); GenerateKeybindings();
GenerateDirectoryFilter(); GenerateDirectoryFilter();
// keybindings_cfg_ = cfg_.get_child("keybindings");
// notebook_cfg_ = cfg_.get_child("notebook");
// menu_cfg_ = cfg_.get_child("menu");
} }
void MainConfig::GenerateSource() { void MainConfig::GenerateSource() {
INFO("Generating source cfg");
boost::property_tree::ptree source_json = cfg_.get_child("source"); boost::property_tree::ptree source_json = cfg_.get_child("source");
boost::property_tree::ptree syntax_json = source_json.get_child("syntax"); boost::property_tree::ptree syntax_json = source_json.get_child("syntax");
boost::property_tree::ptree colors_json = source_json.get_child("colors"); boost::property_tree::ptree colors_json = source_json.get_child("colors");
for ( auto &i : colors_json ) { for (auto &i : colors_json) {
source_cfg_.InsertTag(i.first, i.second.get_value<std::string>()); source_cfg_.InsertTag(i.first, i.second.get_value<std::string>());
} }
for ( auto &i : syntax_json ) { for (auto &i : syntax_json) {
source_cfg_.InsertType(i.first, i.second.get_value<std::string>()); source_cfg_.InsertType(i.first, i.second.get_value<std::string>());
} }
INFO("Source cfg generated");
} }
void MainConfig::GenerateKeybindings() { void MainConfig::GenerateKeybindings() {
INFO("Generating keybindings");
std::string line; std::string line;
std::ifstream menu_xml("menu.xml"); std::ifstream menu_xml("menu.xml");
if (menu_xml.is_open()) { if (menu_xml.is_open()) {
while (getline(menu_xml, line)) { while (getline(menu_xml, line)) {
keybindings_cfg_.AppendXml(line); keybindings_cfg_.AppendXml(line);
} }
} }
boost::property_tree::ptree keys_json = cfg_.get_child("keybindings"); boost::property_tree::ptree keys_json = cfg_.get_child("keybindings");
for (auto &i : keys_json) for (auto &i : keys_json)
keybindings_cfg_.key_map()[i.first] = i.second.get_value<std::string>(); keybindings_cfg_.key_map()[i.first] = i.second.get_value<std::string>();
INFO("Keybindings generated");
} }
void MainConfig::GenerateDirectoryFilter() { void MainConfig::GenerateDirectoryFilter() {

1
juci/config.json
Unescape View File

@ -36,6 +36,7 @@
"#", "#",
"~", "~",
".idea", ".idea",
".so",
"in-lowercase.pls" "in-lowercase.pls"
], ],
"exceptions": [ "exceptions": [

55
juci/directories.cc
Unescape View File

@ -1,4 +1,5 @@
#include "directories.h" #include "directories.h"
#include "logging.h"
Directories::Controller::Controller(Directories::Config& cfg) : Directories::Controller::Controller(Directories::Config& cfg) :
config_(cfg) { config_(cfg) {
@ -8,6 +9,7 @@ Directories::Controller::Controller(Directories::Config& cfg) :
void Directories::Controller:: void Directories::Controller::
open_folder(const boost::filesystem::path& dir_path) { open_folder(const boost::filesystem::path& dir_path) {
INFO("Open folder");
m_refTreeModel = Gtk::TreeStore::create(view()); m_refTreeModel = Gtk::TreeStore::create(view());
m_TreeView.set_model(m_refTreeModel); m_TreeView.set_model(m_refTreeModel);
m_TreeView.remove_all_columns(); m_TreeView.remove_all_columns();
@ -17,6 +19,7 @@ open_folder(const boost::filesystem::path& dir_path) {
Gtk::TreeModel::Row row; Gtk::TreeModel::Row row;
list_dirs(dir_path, row, row_id); list_dirs(dir_path, row, row_id);
m_refTreeModel->set_sort_column(0, Gtk::SortType::SORT_ASCENDING); m_refTreeModel->set_sort_column(0, Gtk::SortType::SORT_ASCENDING);
INFO("Folder opened");
} }
bool Directories::Controller::IsIgnored(std::string path) { bool Directories::Controller::IsIgnored(std::string path) {
@ -80,6 +83,7 @@ int Directories::Controller::count(const std::string path) {
std::string Directories::Controller:: std::string Directories::Controller::
GetCmakeVarValue(const boost::filesystem::path& dir_path, std::string command_name) { GetCmakeVarValue(const boost::filesystem::path& dir_path, std::string command_name) {
INFO("fetches cmake variable value for: "+command_name);
std::string project_name; std::string project_name;
std::string project_name_var; std::string project_name_var;
boost::filesystem::directory_iterator end_itr; boost::filesystem::directory_iterator end_itr;
@ -92,42 +96,50 @@ int Directories::Controller::count(const std::string path) {
while (std::getline(ifs, line)) { while (std::getline(ifs, line)) {
if (line.find(command_name+"(", 0) != std::string::npos if (line.find(command_name+"(", 0) != std::string::npos
|| line.find(command_name+" (", 0) != std::string::npos ) { || line.find(command_name+" (", 0) != std::string::npos ) {
size_t variabel_start = line.find("{", 0); size_t variable_start = line.find("{", 0);
size_t variabel_end = line.find("}", variabel_start); size_t variable_end = line.find("}", variable_start);
project_name_var = line.substr(variabel_start+1, project_name_var = line.substr(variable_start+1,
(variabel_end)-variabel_start-1); (variable_end)-variable_start-1);
boost::algorithm::trim(project_name_var); boost::algorithm::trim(project_name_var);
if (variabel_start == std::string::npos) { // not a variabel if (variable_start == std::string::npos) { // not a variabel
variabel_start = line.find("(", 0); variable_start = line.find("(", 0);
variabel_end = line.find(' ', variabel_start); variable_end = line.find(' ', variable_start);
if(variabel_end != std::string::npos){ if(variable_end != std::string::npos){
return line.substr(variabel_start+1, return line.substr(variable_start+1,
(variabel_end)-variabel_start-1); (variable_end)-variable_start-1);
} }
variabel_end = line.find("#", variabel_start); variable_end = line.find("#", variable_start);
if(variabel_end != std::string::npos){ if(variable_end != std::string::npos){
return line.substr(variabel_start+1, return line.substr(variable_start+1,
(variabel_end)-variabel_start-1); (variable_end)-variable_start-1);
} }
variabel_end = line.find(")", variabel_start); variable_end = line.find(")", variable_start);
return line.substr(variabel_start+1, return line.substr(variable_start+1,
(variabel_end)-variabel_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);
INFO("Wasn't a variable, returning value");
return line.substr(variable_start+1,
(variable_end)-variable_start-1);
} }
break; break;
} }
} }
}
std::ifstream ifs2(itr->path().string()); std::ifstream ifs2(itr->path().string());
while (std::getline(ifs2, line)) { while (std::getline(ifs2, line)) {
if (line.find("set(", 0) != std::string::npos if (line.find("set(", 0) != std::string::npos
|| line.find("set (", 0) != std::string::npos) { || line.find("set (", 0) != std::string::npos) {
if( line.find(project_name_var, 0) != std::string::npos) { if( line.find(project_name_var, 0) != std::string::npos) {
size_t variabel_start = line.find(project_name_var, 0) size_t variable_start = line.find(project_name_var, 0)
+project_name_var.length(); +project_name_var.length();
size_t variabel_end = line.find(")", variabel_start); size_t variable_end = line.find(")", variable_start);
project_name = line.substr(variabel_start+1, project_name = line.substr(variable_start+1,
variabel_end-variabel_start-1); variable_end-variable_start-1);
boost::algorithm::trim(project_name); boost::algorithm::trim(project_name);
INFO("found variable, returning value");
return project_name; return project_name;
} }
} }
@ -135,6 +147,7 @@ int Directories::Controller::count(const std::string path) {
break; break;
} }
} }
INFO("Couldn't find value in CMakeLists.txt");
return "no project name"; return "no project name";
} }

5
juci/juci.cc
Unescape View File

@ -1,4 +1,5 @@
#include "window.h" #include "window.h"
#include "logging.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(
@ -6,8 +7,8 @@ int main(int argc, char *argv[]) {
argv, argv,
"no.sout.juci"); "no.sout.juci");
add_file_log("juci.log");
INFO("Logging initalized");
Window window; Window window;
//api::LoadPlugin("juci_api_test");
return app->run(window); return app->run(window);
} }

22
juci/logging.h
Unescape View File

@ -0,0 +1,22 @@
#ifndef JUCI_LOGGING_H_
#define JUCI_LOGGING_H_
#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/utility/setup/file.hpp>
#include <boost/log/utility/setup/common_attributes.hpp>
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/sources/record_ostream.hpp>
using namespace boost::log;
#define TRACE(x) BOOST_LOG_TRIVIAL(trace) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define DEBUG(x) BOOST_LOG_TRIVIAL(debug) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define INFO(x) BOOST_LOG_TRIVIAL(info) << __func__ << "(" << __LINE__ << "): \"" x << "\"";
#define WARNING(x) BOOST_LOG_TRIVIAL(warning) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define ERROR(x) BOOST_LOG_TRIVIAL(error) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define FATAL(x) BOOST_LOG_TRIVIAL(fatal) << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#endif // JUCI_LOGGING_H_

6
juci/plugins.py
Unescape View File

@ -1,9 +1,11 @@
#!/usr/bin/python #!/usr/bin/python
#plugin handler #plugin handler
import juci_to_python_api as juci, os, glob import sys, os, glob
cwd = os.getcwd()
sys.path.append(cwd)
import juci_to_python_api as juci
def loadplugins(): def loadplugins():
cwd = os.getcwd()
plugin_files = glob.glob(cwd+"/plugins/*.py") plugin_files = glob.glob(cwd+"/plugins/*.py")
for current_file in plugin_files: for current_file in plugin_files:
juci.initPlugin(current_file) juci.initPlugin(current_file)

8
juci/source.cc
Unescape View File

@ -5,9 +5,7 @@
#include <fstream> #include <fstream>
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
#include "notebook.h" #include "notebook.h"
#include "logging.h"
#define log( var ) \
std::cout << "source.cc (" << __LINE__ << ") " << #var << std::endl
Source::Location:: Source::Location::
Location(int line_number, int column_offset) : Location(int line_number, int column_offset) :
@ -267,7 +265,9 @@ HighlightToken(clang::Token *token,
// Constructor for Controller // Constructor for Controller
Source::Controller::Controller(const Source::Config &config, Source::Controller::Controller(const Source::Config &config,
Notebook::Controller *notebook) : Notebook::Controller *notebook) :
model_(config), notebook_(notebook) { } model_(config), notebook_(notebook) {
INFO("Source Controller with childs constructed");
}
// Source::Controller::view() // Source::Controller::view()
// return shared_ptr to the view // return shared_ptr to the view

42
juci/terminal.cc
Unescape View File

@ -33,7 +33,7 @@ void Terminal::Controller::Compile(){
void Terminal::Controller::Run(std::string executable) { void Terminal::Controller::Run(std::string executable) {
PrintMessage("juCi++ execute: " + executable + "\n"); PrintMessage("juCi++ execute: " + executable + "\n");
ExecuteCommand("./"+executable, "w"); ExecuteCommand("./"+executable, "r");
} }
void Terminal::Controller::PrintMessage(std::string message){ void Terminal::Controller::PrintMessage(std::string message){
@ -50,37 +50,17 @@ bool Terminal::Controller::ExistInConsole(std::string string) {
} }
void Terminal::Controller::ExecuteCommand(std::string command, std::string mode) { void Terminal::Controller::ExecuteCommand(std::string command, std::string mode) {
command = folder_command_+command;
std::cout << "EXECUTE COMMAND: "<< command << std::endl; std::cout << "EXECUTE COMMAND: "<< command << std::endl;
if(mode == "w"){ FILE* p = popen(command.c_str(), mode.c_str());
command = path_ + " " +command + " > some_file.txt";
system(command.c_str()); if (p == NULL) {
}else{ PrintMessage("juCi++ ERROR: Failed to run command" + command + "\n");
}else {
FILE* p = popen(command.c_str(), mode.c_str()); char buffer[1028];
command = folder_command_+command; while (fgets(buffer, 1028, p) != NULL) {
if (p == NULL) { PrintMessage(buffer);
PrintMessage("juCi++ ERROR: Failed to run command" + command + "\n");
}else {
char buffer[1028];
while (fgets(buffer, 1028, p) != NULL) {
PrintMessage(buffer);
}
pclose(p);
} }
pclose(p);
} }
// // run a process and create a streambuf that reads its stdout and stderr
// redi::ipstream proc(command, redi::pstreams::pstderr);
// std::string line;
// // read child's stdout
// while (std::getline(proc.out(), line))
// PrintMessage(line+ "\n");
// // read child's stderr
// while (std::getline(proc.err(), line))
// PrintMessage(line+ "\n");
} }

175
juci/window.cc
Unescape View File

@ -1,31 +1,36 @@
#include "window.h" #include "window.h"
#include "logging.h"
Window::Window() : Window::Window() :
window_box_(Gtk::ORIENTATION_VERTICAL), window_box_(Gtk::ORIENTATION_VERTICAL),
main_config_(), main_config_(),
keybindings_(main_config_.keybindings_cfg()), keybindings_(main_config_.keybindings_cfg()),
notebook_(this,keybindings(), main_config_.source_cfg(), main_config_.dir_cfg()), notebook_(this,keybindings(),
menu_(keybindings()) { main_config_.source_cfg(),
main_config_.dir_cfg()),
menu_(keybindings()),
api_(menu_, notebook_) {
INFO("Create Window");
set_title("juCi++"); set_title("juCi++");
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), Gtk::Stock::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), Gtk::Stock::OPEN),
[this]() { [this]() {
OnOpenFile(); OnOpenFile();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("FileOpenFolder", keybindings_.action_group_menu()->add(Gtk::Action::create("FileOpenFolder",
"Open folder"), "Open folder"),
Gtk::AccelKey(keybindings_.config_ Gtk::AccelKey(keybindings_.config_
.key_map()["open_folder"]), .key_map()["open_folder"]),
[this]() { [this]() {
OnFileOpenFolder(); OnFileOpenFolder();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("FileSaveAs", keybindings_.action_group_menu()->add(Gtk::Action::create("FileSaveAs",
"Save as"), "Save as"),
@ -35,14 +40,14 @@ Window::Window() :
notebook_.OnSaveFile(); notebook_.OnSaveFile();
}); });
keybindings_.action_group_menu()->add(Gtk::Action::create("FileSave", keybindings_.action_group_menu()->add(Gtk::Action::create("FileSave",
"Save"), "Save"),
Gtk::AccelKey(keybindings_.config_ Gtk::AccelKey(keybindings_.config_
.key_map()["save"]), .key_map()["save"]),
[this]() { [this]() {
notebook_.OnSaveFile(); notebook_.OnSaveFile();
}); });
keybindings_. keybindings_.
action_group_menu()-> action_group_menu()->
add(Gtk::Action::create("ProjectCompileAndRun", add(Gtk::Action::create("ProjectCompileAndRun",
"Compile And Run"), "Compile And Run"),
@ -96,10 +101,6 @@ Window::Window() :
terminal_.Terminal().signal_button_release_event(). terminal_.Terminal().signal_button_release_event().
connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false); connect(sigc::mem_fun(*this,&Window::OnMouseRelease),false);
PluginApi::menu_ = &menu_;
PluginApi::notebook_ = &notebook_;
PluginApi::InitPlugins();
add_accel_group(keybindings_.ui_manager_menu()->get_accel_group()); add_accel_group(keybindings_.ui_manager_menu()->get_accel_group());
add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group()); add_accel_group(keybindings_.ui_manager_hidden()->get_accel_group());
keybindings_.BuildMenu(); keybindings_.BuildMenu();
@ -112,14 +113,15 @@ Window::Window() :
paned_.pack2(terminal_.view(), true, true); paned_.pack2(terminal_.view(), true, true);
window_box_.pack_end(paned_); window_box_.pack_end(paned_);
show_all_children(); show_all_children();
} // Window constructor INFO("Window created");
} // Window constructor
void Window::OnWindowHide() { void Window::OnWindowHide() {
hide(); hide();
} }
void Window::OnFileOpenFolder() { void Window::OnFileOpenFolder() {
Gtk::FileChooserDialog dialog("Please choose a folder", Gtk::FileChooserDialog dialog("Please choose a folder",
Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
dialog.set_transient_for(*this); dialog.set_transient_for(*this);
//Add response buttons the the dialog: //Add response buttons the the dialog:
@ -130,79 +132,78 @@ void Window::OnFileOpenFolder() {
//Handle the response: //Handle the response:
switch(result) switch(result)
{
case(Gtk::RESPONSE_OK):
{ {
std::cout << "Folder selected: " << dialog.get_filename() case(Gtk::RESPONSE_OK):
<< std::endl; {
notebook_.directories().open_folder(dialog.get_filename()); std::cout << "Folder selected: " << dialog.get_filename()
std::cout << dialog.get_filename()<< std::endl; << std::endl;
break; notebook_.directories().open_folder(dialog.get_filename());
} std::cout << dialog.get_filename()<< std::endl;
break;
}
case(Gtk::RESPONSE_CANCEL): case(Gtk::RESPONSE_CANCEL):
{ {
std::cout << "Cancel clicked." << std::endl; std::cout << "Cancel clicked." << std::endl;
break; break;
} }
default: default:
{ {
std::cout << "Unexpected button clicked." << std::endl; std::cout << "Unexpected button clicked." << std::endl;
break; break;
}
} }
}
} }
void Window::OnOpenFile() { void Window::OnOpenFile() {
Gtk::FileChooserDialog dialog("Please choose a file", Gtk::FileChooserDialog dialog("Please choose a file",
Gtk::FILE_CHOOSER_ACTION_OPEN); Gtk::FILE_CHOOSER_ACTION_OPEN);
dialog.set_transient_for(*this); dialog.set_transient_for(*this);
dialog.set_position(Gtk::WindowPosition::WIN_POS_CENTER_ALWAYS); dialog.set_position(Gtk::WindowPosition::WIN_POS_CENTER_ALWAYS);
//Add response buttons the the dialog: //Add response buttons the the dialog:
dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL); dialog.add_button("_Cancel", Gtk::RESPONSE_CANCEL);
dialog.add_button("_Open", Gtk::RESPONSE_OK); dialog.add_button("_Open", Gtk::RESPONSE_OK);
//Add filters, so that only certain file types can be selected: //Add filters, so that only certain file types can be selected:
Glib::RefPtr<Gtk::FileFilter> filter_text = Gtk::FileFilter::create(); Glib::RefPtr<Gtk::FileFilter> filter_text = Gtk::FileFilter::create();
filter_text->set_name("Text files"); filter_text->set_name("Text files");
filter_text->add_mime_type("text/plain"); filter_text->add_mime_type("text/plain");
dialog.add_filter(filter_text); dialog.add_filter(filter_text);
Glib::RefPtr<Gtk::FileFilter> filter_cpp = Gtk::FileFilter::create(); Glib::RefPtr<Gtk::FileFilter> filter_cpp = Gtk::FileFilter::create();
filter_cpp->set_name("C/C++ files"); filter_cpp->set_name("C/C++ files");
filter_cpp->add_mime_type("text/x-c"); filter_cpp->add_mime_type("text/x-c");
filter_cpp->add_mime_type("text/x-c++"); filter_cpp->add_mime_type("text/x-c++");
filter_cpp->add_mime_type("text/x-c-header"); filter_cpp->add_mime_type("text/x-c-header");
dialog.add_filter(filter_cpp); dialog.add_filter(filter_cpp);
Glib::RefPtr<Gtk::FileFilter> filter_any = Gtk::FileFilter::create(); Glib::RefPtr<Gtk::FileFilter> filter_any = Gtk::FileFilter::create();
filter_any->set_name("Any files"); filter_any->set_name("Any files");
filter_any->add_pattern("*"); filter_any->add_pattern("*");
dialog.add_filter(filter_any); dialog.add_filter(filter_any);
int result = dialog.run(); int result = dialog.run();
switch (result) { switch (result) {
case(Gtk::RESPONSE_OK): { case(Gtk::RESPONSE_OK): {
std::cout << "Open clicked." << std::endl; std::cout << "Open clicked." << std::endl;
std::string path = dialog.get_filename(); std::string path = dialog.get_filename();
std::cout << "File selected: " << path << std::endl; std::cout << "File selected: " << path << std::endl;
notebook_.OnOpenFile(path); notebook_.OnOpenFile(path);
break; break;
} }
case(Gtk::RESPONSE_CANCEL): { case(Gtk::RESPONSE_CANCEL): {
std::cout << "Cancel clicked." << std::endl; std::cout << "Cancel clicked." << std::endl;
break; break;
} }
default: { default: {
std::cout << "Unexpected button clicked." << std::endl; std::cout << "Unexpected button clicked." << std::endl;
break; break;
} }
} }
} }
bool Window::OnMouseRelease(GdkEventButton *button){ bool Window::OnMouseRelease(GdkEventButton *button){
return notebook_.OnMouseRelease(button); return notebook_.OnMouseRelease(button);
} }

1
juci/window.h
Unescape View File

@ -22,6 +22,7 @@ public:
Menu::Controller menu_; Menu::Controller menu_;
Notebook::Controller notebook_; Notebook::Controller notebook_;
Terminal::Controller terminal_; Terminal::Controller terminal_;
PluginApi api_;
Keybindings::Controller& keybindings() { return keybindings_; } Keybindings::Controller& keybindings() { return keybindings_; }
private: private:

Write Preview
Loading…
Cancel
Save