Author: dmacvicar Date: Fri Dec 14 16:07:46 2007 New Revision: 43086 URL: http://svn.opensuse.org/viewcvs/yast?rev=43086&view=rev Log: - Don't create layouts with parent. Qt 4.x automatically reparents them when setting a layout for a widget or adding it to another layout. But creating a layout with the wrong parent causes problems Modified: trunk/qt/src/QY2ComboTabWidget.cc trunk/qt/src/pkg/YQPackageSelector.cc trunk/qt/src/pkg/YQPackageSelectorBase.cc trunk/qt/src/pkg/YQPatternSelector.cc trunk/qt/src/pkg/YQPkgChangesDialog.cc trunk/qt/src/pkg/YQPkgConflictDialog.cc trunk/qt/src/pkg/YQPkgDescriptionDialog.cc trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc trunk/qt/src/pkg/YQPkgPatchFilterView.cc trunk/qt/src/pkg/YQPkgProductDialog.cc trunk/qt/src/pkg/YQPkgRepoFilterView.cc trunk/qt/src/pkg/YQPkgSearchFilterView.cc trunk/qt/src/pkg/YQPkgStatusFilterView.cc trunk/qt/src/pkg/YQPkgTextDialog.cc Modified: trunk/qt/src/QY2ComboTabWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2ComboTabWidget.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/QY2ComboTabWidget.cc (original) +++ trunk/qt/src/QY2ComboTabWidget.cc Fri Dec 14 16:07:46 2007 @@ -42,10 +42,10 @@ const char * name ) : QWidget(parent) { - QVBoxLayout *vbox = new QVBoxLayout(this); + QVBoxLayout *vbox = new QVBoxLayout(); setLayout(vbox); - QHBoxLayout *hbox = new QHBoxLayout(this); + QHBoxLayout *hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); // hbox->setFrameStyle( QFrame::Panel | QFrame::Raised ); // hbox->setLineWidth(2); Modified: trunk/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelector.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelector.cc (original) +++ trunk/qt/src/pkg/YQPackageSelector.cc Fri Dec 14 16:07:46 2007 @@ -216,7 +216,7 @@ void YQPackageSelector::basicLayout() { - QVBoxLayout *layout = new QVBoxLayout(this); + QVBoxLayout *layout = new QVBoxLayout(); setLayout(layout); layoutMenuBar(this); Modified: trunk/qt/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelectorBase.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelectorBase.cc (original) +++ trunk/qt/src/pkg/YQPackageSelectorBase.cc Fri Dec 14 16:07:46 2007 @@ -56,7 +56,7 @@ { setWidgetRep( this ); -// QHBoxLayout *layout = new QHBoxLayout(this); +// QHBoxLayout *layout = new QHBoxLayout(); // setLayout(layout); _showChangesDialog = false; Modified: trunk/qt/src/pkg/YQPatternSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPatternSelector.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPatternSelector.cc (original) +++ trunk/qt/src/pkg/YQPatternSelector.cc Fri Dec 14 16:07:46 2007 @@ -105,7 +105,8 @@ void YQPatternSelector::basicLayout() { - QVBoxLayout *vbox = new QVBoxLayout( this ); + QVBoxLayout *vbox = new QVBoxLayout(); + setLayout(vbox); QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); Q_CHECK_PTR( outer_splitter ); Modified: trunk/qt/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgChangesDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgChangesDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgChangesDialog.cc Fri Dec 14 16:07:46 2007 @@ -64,7 +64,7 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); Q_CHECK_PTR( layout ); layout->setMargin(MARGIN); layout->setSpacing(SPACING); @@ -72,7 +72,7 @@ // HBox for icon and message - QHBoxLayout * hbox = new QHBoxLayout( this ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); layout->addLayout( hbox ); @@ -108,7 +108,7 @@ // Button box - hbox = new QHBoxLayout( this ); + hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); Modified: trunk/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictDialog.cc Fri Dec 14 16:07:46 2007 @@ -79,7 +79,8 @@ // Layout for the dialog (can't simply insert a QVbox) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); + setLayout(layout); layout->setMargin(MARGIN); layout->setSpacing(SPACING); Modified: trunk/qt/src/pkg/YQPkgDescriptionDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDescriptionDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDescriptionDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgDescriptionDialog.cc Fri Dec 14 16:07:46 2007 @@ -54,10 +54,12 @@ // Layout for the dialog (can't simply insert a QVBox) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); + Q_CHECK_PTR( layout ); + setLayout(layout); layout->setMargin(MARGIN); layout->setSpacing(SPACING); - Q_CHECK_PTR( layout ); + // VBox for splitter @@ -85,7 +87,7 @@ // Button box (to center the single button) - QHBoxLayout * hbox = new QHBoxLayout( this ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); Modified: trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgDiskUsageWarningDialog.cc Fri Dec 14 16:07:46 2007 @@ -54,14 +54,14 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); + Q_CHECK_PTR( layout ); layout->setSpacing( SPACING ); layout->setMargin ( MARGIN ); - Q_CHECK_PTR( layout ); - + setLayout(layout); // HBox for icon and message - QHBoxLayout * hbox = new QHBoxLayout( this ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); layout->addLayout( hbox ); @@ -95,7 +95,7 @@ // Button box - hbox = new QHBoxLayout( this ); + hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchFilterView.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchFilterView.cc Fri Dec 14 16:07:46 2007 @@ -53,7 +53,8 @@ YQPkgPatchFilterView::YQPkgPatchFilterView( QWidget * parent ) : QWidget( parent ) { - QVBoxLayout *layout = new QVBoxLayout(this); + QVBoxLayout *layout = new QVBoxLayout(); + setLayout(layout); _splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( _splitter ); @@ -66,7 +67,7 @@ //addVSpacing( vbox, 4 ); - QHBoxLayout * hbox = new QHBoxLayout( this ); Q_CHECK_PTR( hbox ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); vbox->addLayout(hbox); hbox->setSpacing( SPACING ); @@ -104,7 +105,7 @@ // HBox for total download size // - hbox = new QHBoxLayout( this ); Q_CHECK_PTR( hbox ); + hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); vbox->addLayout(hbox); //addHStretch( hbox ); Modified: trunk/qt/src/pkg/YQPkgProductDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgProductDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgProductDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgProductDialog.cc Fri Dec 14 16:07:46 2007 @@ -56,11 +56,11 @@ // Layout for the dialog (can't simply insert a QVBox) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); + Q_CHECK_PTR( layout ); + setLayout(layout); layout->setSpacing( SPACING ); layout->setMargin ( MARGIN ); - Q_CHECK_PTR( layout ); - // VBox for splitter @@ -100,7 +100,7 @@ // Button box (to center the single button) - QHBoxLayout * hbox = new QHBoxLayout( this ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); Modified: trunk/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoFilterView.cc Fri Dec 14 16:07:46 2007 @@ -44,11 +44,12 @@ QSplitter * splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( splitter ); - QVBoxLayout * upper_vbox = new QVBoxLayout( splitter ); + //QVBoxLayout * upper_vbox = new QVBoxLayout( splitter ); _repoList = new YQPkgRepoList( this ); - upper_vbox->addWidget(_repoList); - + //upper_vbox->addWidget(_repoList); + splitter->addWidget(_repoList); + Q_CHECK_PTR( _repoList ); _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert @@ -94,10 +95,13 @@ QWidget * YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent ) { - - QVBoxLayout *vbox = new QVBoxLayout( parent ); + QWidget *vbox = new QWidget(parent); Q_CHECK_PTR( vbox ); - //addVSpacing( vbox, MARGIN ); + + QVBoxLayout *layout = new QVBoxLayout(); + vbox->setLayout(layout); + + layout->addSpacing( MARGIN ); // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of @@ -107,7 +111,7 @@ // few cases where a combo box label is left to the combo box rather than // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" )); - vbox->addWidget(_secondaryFilters); + layout->addWidget(_secondaryFilters); Q_CHECK_PTR( _secondaryFilters ); @@ -122,7 +126,7 @@ // _allPackages = new QWidget( this ); - vbox->addWidget(_allPackages); + layout->addWidget(_allPackages); Q_CHECK_PTR( _allPackages ); _secondaryFilters->addPage( _( "All Packages" ), _allPackages ); @@ -132,7 +136,7 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( this ); - vbox->addWidget(_rpmGroupTagsFilterView); + layout->addWidget(_rpmGroupTagsFilterView); Q_CHECK_PTR( _rpmGroupTagsFilterView ); _secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); @@ -146,7 +150,7 @@ // _searchFilterView = new YQPkgSearchFilterView(this); - vbox->addWidget(_searchFilterView); + layout->addWidget(_searchFilterView); Q_CHECK_PTR( _searchFilterView ); _secondaryFilters->addPage( _( "Search" ), _searchFilterView ); Modified: trunk/qt/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSearchFilterView.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSearchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgSearchFilterView.cc Fri Dec 14 16:07:46 2007 @@ -73,7 +73,7 @@ // Box for search button - QHBoxLayout * hbox = new QHBoxLayout( this ); + QHBoxLayout * hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); layout->addLayout(hbox); hbox->addStretch(); Modified: trunk/qt/src/pkg/YQPkgStatusFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgStatusFilterView.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgStatusFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgStatusFilterView.cc Fri Dec 14 16:07:46 2007 @@ -43,7 +43,7 @@ YQPkgStatusFilterView::YQPkgStatusFilterView( QWidget * parent ) : QWidget( parent ) { - QVBoxLayout *layout = new QVBoxLayout(this); + QVBoxLayout *layout = new QVBoxLayout(); setLayout(layout); layout->setMargin( MARGIN ); Modified: trunk/qt/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTextDialog.cc?rev=43086&r1=43085&r2=43086&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgTextDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgTextDialog.cc Fri Dec 14 16:07:46 2007 @@ -79,11 +79,11 @@ // Layout for the dialog ( can't simply insert a QVBox ) - QVBoxLayout * layout = new QVBoxLayout( this ); + QVBoxLayout * layout = new QVBoxLayout(); + Q_CHECK_PTR( layout ); + setLayout(layout); layout->setMargin(MARGIN); layout->setSpacing(SPACING); - Q_CHECK_PTR( layout ); - // Text browser @@ -97,7 +97,7 @@ // Button box - QHBoxLayout * buttonBox = new QHBoxLayout( this ); + QHBoxLayout * buttonBox = new QHBoxLayout(); Q_CHECK_PTR( buttonBox ); buttonBox->setSpacing( SPACING ); buttonBox->setMargin ( MARGIN ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org