r3226 - software/ui/src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-04 08:52:59 +0000 (Wed, 04 Jul 2007)
New Revision: 3226

Modified:
   software/ui/src/pkgbrowser.cpp
   software/ui/src/ui.fld
Log:
Added tags when viewing a package



Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2007-07-04 06:54:33 UTC (rev 3225)
+++ software/ui/src/pkgbrowser.cpp	2007-07-04 08:52:59 UTC (rev 3226)
@@ -115,18 +115,38 @@
 
 		PackageRecord rec(ui->engine->apt().rawRecord((const char *)data));
 
+		char *pkg_txt = new char[4096];
 		if (ui)
 		{
 			Fl_Text_Buffer *buffer = ui->InfoBuffer();
-			char *txt = new char[4096];
-			snprintf(txt, 4096, "Package: %s\n", rec.package().c_str());
-			buffer->text(txt);
-			snprintf(txt, 4096, "Description: %s\n", rec.shortDescription().c_str());
-			buffer->append(txt);
-			snprintf(txt, 4096, "\n%s\n", rec.longDescription().c_str());
-			buffer->append(txt);
-			delete [] txt;
+			snprintf(pkg_txt, 4096, "Package: %s\n", rec.package().c_str());
+			buffer->text(pkg_txt);
+			snprintf(pkg_txt, 4096, "Description: %s\n", rec.shortDescription().c_str());
+			buffer->append(pkg_txt);
+			snprintf(pkg_txt, 4096, "\n%s\n", rec.longDescription().c_str());
+			buffer->append(pkg_txt);
 		}
+		delete [] pkg_txt;
+
+		static int widths[] = { 80, 80, 0 }; // widths for each column
+		ui->DebTagsBrowser->clear();
+		ui->DebTagsBrowser->showcolsep(1);
+		ui->DebTagsBrowser->column_widths(widths);
+		ui->DebTagsBrowser->add("@B12 at C7@b at .FACET\t at B12@C7 at b@.TAG\t at B12@C7 at b@.DESCRIPTION");
+
+		set<Tag> tags = ui->engine->debtags().getTagsOfItem((const char *)data);
+		char *tag_txt = new char[512];
+		for (set<Tag>::const_iterator i = tags.begin(); i != tags.end(); ++i)
+		{
+			snprintf(tag_txt, 512, "%s\t%s\t%s",
+				gettext(i->facet().name().c_str()),
+				gettext(i->name().c_str()),
+				gettext(i->shortDescription().c_str())
+			);
+			ui->DebTagsBrowser->add(tag_txt);
+		}
+		delete [] tag_txt;
+
 		fflush(stdout);
 	}
 }

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2007-07-04 06:54:33 UTC (rev 3225)
+++ software/ui/src/ui.fld	2007-07-04 08:52:59 UTC (rev 3226)
@@ -123,12 +123,12 @@
       Fl_Text_Display InfoText {
         xywh {385 260 320 170} align 0 textsize 12
       }
-      Fl_Browser DebTagsBrowser {
+      Fl_Browser DebTagsBrowser {selected
         xywh {385 435 320 80} align 0 textsize 11
+        class VersatileBrowser
       }
     }
-    code {w->size_range(710, 500);} {selected
-    }
+    code {w->size_range(710, 500);} {}
   }
   decl {Engine *engine;} {public
   }