Hello community,
here is the log from the commit of package yast2-qt
checked in at Mon Sep 3 18:49:02 CEST 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-08-27 16:20:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-09-03 18:19:27.028482000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 3 18:13:36 CEST 2007 - sh@suse.de
+
+- Limit pkg popups to screen size even with substandard resolutions
+ (bug #300632: dialogs too big on PS3)
+- V 2.15.16
+
+-------------------------------------------------------------------
+Wed Aug 29 14:38:24 CEST 2007 - tgoettlicher@suse.de
+
+- wizard shows titlebar depending on existence of title-bar-gradient.png
+- r40568
+- V 2.15.15
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.15.14.tar.bz2
New:
----
yast2-qt-2.15.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.H15911/_old 2007-09-03 18:48:52.000000000 +0200
+++ /var/tmp/diff_new_pack.H15911/_new 2007-09-03 18:48:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.15.14)
+# spec file for package yast2-qt (Version 2.15.16)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-qt
-Version: 2.15.14
+Version: 2.15.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.15.14.tar.bz2
+Source0: yast2-qt-2.15.16.tar.bz2
prefix: /usr
BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools
Summary: YaST2 - Graphical User Interface
@@ -43,7 +43,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-qt-2.15.14
+%setup -n yast2-qt-2.15.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +89,14 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog
+* Mon Sep 03 2007 - sh@suse.de
+- Limit pkg popups to screen size even with substandard resolutions
+ (bug #300632: dialogs too big on PS3)
+- V 2.15.16
+* Wed Aug 29 2007 - tgoettlicher@suse.de
+- wizard shows titlebar depending on existence of title-bar-gradient.png
+- r40568
+- V 2.15.15
* Mon Aug 27 2007 - sh@suse.de
- Fixed bug #297637: Repository names not shown in Package Manager
- V 2.15.14
++++++ yast2-qt-2.15.14.tar.bz2 -> yast2-qt-2.15.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/pkg/YQPkgChangesDialog.cc new/yast2-qt-2.15.16/src/pkg/YQPkgChangesDialog.cc
--- old/yast2-qt-2.15.14/src/pkg/YQPkgChangesDialog.cc 2007-07-26 15:48:45.000000000 +0200
+++ new/yast2-qt-2.15.16/src/pkg/YQPkgChangesDialog.cc 2007-09-03 18:11:16.000000000 +0200
@@ -194,11 +194,7 @@
QSize
YQPkgChangesDialog::sizeHint() const
{
- QRect available = qApp->desktop()->availableGeometry( (QWidget *) this );
- QSize size = QDialog::sizeHint();
- size = size.boundedTo( QSize( available.width(), available.height() ) );
-
- return size;
+ return limitToScreenSize( this, QDialog::sizeHint() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/pkg/YQPkgConflictDialog.cc new/yast2-qt-2.15.16/src/pkg/YQPkgConflictDialog.cc
--- old/yast2-qt-2.15.14/src/pkg/YQPkgConflictDialog.cc 2007-08-23 11:38:29.000000000 +0200
+++ new/yast2-qt-2.15.16/src/pkg/YQPkgConflictDialog.cc 2007-09-03 18:04:59.000000000 +0200
@@ -207,11 +207,7 @@
QSize
YQPkgConflictDialog::sizeHint() const
{
- QSize size( 550, 450 );
- QRect available = qApp->desktop()->availableGeometry( (QWidget *) this );
- size = size.boundedTo( QSize( available.width(), available.height() ) );
-
- return size;
+ return limitToScreenSize( this, 550, 450 );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/pkg/YQPkgTextDialog.cc new/yast2-qt-2.15.16/src/pkg/YQPkgTextDialog.cc
--- old/yast2-qt-2.15.14/src/pkg/YQPkgTextDialog.cc 2007-08-23 11:38:29.000000000 +0200
+++ new/yast2-qt-2.15.16/src/pkg/YQPkgTextDialog.cc 2007-09-03 17:11:23.000000000 +0200
@@ -141,13 +141,15 @@
{
_rejectButton = 0;
}
+
+ updateGeometry();
}
QSize
YQPkgTextDialog::sizeHint() const
{
- return QSize( 500, 450 );
+ return limitToScreenSize( this, 500, 450 );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/QY2LayoutUtils.cc new/yast2-qt-2.15.16/src/QY2LayoutUtils.cc
--- old/yast2-qt-2.15.14/src/QY2LayoutUtils.cc 2007-07-26 15:48:46.000000000 +0200
+++ new/yast2-qt-2.15.16/src/QY2LayoutUtils.cc 2007-09-03 18:04:27.000000000 +0200
@@ -19,6 +19,7 @@
/-*/
+#include
#include
#include "QY2LayoutUtils.h"
@@ -60,3 +61,26 @@
return spacer;
}
+
+QSize
+limitToScreenSize( const QWidget * widget, int width, int height )
+{
+ return limitToScreenSize( widget, QSize( width, height ) );
+}
+
+
+QSize
+limitToScreenSize( const QWidget * widget, const QSize & desiredSize )
+{
+ QSize availableSize = qApp->desktop()->availableGeometry( const_cast (widget) ).size();
+
+ // Subtract WM decorations. There seems to be no reliable way to tell if
+ // this is necessary at all (even fvwm2 claims it is a NETWM compliant
+ // window manager) or how large the WM decorations are.
+ // For the purpose of this function, let's assume we have to subtract the
+ // common fvwm2 decoration size. This is simplistic and should be improved.
+ availableSize -= QSize( 10, 35 );
+
+ return desiredSize.boundedTo( availableSize );
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/QY2LayoutUtils.h new/yast2-qt-2.15.16/src/QY2LayoutUtils.h
--- old/yast2-qt-2.15.14/src/QY2LayoutUtils.h 2007-07-26 15:48:46.000000000 +0200
+++ new/yast2-qt-2.15.16/src/QY2LayoutUtils.h 2007-09-03 17:15:51.000000000 +0200
@@ -45,5 +45,10 @@
**/
QWidget * addHSpacing( QWidget * parent, int width = 8 );
+/**
+ * Limit a QSize to what is available on the same screen as 'widget'.
+ **/
+QSize limitToScreenSize( const QWidget * widget, const QSize & desiredSize );
+QSize limitToScreenSize( const QWidget * widget, int width, int height );
#endif // ifndef QY2LayoutUtils_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/YQWizard.cc new/yast2-qt-2.15.16/src/YQWizard.cc
--- old/yast2-qt-2.15.14/src/YQWizard.cc 2007-07-26 15:48:46.000000000 +0200
+++ new/yast2-qt-2.15.16/src/YQWizard.cc 2007-08-29 15:33:58.000000000 +0200
@@ -84,13 +84,10 @@
#define TEXTDOMAIN "packages-qt"
#define ENABLE_GRADIENTS 1
-#define ENABLE_TITLEBAR 0
#define USE_SEPARATOR 1
-#if ! ENABLE_TITLEBAR
-# define WORK_AREA_TOP_MARGIN 10
-#endif
+#define WORK_AREA_TOP_MARGIN 10
#if ENABLE_GRADIENTS
# define WORK_AREA_BOTTOM_MARGIN 8
@@ -198,16 +195,19 @@
if ( ! runningEmbedded() )
{
-#if ENABLE_TITLEBAR
- layoutTitleBar( this );
-#else
- QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN );
- CHECK_PTR( spacer );
+ if ( ! _titleBarGradientPixmap.isNull() )
+ {
+ layoutTitleBar( this );
+ }
+ else
+ {
+ QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN );
+ CHECK_PTR( spacer );
-# if ENABLE_GRADIENTS
- spacer->setPaletteBackgroundColor( _gradientCenterColor );
-# endif
-#endif
+# if ENABLE_GRADIENTS
+ spacer->setPaletteBackgroundColor( _gradientTopColor );
+# endif
+ }
}
QHBox * hBox = new QHBox( this );
@@ -325,15 +325,14 @@
#if ENABLE_GRADIENTS
-# if ENABLE_TITLEBAR
-
- // Top gradient
-
- QLabel * topGradient = new QLabel( _stepsPanel );
- CHECK_PTR( topGradient );
- setGradient( topGradient, _topGradientPixmap );
+ if ( !_titleBarGradientPixmap.isNull() )
+ {
+ // Top gradient
-# endif
+ QLabel * topGradient = new QLabel( _stepsPanel );
+ CHECK_PTR( topGradient );
+ setGradient( topGradient, _topGradientPixmap );
+ }
#endif
@@ -706,6 +705,13 @@
_helpBrowser->setMargin( 4 );
_helpBrowser->setResizePolicy( QScrollView::Manual );
+
+ // Set help browser text color
+ QPixmap fgPixmap = QPixmap( PIXMAP_DIR "help-text-color.png" );
+ if (! fgPixmap.isNull() )
+ _helpBrowser->setPaletteForegroundColor( pixelColor( fgPixmap, 0, 0, paletteForegroundColor() ) );
+
+
if ( highColorDisplay() )
{
// Set fancy help browser background pixmap
@@ -1258,7 +1264,8 @@
_topGradientPixmap = QPixmap( PIXMAP_DIR "top-gradient.png" );
_bottomGradientPixmap = QPixmap( PIXMAP_DIR "bottom-gradient.png" );
_titleBarGradientPixmap = QPixmap( PIXMAP_DIR "title-bar-gradient.png" );
- _gradientCenterColor = pixelColor( _bottomGradientPixmap, 0, 0 );
+ _gradientCenterColor = pixelColor( _bottomGradientPixmap, 0, 0, paletteBackgroundColor() );
+ _gradientTopColor = pixelColor( _topGradientPixmap, 0, 0 , paletteBackgroundColor() );
}
else // 8 bit display or worse - don't use gradients
{
@@ -1268,6 +1275,7 @@
// Use deault widget background (some shade of grey) for the center
// stretchable part of the side bar.
_gradientCenterColor = paletteBackgroundColor();
+ _gradientTopColor = paletteBackgroundColor();
}
#endif
}
@@ -1281,9 +1289,9 @@
if ( highColorDisplay() )
{
- _stepCurrentColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-current.png" ), 0, 0 );
- _stepToDoColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-todo.png" ), 0, 0 );
- _stepDoneColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-done.png" ), 0, 0 );
+ _stepCurrentColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-current.png" ), 0, 0, paletteForegroundColor() );
+ _stepToDoColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-todo.png" ), 0, 0, paletteForegroundColor() );
+ _stepDoneColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-done.png" ), 0, 0, paletteForegroundColor() );
}
else
{
@@ -1342,8 +1350,11 @@
-QColor YQWizard::pixelColor( const QPixmap & pixmap, int x, int y )
+QColor YQWizard::pixelColor( const QPixmap & pixmap, int x, int y, const QColor & defaultColor )
{
+ if ( pixmap.isNull() )
+ return defaultColor;
+
// QPixmap doesn't allow direct access to pixel values (which makes some
// sense since this requires a round-trip to the X server - pixmaps are X
// server resources), so we need to convert the QPixmap to a QImage to get
@@ -1352,6 +1363,7 @@
// cut out a tiny portion of the original pixmap and convert only that tiny
// portion.
+
QPixmap tiny( 1, 1 );
bitBlt( &tiny, 0, 0, // dest, dest_x, dest_y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/src/YQWizard.h new/yast2-qt-2.15.16/src/YQWizard.h
--- old/yast2-qt-2.15.14/src/YQWizard.h 2007-07-26 15:48:46.000000000 +0200
+++ new/yast2-qt-2.15.16/src/YQWizard.h 2007-08-29 15:33:58.000000000 +0200
@@ -329,9 +329,10 @@
/**
* Return the color of pixel( x, y ) of a pixmap.
+ * If pixmap is null defaultColor is returned.
* This is a _very_ expensive operation!
**/
- static QColor pixelColor( const QPixmap & pixmap, int x, int y );
+ static QColor pixelColor( const QPixmap & pixmap, int x, int y, const QColor & defaultColor );
protected slots:
@@ -582,6 +583,7 @@
QPixmap _titleBarGradientPixmap;
QPixmap _topGradientPixmap;
QColor _gradientCenterColor;
+ QColor _gradientTopColor;
QPixmap _bottomGradientPixmap;
QPixmap _stepCurrentIcon;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.14/VERSION new/yast2-qt-2.15.16/VERSION
--- old/yast2-qt-2.15.14/VERSION 2007-08-27 16:17:43.000000000 +0200
+++ new/yast2-qt-2.15.16/VERSION 2007-09-03 18:16:51.000000000 +0200
@@ -1 +1 @@
-2.15.14
+2.15.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org