Hello community,
here is the log from the commit of package yast2-qt
checked in at Wed Feb 27 00:34:48 CET 2008.
--------
--- yast2-qt/yast2-qt.changes 2008-02-21 10:21:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-02-26 11:00:22.438028000 +0100
@@ -1,0 +2,13 @@
+Tue Feb 26 08:51:51 CET 2008 - coolo@suse.de
+
+- fix build without ycp
+- hopefully fix popups for real
+- fix -auto-fonts
+- V 2.16.29
+
+-------------------------------------------------------------------
+Mon Feb 25 17:07:12 CET 2008 - sh@suse.de
+
+- Don't just call exit(1) if there is no qt_pkg plug-in (bnc #363958)
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.16.28.tar.bz2
New:
----
yast2-qt-2.16.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.b27947/_old 2008-02-27 00:32:30.000000000 +0100
+++ /var/tmp/diff_new_pack.b27947/_new 2008-02-27 00:32:30.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.16.28)
+# spec file for package yast2-qt (Version 2.16.29)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,27 @@
Name: yast2-qt
-Version: 2.16.28
+Version: 2.16.29
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.16.28.tar.bz2
-BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libqt4-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files
+Source0: yast2-qt-2.16.29.tar.bz2
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: doxygen
+BuildRequires: libdrm-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libxcrypt-devel
+BuildRequires: libxslt
+BuildRequires: perl-XML-Writer
+BuildRequires: libqt4-devel
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
BuildRequires: cmake
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-core-devel >= 2.16.35
-Requires: yast2-core >= 2.16.35
+BuildRequires: yast2-libyui-devel >= 2.16.37
+Requires: yast2-libyui >= 2.16.37
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
@@ -31,6 +40,7 @@
Obsoletes: yast2-ui-qt yast2-ui-qt-devel
Provides: y2qt
Obsoletes: y2qt
+Recommends: yast2-qt-pkg
%description
One of several user interfaces available for YaST2, based on Qt and the
@@ -96,8 +106,7 @@
%files
%defattr (-, root, root)
-%_libdir/YaST2/plugin/libpy2qt.so.*
-%_libdir/YaST2/plugin/libpy2qt.so
+%_libdir/YaST2/plugin/
%_prefix/share/YaST2/data/lang_fonts
%files devel
@@ -105,6 +114,13 @@
%_includedir/*
%changelog
+* Tue Feb 26 2008 coolo@suse.de
+- fix build without ycp
+- hopefully fix popups for real
+- fix -auto-fonts
+- V 2.16.29
+* Mon Feb 25 2008 sh@suse.de
+- Don't just call exit(1) if there is no qt_pkg plug-in (bnc #363958)
* Thu Feb 21 2008 coolo@suse.de
- fix slider layout (bnc#363395)
- V 2.16.28
++++++ yast2-qt-2.16.28.tar.bz2 -> yast2-qt-2.16.29.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/CMakeLists.txt new/yast2-qt-2.16.29/CMakeLists.txt
--- old/yast2-qt-2.16.28/CMakeLists.txt 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/CMakeLists.txt 2008-02-26 11:00:35.000000000 +0100
@@ -8,8 +8,9 @@
SET( RPMNAME "yast2-qt" )
FIND_PACKAGE(Qt4 REQUIRED)
-FIND_PACKAGE(Yast REQUIRED)
+FIND_PACKAGE(Yast)
INCLUDE(YastCommon)
+SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/YaST2)
SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current)
SET(Y2QT_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/package/yast2-qt.changes new/yast2-qt-2.16.29/package/yast2-qt.changes
--- old/yast2-qt-2.16.28/package/yast2-qt.changes 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/package/yast2-qt.changes 2008-02-26 11:00:35.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Tue Feb 26 08:51:51 CET 2008 - coolo@suse.de
+
+- fix build without ycp
+- hopefully fix popups for real
+- fix -auto-fonts
+- V 2.16.29
+
+-------------------------------------------------------------------
+Mon Feb 25 17:07:12 CET 2008 - sh@suse.de
+
+- Don't just call exit(1) if there is no qt_pkg plug-in (bnc #363958)
+
+-------------------------------------------------------------------
Thu Feb 21 10:20:07 CET 2008 - coolo@suse.de
- fix slider layout (bnc#363395)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/CMakeLists.txt new/yast2-qt-2.16.29/src/CMakeLists.txt
--- old/yast2-qt-2.16.28/src/CMakeLists.txt 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/src/CMakeLists.txt 2008-02-26 11:00:35.000000000 +0100
@@ -152,7 +152,7 @@
TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} )
TARGET_LINK_LIBRARIES( py2qt dl X11 )
SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 )
-# SET_TARGET_PROPERTIES( py2qt PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${YAST_PLUGIN_DIR}" )
+SET_TARGET_PROPERTIES( py2qt PROPERTIES LINK_FLAGS "-Wl,--no-undefined" )
INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/QY2Styler.cc new/yast2-qt-2.16.29/src/QY2Styler.cc
--- old/yast2-qt-2.16.28/src/QY2Styler.cc 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/src/QY2Styler.cc 2008-02-26 11:00:35.000000000 +0100
@@ -94,7 +94,14 @@
if ( _backgrounds[name].full )
fillRect = wid->rect();
- QImage back = getScaled( name, fillRect.size() );
+ QImage back;
+ if ( _backgrounds[name].lastscale != fillRect.size() )
+ {
+ _backgrounds[name].scaled = getScaled( name, fillRect.size() );
+ _backgrounds[name].lastscale = fillRect.size();
+ }
+ back = _backgrounds[name].scaled;
+
QPainter pain( &back );
QWidget *child;
foreach( child, _children[wid] )
@@ -126,22 +133,15 @@
wid->setPalette( p );
}
-bool QY2Styler::eventFilter( QObject * obj, QEvent * ev )
+bool QY2Styler::updateRendering( QWidget *wid )
{
- QString name = obj->objectName();
-
- if ( ev->type() != QEvent::Resize && ev->type() != QEvent::Show )
- return QObject::eventFilter( obj, ev );
+ QString name = wid->objectName();
if ( !_backgrounds.contains( name ) )
- return QObject::eventFilter( obj, ev );
-
- QWidget *wid = qobject_cast( obj );
-
- if (! wid->isVisible() )
- return QObject::eventFilter( obj, ev );
+ return false;
- //qDebug() << "eventFilter " << qPrintable( name ) << " " << obj->metaObject()->className() << " " << wid->isVisible();
+ if (! wid->isVisible() || !wid->updatesEnabled() )
+ return false;
if ( _backgrounds[name].pix.isNull() )
{
@@ -157,12 +157,12 @@
while ( parent && !_children.contains( parent ) )
parent = parent->parentWidget();
renderParent( parent );
- return QObject::eventFilter( obj, ev );
} else {
renderParent( wid );
- return QObject::eventFilter( obj, ev );
}
+ return true;
+#if 0
QPixmap result( wid->size() );
QRect fillRect = wid->contentsRect();
if ( _backgrounds[name].full )
@@ -195,6 +195,15 @@
p.setBrush(QPalette::Window, result );
wid->setPalette( p );
+ return true;
+#endif
+}
+
+bool QY2Styler::eventFilter( QObject * obj, QEvent * ev )
+{
+ if ( ev->type() == QEvent::Resize || ev->type() == QEvent::Show )
+ updateRendering( qobject_cast( obj ) );
+
return QObject::eventFilter( obj, ev );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/QY2Styler.h new/yast2-qt-2.16.29/src/QY2Styler.h
--- old/yast2-qt-2.16.28/src/QY2Styler.h 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/src/QY2Styler.h 2008-02-26 11:00:35.000000000 +0100
@@ -23,6 +23,8 @@
return _self;
}
+ bool updateRendering( QWidget *wid );
+
protected:
void renderParent( QWidget *wid );
QImage getScaled( const QString name, const QSize & size );
@@ -37,6 +39,8 @@
struct BackgrInfo {
QString filename;
QImage pix;
+ QImage scaled;
+ QSize lastscale;
bool full;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQApplication.cc new/yast2-qt-2.16.29/src/YQApplication.cc
--- old/yast2-qt-2.16.28/src/YQApplication.cc 2008-02-21 10:21:18.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQApplication.cc 2008-02-26 11:00:35.000000000 +0100
@@ -330,13 +330,8 @@
if ( _autoNormalFontSize >= 0 ) // Use cached values
return;
-#warning FIXME: defaultSize
-#if 0
- int x = _defaultSize.width();
- int y = _defaultSize.height();
-#endif
- int x = 800;
- int y = 600;
+ int x = defaultWidth();
+ int y = defaultHeight();
int normal = 10;
int heading = 12;
@@ -659,7 +654,9 @@
YQUI::ui()->makeScreenShot( fileName );
}
-YQPackageSelectorPluginStub * YQApplication::packageSelectorPlugin()
+
+YQPackageSelectorPluginStub *
+YQApplication::packageSelectorPlugin()
{
static YQPackageSelectorPluginStub * plugin = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQDialog.cc new/yast2-qt-2.16.29/src/YQDialog.cc
--- old/yast2-qt-2.16.28/src/YQDialog.cc 2008-02-21 10:21:18.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQDialog.cc 2008-02-26 11:00:35.000000000 +0100
@@ -83,7 +83,7 @@
if ( dialogType != YMainDialog )
setWindowModality( Qt::ApplicationModal );
- if ( QWidget::parent() == YQMainWinDock::mainWinDock() )
+ if ( dialogType == YMainDialog && QWidget::parent() == YQMainWinDock::mainWinDock() )
{
YQMainWinDock::mainWinDock()->add( this );
}
@@ -106,7 +106,7 @@
QWidget *
YQDialog::chooseParent( YDialogType dialogType )
{
- QWidget * parent = 0;
+ QWidget * parent = YQMainWinDock::mainWinDock()->window();
if ( dialogType == YMainDialog &&
YQMainWinDock::mainWinDock()->couldDock() )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQPackageSelectorPluginStub.cc new/yast2-qt-2.16.29/src/YQPackageSelectorPluginStub.cc
--- old/yast2-qt-2.16.28/src/YQPackageSelectorPluginStub.cc 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQPackageSelectorPluginStub.cc 2008-02-26 11:00:35.000000000 +0100
@@ -10,9 +10,10 @@
| (c) SuSE Linux AG |
\----------------------------------------------------------------------/
- File: NCPackageSelectorPluginStub.cc
+ File: YQPackageSelectorPluginStub.cc
- Author: Hedgehog Painter
+ Authors: Katharina Machalkova
+ Stephan Kulow
/-*/
@@ -35,13 +36,12 @@
}
- impl = (YQPackageSelectorPluginIf*) locateSymbol("PSP");
- if ( !impl )
+ impl = (YQPackageSelectorPluginIf*) locateSymbol("PSP");
+
+ if ( ! impl )
{
yuiError() << "Plugin " << PLUGIN_BASE_NAME << " does not provide PSP symbol" << endl;
- exit( 1 );
}
-
}
@@ -50,32 +50,33 @@
// NOP
}
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : YQPackageSelectorPluginStub::createPackageSelector
-// METHOD TYPE : YWidget
-//
-// DESCRIPTION : Create YQPackageSelectorStart which reads the layout
-// term of the package selection dialog, creates the widget
-// tree and creates the YQPackageSelector.
-//
-YPackageSelector * YQPackageSelectorPluginStub::createPackageSelector( YWidget * parent,
- long modeFlags )
+
+YPackageSelector *
+YQPackageSelectorPluginStub::createPackageSelector( YWidget * parent, long modeFlags )
{
+ if ( ! impl )
+ YUI_THROW( YUIPluginException( PLUGIN_BASE_NAME ) );
+
return impl->createPackageSelector( parent, modeFlags );
}
-YWidget * YQPackageSelectorPluginStub::createPatternSelector( YWidget * parent,
- long modeFlags )
+YWidget *
+YQPackageSelectorPluginStub::createPatternSelector( YWidget * parent, long modeFlags )
{
+ if ( ! impl )
+ YUI_THROW( YUIPluginException( PLUGIN_BASE_NAME ) );
+
return impl->createPatternSelector( parent, modeFlags );
}
-YWidget * YQPackageSelectorPluginStub::createSimplePatchSelector( YWidget * parent,
- long modeFlags )
+
+YWidget *
+YQPackageSelectorPluginStub::createSimplePatchSelector( YWidget * parent, long modeFlags )
{
+ if ( ! impl )
+ YUI_THROW( YUIPluginException( PLUGIN_BASE_NAME ) );
+
return impl->createSimplePatchSelector( parent, modeFlags );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQPackageSelectorPluginStub.h new/yast2-qt-2.16.29/src/YQPackageSelectorPluginStub.h
--- old/yast2-qt-2.16.28/src/YQPackageSelectorPluginStub.h 2008-02-21 10:21:18.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQPackageSelectorPluginStub.h 2008-02-26 11:00:35.000000000 +0100
@@ -10,9 +10,10 @@
| (c) SuSE Linux AG |
\----------------------------------------------------------------------/
- File: YQPackageSelectorPluginStub.h
+ File: YQPackageSelectorPluginStub.h
- Author: Hedgehog Painter
+ Authors: Katharina Machalkova
+ Stephan Kulow
/-*/
@@ -24,29 +25,26 @@
#include
#include
#include
-#include
#include "YQPackageSelectorPluginIf.h"
+
/**
- * Simplified access to the ncurses UI's package selector plugin.
+ * Simplified access to the package selector plugin.
**/
-
class YQPackageSelectorPluginIf;
+
class YQPackageSelectorPluginStub: public YPackageSelectorPlugin
{
public:
-
-
/**
- * Constructor: Load the plugin library for the YQurses package selector.
+ * Constructor: Load the plugin library for the package selector.
**/
YQPackageSelectorPluginStub();
/**
- * Destructor. Calls dlclose() which will unload the plugin library if it
- * is no longer used, i.e. if the reference count dlopen() uses reaches 0.
+ * Destructor.
**/
virtual ~YQPackageSelectorPluginStub();
@@ -57,19 +55,23 @@
* This might return 0 if the plugin lib could not be loaded or if the
* appropriate symbol could not be located in the plugin lib.
**/
- virtual YPackageSelector * createPackageSelector( YWidget * parent,
- long modeFlags );
+ virtual YPackageSelector * createPackageSelector( YWidget * parent,
+ long modeFlags );
- // optional widget
- virtual YWidget * createPatternSelector( YWidget * parent,
- long modeFlags );
+ /**
+ * Create a pattern selector (optional widget).
+ **/
+ virtual YWidget * createPatternSelector( YWidget * parent,
+ long modeFlags );
- // optional widget
- virtual YWidget * createSimplePatchSelector( YWidget * parent,
- long modeFlags );
+ /**
+ * Create a simple patch selector (optional widget).
+ **/
+ virtual YWidget * createSimplePatchSelector( YWidget * parent,
+ long modeFlags );
- YQPackageSelectorPluginIf *impl ;
+ YQPackageSelectorPluginIf * impl ;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQUI_core.cc new/yast2-qt-2.16.29/src/YQUI_core.cc
--- old/yast2-qt-2.16.28/src/YQUI_core.cc 2008-02-21 10:21:18.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQUI_core.cc 2008-02-26 11:00:35.000000000 +0100
@@ -353,7 +353,7 @@
void YQUI::calcDefaultSize()
{
QSize primaryScreenSize = qApp->desktop()->screenGeometry( qApp->desktop()->primaryScreen() ).size();
- QSize availableSize = qApp->desktop()->availableGeometry().size();
+ QSize availableSize = qApp->desktop()->availableGeometry( qApp->desktop()->primaryScreen() ).size();
if ( _fullscreen )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/src/YQWidgetFactory.cc new/yast2-qt-2.16.29/src/YQWidgetFactory.cc
--- old/yast2-qt-2.16.28/src/YQWidgetFactory.cc 2008-02-21 10:21:18.000000000 +0100
+++ new/yast2-qt-2.16.29/src/YQWidgetFactory.cc 2008-02-26 11:00:35.000000000 +0100
@@ -293,11 +293,13 @@
YQWidgetFactory::createPackageSelector(YWidget* parent, long modeFlags)
{
YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin();
+ YUI_CHECK_PTR( plugin );
+
- if ( plugin )
- return plugin->createPackageSelector( parent, modeFlags );
- else
- return 0;
+ YPackageSelector * pkgSel = plugin->createPackageSelector( parent, modeFlags );
+ YUI_CHECK_NEW( pkgSel );
+
+ return pkgSel;
}
YWidget *
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/VERSION.cmake new/yast2-qt-2.16.29/VERSION.cmake
--- old/yast2-qt-2.16.28/VERSION.cmake 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/VERSION.cmake 2008-02-26 11:00:35.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "28")
+SET(VERSION_PATCH "29")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.28/yast2-qt.spec.in new/yast2-qt-2.16.29/yast2-qt.spec.in
--- old/yast2-qt-2.16.28/yast2-qt.spec.in 2008-02-21 10:21:17.000000000 +0100
+++ new/yast2-qt-2.16.29/yast2-qt.spec.in 2008-02-26 11:00:35.000000000 +0100
@@ -2,13 +2,22 @@
@HEADER@
-BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: doxygen
+BuildRequires: libdrm-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libxcrypt-devel
+BuildRequires: libxslt
+BuildRequires: perl-XML-Writer
+BuildRequires: libqt4-devel
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
BuildRequires: cmake
Summary: -
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-core-devel >= 2.16.35
-Requires: yast2-core >= 2.16.35
+BuildRequires: yast2-libyui-devel >= 2.16.37
+Requires: yast2-libyui >= 2.16.37
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
@@ -17,6 +26,7 @@
Obsoletes: yast2-ui-qt yast2-ui-qt-devel
Provides: y2qt
Obsoletes: y2qt
+Recommends: yast2-qt-pkg
%description
-
@@ -61,8 +71,7 @@
%files
%defattr (-, root, root)
-%_libdir/YaST2/plugin/libpy2qt.so.*
-%_libdir/YaST2/plugin/libpy2qt.so
+%_libdir/YaST2/plugin/
%_prefix/share/YaST2/data/lang_fonts
%files devel
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org