Hello community,
here is the log from the commit of package yast2-qt
checked in at Mon Jul 16 17:23:09 CEST 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-06-21 17:40:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-07-16 17:17:58.569753000 +0200
@@ -1,0 +2,7 @@
+Tue Jul 10 11:55:26 CEST 2007 - sh@suse.de
+
+- Don't over-simplify whitespace (replacing newlines with blanks)
+ in dependency problem reports
+- V 2.15.6
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.15.5.tar.bz2
New:
----
yast2-qt-2.15.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.V30397/_old 2007-07-16 17:22:21.000000000 +0200
+++ /var/tmp/diff_new_pack.V30397/_new 2007-07-16 17:22:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.15.5)
+# spec file for package yast2-qt (Version 2.15.6)
#
# 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.5
-Release: 32
-License: GNU General Public License (GPL)
+Version: 2.15.6
+Release: 2
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.15.5.tar.bz2
+Source0: yast2-qt-2.15.6.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.5
+%setup -n yast2-qt-2.15.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +89,10 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog
+* Tue Jul 10 2007 - sh@suse.de
+- Don't over-simplify whitespace (replacing newlines with blanks)
+ in dependency problem reports
+- V 2.15.6
* Thu Jun 21 2007 - adrian@suse.de
- fix changelog entry order
* Mon Apr 23 2007 - sh@suse.de
++++++ yast2-qt-2.15.5.tar.bz2 -> yast2-qt-2.15.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/configure.in new/yast2-qt-2.15.6/configure.in
--- old/yast2-qt-2.15.5/configure.in 2007-04-23 15:34:20.000000000 +0200
+++ new/yast2-qt-2.15.6/configure.in 2007-05-21 13:41:46.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-qt
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-qt, 2.15.5, http://bugs.opensuse.org/, yast2-qt)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/Makefile.am new/yast2-qt-2.15.6/src/pkg/Makefile.am
--- old/yast2-qt-2.15.5/src/pkg/Makefile.am 2007-04-13 17:49:37.000000000 +0200
+++ new/yast2-qt-2.15.6/src/pkg/Makefile.am 2007-05-21 13:12:45.000000000 +0200
@@ -35,6 +35,7 @@
YQPackageSelectorBase.cc \
YQPackageSelectorHelp.cc \
YQPatternSelector.cc \
+ YQSimplePatchSelector.cc \
\
YQPkgChangeLogView.cc \
YQPkgChangesDialog.cc \
@@ -73,6 +74,7 @@
YQPackageSelector.moc \
YQPackageSelectorBase.moc \
YQPatternSelector.moc \
+ YQSimplePatchSelector.moc \
YQPkgChangeLogView.moc \
YQPkgChangesDialog.moc \
YQPkgConflictDialog.moc \
@@ -109,6 +111,7 @@
YQPackageSelector.o YQPackageSelector.lo: YQPackageSelector.moc
YQPackageSelectorBase.o YQPackageSelectorBase.lo: YQPackageSelectorBase.moc
YQPatternSelector.o YQPatternSelector.lo: YQPatternSelector.moc
+YQSimplePatchSelector.o YQSimplePatchSelector.lo: YQSimplePatchSelector.moc
YQPkgChangeLogView.o YQPkgChangeLogView.lo: YQPkgChangeLogView.moc
YQPkgChangesDialog.o YQPkgChangesDialog.lo: YQPkgChangesDialog.moc
@@ -145,6 +148,8 @@
YQPackageSelector.moc: YQPackageSelector.h
YQPackageSelectorBase.moc: YQPackageSelectorBase.h
YQPatternSelector.moc: YQPatternSelector.h
+YQSimplePatchSelector.moc: YQSimplePatchSelector.h
+
YQPkgChangeLogView.moc: YQPkgChangeLogView.h
YQPkgChangesDialog.moc: YQPkgChangesDialog.h
YQPkgConflictDialog.moc: YQPkgConflictDialog.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/Makefile.in new/yast2-qt-2.15.6/src/pkg/Makefile.in
--- old/yast2-qt-2.15.5/src/pkg/Makefile.in 2007-04-23 15:34:38.000000000 +0200
+++ new/yast2-qt-2.15.6/src/pkg/Makefile.in 2007-05-21 13:42:03.000000000 +0200
@@ -66,20 +66,21 @@
libpy2qt_pkg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libpy2qt_pkg_la_OBJECTS = YQPackageSelector.lo \
YQPackageSelectorBase.lo YQPackageSelectorHelp.lo \
- YQPatternSelector.lo YQPkgChangeLogView.lo \
- YQPkgChangesDialog.lo YQPkgConflictDialog.lo \
- YQPkgConflictList.lo YQPkgDependenciesView.lo \
- YQPkgDescriptionDialog.lo YQPkgDescriptionView.lo \
- YQPkgDiskUsageList.lo YQPkgDiskUsageWarningDialog.lo \
- YQPkgFileListView.lo YQPkgGenericDetailsView.lo \
- YQPkgInstSrcFilterView.lo YQPkgInstSrcList.lo YQPkgLangList.lo \
- YQPkgList.lo YQPkgObjList.lo YQPkgPatchFilterView.lo \
- YQPkgPatchList.lo YQPkgPatternList.lo YQPkgProductDialog.lo \
- YQPkgProductList.lo YQPkgRpmGroupTagsFilterView.lo \
- YQPkgSearchFilterView.lo YQPkgSelDescriptionView.lo \
- YQPkgSelList.lo YQPkgSelMapper.lo YQPkgStatusFilterView.lo \
- YQPkgTechnicalDetailsView.lo YQPkgTextDialog.lo \
- YQPkgUpdateProblemFilterView.lo YQPkgVersionsView.lo
+ YQPatternSelector.lo YQSimplePatchSelector.lo \
+ YQPkgChangeLogView.lo YQPkgChangesDialog.lo \
+ YQPkgConflictDialog.lo YQPkgConflictList.lo \
+ YQPkgDependenciesView.lo YQPkgDescriptionDialog.lo \
+ YQPkgDescriptionView.lo YQPkgDiskUsageList.lo \
+ YQPkgDiskUsageWarningDialog.lo YQPkgFileListView.lo \
+ YQPkgGenericDetailsView.lo YQPkgInstSrcFilterView.lo \
+ YQPkgInstSrcList.lo YQPkgLangList.lo YQPkgList.lo \
+ YQPkgObjList.lo YQPkgPatchFilterView.lo YQPkgPatchList.lo \
+ YQPkgPatternList.lo YQPkgProductDialog.lo YQPkgProductList.lo \
+ YQPkgRpmGroupTagsFilterView.lo YQPkgSearchFilterView.lo \
+ YQPkgSelDescriptionView.lo YQPkgSelList.lo YQPkgSelMapper.lo \
+ YQPkgStatusFilterView.lo YQPkgTechnicalDetailsView.lo \
+ YQPkgTextDialog.lo YQPkgUpdateProblemFilterView.lo \
+ YQPkgVersionsView.lo
libpy2qt_pkg_la_OBJECTS = $(am_libpy2qt_pkg_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -282,6 +283,7 @@
YQPackageSelectorBase.cc \
YQPackageSelectorHelp.cc \
YQPatternSelector.cc \
+ YQSimplePatchSelector.cc \
\
YQPkgChangeLogView.cc \
YQPkgChangesDialog.cc \
@@ -319,6 +321,7 @@
YQPackageSelector.moc \
YQPackageSelectorBase.moc \
YQPatternSelector.moc \
+ YQSimplePatchSelector.moc \
YQPkgChangeLogView.moc \
YQPkgChangesDialog.moc \
YQPkgConflictDialog.moc \
@@ -458,6 +461,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/YQPkgTextDialog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/YQPkgUpdateProblemFilterView.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/YQPkgVersionsView.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/YQSimplePatchSelector.Plo@am__quote@
.cc.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -772,6 +776,7 @@
YQPackageSelector.o YQPackageSelector.lo: YQPackageSelector.moc
YQPackageSelectorBase.o YQPackageSelectorBase.lo: YQPackageSelectorBase.moc
YQPatternSelector.o YQPatternSelector.lo: YQPatternSelector.moc
+YQSimplePatchSelector.o YQSimplePatchSelector.lo: YQSimplePatchSelector.moc
YQPkgChangeLogView.o YQPkgChangeLogView.lo: YQPkgChangeLogView.moc
YQPkgChangesDialog.o YQPkgChangesDialog.lo: YQPkgChangesDialog.moc
@@ -807,6 +812,8 @@
YQPackageSelector.moc: YQPackageSelector.h
YQPackageSelectorBase.moc: YQPackageSelectorBase.h
YQPatternSelector.moc: YQPatternSelector.h
+YQSimplePatchSelector.moc: YQSimplePatchSelector.h
+
YQPkgChangeLogView.moc: YQPkgChangeLogView.h
YQPkgChangesDialog.moc: YQPkgChangesDialog.h
YQPkgConflictDialog.moc: YQPkgConflictDialog.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/YQPkgConflictList.cc new/yast2-qt-2.15.6/src/pkg/YQPkgConflictList.cc
--- old/yast2-qt-2.15.5/src/pkg/YQPkgConflictList.cc 2007-04-13 17:49:37.000000000 +0200
+++ new/yast2-qt-2.15.6/src/pkg/YQPkgConflictList.cc 2007-07-10 11:54:31.000000000 +0200
@@ -256,7 +256,7 @@
parent->setOpen( true );
}
- QStringList lines = QStringList::split( '\n', longText.simplifyWhiteSpace(),
+ QStringList lines = QStringList::split( '\n', longText,
true ); // allowEmptyEntries
QValueList<QString>::const_iterator it = lines.begin();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/YQPkgPatchFilterView.cc new/yast2-qt-2.15.6/src/pkg/YQPkgPatchFilterView.cc
--- old/yast2-qt-2.15.5/src/pkg/YQPkgPatchFilterView.cc 2007-04-13 17:49:37.000000000 +0200
+++ new/yast2-qt-2.15.6/src/pkg/YQPkgPatchFilterView.cc 2007-05-21 13:12:45.000000000 +0200
@@ -43,6 +43,8 @@
using std::set;
+#define ENABLE_TOTAL_DOWNLOAD_SIZE 0
+
#define SPACING 6 // between subwidgets
#define MARGIN 4 // around the widget
@@ -87,6 +89,8 @@
_descriptionView->setMinimumSize( 0, 0 );
_detailsViews->addTab( _descriptionView, _( "Patch Description" ) );
+
+#if ENABLE_TOTAL_DOWNLOAD_SIZE
//
// HBox for total download size
//
@@ -105,6 +109,7 @@
_totalDownloadSize->setFrameStyle( QFrame::Panel | QFrame::Sunken );
_totalDownloadSize->setLineWidth(1);
_totalDownloadSize->setMidLineWidth(2);
+#endif
connect( _patchList, SIGNAL( selectionChanged ( ZyppSel ) ),
@@ -194,7 +199,9 @@
totalSize += (*it)->candidateObj()->size();
}
+#if ENABLE_TOTAL_DOWNLOAD_SIZE
_totalDownloadSize->setText( totalSize.asString().c_str() );
+#endif
y2debug( "Calculated total download size in %d millisec", calcTime.elapsed() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/YQSimplePatchSelector.cc new/yast2-qt-2.15.6/src/pkg/YQSimplePatchSelector.cc
--- old/yast2-qt-2.15.5/src/pkg/YQSimplePatchSelector.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.15.6/src/pkg/YQSimplePatchSelector.cc 2007-05-21 13:12:45.000000000 +0200
@@ -0,0 +1,244 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YQSimplePatchSelector.cc
+
+ Author: Stefan Hundhammer
+
+ Textdomain "packages-qt"
+
+/-*/
+
+#include
+#include
+#include
+#include
+#include
+
+#define y2log_component "qt-pkg"
+#include
+
+#include "QY2LayoutUtils.h"
+
+#include "YQSimplePatchSelector.h"
+#include "YQPkgConflictDialog.h"
+#include "YQPkgDiskUsageList.h"
+#include "YQPkgPatchFilterView.h"
+#include "YQPkgPatchList.h"
+#include "YQWizard.h"
+#include "YQDialog.h"
+
+#include "utf8.h"
+#include "YQUI.h"
+#include "YEvent.h"
+#include "YQi18n.h"
+
+
+using std::max;
+using std::string;
+
+#define SHOW_DISK_USAGE 0
+
+#define SPACING 6
+#define MARGIN 6
+
+
+
+YQSimplePatchSelector::YQSimplePatchSelector( QWidget * parent,
+ const YWidgetOpt & opt )
+ : YQPackageSelectorBase( parent, opt )
+{
+ _patchFilterView = 0;
+ _patchList = 0;
+ _diskUsageList = 0;
+ _wizard = findWizard();
+
+ basicLayout();
+ makeConnections();
+
+#if 0
+ _patchList->fillList();
+ _patchList->selectSomething();
+#endif
+
+ if ( _diskUsageList )
+ _diskUsageList->updateDiskUsage();
+}
+
+
+
+YQWizard *
+YQSimplePatchSelector::findWizard() const
+{
+ YQWizard * wizard = 0;
+
+ YQDialog * dialog = dynamic_cast ( YUI::ui()->currentDialog() );
+
+ if ( dialog )
+ wizard = dialog->findWizard();
+
+ return wizard;
+}
+
+
+
+void
+YQSimplePatchSelector::basicLayout()
+{
+ QSplitter * splitter = new QSplitter( QSplitter::Vertical, this );
+ CHECK_PTR( splitter );
+ splitter->setMargin( MARGIN );
+
+ //
+ // PatchFilterView
+ //
+
+ QVBox * upper_vbox = new QVBox( splitter );
+ CHECK_PTR( upper_vbox );
+ splitter->setResizeMode( upper_vbox, QSplitter::Stretch );
+
+ _patchFilterView = new YQPkgPatchFilterView( upper_vbox );
+ CHECK_PTR( _patchFilterView );
+
+ _patchList = _patchFilterView->patchList();
+ CHECK_PTR( _patchList );
+
+ addVSpacing( upper_vbox, MARGIN );
+
+ //
+ // Disk Usage
+ //
+
+
+#if SHOW_DISK_USAGE
+ QVBox * lower_vbox = new QVBox( splitter );
+ CHECK_PTR( lower_vbox );
+ addVSpacing( lower_vbox, MARGIN );
+
+ _diskUsageList = new YQPkgDiskUsageList( lower_vbox );
+ CHECK_PTR( _diskUsageList );
+
+ splitter->setResizeMode( lower_vbox, QSplitter::FollowSizeHint );
+#endif
+
+
+ //
+ // Buttons
+ //
+
+ if ( _wizard ) // No button box - add "Details..." button here
+ {
+ //
+ // "Details" button
+ //
+
+ addVSpacing( this, SPACING );
+
+ QHBox * hbox = new QHBox( this );
+ CHECK_PTR( hbox );
+
+ QPushButton * details_button = new QPushButton( _( "&Details..." ), hbox );
+ CHECK_PTR( details_button );
+
+ connect( details_button, SIGNAL( clicked() ),
+ this, SLOT ( detailedPackageSelection() ) );
+
+ addHStretch( hbox );
+ }
+ else // ! _wizard
+ {
+ layoutButtons( this );
+ }
+}
+
+
+void
+YQSimplePatchSelector::layoutButtons( QWidget * parent )
+{
+ QHBox * button_box = new QHBox( parent );
+ CHECK_PTR( button_box );
+ button_box->setMargin ( MARGIN );
+ button_box->setSpacing( SPACING );
+
+
+ QPushButton * details_button = new QPushButton( _( "&Details..." ), button_box );
+ CHECK_PTR( details_button );
+ details_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
+
+ connect( details_button, SIGNAL( clicked() ),
+ this, SLOT ( detailedPackageSelection() ) );
+
+
+ addHStretch( button_box );
+
+ QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box );
+ CHECK_PTR( cancel_button );
+ cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
+
+ connect( cancel_button, SIGNAL( clicked() ),
+ this, SLOT ( reject() ) );
+
+
+ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box );
+ CHECK_PTR( accept_button );
+ accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert
+
+ connect( accept_button, SIGNAL( clicked() ),
+ this, SLOT ( accept() ) );
+
+ button_box->setFixedHeight( button_box->sizeHint().height() );
+}
+
+
+
+void
+YQSimplePatchSelector::makeConnections()
+{
+ if ( _patchList && _diskUsageList )
+ {
+ connect( _patchList, SIGNAL( updatePackages() ),
+ _diskUsageList, SLOT ( updateDiskUsage() ) );
+ }
+
+ y2milestone( "Connection set up" );
+
+ if ( _wizard )
+ {
+ connect( _wizard, SIGNAL( nextClicked() ),
+ this, SLOT ( accept() ) );
+
+ connect( _wizard, SIGNAL( backClicked() ),
+ this, SLOT ( reject() ) );
+
+ connect( _wizard, SIGNAL( abortClicked() ),
+ this, SLOT ( reject() ) );
+ }
+}
+
+
+void
+YQSimplePatchSelector::detailedPackageSelection()
+{
+ y2milestone( "\"Details..\" button clicked" );
+ YQUI::ui()->sendEvent( new YMenuEvent( YCPSymbol( "details" ) ) );
+}
+
+
+void
+YQSimplePatchSelector::debugTrace()
+{
+ y2warning( "debugTrace" );
+}
+
+
+
+#include "YQSimplePatchSelector.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/pkg/YQSimplePatchSelector.h new/yast2-qt-2.15.6/src/pkg/YQSimplePatchSelector.h
--- old/yast2-qt-2.15.5/src/pkg/YQSimplePatchSelector.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.15.6/src/pkg/YQSimplePatchSelector.h 2007-05-21 13:12:45.000000000 +0200
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YQSimplePatchSelector.h
+
+ Author: Stefan Hundhammer
+
+/-*/
+
+// -*- c++ -*-
+
+#ifndef YQSimplePatchSelector_h
+#define YQSimplePatchSelector_h
+
+#include
+#include
+#include
+
+#include "YQPackageSelectorBase.h"
+
+
+class QPushButton;
+
+class YQPkgPatchFilterView;
+class YQPkgPatchList;
+class YQWizard;
+
+
+class YQSimplePatchSelector : public YQPackageSelectorBase
+{
+ Q_OBJECT
+
+public:
+
+ YQSimplePatchSelector( QWidget * parent, const YWidgetOpt & opt );
+
+
+protected slots:
+
+ /**
+ * User clicked on "Details..." - start the detailed package selection.
+ * This will return from UI::RunPkgSelection() with `details .
+ **/
+ void detailedPackageSelection();
+
+ /**
+ * Debugging
+ **/
+ void debugTrace();
+
+
+protected:
+
+ // Layout methods - create and layout widgets
+
+ void basicLayout();
+ void layoutButtons ( QWidget * parent );
+
+ /**
+ * Find the wizard in the current dialog, if there is any.
+ * Returns 0 if there is none.
+ **/
+ YQWizard * findWizard() const;
+
+ /**
+ * Establish Qt signal / slot connections.
+ **/
+ void makeConnections();
+
+
+ // Data members
+
+ YQPkgPatchFilterView * _patchFilterView;
+ YQPkgPatchList * _patchList;
+ YQWizard * _wizard;
+};
+
+
+
+#endif // YQSimplePatchSelector_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.cc new/yast2-qt-2.15.6/src/YQPackageSelectorPlugin.cc
--- old/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.cc 2007-04-23 15:09:29.000000000 +0200
+++ new/yast2-qt-2.15.6/src/YQPackageSelectorPlugin.cc 2007-05-21 13:12:45.000000000 +0200
@@ -23,6 +23,7 @@
#include
#include "YQPackageSelector.h"
#include "YQPatternSelector.h"
+#include "YQSimplePatchSelector.h"
#define PLUGIN_BASE_NAME "qt_pkg"
@@ -99,3 +100,31 @@
return patternSelector;
}
+
+YWidget *
+YQPackageSelectorPlugin::createSimplePatchSelector( YWidget * parent,
+ YWidgetOpt & opt )
+{
+ if ( error() )
+ return 0;
+
+ YWidget * simplePatchSelector = 0;
+
+ try
+ {
+ simplePatchSelector = new YQSimplePatchSelector( (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 simplePatchSelector;
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.h new/yast2-qt-2.15.6/src/YQPackageSelectorPlugin.h
--- old/yast2-qt-2.15.5/src/YQPackageSelectorPlugin.h 2007-04-23 15:09:39.000000000 +0200
+++ new/yast2-qt-2.15.6/src/YQPackageSelectorPlugin.h 2007-05-21 13:12:45.000000000 +0200
@@ -60,6 +60,14 @@
**/
virtual YWidget * createPatternSelector( YWidget * parent,
YWidgetOpt & opt );
+ /**
+ * Create a simple patch 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 * createSimplePatchSelector( YWidget * parent,
+ YWidgetOpt & opt );
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/YQUI.h new/yast2-qt-2.15.6/src/YQUI.h
--- old/yast2-qt-2.15.5/src/YQUI.h 2007-04-23 15:14:22.000000000 +0200
+++ new/yast2-qt-2.15.6/src/YQUI.h 2007-05-21 13:12:45.000000000 +0200
@@ -518,6 +518,10 @@
YWidget * createPatternSelector ( YWidget * parent,
YWidgetOpt & opt );
+ bool hasSimplePatchSelector();
+ YWidget * createSimplePatchSelector( YWidget * parent,
+ YWidgetOpt & opt );
+
bool hasWizard();
YWidget * createWizard ( YWidget * parent, YWidgetOpt & opt,
const YCPValue & backButtonId, const YCPString & backButtonLabel,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/src/YQUI_widgets.cc new/yast2-qt-2.15.6/src/YQUI_widgets.cc
--- old/yast2-qt-2.15.5/src/YQUI_widgets.cc 2007-04-23 15:25:46.000000000 +0200
+++ new/yast2-qt-2.15.6/src/YQUI_widgets.cc 2007-05-21 13:12:45.000000000 +0200
@@ -46,6 +46,7 @@
#include "YQPackageSelector.h"
#include "YQPartitionSplitter.h"
#include "YQPatternSelector.h"
+#include "YQSimplePatchSelector.h"
#include "YQProgressBar.h"
#include "YQPushButton.h"
#include "YQRadioButton.h"
@@ -204,7 +205,7 @@
YWidget * packageSelector = 0;
YQPackageSelectorPlugin * plugin = packageSelectorPlugin();
-
+
if ( plugin )
{
packageSelector = plugin->createPackageSelector( parent, opt );
@@ -507,8 +508,8 @@
}
-YWidget * YQUI::createPatternSelector( YWidget * parent,
- YWidgetOpt & opt )
+YWidget * YQUI::createPatternSelector( YWidget * parent,
+ YWidgetOpt & opt )
{
YWidget * patternSelector = 0;
YQPackageSelectorPlugin * plugin = packageSelectorPlugin();
@@ -517,11 +518,32 @@
{
patternSelector = plugin->createPatternSelector( parent, opt );
}
-
+
return patternSelector;
}
+bool YQUI::hasSimplePatchSelector()
+{
+ return true;
+}
+
+
+YWidget * YQUI::createSimplePatchSelector( YWidget * parent,
+ YWidgetOpt & opt )
+{
+ YWidget * simplePatchSelector = 0;
+ YQPackageSelectorPlugin * plugin = packageSelectorPlugin();
+
+ if ( plugin )
+ {
+ simplePatchSelector = plugin->createSimplePatchSelector( parent, opt );
+ }
+
+ return simplePatchSelector;
+}
+
+
bool YQUI::hasWizard()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.15.5/VERSION new/yast2-qt-2.15.6/VERSION
--- old/yast2-qt-2.15.5/VERSION 2007-04-23 15:33:23.000000000 +0200
+++ new/yast2-qt-2.15.6/VERSION 2007-07-10 11:55:06.000000000 +0200
@@ -1 +1 @@
-2.15.5
+2.15.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org