Author: coolo Date: Sun Dec 16 11:15:33 2007 New Revision: 43105 URL: http://svn.opensuse.org/viewcvs/yast?rev=43105&view=rev Log: fixing one more tetris widget Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.cc trunk/qt/src/pkg/YQPkgPatchList.cc trunk/qt/src/pkg/YQSimplePatchSelector.cc Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchFilterView.cc?rev=43105&r1=43104&r2=43105&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchFilterView.cc Sun Dec 16 11:15:33 2007 @@ -55,26 +55,26 @@ { QVBoxLayout *layout = new QVBoxLayout(); setLayout(layout); - _splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( _splitter ); layout->addWidget(_splitter); - QVBoxLayout * vbox = new QVBoxLayout(_splitter); - Q_CHECK_PTR( vbox ); - layout->addLayout(vbox); - _patchList = new YQPkgPatchList( this ); Q_CHECK_PTR( _patchList ); - vbox->addWidget(_patchList); - + + QWidget *upper_box = new QWidget( _splitter ); + QVBoxLayout *vbox = new QVBoxLayout( upper_box ); + _patchList = new YQPkgPatchList( upper_box ); + Q_CHECK_PTR( _patchList ); + + vbox->addWidget( _patchList ); //addVSpacing( vbox, 4 ); QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); vbox->addLayout(hbox); hbox->setSpacing( SPACING ); - QLabel * label = new QLabel( _( "&Show Patch Category:" ), this ); + QLabel * label = new QLabel( _( "&Show Patch Category:" ), upper_box ); hbox->addWidget(label); - _patchFilter = new QComboBox( this ); + _patchFilter = new QComboBox( upper_box ); Q_CHECK_PTR( _patchFilter ); hbox->addWidget(_patchFilter); @@ -88,10 +88,11 @@ connect( _patchFilter, SIGNAL( activated( int ) ), this, SLOT( fillPatchList() ) ); //addVSpacing( vbox, 4 ); - vbox = new QVBoxLayout( _splitter ); Q_CHECK_PTR( vbox ); + QWidget *down_box = new QWidget( _splitter ); + vbox = new QVBoxLayout( down_box ); Q_CHECK_PTR( vbox ); //addVSpacing( vbox, 8 ); - _detailsViews = new QTabWidget( this ); Q_CHECK_PTR( _detailsViews ); + _detailsViews = new QTabWidget( down_box ); Q_CHECK_PTR( _detailsViews ); vbox->addWidget(_detailsViews); _descriptionView = new YQPkgDescriptionView( _detailsViews ); Q_CHECK_PTR( _descriptionView ); @@ -99,7 +100,7 @@ _descriptionView->setMinimumSize( 0, 0 ); _detailsViews->addTab( _descriptionView, _( "Patch Description" ) ); - + #if ENABLE_TOTAL_DOWNLOAD_SIZE // // HBox for total download size Modified: trunk/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchList.cc?rev=43105&r1=43104&r2=43105&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchList.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchList.cc Sun Dec 16 11:15:33 2007 @@ -73,7 +73,7 @@ setAllColumnsShowFocus( true ); //FIXME setColumnAlignment( sizeCol(), Qt::AlignRight ); - connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem * ) ), + connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem* ) ), this, SLOT ( filter() ) ); sortItems( categoryCol(), Qt::AscendingOrder ); Modified: trunk/qt/src/pkg/YQSimplePatchSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQSimplePatchSelector.cc?rev=43105&r1=43104&r2=43105&view=diff ============================================================================== --- trunk/qt/src/pkg/YQSimplePatchSelector.cc (original) +++ trunk/qt/src/pkg/YQSimplePatchSelector.cc Sun Dec 16 11:15:33 2007 @@ -96,6 +96,9 @@ QSplitter * splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( splitter ); + setLayout( new QVBoxLayout( ) ); + layout()->addWidget(splitter); + // // PatchFilterView // @@ -107,16 +110,15 @@ upper_vbox->setLayout(layout); splitter->addWidget(upper_vbox); - splitter->setStretchFactor( 0, 1 ); _patchFilterView = new YQPkgPatchFilterView( upper_vbox ); + layout->addWidget( _patchFilterView ); Q_CHECK_PTR( _patchFilterView ); - layout->addWidget(_patchFilterView); _patchList = _patchFilterView->patchList(); Q_CHECK_PTR( _patchList ); - + //addVSpacing( upper_vbox, MARGIN ); // @@ -135,7 +137,7 @@ _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); Q_CHECK_PTR( _diskUsageList ); layout->addWidget(_diskUsageList); - + splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint ); #endif @@ -143,7 +145,7 @@ // // Buttons // - + if ( _wizard ) // No button box - add "Details..." button here { // @@ -175,9 +177,8 @@ YQSimplePatchSelector::layoutButtons( QWidget * parent ) { QWidget * button_box = new QWidget( parent ); - QHBoxLayout *layout = new QHBoxLayout; + QHBoxLayout *layout = new QHBoxLayout( button_box ); Q_CHECK_PTR( button_box ); - button_box->setLayout(layout); layout->setMargin ( MARGIN ); layout->setSpacing( SPACING ); @@ -210,7 +211,8 @@ connect( accept_button, SIGNAL( clicked() ), this, SLOT ( accept() ) ); - button_box->setFixedHeight( button_box->sizeHint().height() ); + this->layout()->addWidget( button_box ); +// button_box->setFixedHeight( button_box->sizeHint().height() ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org