Fix confusing bottom status lines in dselect, unifying them by removing

the method or package name and capitalizing. Closes: #9085

diff --git a/ChangeLog b/ChangeLog
index b0f61f414f2742657a3b9e8101e1fed801af2d0f..1912ebfd84edb4f82b5c5f5cfb4f8a212fd7f112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-11  Guillem Jover  <guillem@debian.org>
+
+       * dselect/pkglist.h (packagelist::severalinfoblurb): Do not take a
+       string argument. Fix all callers.
+       * dselect/pkginfo.cc (packagelist::severalinfoblurb): Likewise.
+       (packagelist::itd_relations): Capitalize and make whatinfo setting
+       common and move it outside of the if block, and do not add the
+       package name.
+       (packagelist::itd_description): Likewise.
+       (packagelist::itd_statuscontrol): Likewise.
+       (packagelist::itd_availablecontrol): Likewise.
+       * dselect/baselist.cc (baselist::itd_keys): Capitalize whatinfo string.
+       * dselect/methlist.cc (methodlist::itd_description): Likewise and do
+       not print the method name.
+
 2007-02-11  Ian Jackson  <iwj@ubuntu.com>
            Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index 4010878d4d6e9e5d49532fdfe2d66258087092f1..483d3a7ab83869effffc5f62ec72d9d12eaaaec6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ dpkg (1.14.0) UNRELEASED; urgency=low
   * Change priority for dpkg-dev from standard to optional to match the
     override.
   * Do not use a build-stamp in debian/rules.
+  * Fix confusing bottom status lines in dselect, unifying them by removing
+    the method or package name and capitalizing. Closes: #9085
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).

diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index c942318e9168ec0c003de4b67c2a6614ecf460c7..64446eb449c1161ab3064164fe32cb2bcc5aa6ad 100644 (file)
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -256,7 +256,7 @@ baselist::baselist(keybindings *kb) {
 }  
 
 void baselist::itd_keys() {
-  whatinfovb(_("keybindings"));
+  whatinfovb(_("Keybindings"));
   
   const int givek= xmax/3;
   bindings->describestart();

diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 054e590d0cb21f6d35e2380e672ed7d703a22ba7..9e3b7d7d167320fb12b014a5ba815794ead96006 100644 (file)
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -188,8 +188,7 @@ quitaction methodlist::display() {
 }
 
 void methodlist::itd_description() {
-  whatinfovb(_("explanation of "));
-  whatinfovb(table[cursorline]->name);
+  whatinfovb(_("Explanation"));
 
   wattrset(infopad,info_headattr);
   waddstr(infopad, table[cursorline]->name);

diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index e9c286ceb6796cb3caae04d72024a90d94999b72..b27396d2eaa36f2b9a00ab67649f96c69411c4c8 100644 (file)
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -76,8 +76,8 @@ const packagelist::infotype packagelist::infoinfos[]= {
 
 const packagelist::infotype *const packagelist::baseinfo= infoinfos;
 
-void packagelist::severalinfoblurb(const char *whatinfoline) {
-  whatinfovb(whatinfoline);
+void packagelist::severalinfoblurb()
+{
   varbuf vb;
   vb(_("The line you have highlighted represents many packages; "
      "if you ask to install, remove, hold, etc. it you will affect all "
@@ -92,24 +92,24 @@ void packagelist::severalinfoblurb(const char *whatinfoline) {
 }
 
 void packagelist::itd_relations() {
+  whatinfovb(_("Interrelationships"));
+
   if (table[cursorline]->pkg->name) {
-    whatinfovb(_("interrelationships affecting "));
-    whatinfovb(table[cursorline]->pkg->name);
     if (debug) fprintf(debug,"packagelist[%p]::idt_relations(); `%s'\n",
                        this,table[cursorline]->relations.string());
     waddstr(infopad,table[cursorline]->relations.string());
   } else {
-    severalinfoblurb(_("interrelationships"));
+    severalinfoblurb();
   }
 }
 
 void packagelist::itd_description() {
-  if (table[cursorline]->pkg->name) {
-    whatinfovb(_("description of "));
-    whatinfovb(table[cursorline]->pkg->name);
+  whatinfovb(_("Description"));
 
+  if (table[cursorline]->pkg->name) {
     const char *m= table[cursorline]->pkg->available.description;
-    if (!m || !*m) m= _("no description available.");
+    if (!m || !*m)
+      m = _("No description available.");
     const char *p= strchr(m,'\n');
     int l= p ? (int)(p-m) : strlen(m);
     wattrset(infopad,info_headattr);
@@ -122,17 +122,17 @@ void packagelist::itd_description() {
       wordwrapinfo(1,++p);
     }
   } else {
-    severalinfoblurb(_("description"));
+    severalinfoblurb();
   }
 }
 
 void packagelist::itd_statuscontrol() {
+  whatinfovb(_("Installed control file information"));
+
   werase(infopad);
   if (!table[cursorline]->pkg->name) {
-    severalinfoblurb(_("currently installed control info"));
+    severalinfoblurb();
   } else {
-    whatinfovb(_("installed control info for "));
-    whatinfovb(table[cursorline]->pkg->name);
     varbuf vb;
     varbufrecord(&vb,table[cursorline]->pkg,&table[cursorline]->pkg->installed);
     vb.terminate();
@@ -143,12 +143,12 @@ void packagelist::itd_statuscontrol() {
 }
 
 void packagelist::itd_availablecontrol() {
+  whatinfovb(_("Available control file information"));
+
   werase(infopad);
   if (!table[cursorline]->pkg->name) {
-    severalinfoblurb(_("available version of control file info"));
+    severalinfoblurb();
   } else {
-    whatinfovb(_("available version of control info for "));
-    whatinfovb(table[cursorline]->pkg->name);
     varbuf vb;
     varbufrecord(&vb,table[cursorline]->pkg,&table[cursorline]->pkg->available);
     vb.terminate();

diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index bc7bdd477ce6a2e68f6cb381682d387163a30074..25a5cf3fcf80b589b252561209710f9d7bf28238 100644 (file)
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -121,7 +121,7 @@ protected:
   static const infotype *const baseinfo;
   int itr_recursive();
   int itr_nonrecursive();
-  void severalinfoblurb(const char *whatinfoline);
+  void severalinfoblurb();
   void itd_mainwelcome();
   void itd_explaindisplay();
   void itd_recurwelcome();