Changeset 488:813dd7ab0834 for browser.c

Timestamp:

1998-10-21 08:40:17 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Byrial Jensen's mutt_multi_choice() patch plus some German
translations.

Files:

• browser.c (modified) (1 diff)

browser.c

@@ -736 +736 @@
       case OP_SORT_REVERSE:
 
-        {
-          int reverse = 0, done = 0;
-          event_t ch;
-
-          move (LINES - 1, 0);
-          if (i == OP_SORT_REVERSE)
+        {
+          int resort = 1;
+          int reverse = (i == OP_SORT_REVERSE);
+          
+          switch (mutt_multi_choice ((reverse) ?
+              _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
+              _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
+              _("dazn")))
           {
-            reverse = SORT_REVERSE;
-            addstr (_("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "));
-          } else {
-            addstr (_("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "));
-          }
-          clrtoeol ();
-
-          FOREVER
-          {
-            ch = mutt_getch();
-            if (ch.ch == 'a' || ch.ch == 'd' || ch.ch == 'z' || ch.ch == 'n')
+            case -1: /* abort */
+              resort = 0;
               break;
 
-            if (ch.ch == -1 || CI_is_return (ch.ch))
-            {
-              done = 1;
-              CLEARLINE (LINES - 1);
+            case 1: /* (d)ate */
+              BrowserSort = reverse | SORT_DATE;
               break;
-            }
-            else
-              BEEP ();
-          }
-
-          /* nothing to be done */
-          if (done)
-            break;
-
-          switch (ch.ch)
-          {
-            case 'a': 
+
+            case 2: /* (a)lpha */
               BrowserSort = reverse | SORT_SUBJECT;
               break;
-            case 'd':
-              BrowserSort = reverse | SORT_DATE;
-              break;
-            case 'z': 
+
+            case 3: /* si(z)e */
               BrowserSort = reverse | SORT_SIZE;
               break;
-            case 'n': 
+
+            case 4: /* do(n)'t sort */
               BrowserSort = SORT_ORDER;
               break;
           }
-          browser_sort (&state);
-          menu->redraw = REDRAW_FULL;
-        }
-
-        break;
+          if (resort)
+          {
+            browser_sort (&state);
+            menu->redraw = REDRAW_FULL;
+          }
+          break;
+        }
 
       case OP_TOGGLE_MAILBOXES: