Author: dmacvicar Date: Sat Apr 12 23:19:14 2008 New Revision: 46483 URL: http://svn.opensuse.org/viewcvs/yast?rev=46483&view=rev Log: Qt has automatic spacing and margin for layouts since around year 1834. The selector looks more natural now and style friendly. The patch list still looks too narrow, but that is because the amount of Splitters is abused there so we get margins per every nested layout. May be setting it manually there to 0 helps. Modified: trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelectorBase.cc trunk/qt-pkg/src/YQPkgPatchFilterView.cc trunk/qt-pkg/src/YQPkgPatternList.cc trunk/qt-pkg/src/YQPkgRepoFilterView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Sat Apr 12 23:19:14 2008 @@ -93,8 +93,6 @@ using std::map; using std::pair; -#define SPACING 6 -#define MARGIN 4 #define DEFAULT_EXPORT_FILE_NAME "user-packages.xml" #define FAST_SOLVER 1 @@ -241,12 +239,9 @@ QWidget * upper_vbox = new QWidget( splitter ); QVBoxLayout *layout = new QVBoxLayout(upper_vbox); upper_vbox->setLayout(layout); - layout->setMargin( 0 ); - layout->setSpacing( 0 ); Q_CHECK_PTR( upper_vbox ); layoutFilters( upper_vbox ); - addVSpacing( upper_vbox, MARGIN ); _diskUsageList = new YQPkgDiskUsageList( splitter ); @@ -390,8 +385,6 @@ Q_CHECK_PTR( right_pane_vbox ); - layout->setMargin( MARGIN ); - QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); Q_CHECK_PTR( splitter ); layout->addWidget(splitter); @@ -399,8 +392,6 @@ Q_CHECK_PTR( splitter ); layoutPkgList( splitter ); - //addVSpacing( splitter, MARGIN ); - layoutDetailsViews( splitter ); layoutButtons( right_pane_vbox ); @@ -425,24 +416,20 @@ { bool haveInstalledPkgs = YQPkgList::haveInstalledPkgs(); - QWidget * details_vbox = new QWidget( parent ); - Q_CHECK_PTR( details_vbox ); - - QVBoxLayout *layout = new QVBoxLayout(details_vbox); - details_vbox->setLayout(layout); - //details_vbox->setMinimumSize( 0, 0 ); + //QWidget * details_vbox = new QWidget( parent ); + //Q_CHECK_PTR( details_vbox ); - addVSpacing( details_vbox, 8 ); + //QVBoxLayout *layout = new QVBoxLayout(details_vbox); + //details_vbox->setLayout(layout); - _detailsViews = new QTabWidget( details_vbox ); - layout->addWidget(_detailsViews); + //_detailsViews = new QTabWidget( details_vbox ); + _detailsViews = new QTabWidget( parent ); + //layout->addWidget(_detailsViews); Q_CHECK_PTR( _detailsViews ); - //FIXME _detailsViews->setMargin( MARGIN ); // _detailsViews->setTabPosition( QTabWidget::Bottom ); - // // Description // @@ -543,9 +530,6 @@ QHBoxLayout *layout = new QHBoxLayout(button_box); button_box->setLayout(layout); - layout->setSpacing( SPACING ); - layout->setMargin( 0 ); - // Button: Dependency check // Translators: Please keep this short! _checkDependenciesButton = new QPushButton( _( "Chec&k" ), button_box ); Modified: trunk/qt-pkg/src/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelectorBase.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelectorBase.cc (original) +++ trunk/qt-pkg/src/YQPackageSelectorBase.cc Sat Apr 12 23:19:14 2008 @@ -56,9 +56,6 @@ { setWidgetRep( this ); -// QHBoxLayout *layout = new QHBoxLayout(); -// setLayout(layout); - _showChangesDialog = false; _pkgConflictDialog = 0; _diskUsageList = 0; Modified: trunk/qt-pkg/src/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchFilterView.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchFilterView.cc Sat Apr 12 23:19:14 2008 @@ -64,11 +64,9 @@ 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:" ), upper_box ); hbox->addWidget(label); @@ -81,22 +79,19 @@ _patchFilter->addItem( _( "Unneeded Patches" )); _patchFilter->addItem( _( "All Patches" ), 2 ); _patchFilter->setCurrentIndex( 0 ); - _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert + label->setBuddy( _patchFilter ); connect( _patchFilter, SIGNAL( activated( int ) ), this, SLOT( fillPatchList() ) ); - //addVSpacing( vbox, 4 ); QWidget *down_box = new QWidget( _splitter ); vbox = new QVBoxLayout( down_box ); Q_CHECK_PTR( vbox ); - //addVSpacing( vbox, 8 ); _detailsViews = new QTabWidget( down_box ); Q_CHECK_PTR( _detailsViews ); vbox->addWidget(_detailsViews); _descriptionView = new YQPkgDescriptionView( _detailsViews ); Q_CHECK_PTR( _descriptionView ); - _descriptionView->setMinimumSize( 0, 0 ); _detailsViews->addTab( _descriptionView, _( "Patch Description" ) ); @@ -107,7 +102,6 @@ hbox = new QHBoxLayout(); Q_CHECK_PTR( hbox ); vbox->addLayout(hbox); - //addHStretch( hbox ); hbox->addWidget(new QLabel( _( "Estimated Download Size:" ) + " ", this )); _totalDownloadSize = new QLabel( FSize(0).asString().c_str(), this ); Modified: trunk/qt-pkg/src/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgPatternList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatternList.cc Sat Apr 12 23:19:14 2008 @@ -40,10 +40,6 @@ using std::string; using std::set; - -#define CATEGORY_BACKGROUND QColor( 0xFF, 0xC0, 0x50 ) - - class YQPkgPatternItemDelegate : public QItemDelegate { YQPkgPatternList *_view; Modified: trunk/qt-pkg/src/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRepoFilterView.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgRepoFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRepoFilterView.cc Sat Apr 12 23:19:14 2008 @@ -36,9 +36,6 @@ #include "YQPkgStatusFilterView.h" #include "YQi18n.h" -#define MARGIN 4 - - YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent ) : QWidget( parent ) { @@ -97,9 +94,7 @@ 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 // "All packages", "RPM groups", "search", "summary" Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView.cc?rev=46483&r1=46482&r2=46483&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Sat Apr 12 23:19:14 2008 @@ -42,20 +42,12 @@ using std::list; using std::string; - -#define SPACING 6 // between subwidgets -#define MARGIN 4 // around the widget - - YQPkgSearchFilterView::YQPkgSearchFilterView( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); _matchCount = 0; - layout->setMargin( MARGIN ); - layout->setSpacing( SPACING ); - layout->addStretch(); // Headline -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org