Merge branch 'master' of github.com:cppit/jucipp into python-refactor

Conflicts:
	.gitmodules

Author: Jørgen Lien Sellæg

.gitmodules

@@ -1,11 +1,9 @@
-[submodule "tiny-process-library"]
-	path = tiny-process-library
-	url = https://github.com/eidheim/tiny-process-library
-	branch = v1.0.3
 [submodule "libclangmm"]
 	path = libclangmm
 	url = https://github.com/cppit/libclangmm
-	branch = v0.9.5
 [submodule "pybind11"]
 	path = pybind11
-	url = https://github.com/pybind/pybind11.git
+	url = https://github.com/pybind/pybind11.git
+[submodule "tiny-process-library"]
+	path = tiny-process-library
+	url = https://github.com/eidheim/tiny-process-library

docs/install.md

@@ -3,8 +3,8 @@
 - Installation
   - Linux
     - [Debian testing/Linux Mint/Ubuntu](#debian-testinglinux-mintubuntu)
-    - [Debian stable/Linux Mint Debian Edition](#debian-stablelinux-mint-debian-edition)
-    - [Arch Linux](#arch-linux)
+    - [Debian stable/Linux Mint Debian Edition/Raspbian](#debian-stablelinux-mint-debian-editionraspbian)
+    - [Arch Linux/Manjaro Linux](#arch-linuxmanjaro-linux)
     - [Fedora 23](#fedora-23)
     - [Mageia 5](#mageia-5)
   - OS X
@@ -29,7 +29,7 @@ make
 sudo make install
 ```
 
-## Debian stable/Linux Mint Debian Edition
+## Debian stable/Linux Mint Debian Edition/Raspbian
 Install dependencies:
 ```sh
 sudo apt-get install git cmake make g++ libclang-3.5-dev liblldb-3.5-dev clang-format-3.5 pkg-config libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libboost-regex-dev libgtksourceviewmm-3.0-dev aspell-en libaspell-dev
@@ -45,8 +45,8 @@ make
 sudo make install
 ```
 
-##Arch Linux
-**Arch Linux's lldb package has an issue that is being worked on, and for the time being you have to build juCi++ without debug support. If you have the lldb package installed, please remove this package before building juCi++.**
+##Arch Linux/Manjaro Linux
+**Arch Linux's lldb package has an issue that is being worked on (see https://github.com/cppit/jucipp/issues/191), and for the time being you have to build juCi++ without debug support. If you have the lldb package installed, please remove this package before building juCi++.**
 
 Package available in the Arch User Repository:
 https://aur.archlinux.org/packages/jucipp-git/
@@ -137,15 +137,15 @@ make install
 ```
 
 ##Windows with MSYS2 (https://msys2.github.io/)
-**MSYS2 does not yet support lldb, but you can still compile juCi++ without debug support.**
-
-Note that juCi++ must be run in a MinGW Shell (for instance MinGW-w64 Win64 Shell). 
+**MSYS2 does not yet support lldb (see https://github.com/cppit/jucipp/issues/190), but you can still compile juCi++ without debug support.**
 
 Install dependencies (replace `x86_64` with `i686` for 32-bit MSYS2 installs):
 ```sh
 pacman -S git mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-gtksourceviewmm3 mingw-w64-x86_64-boost mingw-w64-x86_64-aspell mingw-w64-x86_64-aspell-en mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-pygobject-devel mingw-w64-x86_64-python3-gobject
 ```
 
+Note that juCi++ must be built and run in a MinGW Shell (for instance MinGW-w64 Win64 Shell).
+
 Get juCi++ source, compile and install (replace `mingw64` with `mingw32` for 32-bit MSYS2 installs):
 ```sh
 git clone --recursive https://github.com/cppit/jucipp

libclangmm

@@ -1,5 +1,5 @@
 add_definitions(-DBOOST_LOG_DYN_LINK)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++11 -pthread -Wall -Wno-reorder")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++11 -pthread -Wall -Wextra -Wno-unused-parameter -Wno-reorder")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/")
 
 if(APPLE)

src/CMakeLists.txt

@@ -14,7 +14,9 @@
 #               Known LLVM release numbers.
 
 # most recent versions come first
-set(LIBCLANG_KNOWN_LLVM_VERSIONS 3.8
+set(LIBCLANG_KNOWN_LLVM_VERSIONS 3.9
+  3.8.1
+  3.8
   3.7.1
   3.7
   3.6.2

src/cmake/Modules/FindLibClang.cmake

@@ -63,8 +63,10 @@ bool Directories::TreeStore::drag_data_received_vfunc(const TreeModel::Path &pat
   auto it=directories.get_selection()->get_selected();
   if(it) {
     auto source_path=it->get_value(directories.column_record.path);
-    auto target_path=get_target_folder(path);
+    if(source_path.empty())
+      return false;
 
+    auto target_path=get_target_folder(path);
     target_path/=source_path.filename();
 
     if(source_path==target_path)
@@ -109,6 +111,7 @@ bool Directories::TreeStore::drag_data_received_vfunc(const TreeModel::Path &pat
     directories.select(target_path);
   }
 
+  EntryBox::get().hide();
   return false;
 }
 
@@ -205,6 +208,94 @@ Directories::Directories() : Gtk::TreeView(), stop_update_thread(false) {
   enable_model_drag_source();
   enable_model_drag_dest();
 
+  auto new_file_label = "New File";
+  auto new_file_function = [this] {
+    if(menu_popup_row_path.empty())
+      return;
+    EntryBox::get().clear();
+    auto source_path=std::make_shared<boost::filesystem::path>(menu_popup_row_path);
+    EntryBox::get().entries.emplace_back("", [this, source_path](const std::string &content) {
+      bool is_directory=boost::filesystem::is_directory(*source_path);
+      auto target_path = (is_directory ? *source_path : source_path->parent_path())/content;
+      if(!boost::filesystem::exists(target_path)) {
+        if(filesystem::write(target_path, "")) {
+          update();
+          Notebook::get().open(target_path);
+        }
+        else {
+          Terminal::get().print("Error: could not create "+target_path.string()+'\n', true);
+          return;
+        }
+      }
+      else {
+        Terminal::get().print("Error: could not create "+target_path.string()+": already exists\n", true);
+        return;
+      }
+      
+      EntryBox::get().hide();
+    });
+    auto entry_it=EntryBox::get().entries.begin();
+    entry_it->set_placeholder_text("Filename");
+    EntryBox::get().buttons.emplace_back("Create New File", [this, entry_it](){
+      entry_it->activate();
+    });
+    EntryBox::get().show();
+  };
+  
+  menu_item_new_file.set_label(new_file_label);
+  menu_item_new_file.signal_activate().connect(new_file_function);
+  menu.append(menu_item_new_file);
+  
+  menu_root_item_new_file.set_label(new_file_label);
+  menu_root_item_new_file.signal_activate().connect(new_file_function);
+  menu_root.append(menu_root_item_new_file);
+  
+  auto new_folder_label = "New Folder";
+  auto new_folder_function = [this] {
+    if(menu_popup_row_path.empty())
+      return;
+    EntryBox::get().clear();
+    auto source_path=std::make_shared<boost::filesystem::path>(menu_popup_row_path);
+    EntryBox::get().entries.emplace_back("", [this, source_path](const std::string &content) {
+      bool is_directory=boost::filesystem::is_directory(*source_path);
+      auto target_path = (is_directory ? *source_path : source_path->parent_path())/content;
+      if(!boost::filesystem::exists(target_path)) {
+        boost::system::error_code ec;
+        boost::filesystem::create_directory(target_path, ec);
+        if(!ec) {
+          update();
+          select(target_path);
+        }
+        else {
+          Terminal::get().print("Error: could not create "+target_path.string()+": "+ec.message(), true);
+          return;
+        }
+      }
+      else {
+        Terminal::get().print("Error: could not create "+target_path.string()+": already exists\n", true);
+        return;
+      }
+      
+      EntryBox::get().hide();
+    });
+    auto entry_it=EntryBox::get().entries.begin();
+    entry_it->set_placeholder_text("Folder name");
+    EntryBox::get().buttons.emplace_back("Create New Folder", [this, entry_it](){
+      entry_it->activate();
+    });
+    EntryBox::get().show();
+  };
+  
+  menu_item_new_folder.set_label(new_folder_label);
+  menu_item_new_folder.signal_activate().connect(new_folder_function);
+  menu.append(menu_item_new_folder);
+  
+  menu_root_item_new_folder.set_label(new_folder_label);
+  menu_root_item_new_folder.signal_activate().connect(new_folder_function);
+  menu_root.append(menu_root_item_new_folder);
+  
+  menu.append(menu_item_separator);
+  
   menu_item_rename.set_label("Rename");
   menu_item_rename.signal_activate().connect([this] {
     if(menu_popup_row_path.empty())
@@ -214,46 +305,53 @@ Directories::Directories() : Gtk::TreeView(), stop_update_thread(false) {
     EntryBox::get().entries.emplace_back(menu_popup_row_path.filename().string(), [this, source_path](const std::string &content){
       bool is_directory=boost::filesystem::is_directory(*source_path);
 
-      boost::system::error_code ec;
       auto target_path=source_path->parent_path()/content;
+      
+      if(boost::filesystem::exists(target_path)) {
+        Terminal::get().print("Error: could not rename to "+target_path.string()+": already exists\n", true);
+        return;
+      }
+      
+      boost::system::error_code ec;
       boost::filesystem::rename(*source_path, target_path, ec);
-      if(ec)
-        Terminal::get().print("Error: could not rename "+source_path->string()+": "+ec.message()+'\n');
-      else {
-        update();
-        select(target_path);
-        
-        for(int c=0;c<Notebook::get().size();c++) {
-          auto view=Notebook::get().get_view(c);
-          if(is_directory) {
-            if(filesystem::file_in_path(view->file_path, *source_path)) {
-              auto file_it=view->file_path.begin();
-              for(auto source_it=source_path->begin();source_it!=source_path->end();source_it++)
-                file_it++;
-              auto new_file_path=target_path;
-              for(;file_it!=view->file_path.end();file_it++)
-                new_file_path/=*file_it;
-              view->file_path=new_file_path;
-            }
-          }
-          else if(view->file_path==*source_path) {
-            view->file_path=target_path;
+      if(ec) {
+        Terminal::get().print("Error: could not rename "+source_path->string()+": "+ec.message()+'\n', true);
+        return;
+      }
+      update();
+      select(target_path);
+      
+      for(int c=0;c<Notebook::get().size();c++) {
+        auto view=Notebook::get().get_view(c);
+        if(is_directory) {
+          if(filesystem::file_in_path(view->file_path, *source_path)) {
+            auto file_it=view->file_path.begin();
+            for(auto source_it=source_path->begin();source_it!=source_path->end();source_it++)
+              file_it++;
+            auto new_file_path=target_path;
+            for(;file_it!=view->file_path.end();file_it++)
+              new_file_path/=*file_it;
+            view->file_path=new_file_path;
             g_signal_emit_by_name(view->get_buffer()->gobj(), "modified_changed");
-            
-            std::string old_language_id;
-            if(view->language)
-              old_language_id=view->language->get_id();
-            view->language=Source::guess_language(target_path);
-            std::string new_language_id;
-            if(view->language)
-              new_language_id=view->language->get_id();
-            if(new_language_id!=old_language_id)
-              Terminal::get().print("Warning: language for "+target_path.string()+" has changed. Please reopen the file\n");
           }
         }
-        
-        EntryBox::get().hide();
+        else if(view->file_path==*source_path) {
+          view->file_path=target_path;
+          g_signal_emit_by_name(view->get_buffer()->gobj(), "modified_changed");
+          
+          std::string old_language_id;
+          if(view->language)
+            old_language_id=view->language->get_id();
+          view->language=Source::guess_language(target_path);
+          std::string new_language_id;
+          if(view->language)
+            new_language_id=view->language->get_id();
+          if(new_language_id!=old_language_id)
+            Terminal::get().print("Warning: language for "+target_path.string()+" has changed. Please reopen the file\n");
+        }
       }
+      
+      EntryBox::get().hide();
     });
     auto entry_it=EntryBox::get().entries.begin();
     entry_it->set_placeholder_text("Filename");
@@ -299,6 +397,22 @@ Directories::Directories() : Gtk::TreeView(), stop_update_thread(false) {
 
   menu.show_all();
   menu.accelerate(*this);
+  
+  menu_root.show_all();
+  menu_root.accelerate(*this);
+  
+  set_headers_clickable();
+  forall([this](Gtk::Widget &widget) {
+    if(widget.get_name()=="GtkButton") {
+      widget.signal_button_press_event().connect([this](GdkEventButton *event) {
+        if(event->type==GDK_BUTTON_PRESS && event->button==GDK_BUTTON_SECONDARY && !path.empty()) {
+          menu_popup_row_path=this->path;
+          menu_root.popup(event->button, event->time);
+        }
+        return true;
+      });
+    }
+  });
 }
 
 Directories::~Directories() {
@@ -394,12 +508,28 @@ void Directories::select(const boost::filesystem::path &select_path) {
 
 bool Directories::on_button_press_event(GdkEventButton* event) {
   if(event->type==GDK_BUTTON_PRESS && event->button==GDK_BUTTON_SECONDARY) {
+    EntryBox::get().hide();
     Gtk::TreeModel::Path path;
     if(get_path_at_pos(static_cast<int>(event->x), static_cast<int>(event->y), path)) {
       menu_popup_row_path=get_model()->get_iter(path)->get_value(column_record.path);
+      if(menu_popup_row_path.empty()) {
+        auto parent=get_model()->get_iter(path)->parent();
+        if(parent)
+          menu_popup_row_path=parent->get_value(column_record.path);
+        else {
+          menu_popup_row_path=this->path;
+          menu_root.popup(event->button, event->time);
+          return true;
+        }
+      }
       menu.popup(event->button, event->time);
       return true;
     }
+    else if(!this->path.empty()) {
+      menu_popup_row_path=this->path;
+      menu_root.popup(event->button, event->time);
+      return true;
+    }
   }
 
   return Gtk::TreeView::on_button_press_event(event);

src/directories.cc

@@ -69,8 +69,14 @@ class Directories : public Gtk::TreeView {
   Dispatcher dispatcher;
 
   Gtk::Menu menu;
+  Gtk::MenuItem menu_item_new_file;
+  Gtk::MenuItem menu_item_new_folder;
+  Gtk::SeparatorMenuItem menu_item_separator;
   Gtk::MenuItem menu_item_rename;
   Gtk::MenuItem menu_item_delete;
+  Gtk::Menu menu_root;
+  Gtk::MenuItem menu_root_item_new_file;
+  Gtk::MenuItem menu_root_item_new_folder;
   boost::filesystem::path menu_popup_row_path;
 };
 

src/directories.h

@@ -2,7 +2,7 @@
 #define JUCI_FILES_H_
 #include <string>
 
-#define JUCI_VERSION "1.1.2"
+#define JUCI_VERSION "1.1.2-1"
 
 const std::string configjson =
 "{\n"
@@ -75,6 +75,7 @@ const std::string configjson =
 "        \"open_folder\": \"<primary><shift>o\",\n"
 "        \"save\": \"<primary>s\",\n"
 "        \"save_as\": \"<primary><shift>s\",\n"
+"        \"print\": \"<primary>p\",\n"
 "        \"edit_undo\": \"<primary>z\",\n"
 "        \"edit_redo\": \"<primary><shift>z\",\n"
 "        \"edit_cut\": \"<primary>x\",\n"

src/files.h

@@ -101,6 +101,13 @@ Menu::Menu() : plugin_menu(nullptr) {
              +accels["save_as"]+ //For Ubuntu...
   "        </item>"
   "      </section>"
+  "      <section>"
+  "        <item>"
+  "          <attribute name='label' translatable='yes'>_Print</attribute>"
+  "          <attribute name='action'>app.print</attribute>"
+             +accels["print"]+ //For Ubuntu...
+  "        </item>"
+  "      </section>"
   "    </submenu>"
   ""
   "    <submenu>"

src/menu.cc

@@ -553,7 +553,7 @@ void Project::Python::compile_and_run() {
 }
 
 void Project::JavaScript::compile_and_run() {
-  auto command="node "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string());
+  auto command="node --harmony "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string());
   Terminal::get().print("Running "+command+"\n");
   Terminal::get().async_process(command, Notebook::get().get_current_view()->file_path.parent_path(), [command](int exit_status) {
     Terminal::get().async_print(command+" returned: "+std::to_string(exit_status)+'\n');