Author: dmacvicar Date: Fri Dec 7 14:36:16 2007 New Revision: 42806 URL: http://svn.opensuse.org/viewcvs/yast?rev=42806&view=rev Log: YQPkgProductDialog QT3_SUPPORT Modified: trunk/qt4/src/pkg/YQPkgProductDialog.cc trunk/qt4/src/pkg/YQPkgProductDialog.h Modified: trunk/qt4/src/pkg/YQPkgProductDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgProductDialog.cc?rev=42806&r1=42805&r2=42806&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgProductDialog.cc (original) +++ trunk/qt4/src/pkg/YQPkgProductDialog.cc Fri Dec 7 14:36:16 2007 @@ -18,23 +18,20 @@ /-*/ -#define QT3_SUPPORT 1 - #define y2log_component "qt-pkg" #include -#include +#include <QApplication> #include -#include -#include -#include -#include -#include -#include -#include -#include -//Added by qt3to4: -#include +#include <QHBoxLayout> +#include <QLabel> +#include <QLayout> +#include <QPushButton> +#include <QSplitter> +#include <QStyle> +#include <QTabWidget> +#include <QList> +#include <QBoxLayout> #include "YQPkgProductDialog.h" #include "YQPkgProductList.h" @@ -52,14 +49,16 @@ : QDialog( parent ) { // Dialog title - setCaption( _( "Products" ) ); + setWindowTitle( _( "Products" ) ); // Enable dialog resizing even without window manager setSizeGripEnabled( true ); // Layout for the dialog (can't simply insert a QVBox) - Q3VBoxLayout * layout = new Q3VBoxLayout( this, MARGIN, SPACING ); + QVBoxLayout * layout = new QVBoxLayout( this ); + layout->setSpacing( SPACING ); + layout->setMargin ( MARGIN ); Q_CHECK_PTR( layout ); @@ -68,7 +67,7 @@ QSplitter * splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( splitter ); layout->addWidget( splitter ); - splitter->setMargin( MARGIN ); + layout->setMargin( MARGIN ); // Product list @@ -85,7 +84,7 @@ _detailsViews = new QTabWidget( splitter ); Q_CHECK_PTR( _detailsViews ); - _detailsViews->setMargin( MARGIN ); + //_detailsViews->setMargin( MARGIN ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert // Dependencies view @@ -101,25 +100,26 @@ // Button box (to center the single button) - Q3HBox * hbox = new Q3HBox( this ); + QHBoxLayout * hbox = new QHBoxLayout( this ); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); - layout->addWidget( hbox ); + layout->addLayout( hbox ); - addHStretch( hbox ); + //addHStretch( hbox ); // "OK" button - QPushButton * button = new QPushButton( _( "&OK" ), hbox ); + QPushButton * button = new QPushButton( _( "&OK" ), this ); + hbox->addWidget(button); Q_CHECK_PTR( button ); button->setDefault( true ); connect( button, SIGNAL( clicked() ), this, SLOT ( accept() ) ); - addHStretch( hbox ); + //addHStretch( hbox ); } Modified: trunk/qt4/src/pkg/YQPkgProductDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgProductDialog.h?rev=42806&r1=42805&r2=42806&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgProductDialog.h (original) +++ trunk/qt4/src/pkg/YQPkgProductDialog.h Fri Dec 7 14:36:16 2007 @@ -20,7 +20,7 @@ #ifndef YQPkgProductDialog_h #define YQPkgProductDialog_h -#include +#include <QDialog> class QTabWidget; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org