Configuration

- The old 'curses' configuration variable is now replaced by 'detection', and
  has the same meaning - whether or not to auto-detect terminal size.
This commit is contained in:
Paul Beckingham 2011-04-03 18:24:50 -04:00
parent df41ea9988
commit 585151f184
7 changed files with 24 additions and 21 deletions

View file

@ -63,7 +63,7 @@ std::string Config::defaults =
"gc=on # Garbage-collect data files - DO NOT CHANGE unless you are sure\n"
"\n"
"# Terminal\n"
"curses=on # Detects terminal width\n"
"detection=on # Detects terminal width\n"
"defaultwidth=80 # Without detection, assumed width\n"
"#editor=vi # Preferred text editor\n"
"edit.verbose=yes # Include comments in files created during task edit\n"

View file

@ -136,10 +136,10 @@ void Context::initialize ()
loadCorrectConfigFile ();
loadAliases ();
// When redirecting output to a file, do not use color, curses.
// When redirecting output to a file, do not use color.
if (!isatty (fileno (stdout)))
{
config.set ("curses", "off");
config.set ("detection", "off");
if (! config.getBoolean ("_forcecolor"))
config.set ("color", "off");
@ -346,7 +346,7 @@ void Context::shadow ()
throw std::string ("Configuration variable 'shadow.file' is set to "
"overwrite your undo log. Please change it.");
std::string oldCurses = config.get ("curses");
std::string oldDetection = config.get ("detection");
std::string oldColor = config.get ("color");
clear ();
@ -360,8 +360,8 @@ void Context::shadow ()
split (args, command, ' ');
initialize ();
config.set ("curses", "off");
config.set ("color", "off");
config.set ("detection", "off");
config.set ("color", "off");
parse ();
std::string result;
@ -375,8 +375,8 @@ void Context::shadow ()
else
throw std::string ("Could not write file '") + shadowFile.data + "'";
config.set ("curses", oldCurses);
config.set ("color", oldColor);
config.set ("detection", oldDetection);
config.set ("color", oldColor);
// Optionally display a notification that the shadow file was updated.
if (config.getBoolean ("shadow.notify"))

View file

@ -1169,11 +1169,11 @@ int handleShow (std::string& outs)
"color.calendar.weekend color.calendar.holiday color.calendar.weeknumber "
"color.summary.background color.summary.bar color.history.add "
"color.history.done color.history.delete color.undo.before "
"color.sync.added color.sync.changed color.sync.rejected "
"color.undo.after confirmation curses data.location dateformat "
"dateformat.holiday dateformat.report dateformat.annotation debug "
"default.command default.due default.priority default.project defaultwidth due "
"dependency.confirmation dependency.reminder locale displayweeknumber "
"color.sync.added color.sync.changed color.sync.rejected color.undo.after "
"confirmation data.location dateformat dateformat.holiday "
"dateformat.report dateformat.annotation debug default.command default.due "
"default.priority default.project defaultwidth due "
"dependency.confirmation dependency.reminder detection locale displayweeknumber "
"export.ical.class echo.command fontunderline gc locking monthsperline "
"nag next journal.time journal.time.start.annotation journal.info "
"journal.time.stop.annotation project shadow.command shadow.file "

View file

@ -55,7 +55,7 @@ int Context::getWidth ()
if (width == 0)
return 65536;
if (config.getBoolean ("curses"))
if (config.getBoolean ("detection"))
{
if (terminal_width == 0 &&
terminal_height == 0)
@ -83,7 +83,7 @@ int Context::getHeight ()
{
int height = 24;
if (config.getBoolean ("curses"))
if (config.getBoolean ("detection"))
{
if (terminal_width == 0 &&
terminal_height == 0)