February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r44105 - in /trunk/installation: package/yast2-installation.changes src/modules/InstExtensionImage.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 16:08:42 2008 New Revision: 44105 URL: http://svn.opensuse.org/viewcvs/yast?rev=44105&view=rev Log: - Added new InstExtensionImage module for integration of modular inst-sys images on-the-fly (FATE #302955). Added: trunk/installation/src/modules/InstExtensionImage.ycp Modified: trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Feb 1 16:08:42 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 16:08:26 CET 2008 - locilka(a)suse.cz + +- Added new InstExtensionImage module for integration of modular + inst-sys images on-the-fly (FATE #302955). + +------------------------------------------------------------------- Thu Jan 31 19:05:49 CET 2008 - aschnell(a)suse.de - reflect init-script rename from suse-blinux to sbl Added: trunk/installation/src/modules/InstExtensionImage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstExt… ============================================================================== --- trunk/installation/src/modules/InstExtensionImage.ycp (added) +++ trunk/installation/src/modules/InstExtensionImage.ycp Fri Feb 1 16:08:42 2008 @@ -0,0 +1,257 @@ +/** + * File: modules/InstExtensionImage.ycp + * Package: Installation + * Summary: Functionality downloading and merging extending + * images for the inst-sys + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + * + * This module provides functions that download inst-sys extension images + * (localization, fonts, ...) and merge them to the current int-sys. + * This enables inst-sys to be modular even for running YaST. + * See FATE #302955: 'Split translations out of installation system'. + */ + +{ + + textdomain "installation"; + module "InstExtensionImage"; + + import "Linuxrc"; + import "URL"; + + /*** + * + * Paths where to download inst-sys extension images are taken + * from '/etc/install.inf'. An extension image contains the + * directory structure and files as it was in inst-sys but + * it is a squashfs image of it. + * + * Inst-sys URL might be absolute or 'relative' to repo URL, + * but only if instsys=... parameter wasn't explicitely defined. + * + * When instsys=... parameter _is not_ used: + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: boot/<arch>/root + * (<arch> is for instance "i386", "x86_64", "ppc") + * or + * * RepoURL: nfs://server/repo/url/?device=eth0 + * * InstsysURL: boot/<arch>/root + * + * When instsys=... parameter _is_ used: + * * RepoURL: nfs://server/repo/url/ + * * InstsysURL: http://server/inst-sys/url/ + * or + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: nfs://server/inst-sys/url/?device=eth0 + * + * Files to download are in the same level (directory) with + * inst-sys: + * + * * RepoURL: cd:/?device=sr0 + * * InstsysURL: boot/<arch>/root + * -> cd:/boot/<arch>/$extension_file + * + * * RepoURL: nfs://server/repo/url/?device=eth0 + * * InstsysURL: http://server/inst-sys/url/?device=eth0 + * -> http://server/inst-sys/$extension_file?device=eth0 + * + * These files are always squashfs images that need to be: + * + * * Downloaded: /lbin/wget -v $url $local_filename_path + * * Downloaded file needs to be checked against a SHA1 + * hash defined in /content file + * * Mounted (-o loop) to a directory. + * * Directory needs to be merged into inst-sys by using + * `/lbin/lndir <image_mountpoint> /` + * + * This module remembers downloading a file so it does not + * download any file twice. + * + */ + + // nfs://.../, cd:/, http://.../any/ + // always ends with a slash "/" + string base_url = ""; + + // if there are any params $url?param1=xx&param2=... + // always only params + string base_url_params = ""; + + boolean initialized = false; + + boolean IsURLRelative (string url) { + if (url == nil) + return nil; + + // "http://..." -> not-relative + // "cd:/" -> not relative + // "boot/i386/root -> relative + return ! regexpmatch (url, "^[[:alpha:]]+:/"); + } + + /** + * Merges two different URLs, repspectively their parameters + * to one string with parameters. See the example. + * + * @param string base URL with params + * @param string URL with modifications (added or changed params) + * @return string merged params + * + * @example + * MergeURLsParams ( + * "http://server.net/dir/?param1=x&param2=y", + * "http://server.net/dir/?param2=z&param3=a", + * // param2 from the first URL has been replaced by tho one from the second URL + * ) -> "param1=x&param2=z&param3=a" + */ + string MergeURLsParams (string base_url, string url_with_modifs) { + if (base_url == nil || url_with_modifs == nil) { + y2error ("Wrong params: %1 or %2", base_url, url_with_modifs); + return nil; + } + + // base URL params + integer base_params_pos = search (base_url, "?"); + string base_params = ""; + + if (base_params_pos != nil && base_params_pos >= 0) { + base_params = substring (base_url, (base_params_pos + 1)); + } + + // URL params with modifications + integer modif_params_pos = search (url_with_modifs, "?"); + string modif_params = ""; + + if (modif_params_pos != nil && modif_params_pos >= 0) { + modif_params = substring (url_with_modifs, (modif_params_pos + 1)); + } + + // Nothing to merge + if (base_params == "") + return modif_params; + if (modif_params == "") + return base_params; + + map <string, string> base_params_map = URL::MakeMapFromParams (base_params); + map <string, string> modif_params_map = URL::MakeMapFromParams (modif_params); + map <string, string> final_params_map = (map <string, string>) union (base_params_map, modif_params_map); + + return URL::MakeParamsFromMap (final_params_map); + } + + /** + * Removes the last url item. + * + * @example + * CutLastDirOrFile ("http://server/some/dir/") -> "http://server/some/" + * CutLastDirOrFile ("http://server/some/dir") -> "http://server/some/" + */ + string CutLastDirOrFile (string url) { + if (url == nil || url == "" || url == "/" || ! regexpmatch (url, "/")) { + y2error (-1, "Wrong URL: %1", url); + return ""; + } + + // final "/" is needed for regexp + if (! regexpmatch (url, "/$")) { + url = url + "/"; + } + + return regexpsub (url, "^(.*)/[^/]+/$", "\\1/"); + } + + /** + * Merges two URLs into one and removes parameters from both. + * If the second URL is strictly relative, e.g., "boot/i386/root", + * it is merged with the first one, otherwise the second one is + * returned (with params cut). + * + * @param string base URL + * @param string modif URL (relative or absolute) + * @return string merged URL + * + * @example + * MergeURLs ( + * "nfs://server.name/11-repo/?device=eth0&xxx=zzz", + * "boot/i386/root?device=eth1&aaa=bbb" + * ) -> "nfs://server.name/11-repo/boot/i386/" + * MergeURLs ( + * "nfs://server.name/11-repo/?device=eth0&xxx=zzz", + * "nfs://server2.net/boot/i386/root?device=eth1&aaa=bbb" + * ) -> "nfs://server2.net/boot/i386/" + */ + string MergeURLs (string url_base, string url_with_modifs) { + if (url_base == nil || url_with_modifs == nil) { + y2error ("Wrong URLs: %1 or %2", url_base, url_with_modifs); + return nil; + } + + // relative (to base URL) or absolute URL + integer url_with_modifs_pos = search (url_with_modifs, "?"); + string url_with_modifs_onlyurl = url_with_modifs; + + if (url_with_modifs_pos != nil && url_with_modifs_pos >= 0) { + url_with_modifs_onlyurl = substring (url_with_modifs, 0, url_with_modifs_pos); + } + + // Modif URL is not relative, not using the base URL at all + if (! IsURLRelative (url_with_modifs_onlyurl)) { + return CutLastDirOrFile (url_with_modifs_onlyurl); + } + + // base URL + integer url_base_pos = search (url_base, "?"); + string url_base_onlyurl = url_base; + + if (url_base_pos != nil && url_base_pos >= 0) { + url_base_onlyurl = substring (url_base, 0, url_base_pos); + } + + if (! regexpmatch (url_base_onlyurl, "/$")) { + url_base_onlyurl = url_base_onlyurl + "/"; + } + + return CutLastDirOrFile (url_base_onlyurl + url_with_modifs_onlyurl); + } + + /** + * Every global function should call LazyInit in the beginning. + */ + void LazyInit () { + // already initialized + if (initialized) + return; + + y2milestone ("Initializing..."); + initialized = true; + + // base repo URL + string repo_url = Linuxrc::InstallInf ("RepoURL"); + // inst-sys URL + string inst_sys_url = Linuxrc::InstallInf ("InstsysURL"); + + // non-relative inst-sys, repo is not taken into account + if (! IsURLRelative (inst_sys_url)) { + repo_url = ""; + } + + // final base URL (last file/dir already removed) + base_url = MergeURLs (repo_url, inst_sys_url); + y2milestone ("Base URL: %1", base_url); + + // final params + base_url_params = MergeURLsParams (repo_url, inst_sys_url); + y2milestone ("Base URL params: %1", base_url_params); + } + + // Already downloaded (and mounted and merged) files + list <string> already_downloaded_files = []; + + // Just for testing + global void RemoveThisFunction () { + LazyInit(); + } +/* EOF */ +} Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Fri Feb 1 16:08:42 2008 @@ -3,18 +3,23 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite -# Mode::live_installation -BuildRequires: yast2 >= 2.15.38 + +# URL::MakeParamsFromMap and URL::MakeMapFromParams +BuildRequires: yast2 >= 2.16.25 Requires: autoyast2-installation -# Progress::NewProgressIcons -# Icon YCP module -Requires: yast2 >= 2.16.16 + +# URL::MakeParamsFromMap and URL::MakeMapFromParams +Requires: yast2 >= 2.16.25 + # Required in in the first stage, after # switching to the installed system, bugzilla #249679 + Requires: yast2-bootloader # Newly created RPM + Requires: yast2-country-data >= 2.16.3 + # New System-selection data and API DefaultDesktop module # New API in ProductLicense Requires: yast2-packager >= 2.16.18 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44104 - in /trunk: core/ core/libyui/src/ core/package/ ncurses/ ncurses/package/ ncurses/src/ qt/ qt/package/ qt/src/
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 15:53:23 2008 New Revision: 44104 URL: http://svn.opensuse.org/viewcvs/yast?rev=44104&view=rev Log: Moved event handling from YUI to YDialog Added: trunk/ncurses/src/NCtoY2Event.cc trunk/ncurses/src/NCtoY2Event.h Modified: trunk/core/VERSION trunk/core/libyui/src/ChangeLog trunk/core/libyui/src/YCPErrorDialog.cc trunk/core/libyui/src/YChildrenManager.h trunk/core/libyui/src/YDialog.cc trunk/core/libyui/src/YDialog.h trunk/core/libyui/src/YUI.h trunk/core/libyui/src/YUI_builtins.cc trunk/core/package/yast2-core.changes trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/Makefile.am trunk/ncurses/src/NCBusyIndicator.cc trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/NCDialog.h trunk/ncurses/src/YNCursesUI.cc trunk/ncurses/src/YNCursesUI.h trunk/ncurses/yast2-ncurses.spec.in trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQDialog.cc trunk/qt/src/YQDialog.h trunk/qt/src/YQUI.h trunk/qt/src/YQUI_builtins.cc trunk/qt/src/YQUI_core.cc trunk/qt/yast2-qt.spec.in Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=44104&r1=44103&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Feb 1 15:53:23 2008 @@ -1 +1 @@ -2.16.25 +2.16.26 Modified: trunk/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ChangeLog?rev=44… ============================================================================== --- trunk/core/libyui/src/ChangeLog (original) +++ trunk/core/libyui/src/ChangeLog Fri Feb 1 15:53:23 2008 @@ -437,8 +437,8 @@ * Migrated YWizard * Moved WizardCommand parsing out to YCPWizardCommandParser * Added lots of pure virtual functions to YWizard - * All YCPValue and other YCP related code can now be removed from - YWizard-derived classes + * All YCPValue and other YCP related code can now be removed from + YWizard-derived classes 2007-11-30 sh(a)suse.de @@ -446,7 +446,7 @@ * Migrated YDialog * Removed YContainerWidget for good * Removed legacy YWidget::queryWidget() and YWidget::changeWidget() methods -* Dropped support for outdated property handling with old +* Dropped support for outdated property handling with old YWidget::queryWidget() and YWidget::changeWidget() methods * Dropped support for outdated YWidget( YWidgetOpt ) constructors * Removed unneeded YWidgetOpt fields @@ -466,7 +466,7 @@ 2008-01-20 sh(a)suse.de -* Moved glyph handling from YUI to YApplication, +* Moved glyph handling from YUI to YApplication, now using std::string instead of YCPString and YCPSymbol; forget YMyUI::glyph(), implement YMyApplication::glyph() @@ -492,5 +492,16 @@ - removed YUI::showDialog() - removed YUI::closeDialog() - Now using YDialog::open() and YDialog::destroy() - - Derived classes now have to implement YDialog::openInternal() - and YDialog::activate() + - Derived classes now have to implement: + - YDialog::openInternal() + - YDialog::activate() + + +2008-02-01 sh(a)suse.de + +* Moved event handling from YUI to YDialog: + - removed YUI::userInput() + - removed YUI::pollInput() + - Derived classes now have to implement: + - YDialog::waitForEventInternal() + - YDialog::pollEventInternal() Modified: trunk/core/libyui/src/YCPErrorDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPErrorDialog.c… ============================================================================== --- trunk/core/libyui/src/YCPErrorDialog.cc (original) +++ trunk/core/libyui/src/YCPErrorDialog.cc Fri Feb 1 15:53:23 2008 @@ -53,15 +53,14 @@ closeButton->setId( new YCPValueWidgetID( YCPSymbol( "cancel" ) ) ); dialog->open(); - YCPValue input = YUI::ui()->waitForUserInput(); - yuiMilestone() << "Input: " << input << endl; - + YEvent * event = dialog->waitForEvent(); + delete event; dialog->destroy(); } catch ( YUIException & ex ) { YUI_CAUGHT( exception ); - + // No other action. If opening this error dialog fails, the user will // just have to live with the error being reported in the log file only. } Modified: trunk/core/libyui/src/YChildrenManager.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YChildrenManager… ============================================================================== --- trunk/core/libyui/src/YChildrenManager.h (original) +++ trunk/core/libyui/src/YChildrenManager.h Fri Feb 1 15:53:23 2008 @@ -195,19 +195,6 @@ **/ virtual void add( T * child ) { YUI_THROW( YUITooManyChildrenException<T>( this->container() ) ); } - -#if 0 - /** - * Remove a child. - * - * Reimplemented from YChildrenManager. - * - * Since this class is designed to reject children, this always throws a - * YUIInvalidChildException. - **/ - virtual void remove( T * child ) - { YUI_THROW( YUIInvalidChildException<T>( this->container(), child ) ); } -#endif }; Modified: trunk/core/libyui/src/YDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.cc?rev=4… ============================================================================== --- trunk/core/libyui/src/YDialog.cc (original) +++ trunk/core/libyui/src/YDialog.cc Fri Feb 1 15:53:23 2008 @@ -27,7 +27,8 @@ using std::string; -#define VERBOSE_DIALOGS 0 +#define VERBOSE_DIALOGS 0 +#define VERBOSE_DISCARDED_EVENTS 0 std::stack<YDialog *> YDialog::_dialogStack; @@ -106,22 +107,36 @@ bool +YDialog::isTopmostDialog() const +{ + if ( _dialogStack.empty() ) + { + yuiError() << "Dialog stack empty, but dialog existing: " << this << endl; + return false; + } + + return _dialogStack.top() == this; +} + + +bool YDialog::destroy( bool doThrow ) { YUI_CHECK_WIDGET( this ); - if ( _dialogStack.empty() || - _dialogStack.top() != this ) + if ( isTopmostDialog() ) + { + delete this; + + return true; + } + else { if ( doThrow ) YUI_THROW( YUIDialogStackingOrderException() ); return false; } - - delete this; - - return true; } @@ -213,6 +228,126 @@ } +YEvent * +YDialog::waitForEvent( int timeout_millisec ) +{ + if ( ! isTopmostDialog() ) + YUI_THROW( YUIDialogStackingOrderException() ); + + if ( timeout_millisec < 0 ) + timeout_millisec = 0; + + if ( ! isOpen() ) + open(); + + if ( shortcutCheckPostponed() ) + { + yuiError() << "Performing missing keyboard shortcut check now in " + << this << endl; + + checkShortcuts( true ); + } + + YEvent * event = 0; + + do + { + event = filterInvalidEvents( waitForEventInternal( timeout_millisec ) ); + + // If there was no event or if filterInvalidEvents() discarded + // an invalid event, go back and get the next one. + } while ( ! event ); + + return event; +} + + +YEvent * +YDialog::pollEvent() +{ + if ( ! isTopmostDialog() ) + YUI_THROW( YUIDialogStackingOrderException() ); + + if ( ! isOpen() ) + open(); + + YEvent * event = filterInvalidEvents( pollEventInternal() ); + + // Nevermind if filterInvalidEvents() discarded an invalid event. + // pollInput() is normally called very often (in a loop), and most of the + // times it returns 0 anyway, so there is no need to care for just another + // 0 that is returned in this exotic case. + + return event; +} + + +YEvent * +YDialog::filterInvalidEvents( YEvent * event ) +{ + if ( ! event ) + return 0; + + YWidgetEvent * widgetEvent = dynamic_cast<YWidgetEvent *> (event); + + if ( widgetEvent && widgetEvent->widget() ) + { + if ( ! widgetEvent->widget()->isValid() ) + { + /** + * Silently discard events from widgets that have become invalid. + * + * This may legitimately happen if some widget triggered an event yet + * nobody cared for that event (i.e. called UserInput() or PollInput() ) + * and the widget has been destroyed meanwhile. + **/ + + // yuiDebug() << "Discarding event for widget that has become invalid" << endl; + + delete widgetEvent; + return 0; + } + + if ( widgetEvent->widget()->findDialog() != this ) + { + /** + * Silently discard events from all but the current (topmost) dialog. + * + * This may happen even here even though the specific UI should have + * taken care about that: Events may still be in the queue. They might + * have been valid (i.e. belonged to the topmost dialog) when they + * arrived, but maybe simply nobody has evaluated them. + **/ + + // Yes, really yuiDebug() - this may legitimately happen. + yuiDebug() << "Discarding event from widget from foreign dialog" << endl; + +#if VERBOSE_DISCARDED_EVENTS + yuiDebug() << "Expected: " << this + << ", received: " << widgetEvent->widget()->findDialog() + << endl; + + yuiDebug() << "Event widget: " << widgetEvent->widget() << endl; + yuiDebug() << "From:" << endl; + widgetEvent->widget()->findDialog()->dumpWidgetTree(); + yuiDebug() << "Current dialog:" << endl; + dumpWidgetTree(); +#endif + + activate(); // try to force this dialog to the foreground + + delete widgetEvent; + return 0; + } + + } + + return event; +} + + + + YDialog * Modified: trunk/core/libyui/src/YDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.h?rev=44… ============================================================================== --- trunk/core/libyui/src/YDialog.h (original) +++ trunk/core/libyui/src/YDialog.h Fri Feb 1 15:53:23 2008 @@ -21,6 +21,7 @@ #define YDialog_h #include "YSingleChildContainerWidget.h" +#include "YEvent.h" #include <stack> class YMacroRecorder; @@ -81,6 +82,44 @@ bool isOpen() const; /** + * Wait for a user event. In most cases, this means waiting until the user + * has clicked on a button in this dialog. If any widget has its 'notify' + * flag set (`opt(`notify) in YCP, setNotify( true ) in C++), an action on + * such a widget will also make waitForEvent() return. + * + * If the specified timeout elapses without any user event, a YTimeoutEvent + * will be returned. 0 means no timeout (wait forever). + * + * If open() has not been called for this dialog until now, + * it is called now. + * + * Ownership of the event is transferred to the caller, i.e. the caller is + * responsible for deleting it after use. + * + * If this dialog is not the topmost dialog, an exception is thrown. + **/ + YEvent * waitForEvent( int timeout_millisec = 0 ); + + /** + * Check if a user event is pending. If there is one, return it. + * If there is none, do not wait for one - return 0. + * + * If open() has not been called for this dialog until now, + * it is called now. + * + * Ownership of the event is transferred to the caller, i.e. the caller is + * responsible for deleting it after use. + * + * If this dialog is not the topmost dialog, an exception is thrown. + **/ + YEvent * pollEvent(); + + /** + * Return 'true' if this dialog is the topmost dialog. + **/ + bool isTopmostDialog() const; + + /** * Close and delete this dialog (and all its children) if it is the topmost * dialog. If this is not the topmost dialog, this will throw an exception * if 'doThrow' is true (default). @@ -158,7 +197,7 @@ * changed after it (and its children hierarchy) was initially created. **/ void recalcLayout(); - + /** * Return this dialog's type (YMainDialog / YPopupDialog). **/ @@ -212,12 +251,12 @@ /** * Activate this dialog: Make sure that it is shown as the topmost dialog - * of this application and that it can receive input. + * of this application and that it can receive input. * * Derived classes are required to implement this. **/ virtual void activate() = 0; - + protected: @@ -229,8 +268,29 @@ * necessary to make this dialog visible on the screen. **/ virtual void openInternal() = 0; + + /** + * Wait for a user event. + * + * Derived classes are required to implement this. + **/ + virtual YEvent * waitForEventInternal( int timeout_millisec ) = 0; /** + * Check if a user event is pending. If there is one, return it. + * If there is none, do not wait for one - return 0. + * + * Derived classes are required to implement this. + **/ + virtual YEvent * pollEventInternal() = 0; + + /** + * Filter out invalid events: Return 0 if the event does not belong to this + * dialog or the unchanged event if it does. + **/ + YEvent * filterInvalidEvents( YEvent * event ); + + /** * Stack holding all currently existing dialogs. **/ static std::stack<YDialog *> _dialogStack; Modified: trunk/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI.h?rev=44104&… ============================================================================== --- trunk/core/libyui/src/YUI.h (original) +++ trunk/core/libyui/src/YUI.h Fri Feb 1 15:53:23 2008 @@ -65,20 +65,6 @@ /** * Abstract base class of a YaST2 user interface. - * - * The implementation of a YaST2 user interface such as qt and ncurses - * constists in subclassing YUI. - * - * We have to handle two cases slightly different: The case with and without - * a seperate UI thread. - * - * You have two alternatives how to implement event handling in your UI. - * Either override idleLoop, userInput and pollInput - * or override pollInput and waitForEvent, whichever is - * easier for you. - * - * This class is an abstract base class that contains pure virtuals. - * It is not intended for direct instantiation, only for inheritance. **/ class YUI { @@ -175,11 +161,6 @@ public: /** - * The C++ counterpart to UI::UserInput(). - **/ - YCPValue waitForUserInput(); - - /** * Block (or unblock) events. If events are blocked, any event sent * should be ignored until events are unblocked again. * @@ -372,8 +353,6 @@ const char *moduleName(); - // Event handling, execution flow - /** * This virtual method is called when threads are activated in case the * execution control is currently on the side of the module. This means @@ -390,45 +369,6 @@ **/ virtual void idleLoop( int fd_ycp ) = 0; - /** - * UI-specific UserInput() method. - * - * This is called upon evaluating the UI::UserInput() builtin command. - * This method should remain in its own event loop until an event for the - * topmost dialog (YDialog::currentDialog() ) is available or until the - * specified timeout (in milliseconds, 0 for "wait forever") is expired (in - * which case it should return the pointer to a YTimeoutEvent). - * - * This method is to return a pointer to an event created with the "new" - * operator. The generic UI component assumes ownership of this newly - * created object and destroys it when appropriate. - * - * The caller will gracefully handle if this method returns 0, albeit this - * is always an error which may result in an error message in the log file. - * - * Derived UIs are required to implement this method. - **/ - virtual YEvent * userInput( unsigned long timeout_millisec = 0 ) = 0; - - /** - * UI-specific PollInput() method. - * - * This is called upon evaluating the UI::PollInput() builtin command. - * This method should just check if there are any pending events for the - * topmost dialog (YDialog::currentDialog() ). This method never waits for - * any events - if there is no pending event, it returns 0. - * - * If there is a pending event, a pointer to that event (newly created with - * the "new" operator) is returned. The generic UI component assumes - * ownership of this newly created object and destroys it when appropriate. - * - * Derived UIs are required to implement this method. - **/ - virtual YEvent * pollInput() = 0; - - -protected: - /** * UI-specific setConsoleFont() function. @@ -588,11 +528,6 @@ bool waitForYCPThread(); /** - * Filter out invalid events. - **/ - YEvent * filterInvalidEvents( YEvent * event ); - - /** * Mid-level handler for the user input related UI commands: * UserInput() * TimeoutUserInput() @@ -650,7 +585,6 @@ - // // Data members // @@ -738,7 +672,6 @@ **/ Y2Component * _callback; - /** * Global reference to the UI **/ Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?… ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Fri Feb 1 15:53:23 2008 @@ -23,7 +23,6 @@ #define VERBOSE_REPLACE_WIDGET 0 #define VERBOSE_EVENTS 0 -#define VERBOSE_DISCARDED_EVENTS 0 #include <stdio.h> #include <unistd.h> // pipe() @@ -432,19 +431,6 @@ } -YCPValue YUI::waitForUserInput() -{ -#if VERBOSE_EVENTS - yuiDebug() << "Waiting for user input..." << endl; -#endif - - return doUserInput( YUIBuiltin_UserInput, - 0, // timeout_millisec - true, // wait - false ); // detailed -} - - /** * @builtin PollInput * @short Poll Input @@ -575,34 +561,9 @@ if ( fakeUserInputQueue.empty() ) { if ( wait ) - { - do - { - // Get an event from the specific UI. Wait if there is none. - -#if VERBOSE_EVENTS - yuiDebug() << "SpecificUI::userInput()" << endl; -#endif - event = filterInvalidEvents( userInput( (unsigned long) timeout_millisec ) ); - - // If there was no event or if filterInvalidEvents() discarded - // an invalid event, go back and get the next one. - } while ( ! event ); - } + event = dialog->waitForEvent( timeout_millisec ); else - { - // Get an event from the specific UI. Don't wait if there is none. - -#if VERBOSE_EVENTS - yuiDebug() << "SpecificUI::pollInput()" << endl; -#endif - event = filterInvalidEvents( pollInput() ); - - // Nevermind if filterInvalidEvents() discarded an invalid event. - // PollInput() is called very often (in a loop) anyway, and most of - // the times it returns 'nil' anyway, so there is no need to care - // for just another 'nil' that is returned in this exotic case. - } + event = dialog->pollEvent(); if ( event ) { @@ -660,70 +621,6 @@ } -YEvent * -YUI::filterInvalidEvents( YEvent * event ) -{ - if ( ! event ) - return 0; - - YWidgetEvent * widgetEvent = dynamic_cast<YWidgetEvent *> (event); - - if ( widgetEvent && widgetEvent->widget() ) - { - if ( ! widgetEvent->widget()->isValid() ) - { - /** - * Silently discard events from widgets that have become invalid. - * - * This may legitimately happen if some widget triggered an event yet - * nobody cared for that event (i.e. called UserInput() or PollInput() ) - * and the widget has been destroyed meanwhile. - **/ - - // yuiDebug() << "Discarding event for widget that has become invalid" << endl; - - delete widgetEvent; - return 0; - } - - if ( widgetEvent->widget()->findDialog() != YDialog::currentDialog() ) - { - /** - * Silently discard events from all but the current (topmost) dialog. - * - * This may happen even here even though the specific UI should have - * taken care about that: Events may still be in the queue. They might - * have been valid (i.e. belonged to the topmost dialog) when they - * arrived, but maybe simply nobody has evaluated them. - **/ - - // Yes, really yuiDebug() - this may legitimately happen. - yuiDebug() << "Discarding event from widget from foreign dialog" << endl; - -#if VERBOSE_DISCARDED_EVENTS - yuiDebug() << "Expected: " << YDialog::currentDialog() - << ", received: " << widgetEvent->widget()->findDialog() - << endl; - - yuiDebug() << "Event widget: " << widgetEvent->widget() << endl; - yuiDebug() << "From:" << endl; - widgetEvent->widget()->findDialog()->dumpWidgetTree(); - yuiDebug() << "Current dialog:" << endl; - YDialog::currentDialog()->dumpWidgetTree(); -#endif - - YDialog::currentDialog()->activate(); - - delete widgetEvent; - return 0; - } - - } - - return event; -} - - /** * @builtin OpenDialog * @id OpenDialog_with_options Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Feb 1 15:53:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 14:48:52 CET 2008 - sh(a)suse.de + +- Moved UI event handling from YUI to YDialog +- V 2.16.26 + +------------------------------------------------------------------- Thu Jan 31 15:25:52 CET 2008 - sh(a)suse.de - Simplified and unified internal UI dialog handling Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=44104&r1=441… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Fri Feb 1 15:53:23 2008 @@ -1 +1 @@ -2.16.13 +2.16.14 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Fri Feb 1 15:53:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 15:49:47 CET 2008 - sh(a)suse.de + +- Moved event handling from YUI / YNCursesUI to YDialog / NCDialog +- V 2.16.14 + +------------------------------------------------------------------- Thu Jan 31 15:27:49 CET 2008 - sh(a)suse.de - Simplified dialog handling Modified: trunk/ncurses/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/Makefile.am?rev=4410… ============================================================================== --- trunk/ncurses/src/Makefile.am (original) +++ trunk/ncurses/src/Makefile.am Fri Feb 1 15:53:23 2008 @@ -31,6 +31,7 @@ tnode.h \ position.h \ YNCursesUI.h \ + NCtoY2Event.h \ NCApplication.h \ NCWidgetFactory.h \ NCOptionalWidgetFactory.h \ @@ -101,6 +102,7 @@ Y2Log.cc \ position.cc \ YNCursesUI.cc \ + NCtoY2Event.cc \ NCApplication.cc \ NCWidgetFactory.cc \ NCOptionalWidgetFactory.cc \ Modified: trunk/ncurses/src/NCBusyIndicator.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCBusyIndicator.cc?r… ============================================================================== --- trunk/ncurses/src/NCBusyIndicator.cc (original) +++ trunk/ncurses/src/NCBusyIndicator.cc Fri Feb 1 15:53:23 2008 @@ -374,7 +374,7 @@ if ( !win ) return; - int cp = (_twin->maxx()) * _position; + int cp = (int) ( (_twin->maxx()) * _position ); const NCstyle::StProgbar & style( wStyle().progbar ); _twin->bkgdset( style.nonbar.chattr ); Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=4410… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Fri Feb 1 15:53:23 2008 @@ -23,6 +23,7 @@ #include "NCMenuButton.h" #include "YShortcut.h" #include "NCi18n.h" +#include "NCtoY2Event.h" #include "ncursesw.h" @@ -1047,6 +1048,7 @@ return returnEvent; } + /////////////////////////////////////////////////////////////////// // // @@ -1077,6 +1079,37 @@ return returnEvent; } + +/** + * Back-end for YDialog::waitForEvent() + **/ +YEvent * NCDialog::waitForEventInternal( int timeout_millisec ) +{ + NCtoY2Event cevent; + activate ( true ); + cevent = userInput( timeout_millisec ? timeout_millisec : -1 ); + activate ( false ); + + YEvent * yevent = cevent.propagate(); + + return yevent; +} + + +/** + * Back-end for YDialog::pollEvent() + **/ +YEvent * NCDialog::pollEventInternal() +{ + // no activation here, done in pollInput, if.. + NCtoY2Event cevent = pollInput(); + YEvent * yevent = cevent.propagate(); + + return yevent; +} + + + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/NCDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.h?rev=44104… ============================================================================== --- trunk/ncurses/src/NCDialog.h (original) +++ trunk/ncurses/src/NCDialog.h Fri Feb 1 15:53:23 2008 @@ -133,6 +133,21 @@ **/ virtual void openInternal(); + /** + * Wait for a user event. + * + * Implemented from YDialog. + **/ + virtual YEvent * waitForEventInternal( int timeout_millisec ); + + /** + * Check if a user event is pending. If there is one, return it. + * If there is none, do not wait for one - return 0. + * + * Implemented from YDialog. + **/ + virtual YEvent * pollEventInternal(); + public: Added: trunk/ncurses/src/NCtoY2Event.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCtoY2Event.cc?rev=4… ============================================================================== --- trunk/ncurses/src/NCtoY2Event.cc (added) +++ trunk/ncurses/src/NCtoY2Event.cc Fri Feb 1 15:53:23 2008 @@ -0,0 +1,107 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCtoY2Event.h + + Authors: Michael Andres <ma(a)suse.de> + Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#include "NCtoY2Event.h" +#include "NCWidget.h" +#include "Y2Log.h" + + +NCtoY2Event::NCtoY2Event( const NCursesEvent & ncev ) + : NCursesEvent( ncev ) +{ +} + + +NCtoY2Event & +NCtoY2Event::operator=( const NCursesEvent & ncev ) +{ + if ( ncev.isInternalEvent() ) + NCursesEvent::operator=( none ); + else + NCursesEvent::operator=( ncev ); + return *this; +} + + +YEvent * +NCtoY2Event::propagate() +{ + switch ( type ) + { + // Note: libyui assumes ownership of YEvents, so they need to be + // created on the heap with 'new'. libyui takes care of deleting them. + + case button: + if ( widget->isValid() ) + return new YWidgetEvent( dynamic_cast<YWidget *> (widget), reason ); + else + return 0; + + case menu: + if ( selection ) + return new YMenuEvent( selection ); + else + return 0; + + case cancel: + return new YCancelEvent(); + + case timeout: + return new YTimeoutEvent(); + + case key: + if ( widget->isValid() ) + return new YKeyEvent( keySymbol, dynamic_cast<YWidget *> (widget) ); + else + return 0; + + case none: + case handled: + return 0; + + // Intentionally omitting 'default' branch so the compiler can + // detect unhandled enums + } + + // If we get this far, there must be an error. + + UIINT << "Can't propagate through (EventType*)0" << endl; + UIDBG << *this << endl; + return 0; +} + + +ostream & +operator<< ( std::ostream & stream, const NCtoY2Event & event ) +{ + stream << static_cast<const NCursesEvent &> (event); + + if ( ! event.selection ) + { + stream << "(-)"; + } + else + { + // FIXME: check this - was valuetype() see above + stream << "(" << event.selection->label() << ")"; + } + return stream << " for " << event.widget; +} + Added: trunk/ncurses/src/NCtoY2Event.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCtoY2Event.h?rev=44… ============================================================================== --- trunk/ncurses/src/NCtoY2Event.h (added) +++ trunk/ncurses/src/NCtoY2Event.h Fri Feb 1 15:53:23 2008 @@ -0,0 +1,57 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCtoY2Event.h + + Authors: Michael Andres <ma(a)suse.de> + Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef NCtoY2Event_h +#define NCtoY2Event_h + +#include <NCurses.h> // NCursesEvent, iostream + + +/** + * Helper class for translating an NCurses event to a YEvent. + **/ +class NCtoY2Event : public NCursesEvent +{ +public: + friend ostream & operator<<( std::ostream & stream, const NCtoY2Event & event ); + + /** + * Default constructor + **/ + NCtoY2Event() {} + + /** + * Constructor from an NCursesEvent + **/ + NCtoY2Event( const NCursesEvent & ncev ); + + /** + * Assignment operator + **/ + NCtoY2Event & operator=( const NCursesEvent & ncev ); + + /** + * The reason of existence of this class: + * Translate the NCursesEvent to a YEvent. + **/ + YEvent * propagate(); +}; + + +#endif // ifndef NCtoY2Event_h Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=44… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Fri Feb 1 15:53:23 2008 @@ -175,138 +175,6 @@ /////////////////////////////////////////////////////////////////// -struct NCtoY2Event : public NCursesEvent { - - friend ostream & operator<<( std::ostream & STREAM, const NCtoY2Event & OBJ ) { - STREAM << static_cast<const NCursesEvent &>(OBJ); -#if 0 - if ( OBJ.selection.isNull() ) { - STREAM << "(-)"; - } else { - STREAM << "(" << OBJ.selection->valuetype() << ")"; - } -#endif - if ( !OBJ.selection ) - { - STREAM << "(-)"; - } - else - { - // FIXME: check this - was valuetype() see above - STREAM << "(" << OBJ.selection->label() << ")"; - } - return STREAM << " for " << OBJ.widget; - } - - NCtoY2Event() {} - NCtoY2Event( const NCursesEvent & ncev ) : NCursesEvent( ncev ) {} - - NCtoY2Event & operator=( const NCursesEvent & ncev ) { - if ( ncev.isInternalEvent() ) - NCursesEvent::operator=( none ); - else - NCursesEvent::operator=( ncev ); - return *this; - } - - YEvent * propagate() - { - switch ( type ) - { - // Note: libyui assumes ownership of YEvents, so they need to be - // created on the heap with 'new'. libyui takes care of deleting them. - - case button: - if ( widget->isValid() ) - return new YWidgetEvent( dynamic_cast<YWidget *> (widget), reason ); - else - return 0; - - case menu: - if ( selection ) - return new YMenuEvent( selection ); - else - return 0; - - case cancel: - return new YCancelEvent(); - - case timeout: - return new YTimeoutEvent(); - - case key: - if ( widget->isValid() ) - return new YKeyEvent( keySymbol, dynamic_cast<YWidget *> (widget) ); - else - return 0; - - case none: - case handled: - return 0; - - // Intentionally omitting 'default' branch so the compiler can - // detect unhandled enums - } - - // If we get this far, there must be an error. - - UIINT << "Can't propagate through (EventType*)0" << endl; - UIDBG << *this << endl; - return 0; - } -}; - - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::userInput -// METHOD TYPE : YEvent * -// -// DESCRIPTION : -// -YEvent * YNCursesUI::userInput( unsigned long timeout_millisec ) -{ - NCDialog * ncd = static_cast<NCDialog *>( YDialog::currentDialog() ); - if ( !ncd ) { - UIERR << "No current NCDialog " << endl; - return 0; - } - - NCtoY2Event cevent; - ncd->activate ( true ); - cevent = ncd->userInput( timeout_millisec ? (long)timeout_millisec : -1 ); - ncd->activate ( false ); - - YEvent * yevent = cevent.propagate(); - - return yevent; -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::pollInput -// METHOD TYPE : YWidget * -// -// DESCRIPTION : -// -YEvent * YNCursesUI::pollInput() -{ - NCDialog * ncd = static_cast<NCDialog *>( YDialog::currentDialog() ); - if ( !ncd ) { - UIERR << "No current NCDialog " << endl; - return 0; - } - - // no activation here, done in pollInput, if.. - NCtoY2Event cevent = ncd->pollInput(); - - YEvent * yevent = cevent.propagate(); - - return yevent; -} - #define ONCREATE WIDDBG << endl //#define ONCREATE Modified: trunk/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.h?rev=441… ============================================================================== --- trunk/ncurses/src/YNCursesUI.h (original) +++ trunk/ncurses/src/YNCursesUI.h Fri Feb 1 15:53:23 2008 @@ -107,21 +107,6 @@ virtual void idleLoop( int fd_ycp ); /** - * Go into event loop until user input is available or until the specified - * timeout (in milliseconds) has elapsed. - * - * Reimplemented from YUIInterpreter. - */ - virtual YEvent * userInput( unsigned long timeout_millisec ); - - /** - * Check the event queue for user input. Don't wait. - * - * Reimplemented from YUIInterpreter. - */ - virtual YEvent * pollInput(); - - /** * Fills the PackageSelector widget and runs package selection. */ virtual YEvent * runPkgSelection( YWidget * packageSelector ); Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?re… ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Fri Feb 1 15:53:23 2008 @@ -17,12 +17,10 @@ Provides: y2curses Obsoletes: y2curses Requires: glibc-locale -BuildRequires: yast2-core-devel >= 2.16.24 -Requires: yast2-core >= 2.16.24 +BuildRequires: yast2-core-devel >= 2.16.26 +Requires: yast2-core >= 2.16.26 #adapted to libzypp 3.11 refactoring Requires: libzypp >= 3.11.8 -#FSize.h and YRpmGroupsTree.h moved to libyui -Requires: yast2-core >= 2.16.8 %description - Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=44104&r1=44… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Feb 1 15:53:23 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "22") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Feb 1 15:53:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 15:48:55 CET 2008 - sh(a)suse.de + +- Moved event handling from Y(Q)UI to Y(Q)Dialog +- V 2.16.22 + +------------------------------------------------------------------- Fri Feb 1 11:38:13 CET 2008 - tgoettlicher(a)suse.de - Run solver on startup of PackageManager in online update mode Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=44104&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Fri Feb 1 15:53:23 2008 @@ -230,18 +230,6 @@ void -YQDialog::activate( bool active ) -{ -#if 0 - if ( active ) - { - ensureOnlyOneDefaultButton(); - } -#endif -} - - -void YQDialog::resizeEvent( QResizeEvent * event ) { if ( event ) @@ -274,7 +262,6 @@ YQGenericButton * YQDialog::findDefaultButton( YWidgetListConstIterator begin, YWidgetListConstIterator end ) const - { for ( YWidgetListConstIterator it = begin; it != end; ++it ) { @@ -681,6 +668,21 @@ } +YEvent * +YQDialog::waitForEventInternal( int timeout_millisec ) +{ + return YQUI::ui()->userInput( timeout_millisec ); +} + + +YEvent * +YQDialog::pollEventInternal() +{ + return YQUI::ui()->pollInput(); +} + + + void YQDialog::center( QWidget * dialog, QWidget * parent ) { Modified: trunk/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.h?rev=44104&r1=4… ============================================================================== --- trunk/qt/src/YQDialog.h (original) +++ trunk/qt/src/YQDialog.h Fri Feb 1 15:53:23 2008 @@ -56,11 +56,6 @@ public: /** - * Makes this dialog active or inactive. - **/ - void activate( bool active ); - - /** * Interited from QDialog: The window was closed via the window * manager close button. **/ @@ -213,6 +208,21 @@ virtual void openInternal(); /** + * Wait for a user event. + * + * Implemented from YDialog. + **/ + virtual YEvent * waitForEventInternal( int timeout_millisec ); + + /** + * Check if a user event is pending. If there is one, return it. + * If there is none, do not wait for one - return 0. + * + * Implemented from YDialog. + **/ + virtual YEvent * pollEventInternal(); + + /** * Activate this dialog: Make sure that it is shown as the topmost dialog * of this application and that it can receive input. * Modified: trunk/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.h?rev=44104&r1=44103… ============================================================================== --- trunk/qt/src/YQUI.h (original) +++ trunk/qt/src/YQUI.h Fri Feb 1 15:53:23 2008 @@ -252,27 +252,17 @@ * installation. Ask him if he would like his mouse temporarily configured * as a left-handed mouse. * - * This status can be queried with UI::GetDisplayInfo() ("LeftHandedMouse"). + * This status can be queried with + * UI::GetDisplayInfo() (map entry "LeftHandedMouse"). **/ void maybeLeftHandedUser(); - -protected: - - /** - * Idle around until fd_ycp is readable and handle repaints. - * This is only used when a separate ui thread is running. - * - * Reimplemented from YUI. - **/ - virtual void idleLoop( int fd_ycp ); - /** * Go into event loop until next user input is available. * * Reimplemented from YUI. **/ - YEvent * userInput( unsigned long timeout_millisec = 0 ); + YEvent * userInput( int timeout_millisec = 0 ); /** * Check the event queue for user input. Don't wait. @@ -281,22 +271,6 @@ **/ YEvent * pollInput(); - /** - * Show and activate a dialog. - * - * Reimplemented from YUI. - **/ - void showDialog( YDialog * dialog ); - - /** - * Decativate and close a dialog. This does not delete the dialog yet. - * - * Reimplemented from YUI. - **/ - void closeDialog( YDialog * dialog ); - - -public: /** * Initialize and set a textdomain for gettext() @@ -357,6 +331,9 @@ protected: + +protected: + /** * Display capabilities. * [Reimplemented from YUI] @@ -378,16 +355,11 @@ bool leftHandedMouse() { return _leftHandedMouse; } - QMap<QString, int> screenShotNo; - QString screenShotNameTemplate; - /** * Application shutdown **/ bool close(); -protected: - /** * Handle command line args **/ @@ -401,32 +373,35 @@ void init_ui(); /** + * Idle around until fd_ycp is readable and handle repaints. + * This is only used when a separate ui thread is running. + * + * Reimplemented from YUI. + **/ + virtual void idleLoop( int fd_ycp ); + + /** * Timeout during TimeoutUserInput() / WaitForEvent() **/ void userInputTimeout(); void leaveIdleLoop(); + + // // Data members // - /** - * Use the entire available screen - **/ - bool _fullscreen; + QMap<QString, int> screenShotNo; + QString screenShotNameTemplate; - /** - * No window border for the main window - **/ + bool _fullscreen; bool _noborder; - /** - * Container for the widget stack. QWidgetStack cannot handle a WFlags - * argument, so this needs to be embedded into something else - and a QVBox - * at least handles all the sizeHint and resize stuff. - **/ +#if 0 QWidget * _main_win; +#endif /** * Size for `opt(`defaultsize) dialogs. @@ -434,9 +409,9 @@ QSize _default_size; /** - * This flag is set during @ref #userInput in order to tell - * @ref #returnNow to call exit_loop, which only may be called - * after enter_loop. + * This flag is set during userInput() in order to tell + * returnNow() to call exit_loop(), which only may be called + * after enter_loop(). **/ bool _do_exit_loop; @@ -507,6 +482,8 @@ YQUI_Ui *_qobject; }; + + class YQUI_Ui : public QObject { Q_OBJECT Modified: trunk/qt/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=4410… ============================================================================== --- trunk/qt/src/YQUI_builtins.cc (original) +++ trunk/qt/src/YQUI_builtins.cc Fri Feb 1 15:53:23 2008 @@ -55,16 +55,18 @@ YEvent * YQUI::runPkgSelection( YWidget * packageSelector ) { + YUI_CHECK_PTR( packageSelector ); YEvent * event = 0; try { - do - { - event = filterInvalidEvents( userInput() ); - } while ( ! event ); + event = packageSelector->findDialog()->waitForEvent(); + } + catch ( YUIException & uiEx ) + { + YUI_CAUGHT( uiEx ); } - catch (const std::exception & e) + catch ( std::exception & e) { yuiError() << "Caught std::exception: " << e.what() << "\n" << "This is a libzypp problem. Do not file a bug against the UI!" @@ -261,7 +263,7 @@ items << "Debug logging off" << "Debug logging on"; - QString result = QInputDialog::getItem( _main_win, + QString result = QInputDialog::getItem( 0, _("YaST2 Logging"), _("Configure YaST2 Logging:"), items, 0, Modified: trunk/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_core.cc?rev=44104&r1… ============================================================================== --- trunk/qt/src/YQUI_core.cc (original) +++ trunk/qt/src/YQUI_core.cc Fri Feb 1 15:53:23 2008 @@ -56,7 +56,9 @@ YQUI::YQUI( int argc, char **argv, bool with_threads, const char * macro_file ) : YUI( with_threads ) +#if 0 , _main_win( NULL ) +#endif , _do_exit_loop( false ) , _eventLoop( 0 ) { @@ -132,6 +134,7 @@ _eventLoop = new QEventLoop( qApp ); _do_exit_loop = false; +#if 0 // Create main window for `opt(`defaultsize) dialogs. // // We have to use something else than QWidgetStack since QWidgetStack @@ -145,6 +148,7 @@ if ( _fullscreen ) _main_win->move( 0, 0 ); +#endif // Set window title @@ -167,6 +171,7 @@ } } +#if 0 _main_win->setWindowTitle( title ); @@ -175,6 +180,7 @@ // the main window - there is nothing to display yet. _main_win->hide(); +#endif // Ugly hack as a workaround of bug #121872 (Segfault at program exit @@ -441,7 +447,7 @@ } -YEvent * YQUI::userInput( unsigned long timeout_millisec ) +YEvent * YQUI::userInput( int timeout_millisec ) { init_ui(); @@ -456,7 +462,7 @@ #endif YEvent * event = 0; - YQDialog * dialog = dynamic_cast<YQDialog *> ( YDialog::currentDialog( false ) ); + YDialog * dialog = YDialog::currentDialog( false ); _user_input_timer->stop(); @@ -476,7 +482,7 @@ event = _event_handler.consumePendingEvent(); // Display a busy cursor, but only if there is no other activity within - // BUSY_CURSOR_TIMEOUT milliseconds (avoid cursor flicker) + // BUSY_CURSOR_TIMEOUT milliseconds: Avoid cursor flicker. _busy_cursor_timer->start( BUSY_CURSOR_TIMEOUT ); // single shot } @@ -495,7 +501,7 @@ if ( ! pendingEvent() ) { - YQDialog * dialog = dynamic_cast<YQDialog *> ( YDialog::currentDialog( false ) ); + YDialog * dialog = YDialog::currentDialog( false ); if ( dialog ) { Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=44104&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Fri Feb 1 15:53:23 2008 @@ -6,8 +6,8 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-core-devel >= 2.16.25 -Requires: yast2-core >= 2.16.25 +BuildRequires: yast2-core-devel >= 2.16.26 +Requires: yast2-core >= 2.16.26 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 3.11.8 Provides: yast2_ui -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44103 - /tags/stable-2_16_7/autoinstallation/
by ug＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: ug Date: Fri Feb 1 13:32:28 2008 New Revision: 44103 URL: http://svn.opensuse.org/viewcvs/yast?rev=44103&view=rev Log: Created tag stable-2_16_7 for autoinstallation Added: tags/stable-2_16_7/autoinstallation/ - copied from r44102, trunk/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44102 - /tags/stable-2_16_19/packager/
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 13:30:15 2008 New Revision: 44102 URL: http://svn.opensuse.org/viewcvs/yast?rev=44102&view=rev Log: Created tag stable-2_16_19 for packager Added: tags/stable-2_16_19/packager/ - copied from r44101, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44101 - /tags/stable-2_16_25/yast2/
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 13:17:17 2008 New Revision: 44101 URL: http://svn.opensuse.org/viewcvs/yast?rev=44101&view=rev Log: Created tag stable-2_16_25 for yast2 Added: tags/stable-2_16_25/yast2/ - copied from r44100, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44100 - in /trunk/autoinstallation: VERSION doc/CreateProfileDetails.xml package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: ug Date: Fri Feb 1 13:17:00 2008 New Revision: 44100 URL: http://svn.opensuse.org/viewcvs/yast?rev=44100&view=rev Log: an ask script can influence the next dialog that is shown (fate #303398) Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=441… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Fri Feb 1 13:17:00 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Feb 1 13:17:00 2008 @@ -2619,7 +2619,7 @@ </row> <row> <entry>source</entry> - <entry>the source code of the script + <entry>the source code of the script. Together with "rerun_on_error" on you check the value that was entered for sanity (since 11.0 only). Your script can create a file "/tmp/next_dialog" with a dialog id in it. That's the next dialog autoyast will raise then. A value of -1 terminates the ask sequence. If that file is not created, autoyast will run the dialogs in a normal order (since 11.0 only) <para><screen><source>...</source></screen></para></entry> <entry>this value is required. Otherwise nothing would be executed</entry> </row> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Feb 1 13:17:00 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 1 13:14:34 CET 2008 - ug(a)suse.de + +- an ask script can influence the next dialog that is shown + (fate #303398) +- 2.16.7 + +------------------------------------------------------------------- Fri Jan 18 09:49:35 CET 2008 - ug(a)suse.de - shell escape code fixed (#354671) Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Fri Feb 1 13:17:00 2008 @@ -47,7 +47,23 @@ } }); - foreach( integer dialog_nr, sort( keys ), ``{ + keys = sort( keys ); + + integer dialogCounter = 0; + integer dialog_nr = keys[dialogCounter]:-1; + integer jumpToDialog = -2; + if( SCR::Read(.target.size, "/tmp/next_dialog") > 0 ) { + string s = (string)(SCR::Read(.target.string, "/tmp/next_dialog")); + s = filterchars( s, "0123456789" ); + jumpToDialog = tointeger(s); + SCR::Execute(.target.remove, "/tmp/next_dialog"); + y2milestone("next_dialog file found. Set dialog to %1",jumpToDialog); + } + while( dialog_nr != -1 ) { +// foreach( integer dialog_nr, sort( keys ), ``{ + y2milestone("dialog_nr = %1",dialog_nr); + y2milestone("dialogCounter = %1",dialogCounter); + y2milestone("jumpToDialog %1",jumpToDialog); string helptext = ""; string title = ""; term dialog_term = `VBox(); @@ -77,7 +93,7 @@ } else if( type == "symbol" ) { list<any> dummy = []; foreach( map<string,any> e, s, ``{ - boolean on=(e["value"]:""==ask["default"]:nil)?(true):(false); + boolean on=(e["value"]:`edge_of_dawn==ask["default"]:nil)?(true):(false); dummy = add( dummy, `item(`id(e["value"]:`none), e["label"]:"",on) ); }); if( frametitle != "" ) { @@ -196,7 +212,8 @@ } string executionString = ""; if( script["environment"]:false ) - executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape(val)); + executionString = sformat("VAL=\"%5\" /bin/sh %1 %2 2&> %3/%4.log ", + debug, scriptPath, current_logdir, scriptName, AutoinstConfig::ShellEscape((string)val)); else executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName ); y2milestone("Script Execution command: %1", executionString ); @@ -211,6 +228,14 @@ if( size(feedback) > 0 ) { Popup::LongText("", `RichText(`opt(`plainText), feedback), 50, 20 ); } + if( SCR::Read(.target.size, "/tmp/next_dialog") > 0 ) { + string s = (string)(SCR::Read(.target.string, "/tmp/next_dialog")); + s = filterchars( s, "-0123456789" ); + jumpToDialog = tointeger(s); + SCR::Execute(.target.remove, "/tmp/next_dialog"); + y2milestone("next_dialog file found. Set dialog to %1",jumpToDialog); + } + }; }); if( runAgain == 0 ) @@ -218,7 +243,26 @@ } } UI::CloseDialog(); - }); + if( jumpToDialog != -2 ) { + dialog_nr = jumpToDialog; + jumpToDialog = -2; + integer i = 0; + foreach( integer a, keys, ``{ + if( a == dialog_nr ) { + dialogCounter = i; + break; + } + i = i + 1; + }); + } else { + dialogCounter = dialogCounter + 1; + dialog_nr = keys[dialogCounter]:-1; + } +// }); + y2milestone("E dialog_nr = %1",dialog_nr); + y2milestone("E dialogCounter = %1",dialogCounter); + y2milestone("E jumpToDialog %1",jumpToDialog); + }; return mod; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44099 - in /trunk/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 13:16:14 2008 New Revision: 44099 URL: http://svn.opensuse.org/viewcvs/yast?rev=44099&view=rev Log: 2.16.19 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=44099&r1=44… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Feb 1 13:16:14 2008 @@ -1 +1 @@ -2.16.18 +2.16.19 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Feb 1 13:16:14 2008 @@ -3,6 +3,7 @@ - Using new URL functions in AddOnProduct. - Adjusted RPM dependencies. +- 2.16.19 ------------------------------------------------------------------- Thu Jan 31 11:17:06 CET 2008 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44098 - in /trunk/yast2: VERSION library/modules/Mode.ycp library/types/src/URL.ycp package/yast2.changes
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 13:12:49 2008 New Revision: 44098 URL: http://svn.opensuse.org/viewcvs/yast?rev=44098&view=rev Log: - Added new functions into the URL module: MakeMapFromParams and MakeParamsFromMap. - Fixed deprecated find() calls in URL module. - 2.16.25 Modified: trunk/yast2/VERSION trunk/yast2/library/modules/Mode.ycp trunk/yast2/library/types/src/URL.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=44098&r1=44097… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Feb 1 13:12:49 2008 @@ -1 +1 @@ -2.16.24 +2.16.25 Modified: trunk/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Mode.ycp?r… ============================================================================== --- trunk/yast2/library/modules/Mode.ycp (original) +++ trunk/yast2/library/modules/Mode.ycp Fri Feb 1 13:12:49 2008 @@ -197,6 +197,10 @@ return mode () == "update"; } +global boolean Depeche () { + return true; +} + /** * normal, running system */ Modified: trunk/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URL.ycp?… ============================================================================== --- trunk/yast2/library/types/src/URL.ycp (original) +++ trunk/yast2/library/types/src/URL.ycp Fri Feb 1 13:12:49 2008 @@ -251,7 +251,7 @@ if(url == nil || size(url) < 1) return false; /* We don't allow URLs with spaces */ - if(find(url, " ") != -1) return false; + if(search(url, " ") != nil) return false; map tokens = Parse(url); @@ -329,9 +329,11 @@ } y2debug("url: %1", url); - if (tokens["path"]:"" != "" && find (tokens["path"]:"", "/") != 0 ) + // path is not empty and doesn't start with "/" + if (tokens["path"]:"" != "" && ! regexpmatch (tokens["path"]:"", "^/")) url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); - else if (tokens["path"]:"" != "" && find (tokens["path"]:"", "/") == 0 ) + // patch is not empty and starts with "/" + else if (tokens["path"]:"" != "" && regexpmatch (tokens["path"]:"", "^/")) { while (substring (tokens["path"]:"", 0, 2) == "//") tokens["path"] = substring (tokens["path"]:"", 1); @@ -418,4 +420,93 @@ y2milestone("%1", Check(nil)); */ +/** + * Reads list of HTTP params and returns them as map. + * (Useful also for cd:/, dvd:/, nfs:/ ... params) + * Neither keys nor values are HTML-unescaped, see UnEscapeString(). + * + * @params string params + * @return map <string, string> params + * + * @example + * MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[ + * "device" : "sda3", + * "login" : "aaa", + * "password" : "bbb" + * ] + */ +global map <string, string> MakeMapFromParams (string params) { + // Error + if (params == nil) { + y2error ("Erroneous (nil) params!"); + return nil; + // Empty + } else if (params == "") { + return $[]; + } + + list <string> params_list = splitstring (params, "&"); + + params_list = filter (string one_param, params_list, { + return (one_param != "" && one_param != nil); + }); + + map <string, string> ret = $[]; + integer eq_pos = nil; + string opt = ""; + string val = ""; + + foreach (string one_param, params_list, { + eq_pos = search (one_param, "="); + + if (eq_pos == nil) { + ret[one_param] = ""; + } else { + opt = substring (one_param, 0, eq_pos); + val = substring (one_param, (eq_pos + 1)); + + ret[opt] = val; + } + }); + + return ret; +} + +/** + * Returns string made of HTTP params. It's a reverse function to MakeMapFromParams(). + * Neither keys nor values are HTML-escaped, use EscapeString() if needed. + * + * @param map <string, string> + * + * @see MakeMapFromParams + * + * @example + * MakeMapFromParams ($[ + * "param1" : "a", + * "param2" : "b", + * "param3" : "c", + * ]) -> "param1=a&param2=b&param3=c" + */ +global string MakeParamsFromMap (map <string, string> params_map) { + // ["key1=value1", "key2=value2", ...] -> "key1=value1&key2=value2" + return mergestring ( + // ["key" : "value", ...] -> ["key=value", ...] + maplist (string key, string value, params_map, { + if (value == nil) { + y2warning ("Empty value for key %1", key); + value = ""; + } + + if (key == nil || key == "") { + y2error ("Empty key (will be skipped)"); + return ""; + } + + // "key=value" + return sformat ("%1=%2", key, value); + }), + "&" + ); +} + } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Feb 1 13:12:49 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Feb 1 13:00:18 CET 2008 - locilka(a)suse.cz + +- Added new functions into the URL module: MakeMapFromParams and + MakeParamsFromMap. +- Fixed deprecated find() calls in URL module. +- 2.16.25 + +------------------------------------------------------------------- Mon Jan 28 13:14:13 CET 2008 - locilka(a)suse.cz - Removing useless Wizard() calls in ProductControl to minimize the -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44097 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp yast2-packager.spec.in
by locilka＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: locilka Date: Fri Feb 1 13:11:46 2008 New Revision: 44097 URL: http://svn.opensuse.org/viewcvs/yast?rev=44097&view=rev Log: - Using new URL functions in AddOnProduct. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/AddOnProduct.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Feb 1 13:11:46 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 13:10:37 CET 2008 - locilka(a)suse.cz + +- Using new URL functions in AddOnProduct. +- Adjusted RPM dependencies. + +------------------------------------------------------------------- Thu Jan 31 11:17:06 CET 2008 - locilka(a)suse.cz - Reworked ProductLicense module to handle first-stage installation Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Fri Feb 1 13:11:46 2008 @@ -36,6 +36,7 @@ import "Directory"; import "String"; import "WorkflowManager"; +import "URL"; // variables for installation with product /** @@ -110,47 +111,6 @@ } /** - * Reads list of HTTP params and returns them as map - * - * @params string params - * @return map <string, string> params - * - * @example - * MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[ - * "device" : "sda3", - * "login" : "aaa", - * "password" : "bbb" - * ] - */ -map <string, string> MakeMapFromParams (string params) { - list <string> params_list = splitstring (params, "&"); - - params_list = filter (string one_param, params_list, { - return (one_param != "" && one_param != nil); - }); - - map <string, string> ret = $[]; - integer eq_pos = nil; - string opt = ""; - string val = ""; - - foreach (string one_param, params_list, { - eq_pos = search (one_param, "="); - - if (eq_pos == nil) { - ret[one_param] = ""; - } else { - opt = substring (one_param, 0, eq_pos); - val = substring (one_param, (eq_pos + 1)); - - ret[opt] = val; - } - }); - - return ret; -} - -/** * Returns an absolute URL from base + relative url. * Relative URL needs to start with 'reulrl://' othewise * it is not considered being relative and it's returned @@ -236,27 +196,14 @@ url = regexpsub (url, "^(.*)/\\./(.*)", "\\1/\\2"); } - map <string, string> base_params_map = MakeMapFromParams (base_params); - map <string, string> added_params_map = MakeMapFromParams (added_params); + map <string, string> base_params_map = URL::MakeMapFromParams (base_params); + map <string, string> added_params_map = URL::MakeMapFromParams (added_params); map <string, string> final_params_map = (map <string, string>) union (base_params_map, added_params_map); if (size (final_params_map) > 0) { y2milestone ("%1 merge %2 -> %3", base_params_map, added_params_map, final_params_map); - string url_add = ""; - - foreach (string opt, string val, final_params_map, { - url_add = - url_add + - // add '&' if needed - (size (url_add) > 0 ? "&" : "") + - opt + - // define 'opt=val' if val is set - // otherwise don't use '=val' at all - (size (val) > 0 ? "=" + val : ""); - }); - - url = url + "?" + url_add; + url = url + "?" + URL::MakeParamsFromMap (final_params_map); } y2milestone ("Final URL: '%1'", url); Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Fri Feb 1 13:11:46 2008 @@ -4,8 +4,9 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country-data yast2-xml perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-slp -# Progress::Subprogress*() -BuildRequires: yast2 >= 2.16.17 +# URL::MakeParamsFromMap and URL::MakeMapFromParams +BuildRequires: yast2 >= 2.16.25 + # changed signatures of GPG calbacks BuildRequires: yast2-pkg-bindings >= 2.16.11 @@ -19,8 +20,8 @@ # New functions: GPG key management Requires: yast2-pkg-bindings >= 2.16.10 -# recursive Progress::New() -Requires: yast2 >= 2.16.22 +# URL::MakeParamsFromMap and URL::MakeMapFromParams +Requires: yast2 >= 2.16.25 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44096 - /trunk/installation/src/config/preferences.yast2
by aschnell＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: aschnell Date: Fri Feb 1 12:19:54 2008 New Revision: 44096 URL: http://svn.opensuse.org/viewcvs/yast?rev=44096&view=rev Log: - enable Alt+Tab in icewm Modified: trunk/installation/src/config/preferences.yast2 Modified: trunk/installation/src/config/preferences.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/preferen… ============================================================================== --- trunk/installation/src/config/preferences.yast2 (original) +++ trunk/installation/src/config/preferences.yast2 Fri Feb 1 12:19:54 2008 @@ -10,8 +10,10 @@ # Show only Move, Size and Close in the window menu WinMenuItems="msc" -# Disable Alt+Tab -QuickSwitch=0 +# Enable Alt+Tab +QuickSwitch=1 +KeySysSwitchNext="Alt+Tab" +KeySysSwitchLast="Alt+Shift+Tab" # Colors ColorActiveTitleBar="rgb:4e/6f/9f" @@ -24,7 +26,7 @@ DlgBorderSizeY=3 # Disable most shortcuts -# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences | sed 's/$/=""/' +# :r !grep -o '\<Key[^=]*' /etc/icewm/preferences | grep -v Switch | sed 's/$/=""/' KeyWinRaise="" KeyWinOccupyAll="" KeyWinLower="" @@ -51,8 +53,6 @@ KeyWinArrangeW="" KeyWinArrangeNW="" KeyWinArrangeC="" -KeySysSwitchNext="" -KeySysSwitchLast="" KeySysWinNext="" KeySysWinPrev="" KeySysWinMenu="" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0