aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-12 19:05:53 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-12 19:05:53 +0000
commit82765ad29b50c14ea8c01c1593ee088d1b1e8319 (patch)
tree73abd69fc5cacd5a4148ca2947b3463a69230b84
parent51c21c13138bc52953558d0e145b8d34471eb55e (diff)
downloadpaludis-82765ad29b50c14ea8c01c1593ee088d1b1e8319.tar.gz
paludis-82765ad29b50c14ea8c01c1593ee088d1b1e8319.tar.xz
Be more consistent with colours
-rw-r--r--src/paludis/applets.cc6
-rw-r--r--src/paludis/colour.hh9
-rw-r--r--src/paludis/contents.cc2
-rw-r--r--src/paludis/install.cc8
-rw-r--r--src/paludis/licence.cc4
-rw-r--r--src/paludis/list.cc2
-rw-r--r--src/paludis/paludis.cc2
-rw-r--r--src/paludis/query.cc12
-rw-r--r--src/paludis/uninstall.cc6
9 files changed, 30 insertions, 21 deletions
diff --git a/src/paludis/applets.cc b/src/paludis/applets.cc
index e9a8369..19088b9 100644
--- a/src/paludis/applets.cc
+++ b/src/paludis/applets.cc
@@ -152,7 +152,7 @@ int do_list_repository_formats()
return_code = 0;
for (std::set<std::string>::const_iterator k(keys.begin()), k_end(keys.end()) ;
k != k_end ; ++k)
- std::cout << "* " << colour(cl_package_name, *k) << std::endl;
+ std::cout << "* " << colour(cl_key_name, *k) << std::endl;
}
return return_code;
@@ -170,7 +170,7 @@ int do_list_sync_protocols()
return_code = 0;
for (std::set<std::string>::const_iterator k(keys.begin()), k_end(keys.end()) ;
k != k_end ; ++k)
- std::cout << "* " << colour(cl_package_name, *k) << std::endl;
+ std::cout << "* " << colour(cl_key_name, *k) << std::endl;
}
return return_code;
@@ -188,7 +188,7 @@ int do_list_dep_tag_categories()
return_code = 0;
for (std::set<std::string>::const_iterator k(keys.begin()), k_end(keys.end()) ;
k != k_end ; ++k)
- std::cout << "* " << colour(cl_package_name, *k) << std::endl;
+ std::cout << "* " << colour(cl_key_name, *k) << std::endl;
}
return return_code;
diff --git a/src/paludis/colour.hh b/src/paludis/colour.hh
index 953f703..50aea69 100644
--- a/src/paludis/colour.hh
+++ b/src/paludis/colour.hh
@@ -41,25 +41,34 @@ enum Colour
#if PALUDIS_COLOUR_PINK==1
cl_package_name = cl_bold_pink,
+ cl_repository_name = cl_pink,
cl_flag_on = cl_pink,
cl_flag_off = cl_red,
cl_slot = cl_blue,
cl_visible = cl_flag_on,
cl_masked = cl_flag_off,
+ cl_not_masked = cl_flag_on,
cl_heading = cl_bold_pink,
cl_updatemode = cl_yellow,
cl_tag = cl_yellow,
+ cl_key_name = cl_pink,
#else
cl_package_name = cl_bold_blue,
+ cl_repository_name = cl_blue,
cl_flag_on = cl_green,
cl_flag_off = cl_red,
cl_slot = cl_blue,
cl_visible = cl_flag_on,
cl_masked = cl_flag_off,
+ cl_not_masked = cl_flag_on,
cl_heading = cl_bold_green,
cl_updatemode = cl_yellow,
cl_tag = cl_yellow,
+ cl_key_name = cl_blue,
#endif
+
+ cl_error = cl_bold_red,
+
cl_file = cl_none,
cl_dir = cl_blue,
cl_sym = cl_pink,
diff --git a/src/paludis/contents.cc b/src/paludis/contents.cc
index 4138ece..f2d59f4 100644
--- a/src/paludis/contents.cc
+++ b/src/paludis/contents.cc
@@ -73,7 +73,7 @@ do_one_contents_entry(
std::for_each(contents->begin(), contents->end(), accept_visitor(&d));
}
else
- cout << " " << colour(cl_red, "(unknown)") << endl;
+ cout << " " << colour(cl_error, "(unknown)") << endl;
cout << endl;
}
diff --git a/src/paludis/install.cc b/src/paludis/install.cc
index 462e4a1..9470e91 100644
--- a/src/paludis/install.cc
+++ b/src/paludis/install.cc
@@ -43,13 +43,13 @@ namespace
{
void visit(const p::GLSADepTag * const tag)
{
- cout << "* " << colour(cl_yellow, tag->short_text()) << ": "
+ cout << "* " << colour(cl_tag, tag->short_text()) << ": "
<< tag->glsa_title() << endl;
}
void visit(const p::GeneralSetDepTag * const tag)
{
- cout << "* " << colour(cl_yellow, tag->short_text());
+ cout << "* " << colour(cl_tag, tag->short_text());
if (tag->short_text() == "world")
cout << ": " << "Packages that have been explicitly installed";
else if (tag->short_text() == "everything")
@@ -626,7 +626,7 @@ do_install()
pp->get<p::pde_repository>())->version_metadata(
pp->get<p::pde_name>(), pp->get<p::pde_version>())->get<p::vm_eapi>());
- cerr << " ( " << colour(cl_red, eapi_str) << " )";
+ cerr << " ( " << colour(cl_masked, eapi_str) << " )";
}
else if (p::mr_license == mm)
{
@@ -651,7 +651,7 @@ do_install()
p::create_inserter<p::KeywordName>(
std::inserter(keywords, keywords.end())));
- cerr << " ( " << colour(cl_red, p::join(keywords.begin(),
+ cerr << " ( " << colour(cl_masked, p::join(keywords.begin(),
keywords.end(), " ")) << " )";
}
}
diff --git a/src/paludis/licence.cc b/src/paludis/licence.cc
index bb1ebfd..3679f20 100644
--- a/src/paludis/licence.cc
+++ b/src/paludis/licence.cc
@@ -49,9 +49,9 @@ void
LicenceDisplayer::visit(const paludis::PlainTextDepAtom * atom)
{
if (env->accept_license(atom->text(), db_entry))
- stream << colour(cl_green, atom->text());
+ stream << colour(cl_not_masked, atom->text());
else
- stream << colour(cl_red, "(" + atom->text() + ")!");
+ stream << colour(cl_masked, "(" + atom->text() + ")!");
stream << " ";
}
diff --git a/src/paludis/list.cc b/src/paludis/list.cc
index 40c1efa..5ab9c7f 100644
--- a/src/paludis/list.cc
+++ b/src/paludis/list.cc
@@ -50,7 +50,7 @@ do_list_repositories()
ret_code = 0;
- std::cout << "* " << colour(cl_package_name, r->name()) << std::endl;
+ std::cout << "* " << colour(cl_repository_name, r->name()) << std::endl;
p::RepositoryInfo::ConstPointer ii(r->info(false));
for (p::RepositoryInfo::SectionIterator i(ii->begin_sections()),
diff --git a/src/paludis/paludis.cc b/src/paludis/paludis.cc
index d447c6d..a9c0afe 100644
--- a/src/paludis/paludis.cc
+++ b/src/paludis/paludis.cc
@@ -101,7 +101,7 @@ namespace
r(env->package_database()->begin_repositories()), r_end(env->package_database()->end_repositories()) ;
r != r_end ; ++r)
{
- cout << "Repository " << colour(cl_package_name, r->name()) << ":" << endl;
+ cout << "Repository " << colour(cl_repository_name, r->name()) << ":" << endl;
p::RepositoryInfo::ConstPointer ii(r->info(true));
for (p::RepositoryInfo::SectionIterator i(ii->begin_sections()),
diff --git a/src/paludis/query.cc b/src/paludis/query.cc
index e0b9830..bf5bfcd 100644
--- a/src/paludis/query.cc
+++ b/src/paludis/query.cc
@@ -338,22 +338,22 @@ int do_query()
switch (m)
{
case p::mr_keyword:
- cout << "* " << colour(cl_yellow, "K") << ": keyword";
+ cout << "* " << colour(cl_masked, "K") << ": keyword";
break;
case p::mr_user_mask:
- cout << "* " << colour(cl_yellow, "U") << ": user mask";
+ cout << "* " << colour(cl_masked, "U") << ": user mask";
break;
case p::mr_profile_mask:
- cout << "* " << colour(cl_yellow, "P") << ": profile mask";
+ cout << "* " << colour(cl_masked, "P") << ": profile mask";
break;
case p::mr_repository_mask:
- cout << "* " << colour(cl_yellow, "R") << ": repository mask";
+ cout << "* " << colour(cl_masked, "R") << ": repository mask";
break;
case p::mr_eapi:
- cout << "* " << colour(cl_yellow, "E") << ": EAPI";
+ cout << "* " << colour(cl_masked, "E") << ": EAPI";
break;
case p::mr_license:
- cout << "* " << colour(cl_yellow, "L") << ": licence";
+ cout << "* " << colour(cl_masked, "L") << ": licence";
break;
case p::last_mr:
diff --git a/src/paludis/uninstall.cc b/src/paludis/uninstall.cc
index b16ea61..2b42893 100644
--- a/src/paludis/uninstall.cc
+++ b/src/paludis/uninstall.cc
@@ -76,15 +76,15 @@ do_uninstall()
env->package_database()->query(*t, p::is_installed_only));
if (r->empty())
{
- cout << "* No match for " << colour(cl_red, **t) << endl;
+ cout << "* No match for " << colour(cl_masked, **t) << endl;
ok = false;
}
else if (r->size() > 1)
{
- cout << "* Multiple matches for " << colour(cl_red, **t) << ":" << endl;
+ cout << "* Multiple matches for " << colour(cl_masked, **t) << ":" << endl;
for (p::PackageDatabaseEntryCollection::Iterator p(r->begin()),
p_end(r->end()) ; p != p_end ; ++p)
- cout << " * " << *p << endl;
+ cout << " * " << colour(cl_package_name, *p) << endl;
ok = false;
}
else