From 61b32224a3944ff0c86a44b39c5d63241f1f5d0f Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 11 Feb 2007 01:21:49 +0000 Subject: [PATCH] Fix confusing bottom status lines in dselect, unifying them by removing the method or package name and capitalizing. Closes: #9085 --- ChangeLog | 15 +++++++++++++++ debian/changelog | 2 ++ dselect/baselist.cc | 2 +- dselect/methlist.cc | 3 +-- dselect/pkginfo.cc | 32 ++++++++++++++++---------------- dselect/pkglist.h | 2 +- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0f61f41..1912ebfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-02-11 Guillem Jover + + * 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 Guillem Jover diff --git a/debian/changelog b/debian/changelog index 4010878d..483d3a7a 100644 --- 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 c942318e..64446eb4 100644 --- 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 054e590d..9e3b7d7d 100644 --- 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 e9c286ce..b27396d2 100644 --- 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 bc7bdd47..25a5cf3f 100644 --- 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(); -- 2.39.5