Hello community,
here is the log from the commit of package yast2-qt
checked in at Fri Feb 2 16:12:44 CET 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-01-24 15:11:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-02-01 14:44:22.052409000 +0100
@@ -1,0 +2,19 @@
+Thu Feb 1 14:37:29 CET 2007 - sh@suse.de
+
+- Merged SLE10-SP1 branch changes back to trunk:
+ - Fixed bug #239829: Show patch name (ID) in patches list
+
+- V 2.15.6
+
+-------------------------------------------------------------------
+Wed Jan 31 14:22:26 CET 2007 - sh@suse.de
+
+- Merged SLE10-SP1 branch changes back to trunk:
+ - Fixed bug #187322: Ignore solver errors in patch mode
+ at first solver run
+ - Fixed bug #232522: Added inst src URL to pkg versions view
+ - Fixed bug #152997: Install progress icons
+
+- V 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.14.4.tar.bz2
New:
----
yast2-qt-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.zQ8595/_old 2007-02-02 16:11:46.000000000 +0100
+++ /var/tmp/diff_new_pack.zQ8595/_new 2007-02-02 16:11:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.14.4)
+# spec file for package yast2-qt (Version 2.14.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.14.4
+Version: 2.14.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.14.4.tar.bz2
+Source0: yast2-qt-2.14.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
@@ -42,7 +42,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-qt-2.14.4
+%setup -n yast2-qt-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,17 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog -n yast2-qt
+* Thu Feb 01 2007 - sh@suse.de
+- Merged SLE10-SP1 branch changes back to trunk:
+ - Fixed bug #239829: Show patch name (ID) in patches list
+- V 2.15.6
+* Wed Jan 31 2007 - sh@suse.de
+- Merged SLE10-SP1 branch changes back to trunk:
+ - Fixed bug #187322: Ignore solver errors in patch mode
+ at first solver run
+ - Fixed bug #232522: Added inst src URL to pkg versions view
+ - Fixed bug #152997: Install progress icons
+- V 2.15.5
* Wed Jan 24 2007 - sh@suse.de
- Merged SLE10-SP1 branch changes back to trunk:
- Fixed bug #218669: Broken UTF8 chars in pkg to text file export
++++++ yast2-qt-2.14.4.tar.bz2 -> yast2-qt-2.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/configure new/yast2-qt-2.14.6/configure
--- old/yast2-qt-2.14.4/configure 2007-01-24 15:09:01.000000000 +0100
+++ new/yast2-qt-2.14.6/configure 2007-02-01 14:41:13.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-qt 2.14.4.
+# Generated by GNU Autoconf 2.59 for yast2-qt 2.14.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-qt'
PACKAGE_TARNAME='yast2-qt'
-PACKAGE_VERSION='2.14.4'
-PACKAGE_STRING='yast2-qt 2.14.4'
+PACKAGE_VERSION='2.14.6'
+PACKAGE_STRING='yast2-qt 2.14.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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.14.4 to adapt to many kinds of systems.
+\`configure' configures yast2-qt 2.14.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1042,7 +1042,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-qt 2.14.4:";;
+ short | recursive ) echo "Configuration of yast2-qt 2.14.6:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-qt configure 2.14.4
+yast2-qt configure 2.14.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1205,7 +1205,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.14.4, which was
+It was created by yast2-qt $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1935,7 +1935,7 @@
# Define the identity of the package.
PACKAGE='yast2-qt'
- VERSION='2.14.4'
+ VERSION='2.14.6'
cat >>confdefs.h <<_ACEOF
@@ -2146,7 +2146,7 @@
-VERSION="2.14.4"
+VERSION="2.14.6"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -20510,7 +20510,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-qt $as_me 2.14.4, which was
+This file was extended by yast2-qt $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20573,7 +20573,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-qt config.status 2.14.4
+yast2-qt config.status 2.14.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/configure.in new/yast2-qt-2.14.6/configure.in
--- old/yast2-qt-2.14.4/configure.in 2007-01-24 15:08:48.000000000 +0100
+++ new/yast2-qt-2.14.6/configure.in 2007-02-01 14:40:57.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.14.4, http://bugs.opensuse.org/, yast2-qt)
+AC_INIT(yast2-qt, 2.14.6, 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.14.4"
+VERSION="2.14.6"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/icons/Makefile.am new/yast2-qt-2.14.6/src/include/icons/Makefile.am
--- old/yast2-qt-2.14.4/src/include/icons/Makefile.am 2006-11-10 14:10:54.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/icons/Makefile.am 2007-01-31 14:22:14.000000000 +0100
@@ -25,14 +25,17 @@
normal_conflict.xpm \
protected.xpm \
protected_disabled.xpm \
+ satisfied.xpm \
sel_autodel.xpm \
sel_autodel_disabled.xpm \
sel_autoinstall.xpm \
sel_autoinstall_disabled.xpm \
sel_autoupdate.xpm \
sel_autoupdate_disabled.xpm \
- satisfied.xpm \
select_conflict.xpm \
+ step_current.xpm \
+ step_done.xpm \
+ step_todo.xpm \
stop.xpm \
taboo.xpm \
taboo_disabled.xpm \
@@ -42,8 +45,6 @@
update.xpm \
update_disabled.xpm \
warning_sign.xpm
-#tree_plus and tree_minus added here to compile
-
# Those icons are used at runtime by the online help system.
@@ -68,31 +69,7 @@
sel_autoupdate.xpm \
taboo.xpm \
update.xpm
-#tree_plus and tree_minus added here to compile
EXTRA_DIST = $(helpimages_DATA)
CLEANFILES = y2qt.kdoc
-
-#<INSTALL-HEADER-TARGET>
-
-# Automatically inserted by insert_install_target
-# DO NOT REMOVE THE TAGS!
-
-# Install header files only if different to version already installed -
-# prevent unnecessary installations to keep make dependency changes
-# and thus rebuilds for dependent packages as low as possible.
-
-### install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-### @$(NORMAL_INSTALL)
-### $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
-### @list='$(pkginclude_HEADERS)'; \
-### for p in $$list; do \
-### if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-### if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \
-### echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
-### $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
-### fi \
-### done
-
-#</INSTALL-HEADER-TARGET>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/icons/Makefile.in new/yast2-qt-2.14.6/src/include/icons/Makefile.in
--- old/yast2-qt-2.14.4/src/include/icons/Makefile.in 2007-01-24 15:09:05.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/icons/Makefile.in 2007-02-01 14:41:19.000000000 +0100
@@ -236,14 +236,17 @@
normal_conflict.xpm \
protected.xpm \
protected_disabled.xpm \
+ satisfied.xpm \
sel_autodel.xpm \
sel_autodel_disabled.xpm \
sel_autoinstall.xpm \
sel_autoinstall_disabled.xpm \
sel_autoupdate.xpm \
sel_autoupdate_disabled.xpm \
- satisfied.xpm \
select_conflict.xpm \
+ step_current.xpm \
+ step_done.xpm \
+ step_todo.xpm \
stop.xpm \
taboo.xpm \
taboo_disabled.xpm \
@@ -254,7 +257,6 @@
update_disabled.xpm \
warning_sign.xpm
-#tree_plus and tree_minus added here to compile
# Those icons are used at runtime by the online help system.
# For everything else, they are included in the source code -
@@ -277,7 +279,6 @@
taboo.xpm \
update.xpm
-#tree_plus and tree_minus added here to compile
EXTRA_DIST = $(helpimages_DATA)
CLEANFILES = y2qt.kdoc
all: all-am
@@ -506,29 +507,6 @@
ps ps-am tags uninstall uninstall-am uninstall-helpimagesDATA \
uninstall-info-am
-
-#<INSTALL-HEADER-TARGET>
-
-# Automatically inserted by insert_install_target
-# DO NOT REMOVE THE TAGS!
-
-# Install header files only if different to version already installed -
-# prevent unnecessary installations to keep make dependency changes
-# and thus rebuilds for dependent packages as low as possible.
-
-### install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-### @$(NORMAL_INSTALL)
-### $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
-### @list='$(pkginclude_HEADERS)'; \
-### for p in $$list; do \
-### if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-### if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \
-### echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
-### $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
-### fi \
-### done
-
-#</INSTALL-HEADER-TARGET>
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/icons/step_current.xpm new/yast2-qt-2.14.6/src/include/icons/step_current.xpm
--- old/yast2-qt-2.14.4/src/include/icons/step_current.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/icons/step_current.xpm 2007-01-31 14:22:13.000000000 +0100
@@ -0,0 +1,19 @@
+/* XPM */
+static const char * step_current_xpm[] = {
+"14 14 2 1",
+" c None",
+". c #000000",
+" ",
+" . ",
+" .. ",
+" ... ",
+" .... ",
+" ........... ",
+" ............ ",
+" ............ ",
+" ........... ",
+" .... ",
+" ... ",
+" .. ",
+" . ",
+" "};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/icons/step_done.xpm new/yast2-qt-2.14.6/src/include/icons/step_done.xpm
--- old/yast2-qt-2.14.4/src/include/icons/step_done.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/icons/step_done.xpm 2007-01-31 14:22:13.000000000 +0100
@@ -0,0 +1,31 @@
+/* XPM */
+static const char * step_done_xpm[] = {
+"14 14 14 1",
+" c None",
+". c #C5C8C9",
+"+ c #333333",
+"@ c #767778",
+"# c #AEB1B2",
+"$ c #DBDFE1",
+"% c #D0D3D5",
+"& c #B9BCBE",
+"* c #6B6C6D",
+"= c #3E3E3E",
+"- c #818384",
+"; c #545555",
+"> c #8C8E8F",
+", c #A3A5A7",
+" ",
+" ",
+" .+@ ",
+" @++ ",
+" #$ %++@ ",
+" &+@ @++% ",
+" *++.=+- ",
+" @++=+=$ ",
+" $;+++> ",
+" .=+=$ ",
+" #+, ",
+" % ",
+" ",
+" "};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/icons/step_todo.xpm new/yast2-qt-2.14.6/src/include/icons/step_todo.xpm
--- old/yast2-qt-2.14.4/src/include/icons/step_todo.xpm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/icons/step_todo.xpm 2007-01-31 14:22:13.000000000 +0100
@@ -0,0 +1,20 @@
+/* XPM */
+static const char * step_todo_xpm[] = {
+"14 14 3 1",
+" c None",
+". c #5F6061",
+"+ c #333333",
+" ",
+" ",
+" ",
+" ",
+" .++. ",
+" .++++. ",
+" ++++++ ",
+" ++++++ ",
+" .++++. ",
+" .++. ",
+" ",
+" ",
+" ",
+" "};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/YQIconPool.h new/yast2-qt-2.14.6/src/include/YQIconPool.h
--- old/yast2-qt-2.14.4/src/include/YQIconPool.h 2006-11-10 14:10:58.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/YQIconPool.h 2007-01-31 14:22:13.000000000 +0100
@@ -73,6 +73,10 @@
static QPixmap warningSign();
static QPixmap pkgSatisfied();
+ static QPixmap stepCurrent();
+ static QPixmap stepToDo();
+ static QPixmap stepDone();
+
protected:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/include/YQPkgVersionsView.h new/yast2-qt-2.14.6/src/include/YQPkgVersionsView.h
--- old/yast2-qt-2.14.4/src/include/YQPkgVersionsView.h 2006-11-10 14:10:58.000000000 +0100
+++ new/yast2-qt-2.14.6/src/include/YQPkgVersionsView.h 2007-01-31 14:22:13.000000000 +0100
@@ -65,6 +65,7 @@
int versionCol() const { return _versionCol; }
int archCol() const { return _archCol; }
int productCol() const { return _productCol; }
+ int urlCol() const { return _urlCol; }
int instSrcCol() const { return _instSrcCol; }
int nameCol() const { return _nameCol; }
int summaryCol() const { return _summaryCol; }
@@ -122,6 +123,7 @@
int _versionCol;
int _archCol;
int _productCol;
+ int _urlCol;
int _instSrcCol;
int _nameCol;
int _summaryCol;
@@ -184,6 +186,7 @@
int versionCol() const { return _pkgVersionList->versionCol(); }
int productCol() const { return _pkgVersionList->productCol(); }
+ int urlCol() const { return _pkgVersionList->urlCol(); }
int instSrcCol() const { return _pkgVersionList->instSrcCol(); }
int statusCol() const { return _pkgVersionList->statusCol(); }
int archCol() const { return _pkgVersionList->archCol(); }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/YQIconPool.cc new/yast2-qt-2.14.6/src/YQIconPool.cc
--- old/yast2-qt-2.14.4/src/YQIconPool.cc 2006-11-10 14:11:03.000000000 +0100
+++ new/yast2-qt-2.14.6/src/YQIconPool.cc 2007-01-31 14:22:14.000000000 +0100
@@ -61,6 +61,9 @@
#include "icons/checklist_off.xpm"
#include "icons/checklist_on.xpm"
+#include "icons/step_current.xpm"
+#include "icons/step_todo.xpm"
+#include "icons/step_done.xpm"
YQIconPool * YQIconPool::_iconPool = 0;
@@ -109,6 +112,10 @@
QPixmap YQIconPool::warningSign() { return iconPool()->cachedIcon( warning_sign_xpm ); }
QPixmap YQIconPool::pkgSatisfied() { return iconPool()->cachedIcon( satisfied_xpm ); }
+QPixmap YQIconPool::stepCurrent() { return iconPool()->cachedIcon( step_current_xpm ); }
+QPixmap YQIconPool::stepToDo() { return iconPool()->cachedIcon( step_todo_xpm ); }
+QPixmap YQIconPool::stepDone() { return iconPool()->cachedIcon( step_done_xpm ); }
+
YQIconPool * YQIconPool::iconPool()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/YQPackageSelector.cc new/yast2-qt-2.14.6/src/YQPackageSelector.cc
--- old/yast2-qt-2.14.4/src/YQPackageSelector.cc 2007-01-24 14:46:54.000000000 +0100
+++ new/yast2-qt-2.14.6/src/YQPackageSelector.cc 2007-01-31 14:22:14.000000000 +0100
@@ -201,7 +201,7 @@
#if CHECK_DEPENDENCIES_ON_STARTUP
- if ( ! _testMode )
+ if ( ! _testMode && ! _youMode )
{
// Fire up the first dependency check in the main loop.
// Don't do this right away - wait until all initializations are finished.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/YQPkgPatchList.cc new/yast2-qt-2.14.6/src/YQPkgPatchList.cc
--- old/yast2-qt-2.14.4/src/YQPkgPatchList.cc 2006-11-24 12:44:21.000000000 +0100
+++ new/yast2-qt-2.14.6/src/YQPkgPatchList.cc 2007-02-01 14:18:48.000000000 +0100
@@ -53,7 +53,8 @@
int numCol = 0;
addColumn( "" ); _statusCol = numCol++;
- addColumn( _( "Patch" ) ); _summaryCol = numCol++;
+ addColumn( _( "Patch" ) ); _nameCol = numCol++;
+ addColumn( _( "Summary" ) ); _summaryCol = numCol++;
addColumn( _( "Category" ) ); _categoryCol = numCol++;
addColumn( _( "Size" ) ); _sizeCol = numCol++;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/YQPkgVersionsView.cc new/yast2-qt-2.14.6/src/YQPkgVersionsView.cc
--- old/yast2-qt-2.14.4/src/YQPkgVersionsView.cc 2006-11-10 14:11:03.000000000 +0100
+++ new/yast2-qt-2.14.6/src/YQPkgVersionsView.cc 2007-01-31 14:22:13.000000000 +0100
@@ -44,6 +44,7 @@
_versionCol = -42;
_archCol = -42;
_productCol = -42;
+ _urlCol = -42;
_instSrcCol = -42;
_statusCol = -42;
_nameCol = -42;
@@ -54,6 +55,7 @@
addColumn( _( "Arch." ) ); _archCol = numCol++;
addColumn( _( "Product" ) ); _productCol = numCol++;
addColumn( _( "Installation Source" ) ); _instSrcCol = numCol++;
+ addColumn( _( "URL" ) ); _urlCol = numCol++;
_statusCol = _productCol;
_nameCol = _versionCol;
@@ -254,6 +256,10 @@
if ( product )
setText( productCol(), product->summary() );
}
+ if ( urlCol() >= 0 )
+ {
+ setText( urlCol(), zyppObj->source().url().asString().c_str() );
+ }
if ( _selectable->hasInstalledObj() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/src/YQWizard.cc new/yast2-qt-2.14.6/src/YQWizard.cc
--- old/yast2-qt-2.14.4/src/YQWizard.cc 2006-11-10 14:11:03.000000000 +0100
+++ new/yast2-qt-2.14.6/src/YQWizard.cc 2007-01-31 14:22:14.000000000 +0100
@@ -68,6 +68,7 @@
#include "YQEmpty.h"
#include "YQLabel.h"
#include "YQWizardButton.h"
+#include "YQIconPool.h"
#include "QY2LayoutUtils.h"
#include "YEvent.h"
@@ -1274,22 +1275,22 @@
void YQWizard::loadStepsIcons()
{
+ _stepCurrentIcon = YQIconPool::stepCurrent();
+ _stepToDoIcon = YQIconPool::stepToDo();
+ _stepDoneIcon = YQIconPool::stepDone();
+
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 );
+ _stepToDoColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-todo.png" ), 0, 0 );
+ _stepDoneColor = pixelColor( QPixmap( PIXMAP_DIR "color-step-done.png" ), 0, 0 );
}
else
{
- _stepCurrentColor = paletteForegroundColor();
- _stepToDoColor = paletteForegroundColor();
- _stepDoneColor = paletteForegroundColor();
+ _stepCurrentColor = paletteForegroundColor();
+ _stepToDoColor = paletteForegroundColor();
+ _stepDoneColor = paletteForegroundColor();
}
-
- _stepCurrentIcon = QPixmap( PIXMAP_DIR "step-current.png" );
- _stepToDoIcon = QPixmap( PIXMAP_DIR "step-todo.png" );
- _stepDoneIcon = QPixmap( PIXMAP_DIR "step-done.png" );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.4/VERSION new/yast2-qt-2.14.6/VERSION
--- old/yast2-qt-2.14.4/VERSION 2007-01-24 14:53:50.000000000 +0100
+++ new/yast2-qt-2.14.6/VERSION 2007-02-01 14:18:55.000000000 +0100
@@ -1 +1 @@
-2.14.4
+2.14.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org