Author: locilka
Date: Fri Jul 11 12:36:53 2008
New Revision: 48984
URL: http://svn.opensuse.org/viewcvs/yast?rev=48984&view=rev
Log:
- Enhancing the Webpin Search module and client...
Modified:
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/webpin_package_search.ycp
trunk/packager/src/modules/WebpinPackageSearch.ycp
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=48984&r1=48983&r2=48984&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Fri Jul 11 12:36:53 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Jul 11 11:11:11 CEST 2008 - locilka@suse.cz
+
+- Enhancing the Webpin Search module and client...
+
+-------------------------------------------------------------------
Tue Jul 1 11:35:36 CEST 2008 - locilka@suse.cz
- Added new WebpinPackageSearch YCP module.
Modified: trunk/packager/src/clients/webpin_package_search.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_package_search.ycp?rev=48984&r1=48983&r2=48984&view=diff
==============================================================================
--- trunk/packager/src/clients/webpin_package_search.ycp (original)
+++ trunk/packager/src/clients/webpin_package_search.ycp Fri Jul 11 12:36:53 2008
@@ -70,10 +70,10 @@
string version = sformat(_("<b>Version:</b> %1<br>"), citem["version"]:"");
string archs = sformat(_("<b>Architecture:</b> %1<br>"), mergestring( citem["archs"]:[],","));
- ret = descr + version + archs;
+ ret = "<p>" + descr + version + archs + "</p>";
}
else
- ret = _("No packages matching entered criteria were found");
+ ret = _("<p><b>No packages matching entered criteria were found</b><p>");
UI::ChangeWidget(`id("description"),`Value, ret);
}
@@ -83,6 +83,13 @@
integer i = 0;
foreach ( map it, results, {
+// Webpin seems to return "ppc" arch even for some i386 packages (e.g., "joe")
+ // doesn't match the architecture
+// if (! WebpinPackageSearch::MatchesCurrentArchitecture (it["archs"]:["noarch"])) {
+// y2milestone ("Doesn't match the current arch: %1", it);
+// return;
+// }
+
pkg_items = add( pkg_items, `item(`id(it["checksum"]:""),it["name"]:"" + " - " + it["summary"]:"" ));
index = add( index, it["checksum"]:"", i);
i = i+1;
@@ -114,12 +121,12 @@
];
Progress::New(
- _("Reading Package Search Setup"),
+ _("Reading Package Search Setup..."),
" ",
size(steps),
steps,
actions,
- _("Some very boring help text")
+ _("<p>Please wait while packager is initializing...</p>")
);
Progress::NextStage();
@@ -141,14 +148,14 @@
`VBox (
`HBox (
`VBox(
- `MinWidth(20, `TextEntry (`id ("search_text"), "Search &Expression")),
+ `MinWidth(20, `InputField (`id ("search_text"), `opt (`hstretch), "Search &Expression")),
// TRANSLATORS: push button
`Left(`PushButton (`id ("search"), _("&Search"))),
`VStretch()
),
`MultiSelectionBox(
`id("search_in"),
- _("Search in"),
+ _("Search &In"),
[
`item( `id("name"),_("Name"), true ),
`item( `id("description"), _("Description"), true ),
@@ -189,12 +196,22 @@
`RichText(`id("description"), "")
)
),
- _("Some very boring help text"),
+ _("<p><big><b>Package Search</b></big><br>
+This YaST module enables you to use the functionality of <i>Webpin package search</i>.
+It searches within all known openSUSE build-service and openSUSE community repositories.</p>") +
+
+_("<p><big><b>Security</b></big><br>
+The software found is often not part of the distribution itself and the level of trust
+depends on yourself. We do not take any responsibilities for installing
+such software.</p>"),
//We don't need back button
false,
true
);
+ Wizard::SetTitleIcon ("yast-software");
+ Wizard::SetAbortButton (`cancel, Label::CancelButton());
+
UI::SetFocus(`id("search_text"));
any dialog_ret = nil;
@@ -232,7 +249,7 @@
Popup::ClearFeedback();
list items = CreatePackageList( search_results );
- if (search_results != nil && search_results != []) {
+ if (search_results != nil) {
UI::ChangeWidget(`id("results"), `Items, items);
UI::SetFocus(`id("results"));
}
@@ -249,6 +266,7 @@
}
else if (dialog_ret == `abort || dialog_ret == `cancel) {
if (AbortDialog()) {
+ dialog_ret = `abort;
y2milestone ("Aborting...");
break;
}
Modified: trunk/packager/src/modules/WebpinPackageSearch.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/WebpinPackageSearch.ycp?rev=48984&r1=48983&r2=48984&view=diff
==============================================================================
--- trunk/packager/src/modules/WebpinPackageSearch.ycp (original)
+++ trunk/packager/src/modules/WebpinPackageSearch.ycp Fri Jul 11 12:36:53 2008
@@ -65,19 +65,19 @@
*/
list deps = [
// i386 and x86
- ["x86_64", "i686", "i586", "i486", "i386", "noarch"],
+ ["x86_64", "i686", "i586", "i486", "i386", "noarch", "src"],
// PPC
- ["ppc64", "ppc", "noarch"],
+ ["ppc64", "ppc", "noarch", "src"],
// s390
- ["s390_64", "s390_32", "noarch"],
+ ["s390_64", "s390_32", "noarch", "src"],
// IA-64
- ["ia64", "noarch"],
+ ["ia64", "noarch", "src"],
// Alpha
- ["alphaev67", "alphaev6", "alphapca56", "alphaev56", "alphaev5", "alpha", "noarch"],
+ ["alphaev67", "alphaev6", "alphapca56", "alphaev56", "alphaev5", "alpha", "noarch", "src"],
// SPARC
- ["sparc64", "sparcv9", "sparcv8", "sparc", "noarch"],
+ ["sparc64", "sparcv9", "sparcv8", "sparc", "noarch", "src"],
// MIPS
- ["mips64", "mips", "noarch"],
+ ["mips64", "mips", "noarch", "src"],
];
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org