From rpmcruz@svn.opensuse.org Wed Jul 14 10:56:06 2010 From: rpmcruz@svn.opensuse.org To: yast-commit@lists.opensuse.org Subject: [yast-commit] r62246 - /branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Date: Wed, 14 Jul 2010 10:57:02 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8313448840153390475==" --===============8313448840153390475== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: rpmcruz Date: Wed Jul 14 12:57:02 2010 New Revision: 62246 URL: http://svn.opensuse.org/viewcvs/yast?rev=3D62246&view=3Drev Log: Trunk. Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk= /src/pkg/ygtkpkgdetailview.cc?rev=3D62246&r1=3D62245&r2=3D62246&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc (origina= l) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Wed Jul = 14 12:57:02 2010 @@ -154,15 +154,15 @@ Ypp::Package pkg (sel); std::string url (pkg.url()); if (!url.empty()) { - str +=3D "

"; str +=3D _("Web site:"); - str +=3D " "; + str +=3D "

"; str +=3D _("Web site:"); + str +=3D " "; str +=3D url; str +=3D "

"; } if (pkg.isCandidatePatch()) { Ypp::Selectable _patch =3D pkg.getCandidatePatch(); Ypp::Patch patch (_patch); - str +=3D "

"; str +=3D _("Patch issued:"); - str +=3D " "; str +=3D _patch.summary(); + str +=3D "

"; str +=3D _("Patch issued:"); + str +=3D " "; str +=3D _patch.summary(); str +=3D " ("; str +=3D Ypp::Patch::prioritySummary (patch.priority(= )); str +=3D ")"; str +=3D "

"; =20 @@ -339,7 +339,7 @@ ZyppPackage zpkg =3D castZyppPackage (zobj); =20 std::string str; - std::string b (""), _b (" "), br ("
"); + std::string b (""), _b (" "), br ("
"); str.reserve (2048); str +=3D b + _("Size:") + _b + zobj->installSize().asString(); str +=3D br + b + _("License:") + _b + zpkg->license(); @@ -718,10 +718,10 @@ col =3D ygtk_rich_text_new(); gtk_widget_set_size_request (col, 100, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), - ("" + col1 + "").c_str()); + ("" + col1 + "").c_str()); gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0); col =3D ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); if (dep =3D=3D 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -731,7 +731,7 @@ G_CALLBACK (provides_link_cb), NULL); gtk_box_pack_start (GTK_BOX (hbox), col, TRUE, TRUE, 0); col =3D ygtk_rich_text_new(); - gtk_widget_set_size_request (col, 1, -1); + gtk_widget_set_size_request (col, 80, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col3.c_str()); if (dep =3D=3D 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -759,7 +759,9 @@ =20 clear(); std::string installed_str (_("Installed Version")); - std::string candidate_str (_("Available Version")); + std::string candidate_str (_("Candidate Version")); + installed_str =3D "" + installed_str + ""; + candidate_str =3D "" + candidate_str + ""; if (sel.hasInstalledVersion()) installed_str +=3D "
" + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1026,7 +1028,7 @@ YGUtils::replace (changes, "\n", 1, "
"); if (author.compare (0, 2, "- ", 2) =3D=3D 0) // zypp returns a lot of a= uthor strings as author.erase (0, 2); // "- author". wtf? - text +=3D date + " (" + author + "):
" + changes + ""; + text +=3D "" + date + " (" + author + "):
" + chan= ges + "
"; } } return text; @@ -1050,7 +1052,7 @@ Ypp::Selectable sel =3D list.get (0); std::string str (authors (sel)); if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Not specified."= )); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("Unspecified attribu= te.")); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -1102,9 +1104,10 @@ } =20 if (!authors.empty()) { - text =3D _("Developed by:") + ("
" + authors) + ""; + text =3D ""; text +=3D _("Developed by:"); text +=3D ""; + text +=3D ("
" + authors) + "
"; if (!packager.empty() || !vendor.empty()) { - text +=3D _("Packaged by:"); + text +=3D ""; text +=3D _("Packaged by:"); text +=3D ""; text +=3D "
"; if (!packager.empty()) text +=3D packager + " "; if (!vendor.empty()) text +=3D "(" + vendor + ")"; --=20 To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org --===============8313448840153390475==--