December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42669 - /trunk/core/libyui/src/YWidget.cc
by sh-sh-sh＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: sh-sh-sh Date: Tue Dec 4 16:00:29 2007 New Revision: 42669 URL: http://svn.opensuse.org/viewcvs/yast?rev=42669&view=rev Log: include widgetRep in dumpWidgetTree Modified: trunk/core/libyui/src/YWidget.cc Modified: trunk/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidget.cc?rev=4… ============================================================================== --- trunk/core/libyui/src/YWidget.cc (original) +++ trunk/core/libyui/src/YWidget.cc Tue Dec 4 16:00:29 2007 @@ -651,13 +651,13 @@ if ( descr.empty() ) { - y2milestone( "Widget tree: %s%s %sat %p", - indentation.c_str(), w->widgetClass(), stretch.c_str(), w ); + y2milestone( "Widget tree: %s%s %sat %p (widgetRep: %p)", + indentation.c_str(), w->widgetClass(), stretch.c_str(), w, w->widgetRep() ); } else { - y2milestone( "Widget tree: %s%s %s %sat %p", - indentation.c_str(), w->widgetClass(), descr.c_str(), stretch.c_str(), w ); + y2milestone( "Widget tree: %s%s %s %sat %p (widgetRep: %p)", + indentation.c_str(), w->widgetClass(), descr.c_str(), stretch.c_str(), w,w->widgetRep() ); } } -- 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] r42668 - /trunk/core/libyui/src/YUI_builtins.cc
by sh-sh-sh＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: sh-sh-sh Date: Tue Dec 4 16:00:06 2007 New Revision: 42668 URL: http://svn.opensuse.org/viewcvs/yast?rev=42668&view=rev Log: obsolete Modified: trunk/core/libyui/src/YUI_builtins.cc 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 Tue Dec 4 16:00:06 2007 @@ -678,26 +678,6 @@ /** * @builtin OpenDialog - * - * @short Opens a new dialog. - * @description - * Opens a new dialog. <tt>widget</tt> is a term representation of the widget - * being displayed. - * - * See the widget documentation for details - * what widgets are available. All open dialogs are arranged in a stack. A - * newly opened dialog is put on top of the stack. All operations implicitly - * refer to the topmost dialog. The user can interact only with that dialog. - * The application does not terminate if the last dialog is closed. - * - * @param term widget - * @return boolean Returns true on success. - * - * @usage OpenDialog( `Label( "Please wait..." ) ) - */ - -/** - * @builtin OpenDialog * @id OpenDialog_with_options * @short Opens a Dialog with options * @description -- 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] r42667 - in /trunk/core/libyui/src: YSingleChildContainerWidget.cc YSingleChildContainerWidget.h
by sh-sh-sh＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: sh-sh-sh Date: Tue Dec 4 15:59:49 2007 New Revision: 42667 URL: http://svn.opensuse.org/viewcvs/yast?rev=42667&view=rev Log: obsolete Modified: trunk/core/libyui/src/YSingleChildContainerWidget.cc trunk/core/libyui/src/YSingleChildContainerWidget.h Modified: trunk/core/libyui/src/YSingleChildContainerWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSingleChildCont… ============================================================================== --- trunk/core/libyui/src/YSingleChildContainerWidget.cc (original) +++ trunk/core/libyui/src/YSingleChildContainerWidget.cc Tue Dec 4 15:59:49 2007 @@ -66,18 +66,3 @@ else return YWidget::stretchable( dim ); } - - -string -YSingleChildContainerWidget::debugLabel() -{ - string str = widgetClass(); - - if ( hasChildren() ) - { - str += " with "; - str += firstChild()->debugLabel(); - } - - return str; -} Modified: trunk/core/libyui/src/YSingleChildContainerWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSingleChildCont… ============================================================================== --- trunk/core/libyui/src/YSingleChildContainerWidget.h (original) +++ trunk/core/libyui/src/YSingleChildContainerWidget.h Tue Dec 4 15:59:49 2007 @@ -69,12 +69,6 @@ * Reimplemented from YWidget. **/ virtual bool stretchable( YUIDimension dim ) const; - - /** - * Descriptive label for debugging. Derived from this widget's only child - * (if there is one). - **/ - virtual string debugLabel(); }; -- 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] r42666 - /trunk/pkg-bindings/src/Source.cc
by lslezak＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: lslezak Date: Tue Dec 4 15:59:22 2007 New Revision: 42666 URL: http://svn.opensuse.org/viewcvs/yast?rev=42666&view=rev Log: - SourceLoad() - split into stages Modified: trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Tue Dec 4 15:59:22 2007 @@ -434,6 +434,9 @@ // 3 steps per repository (download, cache rebuild, load resolvables) ProcessStart("Loading the Package Manager...", stages, "help"); + // mark refreshing as in progress now + ProcessNextStage(); + ptr = this; YCPValue ret = SourceLoadImpl(source_receiver); @@ -473,6 +476,9 @@ zypp::ProgressData prog_total(repos_to_load * 3); prog_total.sendTo(progress); + zypp::RepoManager repomanager = CreateRepoManager(); + + // refresh metadata for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); it != repos.end(); ++it) { @@ -481,8 +487,6 @@ { // sub tasks zypp::CombinedProgressData refresh_subprogress(prog_total, 1); - zypp::CombinedProgressData rebuild_subprogress(prog_total, 1); - zypp::CombinedProgressData load_subprogress(prog_total, 1); if (AnyResolvableFrom((*it)->repoInfo().alias())) { @@ -490,28 +494,62 @@ } else { - zypp::RepoManager repomanager = CreateRepoManager(); - // autorefresh the source if ((*it)->repoInfo().autorefresh()) { try { y2milestone("Autorefreshing source: %s", (*it)->repoInfo().alias().c_str()); + RefreshWithCallbacks((*it)->repoInfo()); zypp::ProgressData prog(1); - prog.sendTo(refresh_subprogress); - // TODO pass progress to RefreshWithCallbacks + prog.sendTo(refresh_subprogress); RefreshWithCallbacks((*it)->repoInfo()); prog.toMax(); + } + // NOTE: subtask progresses are reported as done in the descructor + // no need to handle them in the exception code + catch (const zypp::Exception& excpt) + { + y2error ("Error in SourceLoad: %s", excpt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(excpt)); + success = false; + } + } + } + } + } + + ProcessNextStage(); + + // rebuild cache + for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); + it != repos.end(); ++it) + { + // load resolvables only from enabled repos which are not deleted + if ((*it)->repoInfo().enabled() && !(*it)->isDeleted()) + { + // sub tasks + zypp::CombinedProgressData rebuild_subprogress(prog_total, 1); + if (AnyResolvableFrom((*it)->repoInfo().alias())) + { + y2milestone("Resolvables from '%s' are already present, not loading", (*it)->repoInfo().alias().c_str()); + } + else + { + // autorefresh the source + if ((*it)->repoInfo().autorefresh()) + { + try + { // rebuild cache (the default policy is "if needed") y2milestone("Rebuilding cache for '%s'...", (*it)->repoInfo().alias().c_str()); - zypp::ProgressData prog_build(1); - prog.sendTo(rebuild_subprogress); + zypp::ProgressData prog(1); + prog.sendTo(rebuild_subprogress); repomanager.buildCache((*it)->repoInfo()); - prog_build.toMax(); + prog.toMax(); } // NOTE: subtask progresses are reported as done in the descructor // no need to handle them in the exception code @@ -522,13 +560,40 @@ success = false; } } + } + } + } + + ProcessNextStage(); + + for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); + it != repos.end(); ++it) + { + // load resolvables only from enabled repos which are not deleted + if ((*it)->repoInfo().enabled() && !(*it)->isDeleted()) + { + // sub tasks + zypp::CombinedProgressData load_subprogress(prog_total, 1); + + if (AnyResolvableFrom((*it)->repoInfo().alias())) + { + y2milestone("Resolvables from '%s' are already present, not loading", (*it)->repoInfo().alias().c_str()); + } + else + { + zypp::ProgressData prog(1); + prog.sendTo(load_subprogress); // load objects success = LoadResolvablesFrom((*it)->repoInfo()) && success; + + prog.toMax(); } } } + ProcessNextStage(); + // report 100% prog_total.toMax(); @@ -559,7 +624,7 @@ } // enable all sources and load the resolvables - success = YCPBoolean(SourceLoadImpl()->asBoolean()->value() && success->asBoolean()->value()); + success = YCPBoolean(SourceLoad()->asBoolean()->value() && success->asBoolean()->value()); } return success; -- 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] r42665 - in /trunk/ncurses/src: NCDialog.cc NCDialog.h NCPushButton.cc NCPushButton.h
by kmachalkova＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: kmachalkova Date: Tue Dec 4 15:58:52 2007 New Revision: 42665 URL: http://svn.opensuse.org/viewcvs/yast?rev=42665&view=rev Log: Set dialog's default button correctly Modified: trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/NCDialog.h trunk/ncurses/src/NCPushButton.cc trunk/ncurses/src/NCPushButton.h Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=4266… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Tue Dec 4 15:58:52 2007 @@ -62,6 +62,7 @@ : YDialog ( dialogType, colorMode ) , pan ( 0 ) , dlgstyle ( 0 ) + , defaultButton( 0 ) , inMultiDraw_i( 0 ) , active ( false ) , wActive ( this ) @@ -84,6 +85,7 @@ : YDialog ( dialogType, YDialogNormalColor ) , pan ( 0 ) , dlgstyle ( 0 ) + , defaultButton( 0 ) , inMultiDraw_i( 0 ) , active ( false ) , wActive ( this ) @@ -232,6 +234,37 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : NCDialog::setDefaultButton +// METHOD TYPE : void +// +// DESCRIPTION : Set default button of this dialog (move keyboard +// focus on it) +// +void NCDialog::setDefaultButton( NCPushButton *newButton ) +{ + if ( newButton && defaultButton && (newButton != defaultButton )) + { + UIWAR << "Too many default push buttons: " << + " only one allowed." << endl; + defaultButton->setDefaultButton( false ); + } + + defaultButton = newButton; + + if (defaultButton) + { + UIDBG << "New default button: " << endl; + defaultButton->setKeyboardFocus(); + } + + YDialog::setDefaultButton( 0 ); + YDialog::setDefaultButton( defaultButton ); + +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : NCDialog::initDialog // METHOD TYPE : void // @@ -256,8 +289,6 @@ // void NCDialog::showDialog() { - NCMIL << "SHOW" << endl; - dumpWidgetTree(); IODBG << "sd+ " << this << endl; if ( pan && pan->hidden() ) { getVisible(); Modified: trunk/ncurses/src/NCDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.h?rev=42665… ============================================================================== --- trunk/ncurses/src/NCDialog.h (original) +++ trunk/ncurses/src/NCDialog.h Tue Dec 4 15:58:52 2007 @@ -23,6 +23,7 @@ #include "YDialog.h" #include "NCWidget.h" +#include "NCPushButton.h" class NCDialog; @@ -61,6 +62,7 @@ NCursesUserPanel<NCDialog> * pan; NCstyle::StyleSet mystyleset; const NCstyle::Style * dlgstyle; + NCPushButton *defaultButton; unsigned inMultiDraw_i; @@ -147,6 +149,8 @@ **/ virtual void setSize( int newWidth, int newHeight ); + virtual void setDefaultButton( NCPushButton *newButton ); + protected: enum NCDopts { Modified: trunk/ncurses/src/NCPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPushButton.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCPushButton.cc (original) +++ trunk/ncurses/src/NCPushButton.cc Tue Dec 4 15:58:52 2007 @@ -17,6 +17,8 @@ /-*/ #include "Y2Log.h" +#include "YDialog.h" +#include "NCDialog.h" #include "NCurses.h" #include "NCPushButton.h" @@ -145,6 +147,33 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : NCPushButton::setDefaultButton +// METHOD TYPE : void +// +// DESCRIPTION : Mark this button as default within current dialog +// +void NCPushButton::setDefaultButton( bool def ) +{ + YDialog *ydialog = findDialog(); + NCDialog *dlg = 0; + + if (ydialog) + { + dlg = dynamic_cast<NCDialog *> (ydialog); + YUI_CHECK_PTR( dlg ); + } + + YPushButton::setDefaultButton( def ); + + //if this is the default button, let's focus it + if (dlg && def) + dlg->setDefaultButton( this ); + +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : NCPushButton::wRedraw // METHOD TYPE : void // Modified: trunk/ncurses/src/NCPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPushButton.h?rev=4… ============================================================================== --- trunk/ncurses/src/NCPushButton.h (original) +++ trunk/ncurses/src/NCPushButton.h Tue Dec 4 15:58:52 2007 @@ -67,6 +67,8 @@ virtual NCursesEvent wHandleInput( wint_t key ); virtual void setLabel( const string & nlabel ); + + virtual void setDefaultButton( bool def); virtual void setEnabled( bool do_bv ); @@ -75,6 +77,7 @@ return YWidget::setKeyboardFocus(); return true; } + }; /////////////////////////////////////////////////////////////////// -- 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] r42664 - in /trunk/firewall: package/yast2-firewall.changes src/dialogs.ycp src/firewall_proposal.ycp src/summary.ycp src/uifunctions.ycp
by locilka＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: locilka Date: Tue Dec 4 15:31:51 2007 New Revision: 42664 URL: http://svn.opensuse.org/viewcvs/yast?rev=42664&view=rev Log: - Merged proofread texts. Modified: trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/dialogs.ycp trunk/firewall/src/firewall_proposal.ycp trunk/firewall/src/summary.ycp trunk/firewall/src/uifunctions.ycp Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Tue Dec 4 15:31:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 4 15:30:30 CET 2007 - locilka(a)suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Mon Sep 17 17:39:12 CEST 2007 - ug(a)suse.de - firewall.rnc file fixed for autoyast XML file Modified: trunk/firewall/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/dialogs.ycp?rev=426… ============================================================================== --- trunk/firewall/src/dialogs.ycp (original) +++ trunk/firewall/src/dialogs.ycp Tue Dec 4 15:31:51 2007 @@ -36,9 +36,9 @@ "set_service_auto_start" : SetEnableFirewall, // TRANSLATORS: Radio selection - "start_auto_button" : _("&Enable firewall automatic starting"), + "start_auto_button" : _("&Enable Firewall Automatic Starting"), // TRANSLATORS: Radio selection - "start_manual_button" : _("&Disable firewall automatic starting"), + "start_manual_button" : _("&Disable Firewall Automatic Starting"), "help" : sformat(CWMServiceStart::AutoStartHelpTemplate (), // TRANSLATORS: part of help text - radio button label, NO SHORTCUT!!! _("Enable firewall"), Modified: trunk/firewall/src/firewall_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall_proposal.y… ============================================================================== --- trunk/firewall/src/firewall_proposal.ycp (original) +++ trunk/firewall/src/firewall_proposal.ycp Tue Dec 4 15:31:51 2007 @@ -103,7 +103,7 @@ if (! SuSEFirewall::SuSEFirewallIsInstalled()) { // TRANSLATORS: message popup Report::Message (_("Firewall configuration cannot be changed. -SuSEfirewall2 package is not installed.")); +The SuSEfirewall2 package is not installed.")); ret = $[ "workflow_sequence" : `next ]; // Enable firewall Modified: trunk/firewall/src/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/summary.ycp?rev=426… ============================================================================== --- trunk/firewall/src/summary.ycp (original) +++ trunk/firewall/src/summary.ycp Tue Dec 4 15:31:51 2007 @@ -285,11 +285,11 @@ // Is running and will be running again if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; // Is stopped and will be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be started after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; } } else { // Is running and will be stopped @@ -299,7 +299,7 @@ // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration gets written") + li_end + "\n"; } } Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev… ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Tue Dec 4 15:31:51 2007 @@ -1165,10 +1165,10 @@ // disabling firewall if (new_state == false && curr_running == true) { // TRANSLATORS: popup question - if (Popup::YesNo (_("Firewall automatic starting has been just set to be disabled + if (Popup::YesNo (_("Firewall automatic starting has been disabled but firewall is currently running. -Would you like to stop the firewall after the new configuration is written?"))) { +Stop the firewall after the new configuration is written?"))) { y2milestone ("User decided to stop the firewall after it is disabled"); new_running = false; } else { -- 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] r42663 - in /trunk/pkg-bindings/src: Callbacks.YCP.h Callbacks.cc PkgModuleFunctions.h Source.cc
by lslezak＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: lslezak Date: Tue Dec 4 15:22:42 2007 New Revision: 42663 URL: http://svn.opensuse.org/viewcvs/yast?rev=42663&view=rev Log: - added Process*() callbacks - added use total progress in SourceLoad() Modified: trunk/pkg-bindings/src/Callbacks.YCP.h trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/Callbacks.YCP.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.YCP.h… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.YCP.h (original) +++ trunk/pkg-bindings/src/Callbacks.YCP.h Tue Dec 4 15:22:42 2007 @@ -103,7 +103,12 @@ CB_AcceptVerificationFailed, CB_AcceptWrongDigest, CB_AcceptUnknownDigest, CB_TrustedKeyAdded, - CB_TrustedKeyRemoved + CB_TrustedKeyRemoved, + + CB_ProcessStart, + CB_ProcessNextStage, + CB_ProcessProgress, + CB_ProcessFinished, }; /** @@ -201,6 +206,11 @@ ENUM_OUT( TrustedKeyRemoved ); ENUM_OUT( AcceptWrongDigest ); ENUM_OUT( AcceptUnknownDigest ); + + ENUM_OUT( ProcessStart ); + ENUM_OUT( ProcessNextStage ); + ENUM_OUT( ProcessProgress ); + ENUM_OUT( ProcessFinished ); #undef ENUM_OUT // no default! let compiler warn missing values } Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue Dec 4 15:22:42 2007 @@ -2538,4 +2538,25 @@ YCPValue PkgModuleFunctions::CallbackDestDownload( const YCPString& args ) { return SET_YCP_CB( CB_DestDownload, args ); } + +YCPValue PkgModuleFunctions::CallbackProcessStart( const YCPString& func ) +{ + return SET_YCP_CB( CB_ProcessStart, func ); +} + +YCPValue PkgModuleFunctions::CallbackProcessNextStage( const YCPString& func ) +{ + return SET_YCP_CB( CB_ProcessNextStage, func ); +} + +YCPValue PkgModuleFunctions::CallbackProcessDone( const YCPString& func ) +{ + return SET_YCP_CB( CB_ProcessFinished, func ); +} + +YCPValue PkgModuleFunctions::CallbackProcessProgress( const YCPString& func ) +{ + return SET_YCP_CB( CB_ProcessProgress, func); +} + #undef SET_YCP_CB Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Tue Dec 4 15:22:42 2007 @@ -50,6 +50,7 @@ #include <zypp/RepoInfo.h> #include <zypp/RepoManager.h> #include <zypp/MediaSetAccess.h> +#include <zypp/ProgressData.h> #include "PkgError.h" @@ -171,6 +172,13 @@ zypp::repo::RepoType ProbeWithCallbacks(const zypp::Url &url); void ScanProductsWithCallBacks(const zypp::Url &url); + void ProcessStart(const std::string &process, const std::list<std::string> &stages, const std::string &help); + void ProcessProgress(int percent); + void ProcessNextStage(); + void ProcessDone(); + + YCPValue SourceLoadImpl(const zypp::ProgressData::ReceiverFnc & progress = zypp::ProgressData::ReceiverFnc()); + // After all, APPL_HIGH might be more appropriate, because we suggest // the user what he should do and if it does not work, it's his job to // fix it (using USER). --ma @@ -420,6 +428,17 @@ /* TYPEINFO: void(string) */ YCPValue CallbackAcceptFileWithoutChecksum( const YCPString& func ); + + /* TYPEINFO: void(string) */ + YCPValue CallbackProcessStart( const YCPString& func ); + /* TYPEINFO: void(string) */ + YCPValue CallbackProcessProgress( const YCPString& func ); + /* TYPEINFO: void(string) */ + YCPValue CallbackProcessNextStage( const YCPString& func ); + /* TYPEINFO: void(string) */ + YCPValue CallbackProcessDone( const YCPString& func ); + + // source related /* TYPEINFO: boolean(boolean)*/ YCPValue SourceStartManager (const YCPBoolean&); @@ -725,6 +744,8 @@ * Constructor. */ PkgModuleFunctions (); + + bool SourceLoadReceiver(const zypp::ProgressData &progress); /** * Destructor. Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Tue Dec 4 15:22:42 2007 @@ -45,6 +45,7 @@ #include <zypp/repo/RepoType.h> #include <zypp/MediaProducts.h> #include <zypp/ExternalProgram.h> +#include <zypp/ProgressData.h> #include <zypp/base/String.h> @@ -384,6 +385,35 @@ return YCPList(); } +bool PkgModuleFunctions::SourceLoadReceiver(const zypp::ProgressData &progress) +{ + y2milestone("Source Load receiver: %lld (%lld%%)", progress.val(), progress.reportValue()); + + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessProgress); + + // is the callback registered? + if (ycp_handler != NULL) + { + ycp_handler->appendParameter(YCPInteger(progress.reportValue())); + // evaluate the callback function + ycp_handler->evaluateCall(); + } + + return true; +} + +PkgModuleFunctions *ptr = NULL; + +bool source_receiver(const zypp::ProgressData &progress) +{ + if (ptr != NULL) + { + return ptr->SourceLoadReceiver(progress); + } + + return true; +} /**************************************************************************************** * @builtin SourceLoad @@ -396,14 +426,64 @@ YCPValue PkgModuleFunctions::SourceLoad() { + std::list<std::string> stages; + stages.push_back("Refresh Sources"); + stages.push_back("Rebuild Cache"); + stages.push_back("Load Data"); + + // 3 steps per repository (download, cache rebuild, load resolvables) + ProcessStart("Loading the Package Manager...", stages, "help"); + + ptr = this; + + YCPValue ret = SourceLoadImpl(source_receiver); + + ProcessDone(); + + ptr = NULL; + + return ret; +} + + +/**************************************************************************************** + * @builtin SourceLoad + * + * @short Load resolvables from the installation sources + * @description + * Refresh the pool - Add/remove resolvables from the enabled/disabled sources. + * @return boolean True on success + **/ +YCPValue +PkgModuleFunctions::SourceLoadImpl(const zypp::ProgressData::ReceiverFnc &progress) +{ bool success = true; + int repos_to_load = 0; + for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); + it != repos.end(); ++it) + { + if ((*it)->repoInfo().enabled() && !(*it)->isDeleted()) + { + repos_to_load++; + } + } + + // set max. value (3 steps per repository) + zypp::ProgressData prog_total(repos_to_load * 3); + prog_total.sendTo(progress); + for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); it != repos.end(); ++it) { // load resolvables only from enabled repos which are not deleted if ((*it)->repoInfo().enabled() && !(*it)->isDeleted()) { + // sub tasks + zypp::CombinedProgressData refresh_subprogress(prog_total, 1); + zypp::CombinedProgressData rebuild_subprogress(prog_total, 1); + zypp::CombinedProgressData load_subprogress(prog_total, 1); + if (AnyResolvableFrom((*it)->repoInfo().alias())) { y2milestone("Resolvables from '%s' are already present, not loading", (*it)->repoInfo().alias().c_str()); @@ -418,12 +498,23 @@ try { y2milestone("Autorefreshing source: %s", (*it)->repoInfo().alias().c_str()); + + zypp::ProgressData prog(1); + prog.sendTo(refresh_subprogress); + // TODO pass progress to RefreshWithCallbacks RefreshWithCallbacks((*it)->repoInfo()); + prog.toMax(); // rebuild cache (the default policy is "if needed") y2milestone("Rebuilding cache for '%s'...", (*it)->repoInfo().alias().c_str()); + + zypp::ProgressData prog_build(1); + prog.sendTo(rebuild_subprogress); repomanager.buildCache((*it)->repoInfo()); + prog_build.toMax(); } + // NOTE: subtask progresses are reported as done in the descructor + // no need to handle them in the exception code catch (const zypp::Exception& excpt) { y2error ("Error in SourceLoad: %s", excpt.asString().c_str()); @@ -438,6 +529,9 @@ } } + // report 100% + prog_total.toMax(); + return YCPBoolean(success); } @@ -465,7 +559,7 @@ } // enable all sources and load the resolvables - success = YCPBoolean(SourceLoad()->asBoolean()->value() && success->asBoolean()->value()); + success = YCPBoolean(SourceLoadImpl()->asBoolean()->value() && success->asBoolean()->value()); } return success; @@ -2760,4 +2854,79 @@ return zypp::str::toLower(type); } +void PkgModuleFunctions::ProcessStart( const std::string &process, const std::list<std::string> &stages, + const std::string &help) +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessStart); + + y2debug("ProcessStart"); + + // is the callback registered? + if (ycp_handler != NULL) + { + y2debug("Evaluating ProcessStart callback..."); + ycp_handler->appendParameter(YCPString(process)); + + // create list of stages + YCPList lst; + + for(std::list<std::string>::const_iterator it = stages.begin(); + it != stages.end() ; ++it ) + { + lst->add(YCPString(*it) ); + } + + ycp_handler->appendParameter(lst); + + ycp_handler->appendParameter(YCPString(help)); + + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + + +void PkgModuleFunctions::ProcessNextStage() +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessNextStage); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + +void PkgModuleFunctions::ProcessProgress(int percent) +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessProgress); + + // is the callback registered? + if (ycp_handler != NULL) + { + ycp_handler->appendParameter( YCPInteger((long long) percent)); + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + +void PkgModuleFunctions::ProcessDone() +{ + y2debug("ProcessDone"); + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_ProcessFinished); + + // is the callback registered? + if (ycp_handler != NULL) + { + y2milestone("Evaluating ProcessDone callback..."); + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + -- 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] r42662 - in /trunk/dns-server: package/yast2-dns-server.changes src/helps.ycp
by locilka＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: locilka Date: Tue Dec 4 15:21:05 2007 New Revision: 42662 URL: http://svn.opensuse.org/viewcvs/yast?rev=42662&view=rev Log: - Merged texts back from proofreading. Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/helps.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Tue Dec 4 15:21:05 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 4 15:20:21 CET 2007 - locilka(a)suse.cz + +- Merged texts back from proofreading. + +------------------------------------------------------------------- Wed Nov 14 14:04:36 CET 2007 - locilka(a)suse.cz - Fixed recognizing TSIG-keys definition in named.conf. Currently Modified: trunk/dns-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/helps.ycp?rev=426… ============================================================================== --- trunk/dns-server/src/helps.ycp (original) +++ trunk/dns-server/src/helps.ycp Tue Dec 4 15:21:05 2007 @@ -296,7 +296,7 @@ /* Expert Mode Configuration - Zones 3/3 */ _("To modify settings for a zone, such as zone transport and name and -mail servers, select it then click Edit Zone. +mail servers, select it, and click Edit Zone. To remove a configured zone, select it and click Delete Zone. "), -- 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] r42661 - in /trunk/ncurses/src: NCPkgTable.cc NCPopupInfo.cc NCPopupInfo.h pkg/NCPackageSelector.cc pkg/NCPkgNames.cc pkg/NCPkgNames.h
by kmachalkova＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: kmachalkova Date: Tue Dec 4 15:06:22 2007 New Revision: 42661 URL: http://svn.opensuse.org/viewcvs/yast?rev=42661&view=rev Log: Removed reference to printing license text (#327542) Modified: trunk/ncurses/src/NCPkgTable.cc trunk/ncurses/src/NCPopupInfo.cc trunk/ncurses/src/NCPopupInfo.h trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPkgTable.cc?rev=42… ============================================================================== --- trunk/ncurses/src/NCPkgTable.cc (original) +++ trunk/ncurses/src/NCPkgTable.cc Tue Dec 4 15:06:22 2007 @@ -270,8 +270,7 @@ string( _("End User License Agreement") + "" + pkgName + " " + packager->createDescrText( license ) ), NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel(), - NCPkgNames::PrintLicenseText() + NCPkgNames::CancelLabel() ); info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; Modified: trunk/ncurses/src/NCPopupInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.cc?rev=4… ============================================================================== --- trunk/ncurses/src/NCPopupInfo.cc (original) +++ trunk/ncurses/src/NCPopupInfo.cc Tue Dec 4 15:06:22 2007 @@ -45,8 +45,7 @@ const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ) + string cancelButtonLabel ) : NCPopup( at, false ) , helpText( 0 ) , okButton( 0 ) @@ -55,7 +54,7 @@ , vDim( 20 ) , visible ( false ) { - createLayout( headline, text, okButtonLabel, cancelButtonLabel, printLicenseText ); + createLayout( headline, text, okButtonLabel, cancelButtonLabel ); } /////////////////////////////////////////////////////////////////// @@ -81,8 +80,7 @@ void NCPopupInfo::createLayout( const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ) + string cancelButtonLabel ) { // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); @@ -95,14 +93,6 @@ // add the rich text widget helpText = new NCRichText( split, text ); - if (printLicenseText != "" ) - { - new NCSpacing( split, YD_VERT, false, 1 ); - new NCLabel (split, printLicenseText ); - new NCSpacing( split, YD_VERT, false, 1 ); - } - - NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); if ( okButtonLabel != "" && cancelButtonLabel != "" ) Modified: trunk/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.h?rev=42… ============================================================================== --- trunk/ncurses/src/NCPopupInfo.h (original) +++ trunk/ncurses/src/NCPopupInfo.h Tue Dec 4 15:06:22 2007 @@ -72,8 +72,7 @@ const string & text, // the label of an OK button string okButtonLabel = _( "&OK" ), - string cancelButtonLabel = "", - string printLicenseText = "" ); + string cancelButtonLabel = "" ); virtual ~NCPopupInfo(); @@ -83,8 +82,7 @@ void createLayout( const string & headline, const string & text, string okButtonLabel, - string cancelButtonLabel, - string printLicenseText ); + string cancelButtonLabel ); NCursesEvent & showInfoPopup( ); Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue Dec 4 15:06:22 2007 @@ -2556,8 +2556,7 @@ "" + pkgName + " " + createDescrText( licenseText ), NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel(), - NCPkgNames::PrintLicenseText() ); + NCPkgNames::CancelLabel() ); info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?re… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Tue Dec 4 15:06:22 2007 @@ -1211,13 +1211,6 @@ return value; } -const string NCPkgNames::PrintLicenseText() -{ - //zzZZzz - static const string value = _( "If you would like to print this license,\ncheck the EULA.txt file on the first media" ); - return value; -} - const string NCPkgNames::ContinueRequ() { // label continues the part required by ... Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Tue Dec 4 15:06:22 2007 @@ -878,7 +878,6 @@ static const string ConflictText(); static const string NoConflictText(); static const string NotAvailableText(); - static const string PrintLicenseText(); static const string MenuEtc(); static const string MenuDeps(); -- 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] r42660 - /trunk/qt/package/yast2-qt.changes
by tgoettlicher＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: tgoettlicher Date: Tue Dec 4 15:02:56 2007 New Revision: 42660 URL: http://svn.opensuse.org/viewcvs/yast?rev=42660&view=rev Log: changes Modified: trunk/qt/package/yast2-qt.changes 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 Tue Dec 4 15:02:56 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 4 14:57:50 CET 2007 - tgoettlicher(a)suse.de + +- fixed popup windows without decorations (#345825) + +------------------------------------------------------------------- Fri Nov 30 17:20:49 CET 2007 - sh(a)suse.de - Migrated YQDialog to mod-ui -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0