December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42589 - /trunk/core/libyui/src/YUIException.h
by aschnell＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: aschnell Date: Mon Dec 3 11:53:25 2007 New Revision: 42589 URL: http://svn.opensuse.org/viewcvs/yast?rev=42589&view=rev Log: - fixed typo Modified: trunk/core/libyui/src/YUIException.h Modified: trunk/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUIException.h?r… ============================================================================== --- trunk/core/libyui/src/YUIException.h (original) +++ trunk/core/libyui/src/YUIException.h Mon Dec 3 11:53:25 2007 @@ -414,7 +414,7 @@ }; /** - * Exception class vor invalid widgets. + * Exception class for invalid widgets. * This is typically caused by widget pointers that continue living after the * corresponding widget has already been deleted. **/ -- 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] r42588 - in /trunk/core: VERSION libyui/src/YCPPropertyHandler.cc package/yast2-core.changes
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 11:42:55 2007 New Revision: 42588 URL: http://svn.opensuse.org/viewcvs/yast?rev=42588&view=rev Log: fixing #345490 Modified: trunk/core/VERSION trunk/core/libyui/src/YCPPropertyHandler.cc trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=42588&r1=42587&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon Dec 3 11:42:55 2007 @@ -1 +1 @@ -2.16.11 +2.16.12 Modified: trunk/core/libyui/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPPropertyHandl… ============================================================================== --- trunk/core/libyui/src/YCPPropertyHandler.cc (original) +++ trunk/core/libyui/src/YCPPropertyHandler.cc Mon Dec 3 11:42:55 2007 @@ -159,6 +159,7 @@ val = tryGetTableValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetDumbTabValue ( widget ); if ( ! val.isNull() ) return val; + val = tryGetRadioButtonGroupCurrentButton( widget ); if ( ! val.isNull() ) return val; } else if ( propertyName == YUIProperty_Values ) { @@ -318,9 +319,9 @@ return true; } - + // Find the item with the specified ID - + Item_t * item = findItem<Item_t>( selWidget, val ); if ( item ) @@ -646,13 +647,13 @@ if ( ! multiSelBox ) return false; - + if ( val->isVoid() ) // Special case: nil sets "no selected item" { multiSelBox->setCurrentItem( 0 ); return true; } - + // Find the item with the specified ID YCPItem * item = findItem<YCPItem>( multiSelBox , val ); @@ -705,7 +706,7 @@ return false; string msg = "Expected a list of integers"; - + if ( ! val->isList() ) { YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, @@ -716,7 +717,7 @@ YBarGraphMultiUpdate multiUpdate( barGraph ); YCPList valuesList = val->asList(); - + for ( int i=0; i < valuesList->size(); i++ ) { if ( valuesList->value(i)->isInteger() ) @@ -750,7 +751,7 @@ return false; string msg = "Expected a list of strings"; - + if ( ! val->isList() ) { YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, @@ -761,7 +762,7 @@ YBarGraphMultiUpdate multiUpdate( barGraph ); YCPList labelsList = val->asList(); - + for ( int i=0; i < labelsList->size(); i++ ) { if ( labelsList->value(i)->isString() ) @@ -1218,7 +1219,7 @@ for ( int i=0; i < barGraph->segments(); i++ ) result->add( YCPInteger( barGraph->segment(i).value() ) ); - + return result; } @@ -1235,7 +1236,7 @@ for ( int i=0; i < barGraph->segments(); i++ ) result->add( YCPString( barGraph->segment(i).label() ) ); - + return result; } Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Dec 3 11:42:55 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 3 11:42:01 CET 2007 - coolo(a)suse.de + +- continue supporting `Value for RadioButtonGroup (#345490) for now + +------------------------------------------------------------------- Fri Nov 30 17:15:47 CET 2007 - sh(a)suse.de - Removed YContainerWidget for good -- 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] r42587 - in /branches/tmp/coolo/qt4-port/src: QY2ListView.cc YQRichText.cc YQRichText.h
by dmacvicar＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: dmacvicar Date: Mon Dec 3 11:40:18 2007 New Revision: 42587 URL: http://svn.opensuse.org/viewcvs/yast?rev=42587&view=rev Log: RichText done Modified: branches/tmp/coolo/qt4-port/src/QY2ListView.cc branches/tmp/coolo/qt4-port/src/YQRichText.cc branches/tmp/coolo/qt4-port/src/YQRichText.h Modified: branches/tmp/coolo/qt4-port/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Lis… ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ListView.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2ListView.cc Mon Dec 3 11:40:18 2007 @@ -67,7 +67,7 @@ { QY2ListViewItem * item = dynamic_cast<QY2ListViewItem *> (*it); - if ( item /*FIXME&& item->isSelectable() */ ) + if ( item && (item->flags() & Qt::ItemIsSelectable) ) { item->setSelected(true); // emits signal, too return; Modified: branches/tmp/coolo/qt4-port/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRich… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.cc Mon Dec 3 11:40:18 2007 @@ -16,16 +16,13 @@ /-*/ -#define QT3_SUPPORT - #define y2log_component "qt-ui" #include <ycp/y2log.h> #include <QColorGroup> -#include <qtextbrowser.h> -#include <qscrollbar.h> -#include <qregexp.h> -#include <qevent.h> +#include <QScrollBar> +#include <QRegExp> +#include <QEvent> #include <QVBoxLayout> #include "YEvent.h" @@ -55,26 +52,22 @@ if ( plainTextMode ) { - _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrapMode( QTextOption::NoWrap ); + _textBrowser->setPlainText(QString::fromUtf8(text.c_str())); + _textBrowser->setWordWrapMode( QTextOption::NoWrap ); } else { - _textBrowser->setTextFormat( Qt::RichText ); + _textBrowser->setHtml(QString::fromUtf8(text.c_str())); } - setValue( text ); - - // Set the text foreground color to black, regardless of its current // settings - it might be changed if this widget resides in a // warnColor dialog - which we cannot find right now out since our // parent is not set yet :-( QPalette pal( _textBrowser->palette() ); - QColorGroup normalColors( pal.normal() ); - normalColors.setColor( QColorGroup::Text, Qt::black ); - pal.setNormal( normalColors ); + pal.setColor( QPalette::Text, Qt::black ); + pal.setCurrentColorGroup( QPalette::Normal ); _textBrowser->setPalette( pal ); @@ -109,13 +102,18 @@ QString text = fromUTF8( newText ); if ( ! plainTextMode() ) - text.replace( "&product;", YQUI::ui()->productName() ); - + { + text.replace( "&product;", YQUI::ui()->productName() ); + _textBrowser->setHtml( text ); + } + else + { + _textBrowser->setPlainText( text ); + } YRichText::setValue( newText ); - _textBrowser->setText( text ); if ( autoScrollDown() && _textBrowser->verticalScrollBar() ) - _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maxValue() ); + _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maximum() ); } @@ -125,12 +123,7 @@ if ( plainTextMode() ) { - _textBrowser->setTextFormat( Qt::PlainText ); - _textBrowser->setWordWrapMode( QTextOption::NoWrap ); - } - else - { - _textBrowser->setTextFormat( Qt::RichText ); + _textBrowser->setWordWrapMode( QTextOption::NoWrap ); } } @@ -140,14 +133,14 @@ YRichText::setAutoScrollDown( newAutoScrollDown ); if ( autoScrollDown() && _textBrowser->verticalScrollBar() ) - _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maxValue() ); + _textBrowser->verticalScrollBar()->setValue( _textBrowser->verticalScrollBar()->maximum() ); } void YQRichText::linkClicked( const QUrl & url ) { // y2debug( "Selected hyperlink \"%s\"", (const char *) url ); - YQUI::ui()->sendEvent( new YMenuEvent( toUTF8( url ) ) ); + YQUI::ui()->sendEvent( new YMenuEvent(url.toString().toUtf8()) ); } @@ -158,7 +151,7 @@ QKeyEvent * event = ( QKeyEvent * ) ev; if ( ( event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter ) && - ( event->state() == 0 || event->state() == Qt::Keypad ) && + ( event->modifiers() & Qt::NoModifier || event->modifiers() & Qt::KeypadModifier ) && ! haveHyperLinks() ) { YQDialog * dia = (YQDialog *) findDialog(); @@ -180,7 +173,7 @@ if ( plainTextMode() ) return false; - return ( _textBrowser->text().contains( QRegExp( "<a\\s+href\\s*=", false ) ) > 0 ); + return ( _textBrowser->document()->toPlainText().contains( QRegExp( "<a\\s+href\\s*=", Qt::CaseInsensitive ) ) > 0 ); } Modified: branches/tmp/coolo/qt4-port/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRich… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.h Mon Dec 3 11:40:18 2007 @@ -21,7 +21,7 @@ #define YQRichText_h #include <QFrame> -#include <qtextbrowser.h> +#include <QTextBrowser> #include "YRichText.h" using std::string; -- 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] r42586 - in /trunk/devtools: package/.cvsignore package/yast2-devtools.changes yast2-devtools.spec.in
by coolo＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: coolo Date: Mon Dec 3 10:03:00 2007 New Revision: 42586 URL: http://svn.opensuse.org/viewcvs/yast?rev=42586&view=rev Log: fix build Removed: trunk/devtools/package/.cvsignore Modified: trunk/devtools/package/yast2-devtools.changes trunk/devtools/yast2-devtools.spec.in Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Mon Dec 3 10:03:00 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 3 10:02:27 CET 2007 - coolo(a)suse.de + +- include cmake directories + +------------------------------------------------------------------- Mon Nov 26 14:55:32 CET 2007 - dmacvicar(a)suse.de - added basic cmake infrastructure Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?… ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Mon Dec 3 10:03:00 2007 @@ -46,7 +46,7 @@ %dir %{prefix}/share/emacs/site-lisp %{prefix}/share/emacs/site-lisp/*ycp-mode.el %dir %{prefix}/lib/YaST2 -%{prefix}/share/cmake/Modules/* +%{prefix}/share/cmake @ybindir@ %dir %{prefix}/share/YaST2 @ydatadir@ -- 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] r42585 - in /trunk/openwsman-yast: openwsman-yast.changes openwsman-yast.spec.in src/yast_stub_identify.c
by kkaempf＠svn.opensuse.org 03 Dec '07

03 Dec '07

Author: kkaempf Date: Mon Dec 3 01:30:01 2007 New Revision: 42585 URL: http://svn.opensuse.org/viewcvs/yast?rev=42585&view=rev Log: adapt to openwsman >= 1.5.0 Modified: trunk/openwsman-yast/openwsman-yast.changes trunk/openwsman-yast/openwsman-yast.spec.in trunk/openwsman-yast/src/yast_stub_identify.c Modified: trunk/openwsman-yast/openwsman-yast.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/openwsman-yast/openwsman-yast.ch… ============================================================================== --- trunk/openwsman-yast/openwsman-yast.changes (original) +++ trunk/openwsman-yast/openwsman-yast.changes Mon Dec 3 01:30:01 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 28 16:39:42 CEST 2007 - kkaempf(a)suse.de + +- api adaption to openwsman 1.5.x + +------------------------------------------------------------------- Sun Aug 12 12:33:19 CEST 2007 - kkaempf(a)suse.de - fix compiler warnings, don't link against libyui. Modified: trunk/openwsman-yast/openwsman-yast.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/openwsman-yast/openwsman-yast.sp… ============================================================================== --- trunk/openwsman-yast/openwsman-yast.spec.in (original) +++ trunk/openwsman-yast/openwsman-yast.spec.in Mon Dec 3 01:30:01 2007 @@ -6,8 +6,8 @@ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Management -BuildRequires: openwsman >= 1.2.0 openwsman-devel >= 1.2.0 gcc-c++ pkgconfig libxml2-devel yast2-core-devel libxcrypt-devel -Requires: openwsman-server >= 1.2.0 +BuildRequires: openwsman >= 1.5.0 openwsman-devel >= 1.5.0 gcc-c++ pkgconfig libxml2-devel yast2-core-devel libxcrypt-devel +Requires: openwsman-server >= 1.5.0 Requires: yast2-core Summary: YaST plugin for openwsman Modified: trunk/openwsman-yast/src/yast_stub_identify.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/openwsman-yast/src/yast_stub_ide… ============================================================================== --- trunk/openwsman-yast/src/yast_stub_identify.c (original) +++ trunk/openwsman-yast/src/yast_stub_identify.c Mon Dec 3 01:30:01 2007 @@ -54,7 +54,7 @@ #include <wsman-soap.h> #include <wsman-soap-envelope.h> #include <wsman-xml-api.h> -#include <wsman-xml-serializer.h> +#include <wsman-xml-serialize.h> #include "yast.h" @@ -99,7 +99,7 @@ // <wsmid:ProductVersion>1.1.0rc1</wsmid:ProductVersion> // </wsmid:IdentifyResponse> - int result = ws_serialize( cntx, + int result = ws_serialize( ws_serializer_init(), node, // WsXmlNodeH xmlNode, &yast_identify, // XML_TYPE_PTR dataPtr, Wsmid_Identify_TypeInfo,// XmlSerializerInfo * info, -- 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] r42584 - in /branches/tmp/coolo/qt4-port/src: YQSelectionBox.cc YQSelectionBox.h
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:34 2007 New Revision: 42584 URL: http://svn.opensuse.org/viewcvs/yast?rev=42584&view=rev Log: YQSelectionBox Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQSelectionBox.h Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSele… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc Mon Dec 3 00:37:34 2007 @@ -16,17 +16,12 @@ /-*/ -#define QT3_SUPPORT - -#include <qstring.h> -#include <qlabel.h> -#include <q3listbox.h> +#include <QString> +#include <QLabel> +#include <QListWidget> #include <qnamespace.h> -//Added by qt3to4: -#include <qpixmap.h> -#include <qevent.h> -#include <qevent.h> -#include <qevent.h> +#include <QPixmap> +#include <QEvent> #include <QVBoxLayout> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -64,22 +59,22 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listBox = new Q3ListBox( this ); + _qt_listBox = new QListWidget( this ); YUI_CHECK_NEW( _qt_listBox ); layout->addWidget( _qt_listBox ); _qt_listBox->installEventFilter( this ); - _qt_listBox->setVariableHeight( false ); + //FIXME _qt_listBox->setVariableHeight( false ); _qt_listBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - _qt_listBox->setTopItem(0); + //FIXME _qt_listBox->setTopItem(0); _caption->setBuddy( _qt_listBox ); connect( _qt_listBox, SIGNAL( highlighted ( int ) ), this, SLOT ( slotSelected( int ) ) ); - connect( _qt_listBox, SIGNAL( doubleClicked( Q3ListBoxItem * ) ), - this, SLOT ( slotActivated( Q3ListBoxItem * ) ) ); + connect( _qt_listBox, SIGNAL( doubleClicked( QListWidgetItem * ) ), + this, SLOT ( slotActivated( QListWidgetItem * ) ) ); connect( &_timer, SIGNAL( timeout() ), this, SLOT ( returnImmediately() ) ); @@ -114,14 +109,21 @@ } if ( icon.isNull() ) - _qt_listBox->insertItem( fromUTF8( item->label() ) ); + { + _qt_listBox->addItem( fromUTF8( item->label() ) ); + } else - _qt_listBox->insertItem( icon, fromUTF8( item->label() ) ); + { + QListWidgetItem *i = new QListWidgetItem(_qt_listBox); + i->setData(Qt::DisplayRole, fromUTF8( item->label() ) ); + i->setData(Qt::DecorationRole, icon ); + _qt_listBox->addItem( i ); + } if ( item->selected() ) { YQSignalBlocker sigBlocker( _qt_listBox ); - _qt_listBox->setCurrentItem( item->index() ); + _qt_listBox->setCurrentItem( _qt_listBox->item( item->index() ) ); } } @@ -131,7 +133,7 @@ YQSignalBlocker sigBlocker( _qt_listBox ); YSelectionBox::selectItem( item, selected ); - _qt_listBox->setCurrentItem( selected ? item->index() : -1 ); + _qt_listBox->setCurrentRow( selected ? item->index() : -1 ); } @@ -161,7 +163,7 @@ YSelectionBox::deselectAllItems(); _qt_listBox->clearSelection(); - if ( _qt_listBox->currentItem() > -1 ) + if ( _qt_listBox->currentRow() > -1 ) { // Some item is selected after all; the Qt documtation says this // happens if the QListBox is in single selection mode (which it is) @@ -171,7 +173,7 @@ // displays. This has a small performance penalty because it calls // YSelectionBox::deselectAllItems() again which again iterates over // all items. - selectItem( _qt_listBox->currentItem() ); + selectItem( _qt_listBox->row(_qt_listBox->currentItem()) ); } } @@ -216,7 +218,7 @@ { _caption->setEnabled( enabled ); _qt_listBox->setEnabled( enabled ); - _qt_listBox->triggerUpdate( true ); + //FIXME needed? _qt_listBox->triggerUpdate( true ); YWidget::setEnabled( enabled ); } @@ -236,7 +238,7 @@ QKeyEvent * event = ( QKeyEvent * ) ev; if ( ( event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter ) && - ( event->state() == 0 || event->state() == Qt::Keypad ) ) + ( (event->modifiers() & Qt::NoModifier) || (event->modifiers() & Qt::KeypadModifier) ) ) { YQDialog * dia = (YQDialog *) findDialog(); @@ -292,9 +294,9 @@ } -void YQSelectionBox::slotActivated( Q3ListBoxItem * qItem ) +void YQSelectionBox::slotActivated( QListWidgetItem * qItem ) { - selectItem( _qt_listBox->index( qItem ) ); + selectItem( _qt_listBox->row( qItem ) ); if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSele… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.h Mon Dec 3 00:37:34 2007 @@ -21,13 +21,13 @@ #define YQSelectionBox_h #include <QFrame> -#include <qtimer.h> +#include <QTimer> #include "YSelectionBox.h" class YQWidgetCaption; -class Q3ListBox; -class Q3ListBoxItem; +class QListWidget; +class QListWidgetItem; class YQSelectionBox : public QFrame, public YSelectionBox @@ -135,7 +135,7 @@ /** * Notification that an item has been activated (double clicked). **/ - void slotActivated( Q3ListBoxItem * item ); + void slotActivated( QListWidgetItem * item ); /** * Return after some millseconds delay - collect multiple events. @@ -163,7 +163,7 @@ // YQWidgetCaption * _caption; - Q3ListBox * _qt_listBox; + QListWidget * _qt_listBox; QTimer _timer; }; -- 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] r42583 - in /branches/tmp/coolo/qt4-port/src: YQRadioButtonGroup.cc YQRadioButtonGroup.h YQSlider.cc
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:30 2007 New Revision: 42583 URL: http://svn.opensuse.org/viewcvs/yast?rev=42583&view=rev Log: YQSlider Modified: branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h branches/tmp/coolo/qt4-port/src/YQSlider.cc Modified: branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadi… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.cc Mon Dec 3 00:37:30 2007 @@ -17,8 +17,7 @@ /-*/ -#include <qradiobutton.h> -#include <q3buttongroup.h> +#include <QRadioButton> #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadi… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButtonGroup.h Mon Dec 3 00:37:30 2007 @@ -19,10 +19,9 @@ #ifndef YQRadioButtonGroup_h #define YQRadioButtonGroup_h -#include <qwidget.h> +#include <QWidget> #include "YRadioButtonGroup.h" -class Q3ButtonGroup; class YQRadioButtonGroup : public QWidget, public YRadioButtonGroup { Modified: branches/tmp/coolo/qt4-port/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSlid… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSlider.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSlider.cc Mon Dec 3 00:37:30 2007 @@ -16,10 +16,9 @@ /-*/ -#define QT3_SUPPORT -#include <qslider.h> -#include <qspinbox.h> -#include <qlabel.h> +#include <QSlider> +#include <QSpinBox> +#include <QLabel> #include <QVBoxLayout> #define y2log_component "qt-ui" @@ -67,9 +66,10 @@ if ( reverseLayout ) { - _qt_spinBox = new QSpinBox( minValue, maxValue, - 1, // step - _hbox ); + _qt_spinBox = new QSpinBox( _hbox ); + _qt_spinBox->setMinimum(minValue); + _qt_spinBox->setMaximum(maxValue); + _qt_spinBox->setSingleStep(1); layout->addWidget( _qt_spinBox ); } else @@ -77,18 +77,20 @@ _caption->setAlignment( Qt::AlignRight ); } - _qt_slider = new QSlider( minValue, maxValue, - 1, // pageStep - initialValue, - Qt::Horizontal, _hbox ); + _qt_slider = new QSlider( Qt::Horizontal, _hbox ); + _qt_slider->setMinimum(minValue); + _qt_slider->setMaximum(maxValue); + _qt_slider->setPageStep(1); YUI_CHECK_NEW( _qt_slider ); layout->addWidget( _qt_slider ); if ( ! reverseLayout ) { - _qt_spinBox = new QSpinBox( minValue, maxValue, - 1, // step - _hbox ); + _qt_spinBox = new QSpinBox( _hbox ); + _qt_spinBox->setMinimum(minValue); + _qt_spinBox->setMaximum(maxValue); + _qt_spinBox->setSingleStep(1); + layout->addWidget( _qt_spinBox ); } YUI_CHECK_NEW( _qt_spinBox ); -- 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] r42582 - /branches/tmp/coolo/qt4-port/src/YQRadioButton.cc
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:26 2007 New Revision: 42582 URL: http://svn.opensuse.org/viewcvs/yast?rev=42582&view=rev Log: YQRadioButton done Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.cc Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadi… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButton.cc Mon Dec 3 00:37:26 2007 @@ -16,11 +16,9 @@ /-*/ -#define QT3_SUPPORT - #include <qradiobutton.h> #include <QMouseEvent> -#include <q3boxlayout.h> +#include <QBoxLayout> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -52,7 +50,7 @@ setWidgetRep( this ); setFrameStyle( NoFrame ); - QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + QBoxLayout * layout = new QBoxLayout( QBoxLayout::LeftToRight, this ); _qt_radioButton = new QRadioButton( fromUTF8( label ), this ); -- 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] r42581 - in /branches/tmp/coolo/qt4-port/src: YQMultiSelectionBox.cc YQTree.cc
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:24 2007 New Revision: 42581 URL: http://svn.opensuse.org/viewcvs/yast?rev=42581&view=rev Log: remove so grep does not find it Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQTree.cc Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Mon Dec 3 00:37:24 2007 @@ -16,8 +16,6 @@ /-*/ -//#define QT3_SUPPORT 1 - #include <limits.h> #include <QString> #include <QLabel> Modified: branches/tmp/coolo/qt4-port/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.cc Mon Dec 3 00:37:24 2007 @@ -16,7 +16,6 @@ /-*/ -//#define QT3_SUPPORT #include <QColorGroup> #include <QHeaderView> #include <QLabel> -- 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] r42580 - in /branches/tmp/coolo/qt4-port/src: YQMultiSelectionBox.cc YQTree.cc YQTree.h
by dmacvicar＠svn.opensuse.org 02 Dec '07

02 Dec '07

Author: dmacvicar Date: Mon Dec 3 00:37:20 2007 New Revision: 42580 URL: http://svn.opensuse.org/viewcvs/yast?rev=42580&view=rev Log: compiles, YQMultiSelectionBoxItem looks like it should, same as YQTree Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQTree.cc branches/tmp/coolo/qt4-port/src/YQTree.h Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Mon Dec 3 00:37:20 2007 @@ -19,10 +19,10 @@ //#define QT3_SUPPORT 1 #include <limits.h> -#include <qstring.h> -#include <qlabel.h> +#include <QString> +#include <QLabel> #include <QVBoxLayout> -#include <q3header.h> +#include <QHeaderView> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -64,7 +64,8 @@ _qt_listView->setHeaderLabel(""); // QListView doesn't have one single column by default! _qt_listView->sortItems( 0, Qt::AscendingOrder ); //FIXME _qt_listView->header()->setStretchEnabled( true ); - //_qt_listView->header()->hide(); + _qt_listView->header()->hide(); + _qt_listView->setRootIsDecorated ( false ); _caption->setBuddy( _qt_listView ); // Very small default size if specified @@ -332,6 +333,8 @@ , _multiSelectionBox( parent ) { YUI_CHECK_PTR( yItem ); + setFlags( Qt::ItemIsUserCheckable ); + setCheckState( 0, Qt::Unchecked ); setText(0, fromUTF8( yItem->label() )); setFlags(Qt::ItemIsUserCheckable); _serial = _item_count++; Modified: branches/tmp/coolo/qt4-port/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.cc Mon Dec 3 00:37:20 2007 @@ -16,16 +16,15 @@ /-*/ -#define QT3_SUPPORT +//#define QT3_SUPPORT #include <QColorGroup> -#include <q3header.h> -#include <qlabel.h> -#include <q3vbox.h> -#include <q3listview.h> +#include <QHeaderView> +#include <QLabel> +#include <QTreeWidget> #include <QVBoxLayout> -#include <qstring.h> +#include <QString> //Added by qt3to4: -#include <qpixmap.h> +#include <QPixmap> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -61,24 +60,26 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listView = new Q3ListView( this ); + _qt_listView = new QTreeWidget( this ); YUI_CHECK_NEW( _qt_listView ); layout->addWidget( _qt_listView ); - _qt_listView->addColumn( "" ); - _qt_listView->header()->hide(); - _qt_listView->setRootIsDecorated ( true ); + //_qt_listView->setHeaderLabel(""); +// _qt_listView->addColumn( "" ); + _qt_listView->header()->hide(); + // _qt_listView->setHeader(0L); + _qt_listView->setRootIsDecorated ( true ); _caption->setBuddy ( _qt_listView ); - connect( _qt_listView, SIGNAL( selectionChanged ( Q3ListViewItem * ) ), - this, SLOT ( slotSelected ( Q3ListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( selectionChanged ( QTreeWidgetItem * ) ), + this, SLOT ( slotSelected ( QTreeWidgetItem * ) ) ); - connect( _qt_listView, SIGNAL( spacePressed ( Q3ListViewItem * ) ), - this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( spacePressed ( QTreeWidgetItem * ) ), + this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); - connect( _qt_listView, SIGNAL( doubleClicked ( Q3ListViewItem * ) ), - this, SLOT ( slotActivated ( Q3ListViewItem * ) ) ); + connect( _qt_listView, SIGNAL( doubleClicked ( QTreeWidgetItem * ) ), + this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); } @@ -138,13 +139,13 @@ YQTreeItem * yqTreeItem = (YQTreeItem *) treeItem->data(); YUI_CHECK_PTR( yqTreeItem ); - if ( ! selected && yqTreeItem == _qt_listView->selectedItem() ) + if ( ! selected && yqTreeItem == _qt_listView->currentItem() ) { deselectAllItems(); } else { - _qt_listView->setSelected( yqTreeItem, true ); + yqTreeItem->setSelected( true ); openBranch( yqTreeItem ); YTree::selectItem( treeItem, selected ); } @@ -157,7 +158,7 @@ { YQSignalBlocker sigBlocker( _qt_listView ); - _qt_listView->setSelected( item, true ); + item->setSelected( true ); openBranch( item ); YTree::selectItem( item->origItem(), true ); @@ -166,12 +167,12 @@ } -void YQTree::openBranch( Q3ListViewItem * item ) +void YQTree::openBranch( QTreeWidgetItem * item ) { while ( item ) { - item->setOpen( true ); // Takes care of origItem()->setOpen() - item = item->parent(); + item->setExpanded( true ); // Takes care of origItem()->setOpen() + item = item->parent(); } } @@ -194,7 +195,7 @@ } -void YQTree::slotSelected( Q3ListViewItem * qItem ) +void YQTree::slotSelected( QTreeWidgetItem * qItem ) { selectItem( dynamic_cast<YQTreeItem *> (qItem) ); @@ -203,7 +204,7 @@ } -void YQTree::slotActivated( Q3ListViewItem * qItem ) +void YQTree::slotActivated( QTreeWidgetItem * qItem ) { selectItem( dynamic_cast<YQTreeItem *> (qItem) ); @@ -257,10 +258,10 @@ YQTreeItem::YQTreeItem( YQTree * tree, - Q3ListView * listView, + QTreeWidget * listView, YTreeItem * orig, int serial ) - : Q3ListViewItem( listView ) + : QTreeWidgetItem( listView ) { init( tree, orig, serial ); @@ -274,10 +275,9 @@ YQTreeItem * parentItem, YTreeItem * orig, int serial ) - : Q3ListViewItem( parentItem ) + : QTreeWidgetItem( parentItem ) { init( tree, orig, serial ); - #if VERBOSE_TREE_ITEMS y2debug( "Creating tree item \"%s\" as child of \"%s\"", orig->label().c_str(), @@ -310,7 +310,7 @@ if ( icon.isNull() ) y2warning( "Can't load icon %s", iconName.c_str() ); else - setPixmap( 0, icon ); + setData( 0, Qt::DecorationRole, icon ); } } @@ -318,7 +318,7 @@ void YQTreeItem::setOpen( bool open ) { - Q3ListViewItem::setOpen( open ); + QTreeWidgetItem::setExpanded( open ); _origItem->setOpen( open ); } Modified: branches/tmp/coolo/qt4-port/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.h (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.h Mon Dec 3 00:37:20 2007 @@ -21,7 +21,7 @@ #define YQTree_h #include <QFrame> -#include <qlistview.h> +#include <QTreeWidget> #include "YTree.h" @@ -125,14 +125,14 @@ * * This will trigger a 'SelectionChanged' event if 'notify' is set. **/ - void slotSelected( Q3ListViewItem * item ); + void slotSelected( QTreeWidgetItem * item ); /** * Propagate a double click or pressing the space key on a tree item. * * This will trigger an 'Activated' event if 'notify' is set. **/ - void slotActivated( Q3ListViewItem * item); + void slotActivated( QTreeWidgetItem * item); protected: @@ -145,7 +145,7 @@ /** * Open the branch of 'item' recursively to its toplevel item. **/ - void openBranch( Q3ListViewItem * item ); + void openBranch( QTreeWidgetItem * item ); /** * Build a tree of items that will be displayed (YQTreeItems) from the @@ -161,12 +161,12 @@ // YQWidgetCaption * _caption; - Q3ListView * _qt_listView; + QTreeWidget * _qt_listView; int _nextSerialNo; }; -class YQTreeItem: public Q3ListViewItem +class YQTreeItem: public QTreeWidgetItem { public: @@ -174,7 +174,7 @@ * Constructor for a top level item. **/ YQTreeItem( YQTree * tree, - Q3ListView * parent, + QTreeWidget * parent, YTreeItem * origItem, int serial ); @@ -194,7 +194,7 @@ /** * Open this item. * - * Reimplemented from Q3ListViewItem. + * Reimplemented from QTreeWidgetItem. **/ virtual void setOpen( bool open ); @@ -214,7 +214,7 @@ /** * Sort key of this item. * - * Reimplemented from Q3ListViewItem. + * Reimplemented from QTreeWidgetItem. **/ QString key( int column, bool ascending ) const; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0