aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-22 16:16:26 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-22 16:17:45 +0100
commit79c9eff958ab179348b885eef281e992ab995f9b (patch)
tree195e231c691f8155623d44476a03dbd0a97390bc
parentb2267f16c41a270ebcc031ffb90fc428a936c6d4 (diff)
downloadpaludis-79c9eff958ab179348b885eef281e992ab995f9b.tar.gz
paludis-79c9eff958ab179348b885eef281e992ab995f9b.tar.xz
Clearer need changes for message
-rw-r--r--src/clients/cave/cmd_display_resolution-fmt.hh2
-rw-r--r--src/clients/cave/cmd_display_resolution.cc22
2 files changed, 17 insertions, 7 deletions
diff --git a/src/clients/cave/cmd_display_resolution-fmt.hh b/src/clients/cave/cmd_display_resolution-fmt.hh
index ddb360e..b7ad44c 100644
--- a/src/clients/cave/cmd_display_resolution-fmt.hh
+++ b/src/clients/cave/cmd_display_resolution-fmt.hh
@@ -67,7 +67,7 @@ const auto fs_description = make_format_string_fetcher("display-resolution/descr
<< " \"" << param<'s'>() << "\"" << "\\n";
const auto fs_choices_need_changes = make_format_string_fetcher("display-resolution/choices_need_changes", 1)
- << " " << c::bold_red() << "Need changes for: " << c::normal() << param<'c'>()
+ << " " << c::bold_red() << "You need to change: " << c::normal() << param<'c'>()
<< param_if<'u'>() << " " << c::bold_normal() << "No changes needed: " << param<'u'>() << c::normal()
<< param_endif<'u'>() << "\\n";
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 8c89b26..f6472a0 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -673,19 +673,29 @@ namespace
s_prefix.first.append(" ");
std::string t;
+
+ if (! changed_state.is_indeterminate())
+ {
+ if ((*i)->enabled())
+ t = t + printer.prettify_choice_value_enabled(*i);
+ else
+ t = t + printer.prettify_choice_value_disabled(*i);
+ t = t + " -> ";
+ }
+
if ((changed_state.is_indeterminate() && (*i)->enabled()) || (changed_state.is_true()))
{
if ((*i)->locked())
- t = printer.prettify_choice_value_forced(*i);
+ t = t + printer.prettify_choice_value_forced(*i);
else
- t = printer.prettify_choice_value_enabled(*i);
+ t = t + printer.prettify_choice_value_enabled(*i);
}
else
{
if ((*i)->locked())
- t = printer.prettify_choice_value_masked(*i);
+ t = t + printer.prettify_choice_value_masked(*i);
else
- t = printer.prettify_choice_value_disabled(*i);
+ t = t + printer.prettify_choice_value_disabled(*i);
}
if (changed)
@@ -843,7 +853,7 @@ namespace
std::string visit(const ChangedChoicesConfirmation &) const
{
- return "being reconfigured";
+ return "user configuration changes";
}
};