- YaST Commits

[yast-commit] r38225 - in /trunk/storage: VERSION controller/src/controller.ycp package/yast2-storage.changes
by fehr＠svn.opensuse.org 31 May '07

31 May '07

Author: fehr Date: Thu May 31 16:02:59 2007 New Revision: 38225 URL: http://svn.opensuse.org/viewcvs/yast?rev=38225&view=rev Log: - make help option in controller module work (#269888) - version 2.15.14 Modified: trunk/storage/VERSION trunk/storage/controller/src/controller.ycp trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=38225&r1=382… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu May 31 16:02:59 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 Modified: trunk/storage/controller/src/controller.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/controller/src/controlle… ============================================================================== --- trunk/storage/controller/src/controller.ycp (original) +++ trunk/storage/controller/src/controller.ycp Thu May 31 16:02:59 2007 @@ -18,6 +18,7 @@ { textdomain "storage"; +import "CommandLine"; import "Wizard"; import "Misc"; /*import "Bootloader";*/ @@ -245,6 +246,8 @@ } } +define any Sequence () + { Wizard::OpenAbortApplyFinishDialog(); list<map> dev = []; @@ -637,5 +640,19 @@ } while( ret != `abort && ret!=`cancel && ret != `finish ); UI::CloseDialog(); + } + +/* -- the command line description map -------------------------------------- */ +map cmdline = $[ + "id" : "controller", + // translators: command line help text for controller module + "help" : _("Enabling and Disabling of Disk Controller Modules"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the disk controller module is not available"), + "guihandler" : Sequence + ]; + +CommandLine::Run (cmdline); +return true; } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 31 16:02:59 2007 @@ -2,6 +2,8 @@ Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de - automatically increase GPT before creating partitions (#236404) +- make help option in controller module work (#269888) +- version 2.15.14 ------------------------------------------------------------------- Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de -- 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] r38224 - in /trunk/storage: libstorage/src/Disk.cc libstorage/src/Disk.h package/yast2-storage.changes
by fehr＠svn.opensuse.org 31 May '07

31 May '07

Author: fehr Date: Thu May 31 15:54:15 2007 New Revision: 38224 URL: http://svn.opensuse.org/viewcvs/yast?rev=38224&view=rev Log: automatically increase GPT before creating partitions (#236404) Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu May 31 15:54:15 2007 @@ -21,7 +21,8 @@ #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" -#define PARTEDCMD "/usr/sbin/parted -s " // blank at end !! +#define PARTEDBIN "/usr/sbin/parted" +#define PARTEDCMD PARTEDBIN " -s " // blank at end !! using namespace std; using namespace storage; @@ -30,7 +31,7 @@ unsigned long long SizeK ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = Name; undevDevice(nm); logfile_name = nm; @@ -52,7 +53,7 @@ y2milestone( "constructed disk %s nr %u sizeK:%llu", Name.c_str(), num, SizeK ); logfile_name = Name + decString(num); - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; ronly = true; size_k = SizeK; head = new_head = 16; @@ -71,7 +72,7 @@ Disk::Disk( Storage * const s, const string& fname ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = fname.substr( fname.find_last_of( '/' )+1); if( nm.find("disk_")==0 ) nm.erase( 0, 5 ); @@ -417,7 +418,8 @@ byte_cyl = head * sector * 512; y2milestone( "byte_cyl:%lu", byte_cyl ); } - y2milestone( "Label:%s", dlabel.c_str() ); + gpt_enlarge = Cmd.select( "fix the GPT to use all" )>0; + y2milestone( "Label:%s gpt_enlarge:%d", dlabel.c_str(), gpt_enlarge ); if( dlabel!="loop" ) { setLabelData( dlabel ); @@ -1857,6 +1859,7 @@ getStorage()->waitForDevice(); redetectGeometry(); } + gpt_enlarge = false; y2milestone( "ret:%d", ret ); return( ret ); } @@ -2082,9 +2085,24 @@ return( ret ); } +void Disk::enlargeGpt() + { + y2mil( "gpt_enlarge:" << gpt_enlarge ); + if( gpt_enlarge ) + { + string cmd_line( "yes Fix | " PARTEDBIN ); + cmd_line += " ---pretend-input-tty "; + cmd_line += device(); + cmd_line += " print "; + SystemCmd cmd( cmd_line ); + gpt_enlarge = false; + } + } + static bool logicalCreated( const Partition& p ) { return( p.type()==LOGICAL && p.created() ); } + int Disk::doCreate( Volume* v ) { Partition * p = dynamic_cast<Partition *>(v); @@ -2109,6 +2127,10 @@ if( ret==0 ) detected_label = label; } + if( ret==0 && gpt_enlarge ) + { + enlargeGpt(); + } std::ostringstream cmd_line; if( ret==0 ) { @@ -2576,6 +2598,8 @@ s << " iSCSI"; if( d.dmp_slave ) s << " DmpSlave"; + if( d.gpt_enlarge ) + s << " GptEnlarge"; return( s ); } @@ -2670,7 +2694,7 @@ ext_possible==rhs.ext_possible && max_logical==rhs.max_logical && init_disk==rhs.init_disk && label==rhs.label && iscsi==rhs.iscsi && sysfs_dir==rhs.sysfs_dir && - dmp_slave==rhs.dmp_slave; + dmp_slave==rhs.dmp_slave && gpt_enlarge==rhs.gpt_enlarge; if( ret ) { ConstPartPair p = partPair(); @@ -2712,6 +2736,7 @@ logfile_name = rhs.logfile_name; sysfs_dir = rhs.sysfs_dir; dmp_slave = rhs.dmp_slave; + gpt_enlarge = rhs.gpt_enlarge; return( *this ); } Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Thu May 31 15:54:15 2007 @@ -187,6 +187,7 @@ unsigned long len, bool checkRelaxed ); void removePresentPartitions(); void removeFromMemory(); + void enlargeGpt(); static bool notDeleted( const Partition&d ) { return( !d.deleted() ); } static bool bootSpecial( const Partition&d ) { return( !d.deleted()&&(d.id()==0x41||d.id()==0x06) ); } @@ -225,6 +226,7 @@ bool init_disk; bool iscsi; bool dmp_slave; + bool gpt_enlarge; unsigned max_logical; unsigned long byte_cyl; unsigned long range; Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 31 15:54:15 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de + +- automatically increase GPT before creating partitions (#236404) + +------------------------------------------------------------------- Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de - fixed crash during detection (caused by empty key-value-pair) -- 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] r38223 - /branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc
by sh-sh-sh＠svn.opensuse.org 31 May '07

31 May '07

Author: sh-sh-sh Date: Thu May 31 15:27:31 2007 New Revision: 38223 URL: http://svn.opensuse.org/viewcvs/yast?rev=38223&view=rev Log: don't change throw location Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Thu May 31 15:27:31 2007 @@ -182,7 +182,7 @@ catch( YUIPropertyException & exception ) { exception.setWidget( this ); - YUI_RETHROW( exception ); + throw; } if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); @@ -200,7 +200,7 @@ catch( YUIPropertyException & exception ) { exception.setWidget( this ); - YUI_RETHROW( exception ); + throw; } if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); -- 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] r38222 - in /branches/tmp/sh/mod-ui/core/libyui/src: YProperty.cc YProperty.h YRadioButton.cc YUIException.cc YUIException.h YWidget.cc
by sh-sh-sh＠svn.opensuse.org 31 May '07

31 May '07

Author: sh-sh-sh Date: Thu May 31 15:13:34 2007 New Revision: 38222 URL: http://svn.opensuse.org/viewcvs/yast?rev=38222&view=rev Log: property exception handling Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Thu May 31 15:13:34 2007 @@ -18,7 +18,7 @@ /-*/ #include "YProperty.h" - +#include "YUIException.h" #if 0 @@ -52,23 +52,42 @@ } -YPropertySet::SearchResult -YPropertySet::lookup( const std::string & propertyName ) const +void +YPropertySet::check( const std::string & propertyName ) const +{ + if ( ! contains( propertyName ) ) + YUI_THROW( YUIUnknownPropertyException( propertyName ) ); +} + + +void +YPropertySet::check( const std::string & propertyName, YPropertyType type ) const +{ + if ( ! contains( propertyName ) ) + YUI_THROW( YUIUnknownPropertyException( propertyName ) ); + + // YPropertySet::contains( const std::string &, YPropertyType ) will throw + // a YUIPropertyTypeMismatchException, if applicable +} + + +bool +YPropertySet::contains( const std::string & propertyName ) const throw() { for ( std::vector<YProperty>::const_iterator it = _properties.begin(); it != _properties.end(); ++it ) { if ( it->name() == propertyName ) - return Found; + return true; } - return NotFound; + return false; } -YPropertySet::SearchResult -YPropertySet::lookup( const std::string & propertyName, YPropertyType type ) const +bool +YPropertySet::contains( const std::string & propertyName, YPropertyType type ) const { for ( std::vector<YProperty>::const_iterator it = _properties.begin(); it != _properties.end(); @@ -76,14 +95,17 @@ { if ( it->name() == propertyName ) { + if ( it->isReadOnly() ) + YUI_THROW( YUISetReadOnlyPropertyException( *it ) ); + if ( it->type() == type ) - return Found; + return true; else - return TypeMismatch; + YUI_THROW( YUIPropertyTypeMismatchException( *it, type ) ); } } - return NotFound; + return false; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Thu May 31 15:13:34 2007 @@ -47,11 +47,13 @@ { public: /** - * Constructor: Create a property with the specified name. + * Constructor: Create a property with the specified name and type. + * 'isReadOnly' is for properties that cannot be set, only retrieved. **/ - YProperty( const std::string & name, YPropertyType type ) + YProperty( const std::string & name, YPropertyType type, bool isReadOnly = false ) : _name( name ) , _type( type ) + , _isReadOnly( isReadOnly ) {} /** @@ -65,6 +67,11 @@ YPropertyType type() const { return _type; } /** + * Returns 'true' if this property cannot be changed, only retrieved. + **/ + bool isReadOnly() const { return _isReadOnly; } + + /** * Returns the type of this property as string. **/ std::string typeAsStr() const { return YProperty::typeAsStr( _type ); } @@ -73,11 +80,12 @@ * Returns a string description of a property type. **/ static std::string typeAsStr( YPropertyType type ); - + private: std::string _name; YPropertyType _type; + bool _isReadOnly; }; @@ -149,30 +157,60 @@ **/ YPropertySet(); - enum SearchResult - { - NotFound = 0, // = 0 for use like: if ( ! propSet.lookup( "Label" ) ) ... - Found, - TypeMismatch // Found, but wrong type - }; + /** + * Check if a property 'propertyName' exists in this property set. + * Throw a YUIUnknownPropertyException if it does not exist. + * Use YPropertySet::contains() for a check that simply returns 'false' + * if it does not exist. + **/ + void check( const std::string & propertyName ) const; + + /** + * Check if a property 'propertyName' exists in this property set. + * Throw a YUIUnknownPropertyException if it does not exist. + * + * If there is a property with that name, check also the expected type + * against 'type'. If the types don't match, throw a + * YUIPropertyTypeMismatchException. + * If the property is read-only, throw a YUISetReadOnlyPropertyException. + **/ + void check( const std::string & propertyName, YPropertyType type ) const; + + /** + * Same as above, overloaded for convenience. + **/ + void check( const YProperty & prop ) const + { check( prop.name(), prop.type() ); } /** - * Look up a property with 'propertyName' in this property set. + * Check if a property 'propertyName' exists in this property set. + * Returns 'true' if it exists, 'false' if not. + * + * Use YPropertySet::check() for a check that throws exceptions if + * there is no such property. **/ - SearchResult lookup( const std::string & propertyName ) const; + bool contains( const std::string & propertyName ) const throw(); /** - * Look up a property with 'propertyName' in this property set. - * If it contains a property with that name, check also the expected - * type against 'type'. + * Check if a property 'propertyName' exists in this property set. + * Returns 'true' if it exists, 'false' if not. + * + * If there is a property with that name, check also the expected type + * against 'type'. If the types don't match, throw a + * YUIPropertyTypeMismatchException. + * + * If the property is read-only, throw a YUISetReadOnlyPropertyException. + * + * Use YPropertySet::check() for a check that throws exceptions if + * there is no such property. **/ - SearchResult lookup( const std::string & propertyName, YPropertyType type ) const; + bool contains( const std::string & propertyName, YPropertyType type ) const; /** * Same as above, overloaded for convenience. **/ - SearchResult lookup( const YProperty & prop ) const - { return lookup( prop.name(), prop.type() ); } + bool contains( const YProperty & prop ) const + { return contains( prop.name(), prop.type() ); } /** * Returns 'true' if this property set does not contain anything. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Thu May 31 15:13:34 2007 @@ -95,14 +95,13 @@ void YRadioButton::setProperty( const std::string & propertyName, const YPropertyValue & val ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch - if ( result == YPropertySet::Found ) + if ( propertyName == YUIProperty_Value ) setValue( val.boolVal() ); + else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); + else { - if ( propertyName == YUIProperty_Value ) setValue( val.boolVal() ); - else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); - else - YWidget::setProperty( propertyName, val ); + YWidget::setProperty( propertyName, val ); } } @@ -110,14 +109,13 @@ YPropertyValue YRadioButton::getProperty( const std::string & propertyName ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName ); + propertySet().check( propertyName ); // throws exceptions if not found - if ( result == YPropertySet::Found ) + if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); + if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); + else { - if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); - if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); - else - return YWidget::getProperty( propertyName ); + return YWidget::getProperty( propertyName ); } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Thu May 31 15:13:34 2007 @@ -156,16 +156,33 @@ ostream & YUIPropertyTypeMismatchException::dumpOn( ostream & str ) const { - const char * widgetClass = widget() ? - widget()->widgetClass() : - "<Unknown Widget Type>"; + std::string widgetClass; + + if ( widget() ) + widgetClass = std::string( widget()->widgetClass() ) + "::"; return str << "Property type mismatch: " << widgetClass - << "::" << property().name() + << property().name() << "is type " << property().typeAsStr() << ", not " - << value().typeAsStr() + << YProperty::typeAsStr( type() ) + << endl; +} + + +ostream & +YUISetReadOnlyPropertyException::dumpOn( ostream & str ) const +{ + std::string widgetClass; + + if ( widget() ) + widgetClass = std::string( widget()->widgetClass() ) + "::"; + + return str << "Property " + << widgetClass + << property().name() + << "is read-only!" << endl; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Thu May 31 15:13:34 2007 @@ -362,10 +362,15 @@ YProperty property() const { return _property; } /** - * Returns the associated widget or 0 if there was none. + * Returns the corresponding widget or 0 if there was none. **/ YWidget * widget() const { return _widget; } + /** + * Set the corresponding widget. + **/ + void setWidget( YWidget * w ) { _widget = w; } + protected: /** @@ -387,7 +392,8 @@ class YUIUnknownPropertyException: public YUIPropertyException { public: - YUIUnknownPropertyException( const std::string & propertyName, YWidget * widget ) + YUIUnknownPropertyException( const std::string & propertyName, + YWidget * widget = 0 ) : YUIPropertyException( YProperty( propertyName, YUnknownPropertyType ), widget ) {} @@ -412,20 +418,20 @@ { public: - YUIPropertyTypeMismatchException( const YProperty & property, - const YPropertyValue & value, - YWidget * widget ) + YUIPropertyTypeMismatchException( const YProperty & property, + YPropertyType type, + YWidget * widget = 0 ) : YUIPropertyException( property, widget ) - , _val( value ) + , _type( type ) {} virtual ~YUIPropertyTypeMismatchException() throw() {} /** - * Return the property value (and type) the application tried to set. + * Return the property type the application tried to set. **/ - YPropertyValue value() const { return _val; } + YPropertyType type() const { return _type; } protected: @@ -436,7 +442,32 @@ virtual ostream & dumpOn( ostream & str ) const; private: - YPropertyValue _val; + YPropertyType _type; +}; + + +/** + * Exception class for attempt to set a read-only property. + **/ +class YUISetReadOnlyPropertyException: public YUIPropertyException +{ +public: + + YUISetReadOnlyPropertyException( const YProperty & property, + YWidget * widget = 0 ) + : YUIPropertyException( property, widget ) + {} + + virtual ~YUISetReadOnlyPropertyException() throw() + {} + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Thu May 31 15:13:34 2007 @@ -33,6 +33,7 @@ #include "YUIComponent.h" #include "YUI.h" #include "YDialog.h" +#include "YUIException.h" using std::string; @@ -156,15 +157,15 @@ YWidget::propertySet() { static YPropertySet propSet; - + if ( propSet.isEmpty() ) { propSet.add( YProperty( YUIProperty_Enabled, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_Notify, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_WindowID, YIntegerProperty) ); - propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty ) ); - propSet.add( YProperty( YUIProperty_DebugLabel, YStringProperty ) ); - propSet.add( YProperty( YUIProperty_DialogDebugLabel, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty, true ) ); // read-only + propSet.add( YProperty( YUIProperty_DebugLabel, YStringProperty, true ) ); // read-only + propSet.add( YProperty( YUIProperty_DialogDebugLabel, YStringProperty, true ) ); // read-only } return propSet; @@ -174,38 +175,41 @@ void YWidget::setProperty( const std::string & propertyName, const YPropertyValue & val ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); - - if ( result == YPropertySet::Found ) + try { - if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); - else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); - else - { - if ( propertyName == YUIProperty_WidgetClass || - propertyName == YUIProperty_DebugLabel || - propertyName == YUIProperty_DialogDebugLabel ) - { - y2error( "Property \"%s\" is read-only", propertyName.c_str() ); - } - } + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch } + catch( YUIPropertyException & exception ) + { + exception.setWidget( this ); + YUI_RETHROW( exception ); + } + + if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); + else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); } YPropertyValue YWidget::getProperty( const std::string & propertyName ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName ); - - if ( result == YPropertySet::Found ) + try { - if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); - if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); - if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); - if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); - if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + propertySet().check( propertyName ); // throws exceptions if not found } + catch( YUIPropertyException & exception ) + { + exception.setWidget( this ); + YUI_RETHROW( exception ); + } + + if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); + if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); + if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); + if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); + if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + + return YPropertyValue( false ); // NOTREACHED } @@ -271,16 +275,16 @@ if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); /** * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) - */ + */ if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); /** * @property string DebugLabel a (possibly translated) text describing this widget for debugging - */ + */ if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); /** * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging - */ - if ( symbol == YUIProperty_DialogDebugLabel ) + */ + if ( symbol == YUIProperty_DialogDebugLabel ) { return YUIComponent::ui()->currentDialog()->queryWidget( property ); } -- 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] r38221 - in /trunk/ncurses/src: NCPkgTable.cc pkg/NCPackageSelector.cc
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 14:25:45 2007 New Revision: 38221 URL: http://svn.opensuse.org/viewcvs/yast?rev=38221&view=rev Log: allow status change of patch packages Modified: trunk/ncurses/src/NCPkgTable.cc trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPkgTable.cc?rev=38… ============================================================================== --- trunk/ncurses/src/NCPkgTable.cc (original) +++ trunk/ncurses/src/NCPkgTable.cc Thu May 31 14:25:45 2007 @@ -316,6 +316,7 @@ switch ( tableType ) { case T_Packages: + case T_PatchPkgs: case T_Update: // check/show dependencies of packages packager->showPackageDependencies( false ); // only check if automatic check is ON 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 Thu May 31 14:25:45 2007 @@ -1484,8 +1484,8 @@ { // set the connection to the NCPackageSelector !!!! patchPkgs->setPackager( this ); - // set status strategy - NCPkgStatusStrategy * strategy = new PatchPkgStatStrategy(); + // set status strategy - don't set extra strategy, use 'normal' package strategy + NCPkgStatusStrategy * strategy = new PackageStatStrategy(); patchPkgs->setTableType( NCPkgTable::T_PatchPkgs, strategy ); patchPkgs->fillHeader( ); -- 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] r38220 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 11:03:25 2007 New Revision: 38220 URL: http://svn.opensuse.org/viewcvs/yast?rev=38220&view=rev Log: Load library libpy2ncurses_pkg as plugin Modified: trunk/ncurses/package/yast2-ncurses.changes 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 Thu May 31 11:03:25 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 31 11:00:22 CEST 2007 - gs(a)suse.de + +- Load library libpy2ncurses_pkg as plugin + +------------------------------------------------------------------- Tue May 29 13:03:07 CEST 2007 - kmachalkova(a)suse.cz - Removed obsolete save/load selection stuff + related NCPkgPopupFile -- 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] r38219 - /tags/stable-2_15_7/samba-client/
by jsuchome＠svn.opensuse.org 31 May '07

31 May '07

Author: jsuchome Date: Thu May 31 10:33:57 2007 New Revision: 38219 URL: http://svn.opensuse.org/viewcvs/yast?rev=38219&view=rev Log: Created tag stable-2_15_7 for samba-client Added: tags/stable-2_15_7/samba-client/ - copied from r38218, trunk/samba-client/ -- 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] r38218 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/SambaNmbLookup.pm src/dialogs.ycp src/helps.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 31 May '07

31 May '07

Author: jsuchome Date: Thu May 31 10:32:55 2007 New Revision: 38218 URL: http://svn.opensuse.org/viewcvs/yast?rev=38218&view=rev Log: - added help text for DHCP support (F120090) - removed Browse button (#240045) - 2.15.7 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaNmbLookup.pm trunk/samba-client/src/dialogs.ycp trunk/samba-client/src/helps.ycp trunk/samba-client/src/routines.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=38218&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Thu May 31 10:32:55 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Thu May 31 10:32:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 09:27:44 CEST 2007 - jsuchome(a)suse.cz + +- added help text for DHCP support (F120090) +- removed Browse button (#240045) +- 2.15.7 + +------------------------------------------------------------------- Thu May 17 13:44:22 CEST 2007 - jsuchome(a)suse.cz - fix deleting shares from smb.conf (#264834) Modified: trunk/samba-client/src/SambaNmbLookup.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNmbLookup.… ============================================================================== --- trunk/samba-client/src/SambaNmbLookup.pm (original) +++ trunk/samba-client/src/SambaNmbLookup.pm Thu May 31 10:32:55 2007 @@ -207,29 +207,4 @@ return FALSE; } -# Return a list of workgroups and domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableNeighbours}=["function",["list", "string"], "string"]} -sub GetAvailableNeighbours { - my ($self, $domain_suffix) = @_; - $domain_suffix = "" unless $domain_suffix; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ map {$_ . ($self->IsDomain($_)?$domain_suffix:"")} sort keys %Nmbstatus_output ]; -} - -# Return a list of domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableDomains}=["function",["list", "string"]]} -sub GetAvailableDomains { - my ($self) = @_; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ grep {$self->IsDomain($_)} sort keys %Nmbstatus_output ]; -} - 8; Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Thu May 31 10:32:55 2007 @@ -45,7 +45,9 @@ boolean dhcp_support = Samba::GetDHCP (); // help text, do not translate 'winbind uid', 'winbind gid' - string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values)."); + string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).") + + + DHCPSupportHelp (); UI::OpenDialog (`opt (`decorated), `HBox ( `HWeight (1, `RichText (`id (`help), help_text)), @@ -213,12 +215,7 @@ `TextEntry(`id(`workgroup), (Stage::cont() ? _("&Domain") : // translators: text entry label - _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()), - `VBox ( - `Label(""), - // translators: push button label - `PushButton(`id(`browse), _("Br&owse...")) - ) + _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()) ), status_term, winbind_term, @@ -267,9 +264,6 @@ Wizard::HideBackButton(); check_domain_membership (Samba::GetWorkgroupOrRealm()); } - if (Mode::config ()) { - UI::ChangeWidget (`id(`browse), `Enabled, false); - } any ret = nil; while(true) { @@ -436,15 +430,6 @@ ")); } break; - } else if (ret == `browse) { - - string new_workgroup = BrowseNeighbours( Stage::cont() ); - if( new_workgroup != nil && new_workgroup != "" ) { - // fill in the new workgroup name - UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup ); - check_domain_membership (new_workgroup); - } - continue; } else if (ret == `back ) { break; } Modified: trunk/samba-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/helps.ycp?rev=3… ============================================================================== --- trunk/samba-client/src/helps.ycp (original) +++ trunk/samba-client/src/helps.ycp Thu May 31 10:32:55 2007 @@ -42,9 +42,7 @@ "MembershipDialog_nocont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba workgroup dialog help 1/3 */ + _("A Linux client can be a member of a workgroup, NT domain, or Active Directory domain. -Here, specify the name of the membership. Browse -presents the list of all workgroups and domains found in the -network. +Here, specify the name of the membership. ") + /* Samba role dialog help 2/3 */ @@ -60,8 +58,7 @@ /* translators: Samba membership dialog help title (installation) */ "MembershipDialog_cont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba membership dialog help 1/2 (installation) */ -+ _("Specify the name of the NT or Active Directory domain. Browse -presents the list of all domains found in the network. ++ _("Specify the name of the NT or Active Directory domain. ") /* translators: Samba membership dialog help 2/2 (installation) */ + _("When you press Next, the system verifies the domain and Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?re… ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Thu May 31 10:32:55 2007 @@ -168,57 +168,8 @@ if (!res) { return `nojoin; } - return JoinDomain(workgroup); } - - -/** - * Show a selection popup to select a workgroup from the ones existing on LAN. - * - * @return string chosen workgroup or nil if cancelled - */ -define string BrowseNeighbours(boolean domains_only) ``{ - list<string> groups = nil; - - UI::OpenDialog ( - // popup window - `Label (_("Looking for available workgroups and domains..."))); - - UI::BusyCursor (); - - if (domains_only) { - groups = SambaNmbLookup::GetAvailableDomains(); - } else { - groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)")); - } - - UI::CloseDialog (); - if( groups == nil ) return nil; - groups = filter (string group, groups, ``(size (group) > 0)); - - // let the user choose a workgroup - UI::OpenDialog( `VBox( - `HSpacing (36), - // translators: selection box label - `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups), - `HBox( - `PushButton( `id(`ok), Label::OKButton() ), - `PushButton( `id(`cancel), Label::CancelButton() ) - ) - ) ); - - any ret = UI::UserInput(); - string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem ); - // textentry constant (automatically added to some kind of values) - if ( sel != nil && issubstring (sel, _(" (Domain)") ) ) - { - integer pos = search (sel, _(" (Domain)") ); - sel = (pos == nil) ? sel : substring (sel, 0, pos); - } - UI::CloseDialog(); - return ret == `ok ? sel : nil; -} /** @@ -281,6 +232,15 @@ } /** + * return the help text for DHCP support + */ +define string DHCPSupportHelp () { + + // help text ("Retrieve WINS server via DHCP" is a checkbox label) + return _("Check Retrieve WINS server via DHCP to use a WINS server provided by DHCP."); +} + +/** * return the term with shares settings * @param settings map with parameters to show in term */ -- 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] r38217 - /trunk/ncurses/src/NCPackageSelectorPlugin.h
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 10:29:03 2007 New Revision: 38217 URL: http://svn.opensuse.org/viewcvs/yast?rev=38217&view=rev Log: comment corrected Modified: trunk/ncurses/src/NCPackageSelectorPlugin.h Modified: trunk/ncurses/src/NCPackageSelectorPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.h (original) +++ trunk/ncurses/src/NCPackageSelectorPlugin.h Thu May 31 10:29:03 2007 @@ -35,7 +35,7 @@ public: /** - * Constructor: Load the plugin library for the Qt package selector. + * Constructor: Load the plugin library for the NCurses package selector. **/ NCPackageSelectorPlugin(); -- 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] r38216 - /trunk/ncurses/src/pkg/Makefile.am
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 10:27:28 2007 New Revision: 38216 URL: http://svn.opensuse.org/viewcvs/yast?rev=38216&view=rev Log: remove $(wildcard *.h) Modified: trunk/ncurses/src/pkg/Makefile.am Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=… ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Thu May 31 10:27:28 2007 @@ -17,7 +17,7 @@ -L$(libdir) -lyui \ ${ZYPP_LIBS} -noinst_HEADERS = $(wildcard *.h) \ +noinst_HEADERS = \ NCPackageSelector.h \ NCPkgSelMapper.h \ NCPkgStatusStrategy.h \ @@ -31,7 +31,7 @@ NCPkgNames.h \ NCZypp.h -libpy2ncurses_pkg_la_SOURCES = \ +libpy2ncurses_pkg_la_SOURCES = \ NCPackageSelector.cc \ NCPkgSelMapper.cc \ NCPkgStatusStrategy.cc \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0