From 531f9b43d770685c0b4c2a0243675186e8764a0d Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Thu, 23 Jan 2014 19:46:33 +0100
Subject: Slightly revamp help header in Ctrl-F

The old one did really not help any player whatsoever, I tested with
several new ones. Nobody was able to find out what it tried to convey.

Hopefully this layout gets the important points across better now.
What should also be changed are some of the defaults themselves. This
might be addressed in a subsequent commit.
---
 crawl-ref/source/stash.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index a20d19a..1e7335c 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -1883,7 +1883,7 @@ void StashSearchMenu::draw_title()
     {
         cgotoxy(1, 1);
         formatted_string fs = formatted_string(title->colour);
-        fs.cprintf("%d %s%s,",
+        fs.cprintf("%d %s%s",
                    title->quantity, title->text.c_str(),
                    title->quantity > 1 ? "es" : "");
         fs.display();
@@ -1893,13 +1893,13 @@ void StashSearchMenu::draw_title()
 #endif
 
         draw_title_suffix(formatted_string::parse_string(make_stringf(
-                 "<lightgrey> [<w>a-z</w>: %s"
-                 " <w>?</w>/<w>!</w>: %s"
-                 "  <w>-</w>:show %s"
-                 " <w>/</w>:sort %s"
-                 " <w>=</w>:%s]",
-                 menu_action == ACT_EXECUTE ? "travel" : "view",
-                 menu_action == ACT_EXECUTE ? "view" : "travel",
+                 "<lightgrey>"
+                 ": <w>%s</w> [toggle: <w>!</w>],"
+                 " <w>%s</w> stacks [<w>-</w>],"
+                 " by <w>%s</w> [<w>/</w>],"
+                 " <w>%s</w> unusable [<w>=</w>]"
+                 "</lightgrey>",
+                 menu_action == ACT_EXECUTE ? " view " : "travel",
                  stack_style, sort_style, filtered)), false);
     }
 }
@@ -2080,9 +2080,9 @@ bool StashTracker::display_search_results(
     else
         sort(results->begin(), results->end(), compare_by_name());
 
-    StashSearchMenu stashmenu(show_as_stacks ? "stacks" : "items ",
-                              sort_by_dist ? "by dist" : "by name",
-                              filter_useless ? "filtered" : "unfiltered");
+    StashSearchMenu stashmenu(show_as_stacks ? "hide" : "show",
+                              sort_by_dist ? "dist" : "name",
+                              filter_useless ? "hide" : "show");
     stashmenu.set_tag("stash");
     stashmenu.can_travel   = can_travel_interlevel();
     stashmenu.action_cycle = Menu::CYCLE_TOGGLE;
-- 
1.8.5.3


From 037bdf37fd9252ff8ffefcd4ed59489ddf3bfcec Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Thu, 23 Jan 2014 19:46:39 +0100
Subject: Change defaults of show_as_stacks and filter_useless in Ctrl-F

show_as_stacks used to hide some items behind rather unintuitive parens,
and this has come up as actual problem more than once.
filter_useless on the other hand used to spam you with many mostly
irrelevant items and similarly suffered from the weird help line.

The new settings are: show_as_stacks = false, filter_useless = true.
---
 crawl-ref/source/stash.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 1e7335c..a08061d 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -1805,8 +1805,8 @@ void StashTracker::search_stashes()
     }
 
     bool sort_by_dist = true;
-    bool show_as_stacks = true;
-    bool filter_useless = false;
+    bool show_as_stacks = false;
+    bool filter_useless = true;
     bool default_execute = true;
     while (true)
     {
-- 
1.8.5.3