July 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39158 - /trunk/packager/yast2-packager.spec.in
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:42:35 2007 New Revision: 39158 URL: http://svn.opensuse.org/viewcvs/yast?rev=39158&view=rev Log: Adjusted spec-file -- required yast >= 2.15.38 Modified: trunk/packager/yast2-packager.spec.in 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 Wed Jul 4 11:42:35 2007 @@ -3,7 +3,7 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp -BuildRequires: yast2 >= 2.15.22 +BuildRequires: yast2 >= 2.15.38 Requires: yast2-country Requires: yast2-installation >= 2.15.12 @@ -11,8 +11,8 @@ # Pkg::SourceGetBrokenSources() Requires: yast2-pkg-bindings >= 2.15.16 -# WorkflowManager module -Requires: yast2 >= 2.15.22 +# Mode::live_installation +Requires: yast2 >= 2.15.38 # 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] r39157 - in /trunk/yast2: VERSION package/yast2.changes
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:41:11 2007 New Revision: 39157 URL: http://svn.opensuse.org/viewcvs/yast?rev=39157&view=rev Log: 2.15.38 Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=39157&r1=39156… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Jul 4 11:41:11 2007 @@ -1 +1 @@ -2.15.37 +2.15.38 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 Wed Jul 4 11:41:11 2007 @@ -3,6 +3,7 @@ - Fixed adding of firewall custom rules in case of empty destination port but source port set (#284998). +- 2.15.38 ------------------------------------------------------------------- Thu Jun 28 21:33:42 CEST 2007 - jsrain(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] r39156 - in /trunk/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:39:03 2007 New Revision: 39156 URL: http://svn.opensuse.org/viewcvs/yast?rev=39156&view=rev Log: 2.15.43 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=39156&r1=39… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Jul 4 11:39:03 2007 @@ -1 +1 @@ -2.15.42 +2.15.43 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 Wed Jul 4 11:39:03 2007 @@ -4,6 +4,7 @@ - Callback function for setting the trust level to the GnuPG key has been merged with a function for importing the same key. By now, if key is trusted, it's also imported (#282254). +- 2.15.43 ------------------------------------------------------------------- Thu Jun 28 21:34:57 CEST 2007 - jsrain(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] r39155 - /tags/stable-2_15_4/backup/
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:34:36 2007 New Revision: 39155 URL: http://svn.opensuse.org/viewcvs/yast?rev=39155&view=rev Log: Created tag stable-2_15_4 for backup Added: tags/stable-2_15_4/backup/ - copied from r39154, trunk/backup/ -- 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] r39154 - in /trunk/backup: VERSION package/yast2-backup.changes src/Backup.ycp
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:16:29 2007 New Revision: 39154 URL: http://svn.opensuse.org/viewcvs/yast?rev=39154&view=rev Log: - Restart and/or enable cron service if needed for changed/added scheduled backups (#285442). - 2.15.4 Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/Backup.ycp Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=39154&r1=3915… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Wed Jul 4 11:16:29 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Wed Jul 4 11:16:29 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 4 11:13:22 CEST 2007 - locilka(a)suse.cz + +- Restart and/or enable cron service if needed for changed/added + scheduled backups (#285442). +- 2.15.4 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/backup/src/Backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/Backup.ycp?rev=39154&… ============================================================================== --- trunk/backup/src/Backup.ycp (original) +++ trunk/backup/src/Backup.ycp Wed Jul 4 11:16:29 2007 @@ -27,6 +27,7 @@ import "Popup"; import "FileUtils"; import "String"; +import "Service"; include "backup/functions.ycp"; @@ -1071,6 +1072,9 @@ global define void WriteCronSettings() ``{ y2milestone("backup_profiles: %1", backup_profiles); + boolean cron_settings_changed = false; + boolean cron_is_needed = false; + // write cron files foreach(string name, map opts, backup_profiles, ``{ // cron file content @@ -1096,12 +1100,17 @@ SCR::Write(.target.string, cron_file, setting); y2milestone("Created file: %1", cron_file); + + cron_settings_changed = true; + cron_is_needed = true; } else if (size(cron_file) > 0 && opts[`cron_settings, "auto"]:false == false) { // remove existing cron file SCR::Execute(.target.bash, "/bin/rm -f " + cron_file); y2milestone("removed old cron file: %1", cron_file); + + cron_settings_changed = true; } // mark saved value as unchanged @@ -1113,6 +1122,23 @@ backup_profiles[name] = (map)eval(prof); } ); + + // Cron needs to be restarted for changes to take effect + // bugzilla #285442 + if (cron_settings_changed) { + // running + if (Service::Status("cron") == 0) { + // restart it only + Service::Restart ("cron"); + + // not running but needed + } else if (cron_is_needed) { + // not enabled, enable it + if (! Service::Enabled ("cron")) Service::Enable ("cron"); + // and start it + Service::Start ("cron"); + } + } } -- 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] r39153 - in /trunk/packager: package/yast2-packager.changes src/modules/SignatureCheckDialogs.ycp
by locilka＠svn.opensuse.org 04 Jul '07

04 Jul '07

Author: locilka Date: Wed Jul 4 11:00:35 2007 New Revision: 39153 URL: http://svn.opensuse.org/viewcvs/yast?rev=39153&view=rev Log: - Callback function for setting the trust level to the GnuPG key has been merged with a function for importing the same key. By now, if key is trusted, it's also imported (#282254). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SignatureCheckDialogs.ycp 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 Wed Jul 4 11:00:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 4 10:57:55 CEST 2007 - locilka(a)suse.cz + +- Callback function for setting the trust level to the GnuPG key + has been merged with a function for importing the same key. By + now, if key is trusted, it's also imported (#282254). + +------------------------------------------------------------------- Thu Jun 28 21:34:57 CEST 2007 - jsrain(a)suse.cz - updated for live CD installation Modified: trunk/packager/src/modules/SignatureCheckDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SignatureCh… ============================================================================== --- trunk/packager/src/modules/SignatureCheckDialogs.ycp (original) +++ trunk/packager/src/modules/SignatureCheckDialogs.ycp Wed Jul 4 11:00:35 2007 @@ -595,6 +595,13 @@ } /** + * List of trusted keys + * + * @see bugzilla #282254 + */ + list <string> list_of_trusted_keys = []; + + /** * Used for file or package signed by a public key. This key is still * not listed in trusted keys. * @@ -641,7 +648,7 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `HBox ( // push button - `PushButton(`id(`trust), _("&Trust the Key")), + `PushButton(`id(`trust), _("&Trust and Import the Key")), `HSpacing(1), `PushButton(`id(`skip), Label::SkipButton()) ) @@ -652,6 +659,13 @@ // wait for one of listed ID's, return the default value in case of `cancel symbol ret = WaitForSymbolUserInput([`trust, `skip], `skip); + if (ret == `trust) { + // later, if asking whether to import the key, the key is trusted + // so it will be also imported + // bugzilla #282254 + list_of_trusted_keys = add (list_of_trusted_keys, key_id); + } + UI::CloseDialog(); return ret; } @@ -766,6 +780,12 @@ * @return boolean whether zypp should import the key into the keyring of trusted keys */ global boolean ImportGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) { + // bugzilla #282254 + if (key_id != "" && key_id != nil && contains (list_of_trusted_keys, key_id)) { + y2milestone ("Key '%1' is trusted, importing...", key_id); + return true; + } + // additional Richtext (HTML) warning text (kind of help), 1/2 string warning_text = _("<p>The owner of the key may distribute updates, packages, and package repositories that your system will trust and offer -- 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] r39152 - /branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc
by sh-sh-sh＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: sh-sh-sh Date: Tue Jul 3 17:51:37 2007 New Revision: 39152 URL: http://svn.opensuse.org/viewcvs/yast?rev=39152&view=rev Log: obsolete Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc Tue Jul 3 17:51:37 2007 @@ -28,8 +28,6 @@ #include "YQUI.h" #include "YQProgressBar.h" -#define MAX_PROGRESS 10000 - YQProgressBar::YQProgressBar( YWidget * parent, const string & label, -- 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] r39151 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/ProgressBar3.ycp
by sh-sh-sh＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: sh-sh-sh Date: Tue Jul 3 17:51:13 2007 New Revision: 39151 URL: http://svn.opensuse.org/viewcvs/yast?rev=39151&view=rev Log: obsolete Removed: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ProgressBar3.ycp -- 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] r39150 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: sh-sh-sh Date: Tue Jul 3 17:50:06 2007 New Revision: 39150 URL: http://svn.opensuse.org/viewcvs/yast?rev=39150&view=rev Log: ported ProgressBar Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/qt/src/YQInputField.cc branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h branches/tmp/sh/mod-ui/qt/src/YQUI.h branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Tue Jul 3 17:50:06 2007 @@ -324,4 +324,7 @@ * Ported YMultiLineEdit - renamed text() -> value() - renamed setText() -> setValue() - - new: YMultiLineEdit::defaultVisibleLines() (use this in preferredHeight() ) \ No newline at end of file + - new: YMultiLineEdit::defaultVisibleLines() (use this in preferredHeight() ) + +* Ported YProgressBar + - renamed setProgress() -> setValue() Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Tue Jul 3 17:50:06 2007 @@ -53,9 +53,10 @@ #include "YLabel.h" #include "YLayoutBox.h" #include "YMenuButton.h" -#include "YMultiSelectionBox.h" #include "YMultiLineEdit.h" +#include "YMultiSelectionBox.h" #include "YPackageSelector.h" +#include "YProgressBar.h" #include "YPushButton.h" #include "YRadioButton.h" #include "YRadioButtonGroup.h" @@ -2217,23 +2218,21 @@ return 0; } - YCPString label = term->value( argnr )->asString(); - YCPInteger maxprogress( 100 ); - if ( s >= 2 ) maxprogress = term->value( argnr+1 )->asInteger(); - YCPInteger progress( 0LL ); - if ( s >= 3 ) progress = term->value( argnr+2 )->asInteger(); - - if ( maxprogress->value() < 0 - || progress->value() < 0 - || progress->value() > maxprogress->value()) - { - y2error( "Invalid maxprogress/progress value for the ProgressBar widget: %s", - term->toString().c_str() ); - return 0; - } - rejectAllOptions( term,optList ); - return YUI::ui()->createProgressBar( parent, opt, label, maxprogress, progress ); + + string label = term->value( argnr )->asString()->value(); + int maxValue = 100; + int initialValue = 0; + + if ( s >= 2 ) maxValue = term->value( argnr+1 )->asInteger()->value(); + if ( s >= 3 ) initialValue = term->value( argnr+2 )->asInteger()->value(); + + YProgressBar * progressBar = YUI::widgetFactory()->createProgressBar( parent, label, maxValue ); + + if ( initialValue > 0 ) + progressBar->setValue( initialValue ); + + return progressBar; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc Tue Jul 3 17:50:06 2007 @@ -17,115 +17,133 @@ /-*/ -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> #define y2log_component "ui" #include <ycp/y2log.h> #include "YUISymbols.h" #include "YProgressBar.h" +struct YProgressBarPrivate +{ + YProgressBarPrivate( const string & label, + int maxValue ) + : label( label ) + , maxValue( maxValue ) + , value( 0 ) + { + if ( maxValue < 1 ) + maxValue = 1; + } + + string label; + int maxValue; + int value; +}; + -YProgressBar::YProgressBar( const YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxProgress, - const YCPInteger & progress ) - : YWidget( opt ) - , label( label ) - , maxProgress( maxProgress ) - , progress( progress ) + + +YProgressBar::YProgressBar( YWidget * parent, + const string & label, + int maxValue ) + : YWidget( parent ) + , priv( new YProgressBarPrivate( label, maxValue ) ) { + YUI_CHECK_NEW( priv ); + setDefaultStretchable( YD_HORIZ, true ); setStretchable( YD_VERT, false ); } -void YProgressBar::setLabel( const YCPString & label ) +YProgressBar::~YProgressBar() +{ + // NOP +} + + +string YProgressBar::label() +{ + return priv->label; +} + + +void YProgressBar::setLabel( const string & label ) { - this->label = label; + priv->label = label; } -void YProgressBar::setProgress( const YCPInteger & progress ) +int YProgressBar::maxValue() const { - this->progress = progress; + return priv->maxValue; } -YCPString YProgressBar::getLabel() +int YProgressBar::value() const { - return label; + return priv->value; } -YCPInteger YProgressBar::getProgress() +void YProgressBar::setValue( int newValue ) { - return progress; + if ( newValue < 0 ) + newValue = 0; + + if ( newValue > priv->maxValue ) + newValue = priv->maxValue; + + priv->value = newValue; } -YCPValue YProgressBar::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +const YPropertySet & +YProgressBar::propertySet() { - string s = property->symbol(); + static YPropertySet propSet; - /** - * @property integer Value the current progress - */ - if ( s == YUIProperty_Value ) + if ( propSet.isEmpty() ) { - if ( newvalue->isInteger() ) - { - YCPInteger p = newvalue->asInteger(); - if ( p->value() < 0 ) - { - y2warning( "Negative value %s for progress bar", p->toString().c_str() ); - p = YCPInteger( 0LL ); - } - else if ( p->value() > maxProgress->value() ) - { - y2warning( "Too big value %s for progress bar ( max is %s )", - p->toString().c_str(), maxProgress->toString().c_str() ); - p = maxProgress; - } - setProgress(p); - this->progress = p; - return YCPBoolean( true ); - } - else - { - y2error( "ProgressBar: Invalid parameter %s for Value property. Must be integer", - newvalue->toString().c_str() ); - return YCPBoolean( false ); - } + /* + * @property integer Value the current progress + * @property string Label caption above the input field + */ + propSet.add( YProperty( YUIProperty_Value, YIntegerProperty ) ); + propSet.add( YProperty( YUIProperty_Label, YStringProperty ) ); + propSet.add( YWidget::propertySet() ); } - /** - * @property string Label the label above the progress bar - */ - else if ( s == YUIProperty_Label ) + return propSet; +} + + +bool +YProgressBar::setProperty( const string & propertyName, const YPropertyValue & val ) +{ + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch + + if ( propertyName == YUIProperty_Value ) setValue( val.integerVal() ); + else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); + else { - if ( newvalue->isString() ) - { - setLabel( newvalue->asString() ); - return YCPBoolean( true ); - } - else - { - y2error( "ProgressBar: Invalid parameter %s for Label property. Must be string", - newvalue->toString().c_str() ); - return YCPBoolean( false ); - } + YWidget::setProperty( propertyName, val ); } - else return YWidget::changeWidget( property, newvalue ); -} + return true; // success -- no special processing necessary +} -YCPValue YProgressBar::queryWidget( const YCPSymbol & property ) +YPropertyValue +YProgressBar::getProperty( const string & propertyName ) { - string s = property->symbol(); - if ( s == YUIProperty_Value ) return getProgress(); - else if ( s == YUIProperty_Label ) return getLabel(); - else return YWidget::queryWidget( property ); + propertySet().check( propertyName ); // throws exceptions if not found + + if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); + else if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); + else + { + return YWidget::getProperty( propertyName ); + } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h Tue Jul 3 17:50:06 2007 @@ -20,8 +20,8 @@ #define YProgressBar_h #include "YWidget.h" -#include <ycp/YCPString.h> -#include <ycp/YCPInteger.h> + +class YProgressBarPrivate; class YProgressBar : public YWidget @@ -30,73 +30,87 @@ /** * Constructor. **/ - YProgressBar( const YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxProgress, - const YCPInteger & initialProgress ); + YProgressBar( YWidget * parent, + const string & label, + int maxValue = 100 ); public: /** + * Destructor. + **/ + virtual ~YProgressBar(); + + /** * Returns a descriptive name of this widget class for logging, * debugging etc. **/ virtual const char * widgetClass() { return "YProgressBar"; } /** - * Implements the ui command changeWidget. + * Get the label (the caption above the progress bar). **/ - YCPValue changeWidget( const YCPSymbol & property, const YCPValue & newvalue ); + string label(); /** - * Implements the ui command queryWidget + * Set the label (the caption above the progress bar). + * + * Derived classes are free to reimplement this, but they should call this + * base class method at the end of the overloaded function. **/ - YCPValue queryWidget( const YCPSymbol & property ); + virtual void setLabel( const string & label ); /** - * Change the ProgressBar label. Overload this, but call - * YProgressBar::setLabel at the end of your own function. + * Return the maximum progress value. + * Notice that this value can only be set in the constructor. **/ - virtual void setLabel( const YCPString & label ); + int maxValue() const; /** - * Get the current label. This method cannot be overidden. The label of the - * ProgressBar cannot be changed other than by calling setProgress, i.e. not - * by the ui. Therefore setProgress stores the current ProgressBar in - * #ProgressBar. + * Return the current progress value. **/ - YCPString getLabel(); + int value() const; /** - * Change the progress. Overload this, but call - * YProgressBar::setProgress at the end of your own function. + * Set the current progress value ( <= maxValue() ). + * + * Derived classes should reimplement this, but they should call this + * base class method at the end of the overloaded function. **/ - virtual void setProgress( const YCPInteger & progress ); + virtual void setValue( int newValue ); /** - * Get the current progress. This method cannot be overidden. The progress - * of the cannot be changed other than by calling setProgress, i.e. not by - * the ui. Therefore setProgress stores the current ProgressBar in - * #ProgressBar. + * Set a property. + * Reimplemented from YWidget. + * + * This function may throw YUIPropertyExceptions. + * + * This function returns 'true' if the value was successfully set and + * 'false' if that value requires special handling (not in error cases: + * those are covered by exceptions). **/ - YCPInteger getProgress(); + virtual bool setProperty( const string & propertyName, + const YPropertyValue & val ); - -protected: /** - * Current label of the ProgressBar + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw YUIPropertyExceptions. **/ - YCPString label; + virtual YPropertyValue getProperty( const string & propertyName ); /** - * Maximum progress value of the progress bar. - * The progress can go from 0 to maxprogress. + * Return this class's property set. + * This also initializes the property upon the first call. + * + * Reimplemented from YWidget. **/ - YCPInteger maxProgress; + virtual const YPropertySet & propertySet(); - /** - * current progress value of the ProgressBar. - **/ - YCPInteger progress; + +private: + + ImplPtr<YProgressBarPrivate> priv; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Tue Jul 3 17:50:06 2007 @@ -450,7 +450,6 @@ virtual YWidget *createMenuButton( YWidget *parent, YWidgetOpt & opt, const YCPString & label ) = 0; virtual YWidget *createTree( YWidget *parent, YWidgetOpt & opt, const YCPString & label ) = 0; virtual YWidget *createTable( YWidget *parent, YWidgetOpt & opt, vector<string> header ) = 0; - virtual YWidget *createProgressBar( YWidget *parent, YWidgetOpt & opt, const YCPString & label, const YCPInteger & maxprogress, const YCPInteger & progress ) = 0; virtual YWidget *createIntField( YWidget *parent, YWidgetOpt & opt, const YCPString & label, int minValue, int maxValue, int initialValue ) = 0; // FIXME: Obsolete // FIXME: Obsolete Modified: branches/tmp/sh/mod-ui/qt/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQInputF… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQInputField.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQInputField.cc Tue Jul 3 17:50:06 2007 @@ -119,7 +119,7 @@ int minSize = shrinkable() ? 20 : 200; int hintWidth = _qt_label->sizeHint().width(); - if ( _qt_label->text().isEmpty() ) + if ( ! _qt_label->isVisible() ) hintWidth = 0; return max( minSize, hintWidth ); Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc Tue Jul 3 17:50:06 2007 @@ -31,33 +31,59 @@ #define MAX_PROGRESS 10000 -YQProgressBar::YQProgressBar( QWidget * parent, - const YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxProgress, - const YCPInteger & progress ) - : QVBox( parent ) - , YProgressBar( opt, label, maxProgress, progress ) +YQProgressBar::YQProgressBar( YWidget * parent, + const string & label, + int maxValue ) + : QVBox( (QWidget *) parent->widgetRep() ) + , YProgressBar( parent, label, maxValue ) { setWidgetRep( this ); setSpacing( YQWidgetSpacing ); - setMargin( YQWidgetMargin ); + setMargin ( YQWidgetMargin ); - _qt_label = new QLabel( fromUTF8(label->value() ), this ); + _qt_label = new QLabel( fromUTF8( label ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - if ( label->value() == "" ) + if ( label.empty() ) _qt_label->hide(); - _qt_progressbar = new QProgressBar( this ); - _qt_progressbar->setTotalSteps( MAX_PROGRESS ); + _qt_progressbar = new QProgressBar( maxValue, this ); _qt_label->setBuddy( _qt_progressbar ); +} + + +YQProgressBar::~YQProgressBar() +{ + // NOP +} + + +void YQProgressBar::setLabel( const string & label ) +{ + _qt_label->setText( fromUTF8( label ) ); + + if ( label.empty() ) + { + if ( _qt_label->isVisible() ) + _qt_label->hide(); + } + else + { + if ( _qt_label->isHidden() ) + _qt_label->show(); + } +} + - setProgress( progress ); +void YQProgressBar::setValue( int newValue ) +{ + YProgressBar::setValue( newValue ); + _qt_progressbar->setProgress( value() ); } + void YQProgressBar::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); @@ -70,7 +96,7 @@ { int hintWidth = _qt_label->sizeHint().width() + margin(); - if ( _qt_label->text().isEmpty() ) + if ( ! _qt_label->isVisible() ) hintWidth = 0; return max( 200, hintWidth ); @@ -89,40 +115,6 @@ } -void YQProgressBar::setLabel( const YCPString & text ) -{ - _qt_label->setText( fromUTF8(text->value() ) ); - - if ( _qt_label->text().isEmpty() ) - { - if ( _qt_label->isVisible() ) - _qt_label->hide(); - } - else - { - if ( _qt_label->isHidden() ) - _qt_label->show(); - } -} - - -void YQProgressBar::setProgress( const YCPInteger & newProgress ) -{ - int progress = 0; - - if ( maxProgress->value() != 0 ) - { - progress = (int) ( MAX_PROGRESS * - ( (float) newProgress->value() ) / - ( (float) maxProgress->value() ) ); - - } - - _qt_progressbar->setProgress( progress ); - YProgressBar::setProgress( newProgress ); -} - - bool YQProgressBar::setKeyboardFocus() { _qt_progressbar->setFocus(); Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h Tue Jul 3 17:50:06 2007 @@ -21,8 +21,6 @@ #define YQProgressBar_h #include <qvbox.h> -#include <ycp/YCPString.h> - #include "YProgressBar.h" @@ -38,17 +36,34 @@ /** * Constructor. **/ - YQProgressBar( QWidget * parent, - const YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxProgress, - const YCPInteger & initialProgress ); + YQProgressBar( YWidget * parent, + const string & label, + int maxValue = 100 ); + /** + * Destructor. + **/ + virtual ~YQProgressBar(); + + /** + * Set the label (the caption above the progress bar). + * + * Reimplemented from YProgressBar. + **/ + virtual void setLabel( const string & label ); /** - * Inherited from YWidget: Sets the enabled state of the - * widget. Disabling a progress bar makes it grey + * Set the current progress value ( <= maxValue() ). + * + * Reimplemented from YProgressBar. **/ - void setEnabled( bool enabled ); + virtual void setValue( int newValue ); + + /** + * Set enabled/disabled state. + * + * Reimplemented from YWidget. + **/ + virtual void setEnabled( bool enabled ); /** * Preferred width of the widget. @@ -72,18 +87,6 @@ virtual void setSize( int newWidth, int newHeight ); /** - * Change the ProgressBar label. Calls - * YProgressBar::setLabel at the end. - **/ - void setLabel( const YCPString & label ); - - /** - * Change the progress. Calls - * YProgressBar::setProgress at the end. - **/ - void setProgress( const YCPInteger & progress ); - - /** * Accept the keyboard focus. **/ virtual bool setKeyboardFocus(); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI.h?r… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI.h Tue Jul 3 17:50:06 2007 @@ -452,7 +452,6 @@ YWidget * createIntField ( YWidget * parent, YWidgetOpt & opt, const YCPString & label, int minValue, int maxValue, int initialValue); YWidget * createLogView ( YWidget * parent, YWidgetOpt & opt, const YCPString & label, int visibleLines, int maxLines ); - YWidget * createProgressBar ( YWidget * parent, YWidgetOpt & opt, const YCPString & label, const YCPInteger & maxProgress, const YCPInteger & currentProgress ); YWidget * createMenuButton ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); YWidget * createTable ( YWidget * parent, YWidgetOpt & opt, vector<string> header); YWidget * createTree ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_wid… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Tue Jul 3 17:50:06 2007 @@ -35,7 +35,6 @@ #include "YQPartitionSplitter.h" #include "YQPatternSelector.h" #include "YQSimplePatchSelector.h" -#include "YQProgressBar.h" #include "YQSlider.h" #include "YQTable.h" #include "YQTime.h" @@ -123,15 +122,6 @@ return new YQTable( (QWidget *) ( parent->widgetRep() ), opt, header); } -YWidget * YQUI::createProgressBar ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxProgress, - const YCPInteger & progress ) -{ - return new YQProgressBar( (QWidget *) ( parent->widgetRep() ), opt, label, maxProgress, progress ); -} - YWidget * YQUI::createIntField ( YWidget * parent, YWidgetOpt & opt, Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Tue Jul 3 17:50:06 2007 @@ -188,7 +188,10 @@ YQProgressBar * YQWidgetFactory::createProgressBar( YWidget * parent, const string & label, int maxValue ) { - return 0; // FIXME: TO DO + YQProgressBar * progressBar = new YQProgressBar( parent, label, maxValue ); + YUI_CHECK_NEW( progressBar ); + + return progressBar; } -- 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] r39149 - /branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h
by sh-sh-sh＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: sh-sh-sh Date: Tue Jul 3 17:17:54 2007 New Revision: 39149 URL: http://svn.opensuse.org/viewcvs/yast?rev=39149&view=rev Log: obsolete Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h Tue Jul 3 17:17:54 2007 @@ -169,7 +169,6 @@ #define YUIProperty_Value "Value" #define YUIProperty_Values "Values" #define YUIProperty_WidgetClass "WidgetClass" -#define YUIProperty_WindowID "WindowID" // Widget and dialog options -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0