Hello community,
here is the log from the commit of package yast2-qt
checked in at Mon Apr 23 15:37:16 CEST 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-04-16 17:01:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-04-23 15:35:38.651200000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 23 15:33:26 CEST 2007 - sh@suse.de
+
+- Load qt_pkg plugin for PatternSelector widget, too
+- V 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.15.4.tar.bz2
New:
----
yast2-qt-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.o21177/_old 2007-04-23 15:37:10.000000000 +0200
+++ /var/tmp/diff_new_pack.o21177/_new 2007-04-23 15:37:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.15.4)
+# spec file for package yast2-qt (Version 2.15.5)
#
# 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.4
+Version: 2.15.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.15.4.tar.bz2
+Source0: yast2-qt-2.15.5.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.4
+%setup -n yast2-qt-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +89,9 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog
+* Mon Apr 23 2007 - sh@suse.de
+- Load qt_pkg plugin for PatternSelector widget, too
+- V 2.15.5
* Mon Apr 16 2007 - sh@suse.de
- Added qt_pkg plugins to file list
- V 2.15.4
++++++ yast2-qt-2.15.4.tar.bz2 -> yast2-qt-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/configure new/yast2-qt-2.15.5/configure
--- old/yast2-qt-2.15.4/configure 2007-04-13 18:03:17.000000000 +0200
+++ new/yast2-qt-2.15.5/configure 2007-04-23 15:34:34.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-qt 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-qt 2.15.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-qt'
PACKAGE_TARNAME='yast2-qt'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-qt 2.15.3'
+PACKAGE_VERSION='2.15.5'
+PACKAGE_STRING='yast2-qt 2.15.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1426,7 +1426,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-qt 2.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-qt 2.15.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1501,7 +1501,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-qt 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-qt 2.15.5:";;
esac
cat <<\_ACEOF
@@ -1613,7 +1613,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-qt configure 2.15.3
+yast2-qt configure 2.15.5
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1627,7 +1627,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-qt $as_me 2.15.3, which was
+It was created by yast2-qt $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2428,7 +2428,7 @@
# Define the identity of the package.
PACKAGE='yast2-qt'
- VERSION='2.15.3'
+ VERSION='2.15.5'
cat >>confdefs.h <<_ACEOF
@@ -2655,7 +2655,7 @@
-VERSION="2.15.3"
+VERSION="2.15.5"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -21883,7 +21883,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-qt $as_me 2.15.3, which was
+This file was extended by yast2-qt $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21936,7 +21936,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-qt config.status 2.15.3
+yast2-qt config.status 2.15.5
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/configure.in new/yast2-qt-2.15.5/configure.in
--- old/yast2-qt-2.15.4/configure.in 2007-04-13 18:03:02.000000000 +0200
+++ new/yast2-qt-2.15.5/configure.in 2007-04-23 15:34:20.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.15.3, http://bugs.opensuse.org/, yast2-qt)
+AC_INIT(yast2-qt, 2.15.5, http://bugs.opensuse.org/, yast2-qt)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.5"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/src/YQPackageSelectorPlugin.cc new/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.cc
--- old/yast2-qt-2.15.4/src/YQPackageSelectorPlugin.cc 2007-04-13 17:49:38.000000000 +0200
+++ new/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.cc 2007-04-23 15:09:29.000000000 +0200
@@ -22,6 +22,7 @@
#define y2log_component "qt-ui"
#include
#include "YQPackageSelector.h"
+#include "YQPatternSelector.h"
#define PLUGIN_BASE_NAME "qt_pkg"
@@ -69,3 +70,32 @@
return packageSelector;
}
+
+
+YWidget *
+YQPackageSelectorPlugin::createPatternSelector( YWidget * parent,
+ YWidgetOpt & opt )
+{
+ if ( error() )
+ return 0;
+
+ YWidget * patternSelector = 0;
+
+ try
+ {
+ patternSelector = new YQPatternSelector( (QWidget *) ( parent->widgetRep() ), opt );
+ }
+ catch (const std::exception & e)
+ {
+ y2error( "Caught std::exception: %s", e.what() );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ catch (...)
+ {
+ y2error( "Caught unspecified exception." );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+
+ return patternSelector;
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/src/YQPackageSelectorPlugin.h new/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.h
--- old/yast2-qt-2.15.4/src/YQPackageSelectorPlugin.h 2007-04-13 17:49:40.000000000 +0200
+++ new/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.h 2007-04-23 15:09:39.000000000 +0200
@@ -51,6 +51,15 @@
**/
virtual YWidget * createPackageSelector( YWidget * parent,
YWidgetOpt & opt );
+
+ /**
+ * Create a pattern selector.
+ *
+ * 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 YWidget * createPatternSelector( YWidget * parent,
+ YWidgetOpt & opt );
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/src/YQUI.h new/yast2-qt-2.15.5/src/YQUI.h
--- old/yast2-qt-2.15.4/src/YQUI.h 2007-04-13 17:49:40.000000000 +0200
+++ new/yast2-qt-2.15.5/src/YQUI.h 2007-04-23 15:14:22.000000000 +0200
@@ -41,6 +41,7 @@
class QCursor;
class YEvent;
class QY2Settings;
+class YQPackageSelectorPlugin;
using std::string;
using std::vector;
@@ -243,7 +244,7 @@
*/
void beep();
-
+
public slots:
/**
@@ -512,7 +513,7 @@
const YCPString & newPartLabel,
const YCPString & freeFieldLabel,
const YCPString & newPartFieldLabel );
-
+
bool hasPatternSelector();
YWidget * createPatternSelector ( YWidget * parent,
YWidgetOpt & opt );
@@ -640,6 +641,12 @@
**/
virtual float layoutUnits( YUIDimension dim, long device_units );
+ /**
+ * Returns the package selector plugin singleton of this UI or creates it
+ * (including loading the plugin lib) if it does not exist yet.
+ **/
+ YQPackageSelectorPlugin * packageSelectorPlugin();
+
protected:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/src/YQUI_widgets.cc new/yast2-qt-2.15.5/src/YQUI_widgets.cc
--- old/yast2-qt-2.15.4/src/YQUI_widgets.cc 2007-04-13 17:49:39.000000000 +0200
+++ new/yast2-qt-2.15.5/src/YQUI_widgets.cc 2007-04-23 15:25:46.000000000 +0200
@@ -177,12 +177,9 @@
return new YQRichText( (QWidget *) ( parent->widgetRep() ), opt, text);
}
-YWidget * YQUI::createPackageSelector ( YWidget * parent,
- YWidgetOpt & opt,
- const YCPString & floppyDevice )
+
+YQPackageSelectorPlugin * YQUI::packageSelectorPlugin()
{
- _auto_activate_dialogs = false;
- YWidget * packageSelector = 0;
static YQPackageSelectorPlugin * plugin = 0;
if ( ! plugin )
@@ -195,6 +192,19 @@
// open to avoid repeated start-up cost of the plugin and libzypp.
}
+ return plugin;
+}
+
+
+YWidget * YQUI::createPackageSelector ( YWidget * parent,
+ YWidgetOpt & opt,
+ const YCPString & floppyDevice )
+{
+ _auto_activate_dialogs = false;
+ YWidget * packageSelector = 0;
+
+ YQPackageSelectorPlugin * plugin = packageSelectorPlugin();
+
if ( plugin )
{
packageSelector = plugin->createPackageSelector( parent, opt );
@@ -203,6 +213,7 @@
return packageSelector;
}
+
YWidget * YQUI::createPkgSpecial ( YWidget * parent,
YWidgetOpt & opt,
const YCPString & subwidget )
@@ -211,6 +222,7 @@
return 0;
}
+
YWidget * YQUI::createPushButton ( YWidget * parent,
YWidgetOpt & opt,
const YCPString & label )
@@ -498,23 +510,15 @@
YWidget * YQUI::createPatternSelector( YWidget * parent,
YWidgetOpt & opt )
{
- YWidget * w = 0;
+ YWidget * patternSelector = 0;
+ YQPackageSelectorPlugin * plugin = packageSelectorPlugin();
- try
- {
- w = new YQPatternSelector( (QWidget *) ( parent->widgetRep() ), opt );
- }
- catch (const std::exception & e)
- {
- y2error( "Caught std::exception: %s", e.what() );
- y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
- }
- catch (...)
+ if ( plugin )
{
- y2error( "Caught unspecified exception." );
- y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ patternSelector = plugin->createPatternSelector( parent, opt );
}
- return w;
+
+ return patternSelector;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.4/VERSION new/yast2-qt-2.15.5/VERSION
--- old/yast2-qt-2.15.4/VERSION 2007-04-16 15:44:06.000000000 +0200
+++ new/yast2-qt-2.15.5/VERSION 2007-04-23 15:33:23.000000000 +0200
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org