November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42546 - /trunk/ncurses/src/NCFrame.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:23:59 2007 New Revision: 42546 URL: http://svn.opensuse.org/viewcvs/yast?rev=42546&view=rev Log: YContainerWidget is now completely gone Modified: trunk/ncurses/src/NCFrame.cc Modified: trunk/ncurses/src/NCFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFrame.cc?rev=42546… ============================================================================== --- trunk/ncurses/src/NCFrame.cc (original) +++ trunk/ncurses/src/NCFrame.cc Fri Nov 30 12:23:59 2007 @@ -64,8 +64,6 @@ // long NCFrame::nicesize( YUIDimension dim ) { - //defsze = wsze( YContainerWidget::child(0)->nicesize( YD_VERT ), - // YContainerWidget::child(0)->nicesize( YD_HORIZ ) ); defsze = wsze( firstChild()->preferredWidth(), firstChild()->preferredHeight() ); -- 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] r42545 - /trunk/ncurses/src/NCCheckBoxFrame.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:23:40 2007 New Revision: 42545 URL: http://svn.opensuse.org/viewcvs/yast?rev=42545&view=rev Log: YContainerWidget is now completely gone Modified: trunk/ncurses/src/NCCheckBoxFrame.cc Modified: trunk/ncurses/src/NCCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCCheckBoxFrame.cc?r… ============================================================================== --- trunk/ncurses/src/NCCheckBoxFrame.cc (original) +++ trunk/ncurses/src/NCCheckBoxFrame.cc Fri Nov 30 12:23:40 2007 @@ -76,8 +76,6 @@ //space to add - keep vertical dim, add horizontal space //for checkbox wpair plussize = wpair(0,4); - //defsze = wsze( YContainerWidget::child(0)->nicesize( YD_VERT ), - // YContainerWidget::child(0)->nicesize( YD_HORIZ ) ); defsze = wsze( firstChild()->preferredWidth(), firstChild()->preferredHeight() ); if ( label.width() > (unsigned)defsze.W ) -- 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] r42544 - /trunk/ncurses/src/NCAskForDirectory.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:23:13 2007 New Revision: 42544 URL: http://svn.opensuse.org/viewcvs/yast?rev=42544&view=rev Log: removed cruft (gcc complains about unused var - and is perfectly right) Modified: trunk/ncurses/src/NCAskForDirectory.cc Modified: trunk/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForDirectory.cc… ============================================================================== --- trunk/ncurses/src/NCAskForDirectory.cc (original) +++ trunk/ncurses/src/NCAskForDirectory.cc Fri Nov 30 12:23:13 2007 @@ -245,8 +245,6 @@ } else if ( currentId->toString() == idDirList ) { - unsigned int i = dirName->getListSize(); - if ( postevent.result == "" ) return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42543 - in /trunk/qt/src/pkg: YQPkgConflictDialog.cc YQPkgRepoFilterView.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:17:02 2007 New Revision: 42543 URL: http://svn.opensuse.org/viewcvs/yast?rev=42543&view=rev Log: messages back from proof reading Modified: trunk/qt/src/pkg/YQPkgConflictDialog.cc trunk/qt/src/pkg/YQPkgRepoFilterView.cc Modified: trunk/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictDialog.c… ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictDialog.cc Fri Nov 30 12:17:02 2007 @@ -354,7 +354,7 @@ QString heading = QString( "<h2>%1</h2>" ).arg( _( "Create Dependency Resolver Test Case" ) ); QString msg = - _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver." + _( "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver. " "The logs will be stored in directory <br><tt>%1</tt></p>" ).arg( testCaseDir ); int button_no = QMessageBox::information( 0, // parent Modified: trunk/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.c… ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoFilterView.cc Fri Nov 30 12:17:02 2007 @@ -95,7 +95,11 @@ // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of - // "all packages", "RPM groups", "search", "summary" + // "All packages", "RPM groups", "search", "summary" + // + // And yes, the colon really belongs there since this is one of the very + // few cases where a combo box label is left to the combo box rather than + // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" ), vbox ); CHECK_PTR( _secondaryFilters ); -- 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] r42542 - in /branches/tmp/coolo/qt4-port/src: YQMultiProgressMeter.cc YQMultiSelectionBox.cc YQMultiSelectionBox.h
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:26 2007 New Revision: 42542 URL: http://svn.opensuse.org/viewcvs/yast?rev=42542&view=rev Log: more porting Modified: branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Modified: branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiProgressMeter.cc Fri Nov 30 12:03:26 2007 @@ -88,8 +88,8 @@ QPainter painter( this ); - if ( ! event->erased() ) - painter.eraseRect( event->rect() ); +// if ( ! event->erased() ) +// painter.eraseRect( event->rect() ); int totalLength = horizontal() ? width() : height(); int thickness = horizontal() ? height() : width(); @@ -266,7 +266,7 @@ points.setPoint( p++, offset + length, border + thickness - indent ); points.setPoint( p++, offset + length, border + indent ); - painter.setBrush( palette().active().highlight() ); + painter.setBrush( palette().highlight() ); painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } @@ -283,7 +283,7 @@ points.setPoint( p++, offset + fillStart, border + fillHeight ); points.setPoint( p++, offset + fillStart, border + thickness - fillHeight ); - painter.setBrush( palette().active().highlight() ); + painter.setBrush( palette().highlight() ); painter.setPen( Qt::NoPen ); painter.drawConvexPolygon( points ); } @@ -294,12 +294,12 @@ // Draw outline // - const QColor & dark = palette().active().dark(); - const QColor & light = palette().active().light(); + const QBrush & dark = palette().dark(); + const QBrush & light = palette().light(); // Draw arrow base (left) - painter.setPen( dark ); + painter.setBrush( dark ); painter.setPen( Qt::SolidLine ); painter.drawLine( offset, border, offset, border + thickness ); @@ -312,7 +312,7 @@ // Draw arrow point (right) - painter.setPen( light ); + painter.setBrush( light ); painter.drawLine( offset + length - 1, border + indent, offset + length - 1, border + thickness - indent ); @@ -331,9 +331,7 @@ offset -= spacing() / 2 + 1; // integer division rounds down! - const QColor & color = palette().active().foreground(); - painter.setPen( color ); - painter.setPen( Qt::SolidLine ); + const QBrush & color = palette().foreground(); painter.setBrush( color ); // painter.setBrush( NoBrush ); 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 Fri Nov 30 12:03:26 2007 @@ -55,15 +55,15 @@ 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->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - _qt_listView->addColumn( "" ); // QListView doesn't have one single column by default! - _qt_listView->setSorting( 0, false ); - _qt_listView->header()->setStretchEnabled( true ); - _qt_listView->header()->hide(); + _qt_listView->setHeaderLabels( QStringList("") ); // QListView doesn't have one single column by default! + _qt_listView->setSorting(0, false ); +// FIXME _qt_listView->header()->setStretchEnabled( true ); +// FIXME _qt_listView->header()->hide(); _caption->setBuddy( _qt_listView ); // Very small default size if specified @@ -110,7 +110,7 @@ // Take care of the QListView's keyboard focus if ( ! _qt_listView->selectedItem() ) - _qt_listView->setSelected( msbItem, true ); + msbItem->setSelected( true ); } @@ -130,7 +130,7 @@ YQSignalBlocker sigBlocker( _qt_listView ); YMultiSelectionBox::deselectAllItems(); - Q3ListViewItemIterator it( _qt_listView ); + QTreeWidgetItemIterator it( _qt_listView ); while ( *it ) { @@ -179,7 +179,7 @@ // For the purpose of this function, QListView::currentItem() is the // minimum requirement. - Q3ListViewItem * currentQItem = _qt_listView->currentItem(); + QTreeWidgetItem * currentQItem = _qt_listView->currentItem(); if ( currentQItem ) { @@ -213,7 +213,7 @@ YQMultiSelectionBoxItem * msbItem = findItem( yItem ); if ( msbItem ) - _qt_listView->setSelected( msbItem, true ); + msbItem->setSelected( true ); // This does NOT change the item's check box! // (see explanations in YQMultiSelectionBox::currentItem() avove) @@ -226,14 +226,14 @@ { _caption->setEnabled( enabled ); _qt_listView->setEnabled( enabled ); - _qt_listView->triggerUpdate(); + //FIXME _qt_listView->triggerUpdate(); YWidget::setEnabled( enabled ); } int YQMultiSelectionBox::preferredWidth() { - int hintWidth = _caption->isShown() ? + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() + frameWidth() : 0; return max( 80, hintWidth ); @@ -242,7 +242,7 @@ int YQMultiSelectionBox::preferredHeight() { - int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0; + int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0; int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES; hintHeight += visibleLines * _qt_listView->fontMetrics().lineSpacing(); hintHeight += _qt_listView->frameWidth() * 2; @@ -301,7 +301,7 @@ YQMultiSelectionBox::findItem( YItem * wantedItem ) { // FIXME: Don't search through all items, use the YItem::data() pointer instead - Q3ListViewItemIterator it( _qt_listView ); + QTreeWidgetItemIterator it( _qt_listView ); while ( *it ) { @@ -325,9 +325,9 @@ YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - Q3ListView * listView, + QTreeWidget * listView, YItem * yItem ) - : Q3CheckListItem( listView, fromUTF8( yItem->label() ), Q3CheckListItem::CheckBox ) + : QTreeWidgetItem( listView, fromUTF8( yItem->label() ) ) , _yItem( yItem ) , _multiSelectionBox( parent ) { @@ -342,7 +342,7 @@ { _yItem->setSelected( newState ); _multiSelectionBox->sendValueChanged(); - Q3CheckListItem::stateChange( newState ); + //FIXME Q3CheckListItem::stateChange( newState ); } Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Fri Nov 30 12:03:26 2007 @@ -21,7 +21,7 @@ #define YQMultiSelectionBox_h #include <QFrame> -#include <Q3CheckListItem> +#include <QTreeWidgetItem> #include <qlistview.h> #include "YMultiSelectionBox.h" @@ -163,19 +163,19 @@ YQWidgetCaption * _caption; - Q3ListView * _qt_listView; + QTreeWidget * _qt_listView; }; -class YQMultiSelectionBoxItem: public Q3CheckListItem +class YQMultiSelectionBoxItem: public QTreeWidgetItem { public: /** * Constructor. **/ YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - Q3ListView * listView, + QTreeWidget * listView, YItem * yItem ); /** -- 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] r42541 - /branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:25 2007 New Revision: 42541 URL: http://svn.opensuse.org/viewcvs/yast?rev=42541&view=rev Log: Miltiline edit Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc Modified: branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiLineEdit.cc Fri Nov 30 12:03:25 2007 @@ -53,7 +53,7 @@ YUI_CHECK_NEW( _qt_textEdit ); layout->addWidget( _qt_textEdit ); - _qt_textEdit->setTextFormat( Qt::PlainText ); + //_qt_textEdit->setTextFormat( Qt::PlainText ); _qt_textEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _caption->setBuddy( _qt_textEdit ); @@ -71,7 +71,7 @@ string YQMultiLineEdit::value() { - return toUTF8( _qt_textEdit->text() ); + return toUTF8( _qt_textEdit->document()->toPlainText() ); } @@ -94,7 +94,7 @@ { YMultiLineEdit::setInputMaxLength( newMaxLength ); - QString text = _qt_textEdit->text(); + QString text = _qt_textEdit->document()->toPlainText(); if ( (int) text.length() > inputMaxLength() ) { @@ -114,7 +114,7 @@ _qt_textEdit->getCursorPosition( &para, &index); - QString text = _qt_textEdit->text(); + QString text = _qt_textEdit->document()->toPlainText(); int pos = 0; // current positon in text int section =0; // section in text; @@ -183,7 +183,7 @@ int hintHeight = defaultVisibleLines() * _qt_textEdit->fontMetrics().lineSpacing(); hintHeight += _qt_textEdit->frameWidth() * 2 + YQWidgetMargin * 2; - if ( _caption->isShown() ) + if ( !_caption->isHidden() ) hintHeight += _caption->sizeHint().height() + YQWidgetSpacing; return max( 10, hintHeight ); -- 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] r42540 - /branches/tmp/coolo/qt4-port/src/
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:24 2007 New Revision: 42540 URL: http://svn.opensuse.org/viewcvs/yast?rev=42540&view=rev Log: - Various classes Modified: branches/tmp/coolo/qt4-port/src/YQDialog.cc branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc branches/tmp/coolo/qt4-port/src/YQDumbTab.cc branches/tmp/coolo/qt4-port/src/YQGenericButton.cc branches/tmp/coolo/qt4-port/src/YQImage.cc branches/tmp/coolo/qt4-port/src/YQInputField.cc branches/tmp/coolo/qt4-port/src/YQIntField.cc branches/tmp/coolo/qt4-port/src/YQLogView.cc branches/tmp/coolo/qt4-port/src/YQMenuButton.cc branches/tmp/coolo/qt4-port/src/YQMenuButton.h branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/src/YQWizard.h Modified: branches/tmp/coolo/qt4-port/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDial… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.cc Fri Nov 30 12:03:24 2007 @@ -52,7 +52,7 @@ _defaultButton = 0; setWidgetRep( this ); - setCaption( hasDefaultSize() ? "YaST2" : "" ); + setWindowTitle( hasDefaultSize() ? "YaST2" : "" ); setFocusPolicy( Qt::StrongFocus ); if ( ! default_size ) @@ -70,10 +70,10 @@ } QPalette warnPalette( normalBackground ); - QColorGroup normalColors = warnPalette.normal(); - normalColors.setColor( QColorGroup::Text, text ); - normalColors.setColor( QColorGroup::Base, inputFieldBackground ); - warnPalette.setNormal( normalColors ); + //warnPalette.createColorGroup(Active); + warnPalette.setColor( QPalette::Active, QPalette::Text, text ); + warnPalette.setColor( QPalette::Active, QPalette::Base, inputFieldBackground ); + warnPalette.setCurrentColorGroup(QPalette::Active); setPalette( warnPalette ); } @@ -213,7 +213,7 @@ if ( ! YQUI::ui()->haveWM() ) { if ( YQUI::ui()->autoActivateDialogs() ) - setActiveWindow(); + activateWindow(); else y2milestone( "Auto-activating dialog window turned off" ); } @@ -311,9 +311,9 @@ if ( _defaultButton && button != _defaultButton ) { y2error( "Too many default buttons: [%s]", - (const char *) button->text() ); + qPrintable(button->text()) ); y2error( "Using old default button: [%s]", - (const char *) _defaultButton->text() ); + qPrintable(_defaultButton->text()) ); } else { @@ -441,7 +441,7 @@ else { y2error( "Too many `opt(`default) PushButtons: [%s]", - (const char *) newDefaultButton->text() ); + qPrintable(newDefaultButton->text()) ); newDefaultButton->setDefaultButton( false ); return; } @@ -452,7 +452,7 @@ if ( _defaultButton ) { _defaultButton->setDefaultButton( true ); - y2debug( "New default button: [%s]", (const char *) _defaultButton->text() ); + y2debug( "New default button: [%s]", qPrintable(_defaultButton->text()) ); if ( _defaultButton && ! _focusButton ) _defaultButton->showAsDefault( true ); @@ -469,7 +469,7 @@ _focusButton->isEnabled() && _focusButton->isShownAsDefault() ) { - y2debug( "Activating focus button: [%s]", (const char *) _focusButton->text() ); + y2debug( "Activating focus button: [%s]", qPrintable(_focusButton->text()) ); _focusButton->activate(); return true; } @@ -483,7 +483,7 @@ _defaultButton->isEnabled() && _defaultButton->isShownAsDefault() ) { - y2debug( "Activating default button: [%s]", (const char *) _defaultButton->text() ); + y2debug( "Activating default button: [%s]", qPrintable(_defaultButton->text()) ); _defaultButton->activate(); return true; } @@ -547,7 +547,7 @@ return; } else if ( event->key() == Qt::Key_F4 && // Shift-F4: toggle colors for vision impaired users - event->state() == Qt::ShiftButton ) + event->modifiers() & Qt::ShiftModifier ) { YQUI::ui()->toggleVisionImpairedPalette(); @@ -565,18 +565,18 @@ return; } else if ( event->key() == Qt::Key_F7 && // Shift-F7: toggle y2debug logging - event->state() == Qt::ShiftButton ) + event->modifiers() == Qt::ShiftModifier ) { YQUI::ui()->askConfigureLogging(); return; } else if ( event->key() == Qt::Key_F8 && // Shift-F8: save y2logs - event->state() == Qt::ShiftButton ) + event->modifiers() & Qt::ShiftModifier ) { YQUI::ui()->askSaveLogs(); return; } - else if ( event->state() == 0 ) // No Ctrl / Alt / Shift etc. pressed + else if ( event->modifiers() & Qt::NoModifier ) // No Ctrl / Alt / Shift etc. pressed { if ( event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter ) @@ -585,7 +585,7 @@ return; } } - else if ( event->state() == ( Qt::ControlButton | Qt::ShiftButton | Qt::AltButton ) ) + else if ( event->modifiers() & ( Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier ) ) { // Qt-UI special keys - all with Ctrl-Shift-Alt @@ -656,11 +656,16 @@ void YQDialog::show() { - if ( ! hasDefaultSize() && qApp->mainWidget()->isVisible() ) - center( this, qApp->mainWidget() ); + //if ( ! hasDefaultSize() && qApp->mainWidget()->isVisible() ) + if ( ! hasDefaultSize() ) + { + // will use topwidget anyway + center( this, 0 ); + } else if ( isCentered() ) - center( this, qApp->desktop() ); - + { + center( this, qApp->desktop() ); + } QWidget::show(); } @@ -669,18 +674,26 @@ YQDialog::center( QWidget * dialog, QWidget * parent ) { if ( ! dialog ) - return; + return; if ( ! parent ) { - if ( dialog == qApp->mainWidget() ) - parent = qApp->desktop(); - else - parent = qApp->mainWidget(); + //FIXME if not toplevel window + // align with top level widget + foreach (QWidget *widget, QApplication::topLevelWidgets()) + { + // if it is a top level widget, center with desktop + if (dialog == widget) parent = qApp->desktop(); break; + } + + if ( QApplication::topLevelWidgets().empty() ) + return; + + parent = QApplication::topLevelWidgets().first(); } QPoint pos( ( parent->width() - dialog->width() ) / 2, - ( parent->height() - dialog->height() ) / 2 ); + ( parent->height() - dialog->height() ) / 2 ); pos += parent->mapToGlobal( QPoint( 0, 0 ) ); pos = dialog->mapToParent( dialog->mapFromGlobal( pos ) ); Modified: branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDown… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDownloadProgress.cc Fri Nov 30 12:03:24 2007 @@ -60,8 +60,8 @@ connect( _timer, SIGNAL( timeout() ), this, SLOT ( pollFileSize() ) ); - _timer->start( 250, // millisec - false ); // single shot? + _timer->setSingleShot(false); + _timer->start( 250 );// millisec } Modified: branches/tmp/coolo/qt4-port/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDumb… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDumbTab.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDumbTab.cc Fri Nov 30 12:03:24 2007 @@ -171,7 +171,7 @@ qDrawWinPanel( &painter, x_offset, y_offset, frameWidth, frameHeight, - colorGroup(), + palette(), false, // sunken (const QBrush *) 0 ); // brush - don't fill interior } Modified: branches/tmp/coolo/qt4-port/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQGene… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQGenericButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQGenericButton.cc Fri Nov 30 12:03:24 2007 @@ -130,7 +130,7 @@ if ( qIconName.isEmpty() ) { - _qPushButton->setIconSet( QIcon() ); + _qPushButton->setIcon( QIcon() ); return; } @@ -138,9 +138,9 @@ QPixmap icon( qIconName ); if ( icon.isNull() ) - y2warning( "Can't load icon '%s'", (const char *) qIconName ); + y2warning( "Can't load icon '%s'", qPrintable(qIconName) ); else - _qPushButton->setIconSet( icon ); + _qPushButton->setIcon( icon ); } @@ -149,7 +149,7 @@ if ( _qPushButton ) _qPushButton->setText( label ); else - y2error( "NULL button '%s'", (const char *) label ); + y2error( "NULL button '%s'", qPrintable(label) ); YPushButton::setLabel( toUTF8( label ) ); } Modified: branches/tmp/coolo/qt4-port/src/YQImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQImag… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQImage.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQImage.cc Fri Nov 30 12:03:24 2007 @@ -63,7 +63,7 @@ { QMovie movie( fromUTF8( imageFileName() ) ); - if ( movie.isNull() ) + if ( movie.isValid() ) { y2error( "Couldn't load animation from %s", imageFileName().c_str() ); } Modified: branches/tmp/coolo/qt4-port/src/YQInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQInpu… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQInputField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQInputField.cc Fri Nov 30 12:03:24 2007 @@ -122,7 +122,7 @@ int YQInputField::preferredWidth() { int minSize = shrinkable() ? 30 : 200; - int hintWidth = _caption->isShown() + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() + 2 * YQWidgetMargin : 0; @@ -179,7 +179,7 @@ if ( ! isValidText( _qt_lineEdit->text() ) ) { y2error( "Old value \"%s\" of %s \"%s\" invalid according to ValidChars \"%s\" - deleting", - (const char *) _qt_lineEdit->text(), + qPrintable(_qt_lineEdit->text()), widgetClass(), debugLabel().c_str(), newValidChars.c_str() ); _qt_lineEdit->setText( "" ); Modified: branches/tmp/coolo/qt4-port/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQIntF… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQIntField.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQIntField.cc Fri Nov 30 12:03:24 2007 @@ -50,9 +50,11 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_spinBox = new QSpinBox( minValue, maxValue, - 1, // step - this ); + _qt_spinBox = new QSpinBox(this); + _qt_spinBox->setMinimum(minValue); + _qt_spinBox->setMaximum(maxValue); + _qt_spinBox->setSingleStep(1); + YUI_CHECK_NEW( _qt_spinBox ); layout->addWidget( _qt_spinBox ); Modified: branches/tmp/coolo/qt4-port/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQLogV… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQLogView.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQLogView.cc Fri Nov 30 12:03:24 2007 @@ -107,7 +107,7 @@ hintHeight += _qt_text->style()->pixelMetric( QStyle::PM_ScrollBarExtent ); hintHeight += _qt_text->frameWidth() * 2; - if ( _caption->isShown() ) + if ( !_caption->isHidden() ) hintHeight += _caption->sizeHint().height(); return max( 80, hintHeight ); Modified: branches/tmp/coolo/qt4-port/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMenu… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMenuButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMenuButton.cc Fri Nov 30 12:03:24 2007 @@ -18,7 +18,7 @@ #include <qpushbutton.h> -#include <q3popupmenu.h> +#include <QMenu> #include <qsize.h> #include <qtimer.h> #define y2log_component "qt-ui" @@ -68,16 +68,16 @@ // (in case the menu items got replaced) // - if ( _qt_button->popup() ) - delete _qt_button->popup(); + if ( _qt_button->menu() ) + delete _qt_button->menu(); // // Create toplevel menu // - Q3PopupMenu * menu = new Q3PopupMenu( _qt_button ); + QMenu * menu = new QMenu( _qt_button ); YUI_CHECK_NEW( menu ); - _qt_button->setPopup( menu ); + _qt_button->setMenu( menu ); connect( menu, SIGNAL( activated ( int ) ), this, SLOT ( menuEntryActivated( int ) ) ); @@ -91,7 +91,7 @@ void -YQMenuButton::rebuildMenuTree( Q3PopupMenu * parentMenu, YItemIterator begin, YItemIterator end ) +YQMenuButton::rebuildMenuTree( QMenu * parentMenu, YItemIterator begin, YItemIterator end ) { for ( YItemIterator it = begin; it != end; ++it ) { @@ -111,13 +111,12 @@ if ( item->hasChildren() ) { - Q3PopupMenu * subMenu = new Q3PopupMenu( parentMenu ); - YUI_CHECK_NEW( subMenu ); + QMenu * subMenu; if ( icon.isNull() ) - parentMenu->insertItem( fromUTF8( item->label() ), subMenu ); + subMenu = parentMenu->addMenu( fromUTF8( item->label() )); else - parentMenu->insertItem( QIconSet( icon ), fromUTF8( item->label() ), subMenu ); + subMenu = parentMenu->addMenu( QIcon( icon ), fromUTF8( item->label() )); connect( subMenu, SIGNAL( activated ( int ) ), this, SLOT ( menuEntryActivated( int ) ) ); @@ -131,9 +130,9 @@ // to this YQMenuButton. if ( icon.isNull() ) - parentMenu->insertItem( fromUTF8( item->label() ), item->index() ); + parentMenu->addAction( fromUTF8( item->label() ) /*, item->index() */); else - parentMenu->insertItem( QIconSet( icon ), fromUTF8( item->label() ), item->index() ); + parentMenu->addAction( QIcon( icon ), fromUTF8( item->label() ) /*, item->index()*/); } } } Modified: branches/tmp/coolo/qt4-port/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMenu… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMenuButton.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMenuButton.h Fri Nov 30 12:03:24 2007 @@ -25,7 +25,7 @@ class QPushButton; -class Q3PopupMenu; +class QMenu; class YQMenuButton : public QWidget, public YMenuButton { @@ -110,7 +110,7 @@ /** * Recursively insert menu items into 'menu' from iterator 'begin' to iterator 'end'. **/ - void rebuildMenuTree( Q3PopupMenu * menu, YItemIterator begin, YItemIterator end ); + void rebuildMenuTree( QMenu * menu, YItemIterator begin, YItemIterator end ); // Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_c… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Fri Nov 30 12:03:24 2007 @@ -341,10 +341,11 @@ { // Get _default_size via -geometry command line option (if set) - QWidget * dummy = new QWidget(); - dummy->hide(); - qApp->setMainWidget( dummy ); - _default_size = dummy->size(); +// NOTE not needed in qt4 +// QWidget * dummy = new QWidget(); +// dummy->hide(); +// qApp->setMainWidget( dummy ); +// _default_size = dummy->size(); // Set min defaultsize or figure one out if -geometry was not used Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Fri Nov 30 12:03:24 2007 @@ -48,7 +48,7 @@ #include "QY2ListView.h" //Added by qt3to4: #include <q3boxlayout.h> -#include <q3gridlayout.h> +#include <QGridLayout> #include <q3frame.h> #include <qevent.h> #include <q3boxlayout.h> @@ -473,9 +473,10 @@ // Create a grid layout for the steps - _stepsGrid = new Q3GridLayout( stepsParent, // parent - _stepsList.count(), 4, // rows, cols - 0, STEPS_SPACING ); // margin, spacing + _stepsGrid = new QGridLayout(stepsParent); + //_stepsList.count(), 4, // rows, cols + _stepsGrid->setMargin(0); + _stepsGrid->setSpacing(STEPS_SPACING); YUI_CHECK_NEW( _stepsGrid ); const int statusCol = 1; Modified: branches/tmp/coolo/qt4-port/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.h (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.h Fri Nov 30 12:03:24 2007 @@ -28,9 +28,9 @@ #include <q3dict.h> #include "QY2ListView.h" //Added by qt3to4: -#include <q3gridlayout.h> +#include <QGridLayout> #include <qlabel.h> -#include <q3popupmenu.h> +#include <QMenu> #include <qevent.h> #include <YWizard.h> #include "YQWizardButton.h" @@ -38,7 +38,7 @@ #include <string> #include <vector> -class Q3GridLayout; +class QGridLayout; class QFrame; class QLabel; class QMenuBar; @@ -603,7 +603,7 @@ Q3WidgetStack * _sideBar; Q3VBox * _stepsPanel; Q3VBox * _stepsBox; - Q3GridLayout * _stepsGrid; + QGridLayout * _stepsGrid; QPushButton * _releaseNotesButton; string _releaseNotesButtonId; QPushButton * _helpButton; @@ -663,7 +663,7 @@ bool isEnabled() const { return _enabled; } const QStringList & id() const { return _idList; } void addID( const QString & id ) { _idList.append( id ); } - virtual bool hasID( const QString & id ) { return _idList.find( id ) != _idList.end(); } + virtual bool hasID( const QString & id ) { return _idList.indexOf( id ) != -1; } void setStatusLabel( QLabel * label ) { _statusLabel = label; } void setNameLabel ( QLabel * label ) { _nameLabel = label; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42539 - in /branches/tmp/coolo/qt4-port/src: YQCheckBoxFrame.cc YQComboBox.cc
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:22 2007 New Revision: 42539 URL: http://svn.opensuse.org/viewcvs/yast?rev=42539&view=rev Log: YQComboBox Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc branches/tmp/coolo/qt4-port/src/YQComboBox.cc Modified: branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQChec… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBoxFrame.cc Fri Nov 30 12:03:22 2007 @@ -103,10 +103,8 @@ */ // Find the check box in the child hierarchy (as a direct child) - - _checkBox = dynamic_cast<QCheckBox *>( QObject::child( 0, // objName - "QCheckBox", // inheritsClass - false ) ); // recursive + // NOTE findChild search recursively by default + _checkBox = QObject::findChild<QCheckBox *>(); if ( ! _checkBox ) { Modified: branches/tmp/coolo/qt4-port/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQComb… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQComboBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQComboBox.cc Fri Nov 30 12:03:22 2007 @@ -55,7 +55,8 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_comboBox = new QComboBox( editable, this ); + _qt_comboBox = new QComboBox(this); + _qt_comboBox->setEditable(editable); YUI_CHECK_NEW( _caption ); layout->addWidget( _qt_comboBox ); @@ -93,7 +94,7 @@ if ( isValidText( text ) ) { YQSignalBlocker sigBlocker( _qt_comboBox ); - _qt_comboBox->setCurrentText( text ); + _qt_comboBox->setItemText(_qt_comboBox->currentIndex(), text ); } else { @@ -106,21 +107,21 @@ void YQComboBox::addItem( YItem * item ) { YComboBox::addItem( item ); - QPixmap icon; + QIcon icon; if ( item->hasIconName() ) { string iconName = iconFullPath( item ); - icon = QPixmap( iconName.c_str() ); + icon = QIcon( iconName.c_str() ); if ( icon.isNull() ) y2warning( "Can't load icon %s", iconName.c_str() ); } if ( icon.isNull() ) - _qt_comboBox->insertItem( fromUTF8( item->label() ) ); + _qt_comboBox->insertItem( -1, fromUTF8( item->label() ) ); else - _qt_comboBox->insertItem( icon, fromUTF8( item->label() ) ); + _qt_comboBox->insertItem( -1, icon, fromUTF8( item->label() ) ); if ( item->selected() ) { @@ -148,7 +149,7 @@ void YQComboBox::setValidChars( const string & newValidChars ) { - if ( ! _qt_comboBox->editable() ) + if ( ! _qt_comboBox->isEditable() ) { y2warning( "Setting ValidChars is useless on a combo box that isn't editable! (%s)", debugLabel().c_str() ); @@ -171,10 +172,10 @@ if ( ! isValidText( _qt_comboBox->currentText() ) ) { y2error( "Old value \"%s\" of %s \"%s\" invalid according to ValidChars \"%s\" - deleting", - (const char *) _qt_comboBox->currentText(), + qPrintable(_qt_comboBox->currentText()), widgetClass(), debugLabel().c_str(), newValidChars.c_str() ); - _qt_comboBox->setCurrentText( "" ); + _qt_comboBox->setItemText(_qt_comboBox->currentIndex(), ""); } YComboBox::setValidChars( newValidChars ); -- 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] r42538 - /branches/tmp/coolo/qt4-port/src/YQCheckBox.cc
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:21 2007 New Revision: 42538 URL: http://svn.opensuse.org/viewcvs/yast?rev=42538&view=rev Log: QCheckBox ported partially Modified: branches/tmp/coolo/qt4-port/src/YQCheckBox.cc Modified: branches/tmp/coolo/qt4-port/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQChec… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQCheckBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQCheckBox.cc Fri Nov 30 12:03:21 2007 @@ -18,7 +18,7 @@ #include <qcheckbox.h> -#include <q3boxlayout.h> +#include <QBoxLayout> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -41,7 +41,7 @@ setWidgetRep( this ); setFrameStyle( NoFrame ); - QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); + QBoxLayout * layout = new QBoxLayout( QBoxLayout::LeftToRight, this ); _qt_checkBox = new QCheckBox( fromUTF8( label ), this ); YUI_CHECK_NEW( _qt_checkBox ); @@ -94,7 +94,7 @@ case YCheckBox_dont_care: _qt_checkBox->setTristate( true ); - _qt_checkBox->setNoChange(); + _qt_checkBox->setCheckState(Qt::PartiallyChecked); break; } } -- 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] r42537 - in /branches/tmp/coolo/qt4-port/src: YQApplication.cc utf8.h
by dmacvicar＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dmacvicar Date: Fri Nov 30 12:03:19 2007 New Revision: 42537 URL: http://svn.opensuse.org/viewcvs/yast?rev=42537&view=rev Log: ported YQApplication and utf8 Modified: branches/tmp/coolo/qt4-port/src/YQApplication.cc branches/tmp/coolo/qt4-port/src/utf8.h Modified: branches/tmp/coolo/qt4-port/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQAppl… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQApplication.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQApplication.cc Fri Nov 30 12:03:19 2007 @@ -78,7 +78,7 @@ QString language = QLocale::system().name(); QString transFile = QString( "qt_%1.qm") - .arg( language.lower().replace('_','-') ); + .arg( language.toLower().replace('_','-') ); if ( path.isEmpty() ) { @@ -95,19 +95,19 @@ if ( _qtTranslations->isEmpty() ) { // try fallback - transFile = QString( "qt_%1.qm").arg( language.lower().left(2) ); + transFile = QString( "qt_%1.qm").arg( language.toLower().left(2) ); _qtTranslations->load( transFile, path ); } if ( _qtTranslations->isEmpty() ) { y2warning( "Can't load translations for predefined Qt dialogs from %s/%s", - (const char *) path, (const char *) transFile ); + qPrintable(path), qPrintable(transFile) ); } else { y2milestone( "Loaded translations for predefined Qt dialogs from %s/%s", - (const char *) path, (const char *) transFile ); + qPrintable(path), qPrintable(transFile) ); qApp->installTranslator( _qtTranslations ); } @@ -117,12 +117,12 @@ if ( ( language.startsWith( "ar" ) || // Arabic language.startsWith( "he" ) ) // Hebrew - && ! qApp->reverseLayout() ) + && ! (qApp->layoutDirection() == Qt::RightToLeft) ) { y2warning( "Using fallback rule for reverse layout for language '%s'", - (const char *) language ); + qPrintable(language) ); - qApp->setReverseLayout( true ); + qApp->setLayoutDirection( Qt::RightToLeft ); } } @@ -138,9 +138,9 @@ Q_CHECK_PTR( _langFonts ); if ( _langFonts->readError() ) - y2error( "Error reading %s", (const char *) _langFonts->fileName() ); + y2error( "Error reading %s", qPrintable(_langFonts->fileName()) ); else - y2milestone( "%s read OK", (const char *) _langFonts->fileName() ); + y2milestone( "%s read OK", qPrintable(_langFonts->fileName()) ); } QString lang = language.c_str(); @@ -161,25 +161,25 @@ if ( _langFonts->hasKey( fontKey( lang ) ) ) { _fontFamily = _langFonts->get( fontKey( lang ), "Sans Serif" ); - y2milestone( "%s = \"%s\"", (const char *) fontKey( lang ), (const char *) _fontFamily ); + y2milestone( "%s = \"%s\"", qPrintable(fontKey( lang )), qPrintable(_fontFamily) ); } else { _fontFamily = _langFonts->get( fontKey( "" ), "Sans Serif" ); y2milestone( "Using fallback for %s: font = \"%s\"", - (const char *) lang, (const char *) _fontFamily ); + qPrintable(lang), qPrintable(_fontFamily) ); } if ( _fontFamily != oldFontFamily && ! _fontFamily.isEmpty() ) { - y2milestone( "New font family: %s", _fontFamily.latin1() ); + y2milestone( "New font family: %s", qPrintable(_fontFamily) ); deleteFonts(); int size = qApp->font().pointSize(); QFont font( _fontFamily ); font.setPointSize( size ); - qApp->setFont( font, true ); // font, informWidgets + qApp->setFont(font); // font, informWidgets y2milestone( "Reloading fonts - now using \"%s\"", - (const char *) font.toString() ); + qPrintable(font.toString()) ); } else { @@ -224,9 +224,9 @@ _currentFont->setWeight( QFont::Normal ); y2milestone( "Loaded %d pixel font: %s", _autoNormalFontSize, - (const char *) _currentFont->toString() ); + qPrintable(_currentFont->toString()) ); - qApp->setFont( * _currentFont, true ); // font, informWidgets + qApp->setFont( * _currentFont); // font, informWidgets } else { @@ -270,7 +270,7 @@ _headingFont->setWeight( QFont::Bold ); y2milestone( "Loaded %d pixel bold font: %s", _autoHeadingFontSize, - (const char *) _headingFont->toString() ); + qPrintable(_headingFont->toString()) ); } else { Modified: branches/tmp/coolo/qt4-port/src/utf8.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/utf8.h… ============================================================================== --- branches/tmp/coolo/qt4-port/src/utf8.h (original) +++ branches/tmp/coolo/qt4-port/src/utf8.h Fri Nov 30 12:03:19 2007 @@ -35,7 +35,7 @@ if ( str.isEmpty() ) return std::string( "" ); else - return std::string( str.utf8().data() ); + return std::string( str.toUtf8().data() ); } #endif // utf8_h -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0