Hello community, here is the log from the commit of package yast2-gtk checked in at Mon Jan 21 01:18:16 CET 2008. -------- --- yast2-gtk/yast2-gtk.changes 2008-01-16 14:43:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2008-01-18 14:09:31.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 18 14:08:57 CET 2008 - coolo@suse.de + +- Ricardo fixed make test + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.y26854/_old 2008-01-21 01:18:05.000000000 +0100 +++ /var/tmp/diff_new_pack.y26854/_new 2008-01-21 01:18:05.000000000 +0100 @@ -13,7 +13,7 @@ Name: yast2-gtk Url: http://en.opensuse.org/YaST2-GTK Version: 2.16.1 -Release: 1 +Release: 2 License: LGPL v2.1 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +68,8 @@ %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so %changelog +* Fri Jan 18 2008 coolo@suse.de +- Ricardo fixed make test * Wed Jan 16 2008 coolo@suse.de - update to latest yast2-core API * Fri Jan 11 2008 btimothy@suse.de ++++++ yast2-gtk-2.16.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/ChangeLog new/yast2-gtk-2.16.1/ChangeLog --- old/yast2-gtk-2.16.1/ChangeLog 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.1/ChangeLog 2008-01-18 10:33:30.000000000 +0100 @@ -1,3 +1,8 @@ +2008-01-17 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> + + * src/pkg-selector-help.h: added help to package selector. Thanks to + Christian Jäger for writting the 1st version of the help. + 2008-01-16 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/YGDialog.cc, src/YGLayout.cc & src/YGWidget.cc: ditched the old diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/Makefile.am new/yast2-gtk-2.16.1/src/Makefile.am --- old/yast2-gtk-2.16.1/src/Makefile.am 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/Makefile.am 2008-01-18 10:33:30.000000000 +0100 @@ -82,5 +82,6 @@ icons/pkg-list-mode.xpm \ icons/pkg-unlocked.xpm \ icons/pkg-installed-upgradable-locked.xpm \ - icons/pkg-locked.xpm + icons/pkg-locked.xpm \ + pkg-selector-help.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/Makefile.in new/yast2-gtk-2.16.1/src/Makefile.in --- old/yast2-gtk-2.16.1/src/Makefile.in 2008-01-16 14:37:35.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/Makefile.in 2008-01-18 14:11:32.000000000 +0100 @@ -334,7 +334,8 @@ icons/pkg-list-mode.xpm \ icons/pkg-unlocked.xpm \ icons/pkg-installed-upgradable-locked.xpm \ - icons/pkg-locked.xpm + icons/pkg-locked.xpm \ + pkg-selector-help.h all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/pkg-selector-help.h new/yast2-gtk-2.16.1/src/pkg-selector-help.h --- old/yast2-gtk-2.16.1/src/pkg-selector-help.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/pkg-selector-help.h 2008-01-18 10:33:30.000000000 +0100 @@ -0,0 +1,90 @@ +static const char *pkg_help = _( +"<h1>Purpose</h1>" +"<p>This tool lets you manage software, as in 'install, remove, update applications'.</p>" +"<p>openSUSE's software management is also called 'package management'. A package is " +"generally an application bundle, but multiple packages that extend the application " +"may be offered in order to avoid clutter (e.g. games tend to de-couple the music " +"data in another package, since its not essential and requires significant disk space). " +"The base package will get the application's name, while extra packages are suffix-ed. " +"Common extras are:</p>" +"<ul>" +"<li>-plugin-: extends the application with some extra functionality.</li>" +"<li>-devel: needed for software development.</li>" +"<li>-debuginfo: needed for software beta-testing.</li>" +"<li>-fr, -dr, -pl (language siglas): translation files (your language package will " +"be marked for installation automatically).</li>" +"</ul>" +"<p>You will find both packages installed on your system, and packages that are made " +"available through the setup-ed repositories. You cans either install or upgrade " +"an available package, or remove an installed one.</p>" +"<blockquote>A repository is a packages media; it can either be local (like your Suse CDs), " +"or a remote internet server. You can find utilities to setup repositories " +"on the YaST control center.</blockquote>" +"" +"<h1>Usage</h1>" +"<h2>Available, Upgrades, Installed buttons</h2>" +"<p>These buttons produce listings of the different sources of packages. 'Available' " +"are the ones from the setup-ed repositories less those you have installed. " +"'Installed' lists the packages installed in your system. 'Upgrades' is a " +"mix listing of the installed packages that have more recent versions available. " +"'All' will combine all sources.</p>" +"" +"<h2>Filters</h2>" +"<p>Enter free text into the search-field to match their names and descriptions. " +"(a search for 'office' will bring up the 'OpenOffice' packages as well as " +"AbiWord which carries the word 'office' in its description). You can also " +"choose to view software from a specific repository.</p>" +"" +"<h2>Categories & Collections</h2>" +"<p>Software for openSUSE is indexed so that you can find software for a specific " +"task when you don't know the name of the software you are looking for. Browse " +"indices of software by using the tree-view in the left column; you can view the " +"available software by their Package names, or grouped in 'Categories' or 'Patterns' " +"by the selecting a view-mode from the drop-down-menu below. Categories' are simple, " +"hierarchical classifications of software packages, like 'Multimedia/Video', while " +"'Patterns' are task-oriented collections of multiple packages that install like one " +"(the installation of the 'server'-pattern for example will install various software " +"needed for running a server). By using 'Install All' you make sure that future " +"collection changes, when you upgrade openSUSE, will be honored.</p>" +"" +"<h2>Software details in the box below</h2>" +"<p>In the package detail view you can perform actions affecting this software; " +"like install, uninstall, version-upgrade or -downgrade. All changes that you " +"make will be saved, but not yet performed.</p>" +"<p>You can review changes in the right-side pane of the software-manager. You can " +"revoke changes individually at any time by clicking the 'undo'-button next to " +"a saved change.</p>" +"<p>The lock button can be used to lock the selected package state; it won't allow " +"some automatic operation to install, upgrade or remove the package. This is only " +"useful in very unusual cases: for instance, you may not want to install some " +"drivers because they interfer with your system, yet you want to install some " +"collection that includes them.</p>" +"<p>The changes will be performed once you decide to click the 'perform changes' " +"button in the lower-right corner. If you want to leave the software-manager " +"without performing any changes, simply press the button labeled 'Abort'.</p>" +"" +"<p><i>Thanks to Christian Jäger for co-designing this tool.</i></p>" +); + +static const char *patch_help = _( +"<h1>Purpose</h1>" +"<p>This tool gives you control on overviewing and picking patches. You may also " +"reverse patches that have been applied to the system.</p>" +"" +"<h1>Usage</h1>" +"<h2>Categories</h2>" +"<p>Patches are grouped as follows:</p>" +"<ul>" +"<li>Security: patches a software flaw that could be exploited to gain " +"restricted privilege.</li>" +"<li>Recommended: fixes non-security related flaws (e.g. data corruption, " +"performance slowdown)</li>" +"<li>Optional: ones that only apply to few users.</li>" +"</ul>" +"<p>Only patches that apply to your system will be visible. openSUSE developers " +"are very restrained in pushing patches; you can be sure that all patches are " +"of signficant severity.</p>" +"<p>If you are looking for applications enhancements, you should check for Upgrades " +"on the Software Manager.</p>" +); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/test.cc new/yast2-gtk-2.16.1/src/test.cc --- old/yast2-gtk-2.16.1/src/test.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/test.cc 2008-01-18 14:07:41.000000000 +0100 @@ -38,34 +38,6 @@ return true; } -bool testFilterText () -{ - fprintf (stderr, "Test filter text\t"); - struct { - const char *in; - const char *valid; - const char *out; - } aTests[] = { - { "Foo", "F", "F" }, - { "Foo", "Fo", "Foo" }, - { "Baa", "a", "aa" }, - { "Kuckles", "Ks", "Ks" }, - { NULL, NULL } - }; - for (int i = 0; aTests[i].in; i++) { - string filtered = YGUtils::filterText - (aTests[i].in, strlen (aTests[i].in), aTests[i].valid); - if (filtered != aTests[i].out) { - fprintf (stderr, "Mis-filtered text '%s' vs '%s'\n", - filtered.c_str(), aTests[i].out); - return false; - } - fprintf (stderr, "%d ", i); - } - fprintf (stderr, "\n"); - return true; -} - bool testXHtmlConvert() { fprintf (stderr, "Test HTML->XML rewrite \t"); @@ -75,9 +47,9 @@ } aTests[] = { // preservation { "<p>foo</p>", "<body><p>foo</p></body>" }, - // product substitution +/* // product substitution { "&product;", "<body>foo</body>" }, - { " <p>&product;</p>", "<body><p>foo</p></body>" }, + { " <p>&product;</p>", "<body><p>foo</p></body>" },*/ // outer tag { "some text", "<body>some text</body>" }, // unquoted attributes @@ -121,32 +93,6 @@ return true; } -bool testStrCmp() -{ - fprintf (stderr, "Test our strcmp\t"); - struct { - const char *in1, *in2; - int out; - } aTests[] = { - { "aaa", "aaaa", 1 }, - { "29", "235", -1 }, - { "aA", "Aa", 0 }, - { "200rt9", "200rT9", 0 }, - { NULL, NULL } - }; - for (int i = 0; aTests[i].in1; i++) { - int ret = YGUtils::strcmp(aTests[i].in1, aTests[i].in2); - if (ret * aTests[i].out < 0 || (ret && !aTests[i].out) || (!ret && aTests[i].out)) { - fprintf (stderr, "Mis-mapped str comp '%d' vs '%d' ('%s' to '%s')\n", - ret, aTests[i].out, aTests[i].in1, aTests[i].in2); - return false; - } - fprintf (stderr, "%d ", i); - } - fprintf (stderr, "\n"); - return true; -} - bool testMarkupEscape() { fprintf (stderr, "Test markup escape\t"); @@ -160,7 +106,8 @@ { NULL, NULL } }; for (int i = 0; aTests[i].in; i++) { - string out = YGUtils::escape_markup (aTests[i].in); + string out (aTests[i].in); + YGUtils::escapeMarkup (out); if (out != aTests[i].out) { fprintf (stderr, "Mis-converted entry %d XML '%s' should be '%s'\n", i, out.c_str(), aTests[i].out); @@ -177,10 +124,9 @@ bool bSuccess = true; bSuccess &= testMapKBAccel(); - bSuccess &= testFilterText(); bSuccess &= testXHtmlConvert(); - bSuccess &= testStrCmp(); bSuccess &= testMarkupEscape(); return !bSuccess; } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGPackageSelector.cc new/yast2-gtk-2.16.1/src/YGPackageSelector.cc --- old/yast2-gtk-2.16.1/src/YGPackageSelector.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/YGPackageSelector.cc 2008-01-18 10:33:30.000000000 +0100 @@ -1593,6 +1593,7 @@ }; #include "YPackageSelector.h" +#include "pkg-selector-help.h" class YGPackageSelector : public YPackageSelector, public YGWidget, public Ypp::Interface { @@ -1619,7 +1620,7 @@ THEMEDIR "/icons/22x22/apps/yast-software.png"); ygtk_wizard_set_header_text (wizard, window, onlineUpdateMode() ? _("Patch Selector") : _("Package Selector")); - ygtk_wizard_set_help_text (wizard, ""); + ygtk_wizard_set_help_text (wizard, onlineUpdateMode() ? patch_help : pkg_help); ygtk_wizard_set_abort_button_label (wizard, _("_Cancel")); ygtk_wizard_set_abort_button_str_id (wizard, "cancel"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGProgressBar.cc new/yast2-gtk-2.16.1/src/YGProgressBar.cc --- old/yast2-gtk-2.16.1/src/YGProgressBar.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.1/src/YGProgressBar.cc 2008-01-18 10:33:30.000000000 +0100 @@ -171,8 +171,7 @@ public: YGBusyIndicator (YWidget *parent, const string &label, int timeout) : YBusyIndicator (NULL, label, timeout) - , YGLabeledWidget (this, parent, label, YD_VERT, true, - GTK_TYPE_PROGRESS_BAR, NULL) + , YGLabeledWidget (this, parent, label, YD_VERT, true, GTK_TYPE_PROGRESS_BAR, NULL) { pulse_timeout_id = 0; pulse(); @@ -208,13 +207,13 @@ static gboolean pulse_timeout_cb (void *pData) { YGBusyIndicator *pThis = (YGBusyIndicator*) pData; - if (pThis->alive_timeout > 0) { - pThis->alive_timeout -= PULSE_INTERVAL; - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (pThis->getWidget())); - return TRUE; + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (pThis->getWidget())); + pThis->alive_timeout -= PULSE_INTERVAL; + if (pThis->alive_timeout <= 0) { + pThis->pulse_timeout_id = 0; + return FALSE; } - pThis->pulse_timeout_id = 0; - return FALSE; + return TRUE; } YGWIDGET_IMPL_COMMON ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de