Author: dmacvicar
Date: Fri Dec 7 17:26:43 2007
New Revision: 42822
URL: http://svn.opensuse.org/viewcvs/yast?rev=42822&view=rev
Log:
YQPkgConflictDialog
Modified:
trunk/qt4/src/pkg/YQPkgConflictDialog.cc
Modified: trunk/qt4/src/pkg/YQPkgConflictDialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgConflictDialog.cc?rev=42822&r1=42821&r2=42822&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgConflictDialog.cc (original)
+++ trunk/qt4/src/pkg/YQPkgConflictDialog.cc Fri Dec 7 17:26:43 2007
@@ -18,8 +18,6 @@
/-*/
-#define QT3_SUPPORT 1
-
#define y2log_component "qt-pkg"
#include
@@ -73,7 +71,7 @@
// or may not be visible, depending on whether or not there is a window
// manager running (and configured to show any dialog titles).
- setCaption( _( "Warning" ) );
+ setWindowTitle( _( "Warning" ) );
// Enable dialog resizing even without window manager
setSizeGripEnabled( true );
@@ -81,7 +79,10 @@
// Layout for the dialog (can't simply insert a QVbox)
- QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING );
+ QVBoxLayout * layout = new QVBoxLayout( this );
+ layout->setMargin(MARGIN);
+ layout->setSpacing(SPACING);
+
Q_CHECK_PTR( layout );
// Conflict list
@@ -129,9 +130,9 @@
_expertMenu = new QMenu( button );
Q_CHECK_PTR( _expertMenu );
- button->setPopup( _expertMenu );
+ button->setMenu( _expertMenu );
- _expertMenu->insertItem( _( "&Save This List to a File..." ),
+ _expertMenu->addAction( _( "&Save This List to a File..." ),
_conflictList, SLOT( askSaveToFile() ) );
@@ -154,7 +155,7 @@
);
Q_CHECK_PTR( _busyPopup );
- _busyPopup->setCaption( "" );
+ _busyPopup->setWindowTitle( "" );
_busyPopup->resize( _busyPopup->sizeHint() );
YQDialog::center( _busyPopup, parent );
@@ -183,7 +184,7 @@
QPixmap pixmap( 3 * size.width(), 3 * size.height() );
// Clear the pixmap with the widget's normal background color.
- pixmap.fill( _busyPopup->paletteBackgroundColor() );
+ //FIXME pixmap.fill( _busyPopup->paletteBackgroundColor() );
// Render the text - aligned top and left because otherwise it will of
// course be centered inside the pixmap which is usually much larger than
@@ -192,7 +193,7 @@
painter.drawText( pixmap.rect(), Qt::AlignLeft | Qt::AlignTop, _busyPopup->text() );
painter.end();
- _busyPopup->setPaletteBackgroundPixmap( pixmap );
+ //FIXME _busyPopup->setPaletteBackgroundPixmap( pixmap );
// If the application manages to render the true contents of the label we
// just misused so badly, the real label will interfere with the background
@@ -376,7 +377,7 @@
return;
y2milestone( "Generating solver test case START" );
- bool success = zypp::getZYpp()->resolver()->createSolverTestcase( testCaseDir.ascii() );
+ bool success = zypp::getZYpp()->resolver()->createSolverTestcase( qPrintable(testCaseDir) );
y2milestone( "Generating solver test case END" );
if ( success )
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
