June 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39051 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: sh-sh-sh Date: Wed Jun 27 12:31:52 2007 New Revision: 39051 URL: http://svn.opensuse.org/viewcvs/yast?rev=39051&view=rev Log: ported RichText 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/YRichText.cc branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQRichText.cc branches/tmp/sh/mod-ui/qt/src/YQRichText.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 branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h 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 Wed Jun 27 12:31:52 2007 @@ -246,3 +246,23 @@ - no longer just boolean values, now using YCheckBoxState enum: _on, _off, _dont_care - YCheckBox constructor doesn't accept an initiallyChecked value any more (but derived classes should so the widgetFactory can pass it on easily) + + +2007-06-21 12:30 sh(a)suse.de + +* YRichText: + + virtual setText() -> virtual setValue() + virtual getText() -> virtual value() + + setText() is still there, but no longer virtual - implement setValue() instead! + + new (instead of YWidgetOpt() ): + + - bool plainTextMode() const; + - virtual void setPlainTextMode( bool on = true ); + - bool autoScrollDown() const; + - virtual void setAutoScrollDown( bool on = true ); + - bool shrinkable() const; + - void setShrinkable( bool shrinkable = true ); + 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 Wed Jun 27 12:31:52 2007 @@ -56,6 +56,7 @@ #include "YRadioButton.h" #include "YRadioButtonGroup.h" #include "YReplacePoint.h" +#include "YRichText.h" #include "YSelectionBox.h" #include "YSpacing.h" #include "YSquash.h" @@ -1050,21 +1051,31 @@ return 0; } + string text = term->value( argnr )->asString()->value(); + bool plainTextMode = false; + bool autoScrollDown = false; + bool shrinkable = false; + for ( int o=0; o < optList->size(); o++ ) { if ( optList->value(o)->isSymbol() ) { string sym = optList->value(o)->asSymbol()->symbol(); - if ( sym == YUIOpt_plainText ) opt.plainTextMode.setValue( true ); - else if ( sym == YUIOpt_autoScrollDown ) opt.autoScrollDown.setValue( true ); - else if ( sym == YUIOpt_shrinkable ) opt.isShrinkable.setValue( true ); + if ( sym == YUIOpt_plainText ) plainTextMode = true; + else if ( sym == YUIOpt_autoScrollDown ) autoScrollDown = true; + else if ( sym == YUIOpt_shrinkable ) shrinkable = true; else logUnknownOption( term, optList->value(o) ); } else logUnknownOption( term, optList->value(o) ); } - return YUI::ui()->createRichText( parent, opt, term->value( argnr )->asString() ); + YRichText * richText = YUI::widgetFactory()->createRichText( parent, text, plainTextMode ); + + if ( autoScrollDown ) richText->setAutoScrollDown( true ); + if ( shrinkable ) richText->setShrinkable( true ); + + return richText; } @@ -1420,11 +1431,16 @@ string label = term->value( argnr )->asString()->value(); bool checked = false; - + if ( size == 2 ) checked = term->value( argnr+1 )->asBoolean()->value(); - return YUI::widgetFactory()->createCheckBox( parent, label, checked ); + YCheckBox * checkBox = YUI::widgetFactory()->createCheckBox( parent, label, checked ); + + if ( opt.boldFont.value() ) + checkBox->setUseBoldFont(); + + return checkBox; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc Wed Jun 27 12:31:52 2007 @@ -17,8 +17,6 @@ /-*/ -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> #define y2log_component "ui" #include <ycp/y2log.h> @@ -26,62 +24,138 @@ #include "YRichText.h" -YRichText::YRichText( const YWidgetOpt & opt, YCPString text ) - : YWidget( opt ) - , text( text ) - , autoScrollDown( false ) +struct YRichTextPrivate { - // Derived classes need to check opt.plainTextMode and opt.shrinkable! + /** + * Constructor. + **/ + YRichTextPrivate( const string & text, bool plainTextMode ) + : text( text ) + , plainTextMode( plainTextMode ) + , autoScrollDown ( false ) + , shrinkable( false ) + {} + + string text; + bool plainTextMode; + bool autoScrollDown; + bool shrinkable; +}; + + + - if ( opt.autoScrollDown.value() ) - autoScrollDown = true; +YRichText::YRichText( YWidget * parent, const string & text, bool plainTextMode ) + : YWidget( parent ) + , priv( new YRichTextPrivate( text, plainTextMode ) ) +{ + YUI_CHECK_NEW( priv ); setDefaultStretchable( YD_HORIZ, true ); setDefaultStretchable( YD_VERT, true ); } -YCPValue YRichText::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +YRichText::~YRichText() { - string s = property->symbol(); - /* - * @property string Value the RichText's text contents - */ - if ( s == YUIProperty_Value ) - { - if ( newvalue->isString() ) - { - setText( newvalue->asString() ); - return YCPBoolean( true ); - } - else - { - y2error( "RichText: Invalid parameter %s for Value property. Must be string", - newvalue->toString().c_str() ); - return YCPBoolean( false ); - } - } - else return YWidget::changeWidget( property, newvalue ); + // NOP } +void YRichText::setValue( const string & newValue ) +{ + priv->text = newValue; +} + -YCPValue YRichText::queryWidget( const YCPSymbol & property ) +string YRichText::value() const { - string s = property->symbol(); - if ( s == YUIProperty_Value ) return getText(); - else return YWidget::queryWidget( property ); + return priv->text; } -void YRichText::setText( const YCPString & RichText ) +bool YRichText::plainTextMode() const { - text = RichText; + return priv->plainTextMode; } -YCPString YRichText::getText() +void YRichText::setPlainTextMode( bool plainTextMode ) { - return text; + priv->plainTextMode = plainTextMode; +} + + +bool YRichText::autoScrollDown() const +{ + return priv->autoScrollDown; +} + + +void YRichText::setAutoScrollDown( bool autoScrollDown ) +{ + priv->autoScrollDown = autoScrollDown; +} + + +bool YRichText::shrinkable() const +{ + return priv->shrinkable; +} + + +void YRichText::setShrinkable( bool shrinkable ) +{ + priv->shrinkable = shrinkable; +} + + +const YPropertySet & +YRichText::propertySet() +{ + static YPropertySet propSet; + + if ( propSet.isEmpty() ) + { + /* + * @property string Value the text content + * @property string Text the text content + */ + propSet.add( YProperty( YUIProperty_Value, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_Text, YStringProperty ) ); + propSet.add( YWidget::propertySet() ); + } + + return propSet; +} + + +bool +YRichText::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.stringVal() ); + if ( propertyName == YUIProperty_Text ) setValue( val.stringVal() ); + else + { + YWidget::setProperty( propertyName, val ); + } + + return true; // success -- no special processing necessary +} + + +YPropertyValue +YRichText::getProperty( const string & propertyName ) +{ + propertySet().check( propertyName ); // throws exceptions if not found + + if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); + else if ( propertyName == YUIProperty_Text ) return YPropertyValue( value() ); + else + { + return YWidget::getProperty( propertyName ); + } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h Wed Jun 27 12:31:52 2007 @@ -19,22 +19,34 @@ #ifndef YRichText_h #define YRichText_h +#include <string> #include "YWidget.h" -#include <ycp/YCPString.h> +#include "ImplPtr.h" + +using std::string; + +class YRichTextPrivate; + -/** - * @short Implementation of the RichText widget. - * Derived classes need to check opt.plainTextMode! - **/ class YRichText : public YWidget { public: + /** - * Constructor - * @param text the initial text of the RichText - * @param opt the widget options + * Constructor. + * + * 'plainTextMode' indicates that the text should be treated as plain text, + * i.e. any HTML-like tags in the text should not be interpreted in any + * way. **/ - YRichText( const YWidgetOpt & opt, YCPString text ); + YRichText( YWidget * parent, + const string & text, + bool plainTextMode = false ); + + /** + * Destructor. + **/ + virtual ~YRichText(); /** * Returns a descriptive name of this widget class for logging, @@ -43,41 +55,105 @@ virtual const char * widgetClass() { return "YRichText"; } /** - * Implements the ui command changeWidget. + * Change the text content of the RichText widget. + * + * Derived classes should overwrite this function, but call this base class + * function in the new function. + **/ + virtual void setValue( const string & newValue ); + + /** + * Return the text content of the RichText widget. **/ - YCPValue changeWidget( const YCPSymbol & property, const YCPValue & newvalue ); + string value() const; /** - * Implements the ui command queryWidget + * Alias for setValue(). **/ - YCPValue queryWidget( const YCPSymbol & property ); + void setText( const string & newText ) { setValue( newText ); } /** - * Change the RichText text. Overload this, but call - * YRichText::setText at the end of your own function. + * Alias for value(). **/ - virtual void setText( const YCPString & RichText ); + string text() const { return value(); } /** - * Get the current RichText text. This method cannot be overidden. The value - * of the RichText cannot be changed other than by calling setRichText, - * i.e. not by the ui. Therefore setRichText stores the current RichText in - * #RichText. + * Return 'true' if this RichText widget is in "plain text" mode, i.e. does + * not try to interpret RichText/HTML tags. **/ - YCPString getText(); + bool plainTextMode() const; + /** + * Set this RichText widget's "plain text" mode on or off. + * + * Derived classes may want to reimplement this, but they should call this + * base class function in the new function. + **/ + virtual void setPlainTextMode( bool on = true ); -protected: /** - * Current text of the RichText + * Return 'true' if this RichText widget should automatically scroll down + * when the text content is changed. This is useful for progress displays + * and log files. **/ - YCPString text; + bool autoScrollDown() const; + /** + * Set this RichText widget's "auto scroll down" mode on or off. + * + * Derived classes may want to reimplement this, but they should call this + * base class function in the new function. + **/ + virtual void setAutoScrollDown( bool on = true ); /** - * Flag: Should the text automatically scroll all the way down upon text change? + * Returns 'true' if this widget is "shrinkable", i.e. it should be very + * small by default. **/ - bool autoScrollDown; + bool shrinkable() const; + + /** + * Make this widget shrinkable, i.e. very small in layouts. + * + * This method is intentionally not virtual because it doesn't have any + * immediate effect; it is only needed in preferredWidth() / + * preferredHeight(). + **/ + void setShrinkable( bool shrinkable = true ); + + /** + * 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). + **/ + virtual bool setProperty( const string & propertyName, + const YPropertyValue & val ); + + /** + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw YUIPropertyExceptions. + **/ + virtual YPropertyValue getProperty( const string & propertyName ); + + /** + * Return this class's property set. + * This also initializes the property upon the first call. + * + * Reimplemented from YWidget. + **/ + virtual const YPropertySet & propertySet(); + + +protected: + + ImplPtr<YRichTextPrivate> 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 Wed Jun 27 12:31:52 2007 @@ -446,7 +446,6 @@ // FIXME: Obsolete public: virtual YDialog *createDialog( YWidgetOpt & opt ) = 0; - virtual YWidget *createRichText( YWidget *parent, YWidgetOpt & opt, const YCPString & text ) = 0; virtual YWidget *createLogView( YWidget *parent, YWidgetOpt & opt, const YCPString & label, int visibleLines, int maxLines ) = 0; virtual YWidget *createMenuButton( YWidget *parent, YWidgetOpt & opt, const YCPString & label ) = 0; virtual YWidget *createMultiLineEdit( YWidget *parent, YWidgetOpt & opt, const YCPString & label, const YCPString & text ) = 0; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Wed Jun 27 12:31:52 2007 @@ -98,7 +98,7 @@ virtual YTree * createTree ( YWidget * parent, const string & label ) = 0; virtual YTable * createTable ( YWidget * parent ) = 0; virtual YProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ) = 0; - virtual YRichText * createRichText ( YWidget * parent ) = 0; + virtual YRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ) = 0; // // Less Common Leaf Widgets Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.cc Wed Jun 27 12:31:52 2007 @@ -28,21 +28,21 @@ #include "YQRichText.h" -YQRichText::YQRichText( QWidget * parent, - const YWidgetOpt & opt, - const YCPString & text ) - : QVBox( parent ) - , YRichText( opt, text ) +YQRichText::YQRichText( YWidget * parent, const string & text, bool plainTextMode ) + : QVBox( (QWidget *) parent->widgetRep() ) + , YRichText( parent, text, plainTextMode ) { setWidgetRep( this ); setMargin( YQWidgetMargin ); _textBrowser = new YQTextBrowser( this ); + YUI_CHECK_NEW( _textBrowser ); + _textBrowser->setMimeSourceFactory( 0 ); _textBrowser->installEventFilter( this ); - if ( opt.plainTextMode.value() ) + if ( plainTextMode ) { _textBrowser->setTextFormat( Qt::PlainText ); _textBrowser->setWordWrap( QTextEdit::NoWrap ); @@ -52,7 +52,7 @@ _textBrowser->setTextFormat( Qt::RichText ); } - setText( text ); + setValue( text ); // Set the text foreground color to black, regardless of its current @@ -70,10 +70,6 @@ _textBrowser->setPaper( QColor( 234, 234, 234 ) ); - // Very small default size if specified - - _shrinkable = opt.isShrinkable.value(); - // Propagate clicks on hyperlinks @@ -82,57 +78,55 @@ } -void YQRichText::setEnabled( bool enabled ) -{ - _textBrowser->setEnabled( enabled ); - YWidget::setEnabled( enabled ); -} - - -int YQRichText::preferredWidth() +YQRichText::~YQRichText() { - return _shrinkable ? 10 : 100; + // NOP } -int YQRichText::preferredHeight() -{ - return _shrinkable ? 10 : 100; -} - - -void YQRichText::setSize( int newWidth, int newHeight ) -{ - resize( newWidth, newHeight ); -} - - -void YQRichText::setText( const YCPString & ytext ) +void YQRichText::setValue( const string & newText ) { if ( _textBrowser->horizontalScrollBar() ) _textBrowser->horizontalScrollBar()->setValue(0); - if ( ! autoScrollDown && _textBrowser->verticalScrollBar() ) + if ( ! autoScrollDown() && _textBrowser->verticalScrollBar() ) _textBrowser->verticalScrollBar()->setValue(0); - QString text = fromUTF8( ytext->value() ); + QString text = fromUTF8( newText ); - if ( _textBrowser->textFormat() != Qt::PlainText ) + if ( ! plainTextMode() ) text.replace( "&product;", YQUI::ui()->productName() ); - YRichText::setText( ytext ); + YRichText::setValue( newText ); _textBrowser->setText( text ); - if ( autoScrollDown && _textBrowser->verticalScrollBar() ) + if ( autoScrollDown() && _textBrowser->verticalScrollBar() ) _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maxValue() ); } -bool YQRichText::setKeyboardFocus() +void YQRichText::setPlainTextMode( bool newPlainTextMode ) { - _textBrowser->setFocus(); + YRichText::setPlainTextMode( newPlainTextMode ); - return true; + if ( plainTextMode() ) + { + _textBrowser->setTextFormat( Qt::PlainText ); + _textBrowser->setWordWrap( QTextEdit::NoWrap ); + } + else + { + _textBrowser->setTextFormat( Qt::RichText ); + } +} + + +void YQRichText::setAutoScrollDown( bool newAutoScrollDown ) +{ + YRichText::setAutoScrollDown( newAutoScrollDown ); + + if ( autoScrollDown() && _textBrowser->verticalScrollBar() ) + _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maxValue() ); } @@ -169,12 +163,45 @@ bool YQRichText::haveHyperLinks() { - if ( _textBrowser->textFormat() == Qt::PlainText ) + if ( plainTextMode() ) return false; return ( _textBrowser->text().contains( QRegExp( "<a\\s+href\\s*=", false ) ) > 0 ); } +int YQRichText::preferredWidth() +{ + return shrinkable() ? 10 : 100; +} + + +int YQRichText::preferredHeight() +{ + return shrinkable() ? 10 : 100; +} + + +void YQRichText::setSize( int newWidth, int newHeight ) +{ + resize( newWidth, newHeight ); +} + + +void YQRichText::setEnabled( bool enabled ) +{ + _textBrowser->setEnabled( enabled ); + YWidget::setEnabled( enabled ); +} + + +bool YQRichText::setKeyboardFocus() +{ + _textBrowser->setFocus(); + + return true; +} + + #include "YQRichText.moc" Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.h Wed Jun 27 12:31:52 2007 @@ -22,10 +22,10 @@ #include <qvbox.h> #include <qtextbrowser.h> -#include <ycp/YCPString.h> - #include "YRichText.h" +using std::string; + class YQTextBrowser; @@ -36,18 +36,39 @@ public: /** - * Constructor + * Constructor. + **/ + YQRichText( YWidget * parent, + const string & text, + bool plainTextMode = false ); + + /** + * Destructor. **/ - YQRichText( QWidget * parent, const YWidgetOpt & opt, const YCPString & text ); + virtual ~YQRichText(); /** - * Inherited from YWidget: Sets the enabled state of the - * widget. All new widgets are enabled per definition. Only - * enabled widgets can take user input. + * Change the text content of the RichText widget. + * + * Reimplemented from YRichText. **/ - void setEnabled( bool enabled ); + virtual void setValue( const string & newValue ); /** + * Set this RichText widget's "plain text" mode on or off. + * + * Reimplemented from YRichText. + **/ + virtual void setPlainTextMode( bool on = true ); + + /** + * Set this RichText widget's "auto scroll down" mode on or off. + * + * Reimplemented from YRichText. + **/ + virtual void setAutoScrollDown( bool on = true ); + + /** * Preferred width of the widget. * * Reimplemented from YWidget. @@ -69,19 +90,25 @@ virtual void setSize( int newWidth, int newHeight ); /** - * Change the RichText text. + * Set enabled/disabled state. + * + * Reimplemented from YWidget. **/ - void setText( const YCPString & RichText ); + virtual void setEnabled( bool enabled ); /** * Accept the keyboard focus. + * + * Reimplemented from YWidget. **/ virtual bool setKeyboardFocus(); /** - * Event filter - inherited from QWidget + * Event filter. + * + * Reimplemented from QWidget. **/ - bool eventFilter( QObject * obj, QEvent * ev ); + virtual bool eventFilter( QObject * obj, QEvent * ev ); /** * Returns 'true' if the current text of this RichText widget contains @@ -105,7 +132,6 @@ // YQTextBrowser * _textBrowser; - bool _shrinkable; }; 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 Wed Jun 27 12:31:52 2007 @@ -453,7 +453,6 @@ YWidget * createProgressBar ( YWidget * parent, YWidgetOpt & opt, const YCPString & label, const YCPInteger & maxProgress, const YCPInteger & currentProgress ); YWidget * createPackageSelector ( YWidget * parent, YWidgetOpt & opt, const YCPString & floppyDevice ); YWidget * createMenuButton ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); - YWidget * createRichText ( YWidget * parent, YWidgetOpt & opt, const YCPString & text); YWidget * createSelectionBox ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); YWidget * createMultiSelectionBox ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); YWidget * createTable ( YWidget * parent, YWidgetOpt & opt, vector<string> header); 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 Wed Jun 27 12:31:52 2007 @@ -41,13 +41,9 @@ #include "YQPatternSelector.h" #include "YQSimplePatchSelector.h" #include "YQProgressBar.h" -#include "YQRichText.h" #include "YQSelectionBox.h" #include "YQSlider.h" -#include "YQSpacing.h" -#include "YQSquash.h" #include "YQTable.h" -#include "YQInputField.h" #include "YQTime.h" #include "YQTree.h" #include "YQWizard.h" @@ -92,13 +88,6 @@ return new YQLogView( (QWidget *) ( parent->widgetRep() ), opt, label, visibleLines, maxLines); } -YWidget * YQUI::createRichText ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & text ) -{ - return new YQRichText( (QWidget *) ( parent->widgetRep() ), opt, text); -} - YQPackageSelectorPlugin * YQUI::packageSelectorPlugin() { 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 Wed Jun 27 12:31:52 2007 @@ -186,9 +186,12 @@ YQRichText * -YQWidgetFactory::createRichText( YWidget * parent ) +YQWidgetFactory::createRichText( YWidget * parent, const string & text, bool plainTextMode ) { - return 0; // FIXME: TO DO + YQRichText * richText = new YQRichText( parent, text, plainTextMode ); + YUI_CHECK_NEW( richText ); + + return richText; } Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Wed Jun 27 12:31:52 2007 @@ -92,7 +92,7 @@ virtual YQTree * createTree ( YWidget * parent, const string & label ); virtual YQTable * createTable ( YWidget * parent ); virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); - virtual YQRichText * createRichText ( YWidget * parent ); + virtual YQRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ); // // Less Common Leaf Widgets -- 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] r39050 - /branches/tmp/mvidner/ui-as-namespace/core/
by mvidner＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: mvidner Date: Wed Jun 27 12:08:03 2007 New Revision: 39050 URL: http://svn.opensuse.org/viewcvs/yast?rev=39050&view=rev Log: branching core, mainly libyui and liby2 Added: branches/tmp/mvidner/ui-as-namespace/core/ - copied from r39049, trunk/core/ -- 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] r39049 - /branches/tmp/mvidner/ui-as-namespace/ncurses/
by mvidner＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: mvidner Date: Wed Jun 27 12:07:36 2007 New Revision: 39049 URL: http://svn.opensuse.org/viewcvs/yast?rev=39049&view=rev Log: branching a UI Added: branches/tmp/mvidner/ui-as-namespace/ncurses/ - copied from r39048, trunk/ncurses/ -- 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] r39048 - /branches/tmp/mvidner/ui-as-namespace/qt/
by mvidner＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: mvidner Date: Wed Jun 27 12:07:17 2007 New Revision: 39048 URL: http://svn.opensuse.org/viewcvs/yast?rev=39048&view=rev Log: branching a UI Added: branches/tmp/mvidner/ui-as-namespace/qt/ - copied from r39047, trunk/qt/ -- 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] r39047 - /branches/tmp/mvidner/ui-as-namespace/gtk/
by mvidner＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: mvidner Date: Wed Jun 27 12:05:38 2007 New Revision: 39047 URL: http://svn.opensuse.org/viewcvs/yast?rev=39047&view=rev Log: branching a UI Added: branches/tmp/mvidner/ui-as-namespace/gtk/ - copied from r39046, trunk/gtk/ -- 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] r39046 - /branches/tmp/mvidner/ui-as-namespace/
by mvidner＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: mvidner Date: Wed Jun 27 12:02:28 2007 New Revision: 39046 URL: http://svn.opensuse.org/viewcvs/yast?rev=39046&view=rev Log: Making UI a regular namespace so that it is callable from other YaST languages than YCP. Porting Stano's work from http://svn.opensuse.org/svn/yast/branches/tmp/visnov/{core,qt}-standalone-ui See also http://idea.opensuse.org/content/ideas/making-the-yast2-ui-usable-without-a… Added: branches/tmp/mvidner/ui-as-namespace/ -- 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] r39045 - /tags/stable-2_15_17/storage/
by fehr＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: fehr Date: Wed Jun 27 11:36:38 2007 New Revision: 39045 URL: http://svn.opensuse.org/viewcvs/yast?rev=39045&view=rev Log: Created tag stable-2_15_17 for storage Added: tags/stable-2_15_17/storage/ - copied from r39044, trunk/storage/ -- 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] r39044 - /tags/stable-2_15_17/storage/
by fehr＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: fehr Date: Wed Jun 27 11:36:32 2007 New Revision: 39044 URL: http://svn.opensuse.org/viewcvs/yast?rev=39044&view=rev Log: update Removed: tags/stable-2_15_17/storage/ -- 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] r39043 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: fehr Date: Wed Jun 27 11:36:01 2007 New Revision: 39043 URL: http://svn.opensuse.org/viewcvs/yast?rev=39043&view=rev Log: prevent win mount points on hotplug devices (#287252) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp 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 Wed Jun 27 11:36:01 2007 @@ -2,6 +2,8 @@ Tue Jun 26 10:57:56 CEST 2007 - fehr(a)suse.de - add windows default mount points also in VM proposal (#262417) +- prevent win mount points on hotplug devices (#287252) +- version 2.15.17 ------------------------------------------------------------------- Mon Jun 25 17:41:27 CEST 2007 - fehr(a)suse.de @@ -9,7 +11,6 @@ - fixed problem mounting filesystem in inst-sys (#286686) - prevent direct or indirect change of partitions used for swap or as install source during installation (#274321,#262417) -- version 2.15.17 ------------------------------------------------------------------- Mon Jun 18 12:48:04 CEST 2007 - fehr(a)suse.de Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jun 27 11:36:01 2007 @@ -3228,13 +3228,15 @@ foreach(string disk, map data, targets, ``{ - if( data["used_by_type"]:`UB_NONE == `UB_NONE ) + if( !data["hotpluggable"]:false && + data["used_by_type"]:`UB_NONE == `UB_NONE ) AddMountPointsForWinParts( data["partitions"]:[], true, data["max_primary"]:4, foreign_nr ); }); foreach(string disk, map data, targets, ``{ - if( data["used_by_type"]:`UB_NONE == `UB_NONE ) + if( !data["hotpluggable"]:false && + data["used_by_type"]:`UB_NONE == `UB_NONE ) AddMountPointsForWinParts( data["partitions"]:[], false, data["max_primary"]:4, foreign_nr ); }); -- 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] r39042 - /branches/tmp/sh/mod-ui/qt/src/
by sh-sh-sh＠svn.opensuse.org 27 Jun '07

27 Jun '07

Author: sh-sh-sh Date: Wed Jun 27 11:24:49 2007 New Revision: 39042 URL: http://svn.opensuse.org/viewcvs/yast?rev=39042&view=rev Log: removed superfluous setFont() calls Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc branches/tmp/sh/mod-ui/qt/src/YQDate.cc branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc branches/tmp/sh/mod-ui/qt/src/YQFrame.cc branches/tmp/sh/mod-ui/qt/src/YQInputField.cc branches/tmp/sh/mod-ui/qt/src/YQIntField.cc branches/tmp/sh/mod-ui/qt/src/YQLogView.cc branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc branches/tmp/sh/mod-ui/qt/src/YQPushButton.cc branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc branches/tmp/sh/mod-ui/qt/src/YQRichText.cc branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQSlider.cc branches/tmp/sh/mod-ui/qt/src/YQTable.cc branches/tmp/sh/mod-ui/qt/src/YQTime.cc branches/tmp/sh/mod-ui/qt/src/YQTree.cc branches/tmp/sh/mod-ui/qt/src/YQUI_x11.cc branches/tmp/sh/mod-ui/qt/src/YQWizard.cc branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc Wed Jun 27 11:24:49 2007 @@ -31,7 +31,6 @@ { setWidgetRep( this ); _barGraph = new QY2BarGraph( this ); - _barGraph->setFont( YQUI::ui()->currentFont() ); _barGraph->move( YQWidgetMargin, YQWidgetMargin ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc Wed Jun 27 11:24:49 2007 @@ -40,7 +40,6 @@ setWidgetRep ( this ); QGroupBox::setTitle( fromUTF8( label ) ); QGroupBox::setCheckable( true ); - setFont( YQUI::ui()->currentFont() ); preventQGroupBoxAutoEnablement(); setValue( checked ); Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc Wed Jun 27 11:24:49 2007 @@ -47,14 +47,11 @@ _qt_label = new QLabel( fromUTF8(label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( _qt_label->text().isEmpty() ) _qt_label->hide(); _qt_combo_box = new QComboBox( opt.isEditable.value(), this ); - _qt_combo_box->setFont( YQUI::ui()->currentFont() ); - _qt_label->setBuddy( _qt_combo_box ); #if SEND_SELECTION_CHANGED_EVENT Modified: branches/tmp/sh/mod-ui/qt/src/YQDate.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDate.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDate.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDate.cc Wed Jun 27 11:24:49 2007 @@ -39,7 +39,6 @@ _qt_label = new QLabel( fromUTF8(label->value()), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); Modified: branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDownlo… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc Wed Jun 27 11:24:49 2007 @@ -41,10 +41,8 @@ _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_progress = new QProgressBar( this ); - _qt_progress->setFont( YQUI::ui()->currentFont() ); _qt_progress->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); _qt_progress->setTotalSteps( expectedSize ); Modified: branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDumbTa… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc Wed Jun 27 11:24:49 2007 @@ -36,7 +36,6 @@ , YDumbTab( opt ) { setWidgetRep( this ); - setFont( YQUI::ui()->currentFont() ); addVSpacing( this, 4 ); _doingResize = false; @@ -47,7 +46,6 @@ _tabBar = new QTabBar( this ); CHECK_PTR( _tabBar ); - _tabBar->setFont( YQUI::ui()->currentFont() ); _tabBar->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); // hor/vert setFocusProxy( _tabBar ); setFocusPolicy( TabFocus ); Modified: branches/tmp/sh/mod-ui/qt/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQFrame.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQFrame.cc Wed Jun 27 11:24:49 2007 @@ -34,7 +34,6 @@ { setWidgetRep ( this ); QGroupBox::setTitle( fromUTF8( label() ) ); - setFont( YQUI::ui()->currentFont() ); } 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 Wed Jun 27 11:24:49 2007 @@ -59,13 +59,11 @@ _qt_label = new QLabel( fromUTF8( label ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label.empty() ) _qt_label->hide(); _qt_lineEdit = new YQRawLineEdit( this ); - _qt_lineEdit->setFont( YQUI::ui()->currentFont() ); _qt_label->setBuddy( _qt_lineEdit ); @@ -228,7 +226,6 @@ // Simply leave it. _qt_label->setText( _( "CapsLock!" ) ); - _qt_label->setFont( YQUI::ui()->boldFont() ); _displayingCapsLockWarning = true; } @@ -243,7 +240,6 @@ return; _qt_label->setText( fromUTF8( label() ) ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _displayingCapsLockWarning = false; } Modified: branches/tmp/sh/mod-ui/qt/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQIntFie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQIntField.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQIntField.cc Wed Jun 27 11:24:49 2007 @@ -42,14 +42,12 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_label->setAlignment( Qt::AlignLeft ); _qt_spinbox = new QSpinBox( minValue, maxValue, 1, // step this ); _qt_spinbox->setValue( initialValue ); - _qt_spinbox->setFont( YQUI::ui()->currentFont() ); _qt_label->setBuddy( _qt_spinbox ); Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.cc Wed Jun 27 11:24:49 2007 @@ -45,13 +45,11 @@ _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); _qt_text = new QMultiLineEdit( this ); - _qt_text->setFont( YQUI::ui()->currentFont() ); _qt_text->setReadOnly( true ); _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); Modified: branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMenuBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc Wed Jun 27 11:24:49 2007 @@ -44,7 +44,6 @@ { setWidgetRep( this ); _qt_pushbutton = new QPushButton( fromUTF8( label->value() ), this ); - _qt_pushbutton->setFont( YQUI::ui()->currentFont() ); _qt_pushbutton->setMinimumSize( 2,2 ); _qt_pushbutton->move( YQButtonBorder, YQButtonBorder ); setMinimumSize( _qt_pushbutton->minimumSize() Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiL… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc Wed Jun 27 11:24:49 2007 @@ -48,14 +48,12 @@ { _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); } else _qt_label = 0; _qt_textedit = new QTextEdit( this ); _qt_textedit->setTextFormat( Qt::PlainText ); - _qt_textedit->setFont( YQUI::ui()->currentFont() ); _qt_textedit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _qt_textedit->setText( fromUTF8( initialText->value() ) ); Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Wed Jun 27 11:24:49 2007 @@ -48,7 +48,6 @@ _qt_label = new QLabel( fromUTF8(label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_listview = new QListView( this ); _qt_listview->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); Modified: branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPartit… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc Wed Jun 27 11:24:49 2007 @@ -79,7 +79,6 @@ _qt_freeFieldLabel = new QLabel( fromUTF8( freeFieldLabel()->value() ), _labels_hbox ); _qt_freeFieldLabel->setTextFormat( QLabel::PlainText ); - _qt_freeFieldLabel->setFont( YQUI::ui()->currentFont() ); _qt_freeFieldLabel->setAlignment( Qt::AlignLeft ); @@ -88,7 +87,6 @@ _qt_newPartFieldLabel = new QLabel( fromUTF8( newPartFieldLabel()->value() ), _labels_hbox ); _qt_newPartFieldLabel->setTextFormat( QLabel::PlainText ); - _qt_newPartFieldLabel->setFont( YQUI::ui()->currentFont() ); _qt_newPartFieldLabel->setAlignment( Qt::AlignRight ); @@ -103,7 +101,6 @@ _qt_freeSizeField = new QSpinBox( minFreeSize(), maxFreeSize(), 1, // step _fields_hbox ); - _qt_freeSizeField->setFont( YQUI::ui()->currentFont() ); _qt_freeFieldLabel->setBuddy( _qt_freeSizeField ); @@ -113,7 +110,6 @@ 1, // pageStep remainingFreeSize(), // initial value QSlider::Horizontal, _fields_hbox ); - _qt_freeSizeSlider->setFont( YQUI::ui()->currentFont() ); // SpinBox for the new partition size @@ -121,7 +117,6 @@ _qt_newPartSizeField = new QSpinBox( minNewPartSize(), maxNewPartSize(), 1, // step _fields_hbox ); - _qt_newPartSizeField->setFont( YQUI::ui()->currentFont() ); _qt_newPartFieldLabel->setBuddy( _qt_newPartSizeField ); // Initialize all fields and the bar graph 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 Wed Jun 27 11:24:49 2007 @@ -46,13 +46,11 @@ _qt_label = new QLabel( fromUTF8(label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); _qt_progressbar = new QProgressBar( this ); - _qt_progressbar->setFont( YQUI::ui()->currentFont() ); _qt_progressbar->setTotalSteps( MAX_PROGRESS ); _qt_label->setBuddy( _qt_progressbar ); Modified: branches/tmp/sh/mod-ui/qt/src/YQPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPushBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPushButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPushButton.cc Wed Jun 27 11:24:49 2007 @@ -39,7 +39,6 @@ setQPushButton( button ); - button->setFont( YQUI::ui()->currentFont() ); button->setMinimumSize( 2, 2 ); button->move( YQButtonBorder, YQButtonBorder ); setMinimumSize( button->minimumSize() Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc Wed Jun 27 11:24:49 2007 @@ -51,6 +51,7 @@ QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); _qt_radioButton = new QRadioButton( fromUTF8( label ), this ); + layout->addSpacing( SPACING ); layout->addWidget( _qt_radioButton ); layout->addSpacing( SPACING ); Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.cc Wed Jun 27 11:24:49 2007 @@ -40,7 +40,6 @@ _textBrowser = new YQTextBrowser( this ); _textBrowser->setMimeSourceFactory( 0 ); - _textBrowser->setFont( YQUI::ui()->currentFont() ); _textBrowser->installEventFilter( this ); if ( opt.plainTextMode.value() ) Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc Wed Jun 27 11:24:49 2007 @@ -52,7 +52,6 @@ _qt_label = new QLabel( fromUTF8(label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( _qt_label->text().isEmpty() ) _qt_label->hide(); Modified: branches/tmp/sh/mod-ui/qt/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSlider… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSlider.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSlider.cc Wed Jun 27 11:24:49 2007 @@ -42,7 +42,6 @@ setMargin( YQWidgetMargin ); _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _qt_label->setAlignment( Qt::AlignRight ); _hbox = new QHBox( this ); @@ -52,13 +51,11 @@ 1, // pageStep initialValue, QSlider::Horizontal, _hbox ); - _qt_slider->setFont( YQUI::ui()->currentFont() ); _qt_spinbox = new QSpinBox( minValue, maxValue, 1, // step _hbox ); _qt_spinbox->setValue( initialValue ); - _qt_spinbox->setFont( YQUI::ui()->currentFont() ); _qt_label->setBuddy( _qt_spinbox ); Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.cc Wed Jun 27 11:24:49 2007 @@ -127,7 +127,6 @@ } } - _qt_listview->setFont( YQUI::ui()->currentFont() ); _qt_listview->setAllColumnsShowFocus( true ); if ( opt.notifyMode.value() ) Modified: branches/tmp/sh/mod-ui/qt/src/YQTime.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTime.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTime.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTime.cc Wed Jun 27 11:24:49 2007 @@ -39,7 +39,6 @@ _qt_label = new QLabel( fromUTF8(label->value()), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); if ( label->value() == "" ) _qt_label->hide(); Modified: branches/tmp/sh/mod-ui/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTree.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTree.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTree.cc Wed Jun 27 11:24:49 2007 @@ -52,10 +52,8 @@ _qt_label = new QLabel( fromUTF8( label->value() ), this ); _qt_label->setTextFormat( QLabel::PlainText ); - _qt_label->setFont( YQUI::ui()->currentFont() ); _listView = new QListView( this ); - _listView->setFont( YQUI::ui()->currentFont() ); _listView->addColumn( "" ); _listView->header()->hide(); _listView->setRootIsDecorated ( true ); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_x11… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_x11.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_x11.cc Wed Jun 27 11:24:49 2007 @@ -129,7 +129,7 @@ * * There are many fonts that claim to be Unicode, but most of them contain * just a sorry excuse for a complete Unicode character set. Qt can't know - * how complete a font is, so it chooses one that might be better in other + * how complete a font is, so it chooses one that might be better in otherf * aspects, but lacks necessary characters. **/ Modified: branches/tmp/sh/mod-ui/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Wed Jun 27 11:24:49 2007 @@ -175,7 +175,6 @@ _stepsList.setAutoDelete( true ); _stepsIDs.setAutoDelete( false ); // Only for one of both! - setFont( YQUI::ui()->currentFont() ); // Make sure qApp->font() is initialized YQUI::setTextdomain( TEXTDOMAIN ); @@ -702,7 +701,6 @@ YUI_CHECK_NEW( _helpBrowser ); _helpBrowser->setMimeSourceFactory( 0 ); - _helpBrowser->setFont( YQUI::ui()->currentFont() ); _helpBrowser->installEventFilter( this ); _helpBrowser->setTextFormat( Qt::RichText ); _helpBrowser->setMargin( 4 ); Modified: branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizardButton.cc Wed Jun 27 11:24:49 2007 @@ -42,7 +42,6 @@ setQPushButton( button ); setWidgetRep( button ); setId( new YCPValueWidgetID( id ) ); - button->setFont( YQUI::ui()->currentFont() ); connect( button, SIGNAL( clicked() ), this, SIGNAL( clicked() ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0