From b7c1ad4d8e864367f027b43768fd0738f41b1428 Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 24 Dec 2015 10:27:09 +0100 Subject: [PATCH 1/6] Added link to Arch User Repository package --- docs/install.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/install.md b/docs/install.md index 8d2d726..4a60c1c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -34,6 +34,11 @@ sudo make install ``` ##Arch Linux +Package available in the Arch User Repository: +https://aur.archlinux.org/packages/jucipp-git/ + +Alternatively, follow the instructions below. + Install dependencies: ```sh #as root From 9accf6c430c506e30ef0ea640e1518fe463ec4e0 Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 24 Dec 2015 12:10:08 +0100 Subject: [PATCH 2/6] Added additional check on indent left after { on newline (Allman style) --- src/source_clang.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/source_clang.cc b/src/source_clang.cc index 4384848..8180d53 100644 --- a/src/source_clang.cc +++ b/src/source_clang.cc @@ -619,11 +619,13 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) { start_iter.backward_chars(tab_size); if(boost::regex_match(previous_line, sm, no_bracket_statement_regex) || boost::regex_match(previous_line, sm, no_bracket_no_para_statement_regex)) { - get_buffer()->erase(start_iter, iter); - get_buffer()->insert_at_cursor("{"); - scroll_to(get_buffer()->get_insert()); - get_buffer()->end_user_action(); - return true; + if((tabs.size()-tab_size)==sm[1].str().size()) { + get_buffer()->erase(start_iter, iter); + get_buffer()->insert_at_cursor("{"); + scroll_to(get_buffer()->get_insert()); + get_buffer()->end_user_action(); + return true; + } } } } From 6b96b64d6136ae36c60bc7b0e1efb3306d32df07 Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 24 Dec 2015 12:21:00 +0100 Subject: [PATCH 3/6] Visual size of tab (\t) set to 4 spaces --- src/source.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/source.cc b/src/source.cc index a9faacf..97413e7 100644 --- a/src/source.cc +++ b/src/source.cc @@ -257,6 +257,7 @@ Source::View::View(const boost::filesystem::path &file_path, const boost::filesy set_tooltip_and_dialog_events(); + set_tab_width(4); //Visual size of a \t hardcoded to be equal to visual size of 4 spaces tab_char=Config::get().source.default_tab_char; tab_size=Config::get().source.default_tab_size; if(Config::get().source.auto_tab_char_and_size) { From ec097687d0858eae4f3717e69e34bb7d0ef4fb2c Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Thu, 24 Dec 2015 15:17:13 +0100 Subject: [PATCH 4/6] Added contents --- docs/install.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/install.md b/docs/install.md index 4a60c1c..f7ac459 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,5 +1,14 @@ # juCi++ Installation Guide +- Linux + - [Debian/Ubuntu 15](#debianubuntu-15) + - [Ubuntu 14/Linux Mint 17](#ubuntu-14linux-mint-17) + - [Arch Linux](#arch-linux) +- OS X + - [Homebrew](#os-x-with-homebrew-httpbrewsh) +- Windows + - [MSYS 2](windows-with-msys2-httpsmsys2githubio) + ## Debian/Ubuntu 15 Install dependencies: ```sh From 68705dc58faec16547184a277fe638712cbe15f4 Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Thu, 24 Dec 2015 15:19:20 +0100 Subject: [PATCH 5/6] Corrected MSYS2 link in contents --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index f7ac459..672e5f3 100644 --- a/docs/install.md +++ b/docs/install.md @@ -7,7 +7,7 @@ - OS X - [Homebrew](#os-x-with-homebrew-httpbrewsh) - Windows - - [MSYS 2](windows-with-msys2-httpsmsys2githubio) + - [MSYS 2](#windows-with-msys2-httpsmsys2githubio) ## Debian/Ubuntu 15 Install dependencies: From 0e5568351c4bdef93e1f1dbfc4e36a68a8d6d87d Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 24 Dec 2015 15:51:47 +0100 Subject: [PATCH 6/6] Now correctly removes opened subdirectories when closing a directory. This fixes a crash when changes happened in a subdirectory that had one of its parent/grandparent/etc closed --- src/directories.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/directories.cc b/src/directories.cc index 4209ec7..ab027a9 100644 --- a/src/directories.cc +++ b/src/directories.cc @@ -57,7 +57,13 @@ Directories::Directories() : Gtk::TreeView(), stop_update_thread(false) { }); signal_row_collapsed().connect([this](const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path){ update_mutex.lock(); - last_write_times.erase(iter->get_value(column_record.path).string()); + auto directory_str=iter->get_value(column_record.path).string(); + for(auto it=last_write_times.begin();it!=last_write_times.end();) { + if(directory_str==it->first.substr(0, directory_str.size())) + it=last_write_times.erase(it); + else + it++; + } update_mutex.unlock(); auto children=iter->children(); if(children) {