Author: sh-sh-sh Date: Fri Oct 31 17:57:49 2008 New Revision: 52810 URL: http://svn.opensuse.org/viewcvs/yast?rev=52810&view=rev Log: Fixed bnc #381981: Bad initial size for secondary filters in "Repositories" filter view Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgRepoFilterView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=52810&r1=52809&r2=52810&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Oct 31 17:57:49 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "14") +SET(VERSION_PATCH "15") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=52810&r1=52809&r2=52810&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Oct 31 17:57:49 2008 @@ -1,7 +1,14 @@ ------------------------------------------------------------------- +Fri Oct 31 17:56:00 CET 2008 - sh@suse.de + +- Fixed bnc #381981: Bad initial size for secondary filters in + "Repositories" filter view +- V 2.17.5 + +------------------------------------------------------------------- Fri Oct 24 18:25:17 CEST 2008 - sh@suse.de -- Fixed bnc # 403367: Crash when searching for invalid regex +- Fixed bnc #403367: Crash when searching for invalid regex - V 2.17.4 ------------------------------------------------------------------- Modified: trunk/qt-pkg/src/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRepoFilterView.cc?rev=52810&r1=52809&r2=52810&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgRepoFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRepoFilterView.cc Fri Oct 31 17:57:49 2008 @@ -20,15 +20,15 @@ #define YUILogComponent "qt-pkg" -#include "YUILog.h" +#include <YUILog.h> +#include <YUIException.h> -#include <qsplitter.h> +#include <QVBoxLayout> +#include <QSplitter> +#include <QFrame> #include "QY2ComboTabWidget.h" #include "QY2LayoutUtils.h" -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QFrame> #include "YQPkgRepoFilterView.h" #include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" @@ -36,6 +36,7 @@ #include "YQPkgStatusFilterView.h" #include "YQi18n.h" + YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent ) : QWidget( parent ) { @@ -43,14 +44,14 @@ layout->setContentsMargins(0,0,0,0); QSplitter * splitter = new QSplitter( Qt::Vertical, this ); - Q_CHECK_PTR( splitter ); + YUI_CHECK_NEW( splitter ); layout->addWidget( splitter ); _repoList = new YQPkgRepoList( this ); splitter->addWidget(_repoList); - Q_CHECK_PTR( _repoList ); + YUI_CHECK_NEW( _repoList ); _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert // Directly propagate signals filterStart() and filterFinished() @@ -90,12 +91,14 @@ QWidget * YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent ) { - QWidget *vbox = new QWidget(parent); - Q_CHECK_PTR( vbox ); + QWidget *vbox = new QWidget( parent ); + YUI_CHECK_NEW( vbox ); QVBoxLayout *layout = new QVBoxLayout(); - vbox->setLayout(layout); - layout->setContentsMargins(0,0,0,0); + YUI_CHECK_NEW( layout ); + + vbox->setLayout( layout ); + layout->setContentsMargins( 0, 0, 0, 0 ); // Translators: This is a combo box where the user can apply a secondary filter // in addition to the primary filter by repository - one of @@ -105,25 +108,23 @@ // few cases where a combo box label is left to the combo box rather than // above it. _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" )); + YUI_CHECK_NEW( _secondaryFilters ); layout->addWidget(_secondaryFilters); - Q_CHECK_PTR( _secondaryFilters ); - // // All Packages // _allPackages = new QWidget( this ); - layout->addWidget(_allPackages); - Q_CHECK_PTR( _allPackages ); + YUI_CHECK_NEW( _allPackages ); _secondaryFilters->addPage( _( "All Packages" ), _allPackages ); - // unmaintaned packages (packages that are not provided in any of - // the configured repositories) + + // Unmaintaned packages: Packages that are not provided in any of + // the configured repositories _unmaintainedPackages = new QWidget( this ); - layout->addWidget(_unmaintainedPackages); - Q_CHECK_PTR( _unmaintainedPackages ); + YUI_CHECK_NEW( _unmaintainedPackages ); _secondaryFilters->addPage( _( "Unmaintained Packages" ), _unmaintainedPackages ); // @@ -131,22 +132,22 @@ // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( this ); - layout->addWidget(_rpmGroupTagsFilterView); - - Q_CHECK_PTR( _rpmGroupTagsFilterView ); + YUI_CHECK_NEW( _rpmGroupTagsFilterView ); _secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( _rpmGroupTagsFilterView, SIGNAL( filterStart() ), - _repoList, SLOT ( filter() ) ); + _repoList, SLOT ( filter() ) ); // // Package search view // - _searchFilterView = new YQPkgSearchFilterView(this); - layout->addWidget(_searchFilterView); - Q_CHECK_PTR( _searchFilterView ); + _searchFilterView = new YQPkgSearchFilterView( this ); + YUI_CHECK_NEW( _searchFilterView ); + + _searchFilterView->setSizePolicy( QSizePolicy::Minimum, // horizontal + QSizePolicy::Minimum ); // vertical _secondaryFilters->addPage( _( "Search" ), _searchFilterView ); connect( _searchFilterView, SIGNAL( filterStart() ), @@ -161,7 +162,11 @@ // _statusFilterView = new YQPkgStatusFilterView( parent ); - Q_CHECK_PTR( _statusFilterView ); + YUI_CHECK_NEW( _statusFilterView ); + + _searchFilterView->setSizePolicy( QSizePolicy::Minimum, // horizontal + QSizePolicy::Minimum ); // vertical + _secondaryFilters->addPage( _( "Installation Summary" ), _statusFilterView ); connect( _statusFilterView, SIGNAL( filterStart() ), Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView.cc?rev=52810&r1=52809&r2=52810&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Fri Oct 31 17:57:49 2008 @@ -49,20 +49,21 @@ YQPkgSearchFilterView::YQPkgSearchFilterView( QWidget * parent ) : QWidget( parent ) { - QVBoxLayout *layout = new QVBoxLayout; - setLayout(layout); + QVBoxLayout * layout = new QVBoxLayout; + YUI_CHECK_NEW( layout ); + setLayout( layout ); _matchCount = 0; layout->addStretch(); // Headline QLabel * label = new QLabel( _( "Searc&h:" ), this ); - Q_CHECK_PTR( label ); + YUI_CHECK_NEW( label ); layout->addWidget(label); label->setFont( YQUI::yqApp()->headingFont() ); // Input field ( combo box ) for search text _searchText = new QComboBox( this ); - Q_CHECK_PTR( _searchText ); + YUI_CHECK_NEW( _searchText ); layout->addWidget(_searchText); _searchText->setEditable( true ); label->setBuddy( _searchText ); @@ -70,13 +71,13 @@ // Box for search button QHBoxLayout * hbox = new QHBoxLayout(); - Q_CHECK_PTR( hbox ); + YUI_CHECK_NEW( hbox ); layout->addLayout(hbox); hbox->addStretch(); // Search button _searchButton = new QPushButton( _( "&Search" ), this ); - Q_CHECK_PTR( _searchButton ); + YUI_CHECK_NEW( _searchButton ); hbox->addWidget(_searchButton); connect( _searchButton, SIGNAL( clicked() ), @@ -89,27 +90,27 @@ // QGroupBox * gbox = new QGroupBox( _( "Search in" ), this ); - Q_CHECK_PTR( gbox ); + YUI_CHECK_NEW( gbox ); layout->addWidget( gbox ); QVBoxLayout *vLayout = new QVBoxLayout; gbox->setLayout( vLayout ); - _searchInName = new QCheckBox( _( "&Name" ), gbox ); Q_CHECK_PTR( _searchInName ); + _searchInName = new QCheckBox( _( "&Name" ), gbox ); YUI_CHECK_NEW( _searchInName ); vLayout->addWidget(_searchInName); - _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); Q_CHECK_PTR( _searchInSummary ); + _searchInSummary = new QCheckBox( _( "Su&mmary" ), gbox ); YUI_CHECK_NEW( _searchInSummary ); vLayout->addWidget(_searchInSummary); - _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); Q_CHECK_PTR( _searchInDescription ); + _searchInDescription = new QCheckBox( _( "Descr&iption" ), gbox ); YUI_CHECK_NEW( _searchInDescription ); vLayout->addWidget(_searchInDescription); vLayout->addStretch(); // Intentionally NOT marking RPM tags for translation - _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); Q_CHECK_PTR( _searchInProvides ); + _searchInProvides = new QCheckBox( "RPM \"&Provides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides ); vLayout->addWidget(_searchInProvides); - _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); Q_CHECK_PTR( _searchInRequires ); + _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); YUI_CHECK_NEW( _searchInRequires ); vLayout->addWidget(_searchInRequires); - _searchInFileList = new QCheckBox( _( "File list" ), gbox ); Q_CHECK_PTR( _searchInFileList ); + _searchInFileList = new QCheckBox( _( "File list" ), gbox ); YUI_CHECK_NEW( _searchInFileList ); vLayout->addWidget(_searchInFileList); @@ -124,11 +125,11 @@ // label = new QLabel( _( "Search &Mode:" ), this ); - Q_CHECK_PTR( label ); + YUI_CHECK_NEW( label ); layout->addWidget( label ); _searchMode = new QComboBox( this ); - Q_CHECK_PTR( _searchMode ); + YUI_CHECK_NEW( _searchMode ); layout->addWidget( _searchMode ); _searchMode->setEditable( false ); @@ -148,7 +149,7 @@ layout->addStretch(); _caseSensitive = new QCheckBox( _( "Case Sensiti&ve" ), this ); - Q_CHECK_PTR( _caseSensitive ); + YUI_CHECK_NEW( _caseSensitive ); layout->addWidget(_caseSensitive); for ( int i=0; i < 6; i++ ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org