Browse Source

Added option to turn off terminal progress, for instance when opening c/c++ files

merge-requests/365/head
eidheim 10 years ago
parent
commit
6095be64a1
  1. 2
      src/config.cc
  2. 1
      src/config.h
  3. 5
      src/files.h
  4. 5
      src/terminal.cc

2
src/config.cc

@ -98,6 +98,8 @@ void Config::retrieve_config() {
terminal.history_size=cfg.get<int>("terminal.history_size");
terminal.font=cfg.get<std::string>("terminal.font");
terminal.show_progress=cfg.get<bool>("terminal.show_progress");
terminal.clang_format_command="clang-format";
#ifdef __linux
if(terminal.clang_format_command=="clang-format" &&

1
src/config.h

@ -27,6 +27,7 @@ public:
std::string clang_format_command;
int history_size;
std::string font;
bool show_progress;
#ifdef _WIN32
boost::filesystem::path msys2_mingw_path;

5
src/files.h

@ -2,7 +2,7 @@
#define JUCI_FILES_H_
#include <string>
#define JUCI_VERSION "1.2.0-rc4"
#define JUCI_VERSION "1.2.0-rc5"
const std::string default_config_file = R"RAW({
"version": ")RAW"+std::string(JUCI_VERSION)+R"RAW(",
@ -19,7 +19,8 @@ const std::string default_config_file = R"RAW({
"terminal": {
"history_size": 1000,
"font_comment": "Use \"\" to use source.font with slightly smaller size",
"font": ""
"font": "",
"show_progress": true
},
"source": {
"style_comment": "Use \"\" for default style, and for instance juci-dark or juci-dark-blue together with dark gtk_theme variant. Styles from normal gtksourceview install: classic, cobalt, kate, oblivion, solarized-dark, solarized-light, tango",

5
src/terminal.cc

@ -6,7 +6,10 @@
#include <iostream>
Terminal::InProgress::InProgress(const std::string& start_msg): stop(false) {
start(start_msg);
if(Config::get().terminal.show_progress)
start(start_msg);
else
stop=true;
}
Terminal::InProgress::~InProgress() {

Loading…
Cancel
Save