Hello community, here is the log from the commit of package yast2-tune checked in at Thu Dec 14 02:08:51 CET 2006. -------- --- yast2-tune/yast2-tune.changes 2006-11-13 13:58:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2006-12-13 16:51:45.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 13 15:27:51 CET 2006 - lslezak@suse.cz + +- append /dev name to device name (#164823) +- translate more keys +- display better progress popup when probing devices +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-tune-2.14.0.tar.bz2 New: ---- yast2-tune-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tune.spec ++++++ --- /var/tmp/diff_new_pack.mam2BN/_old 2006-12-14 02:07:44.000000000 +0100 +++ /var/tmp/diff_new_pack.mam2BN/_new 2006-12-14 02:07:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tune (Version 2.14.0) +# spec file for package yast2-tune (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-tune -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tune-2.14.0.tar.bz2 +Source0: yast2-tune-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite Requires: yast2 hdparm yast2-bootloader @@ -32,7 +32,7 @@ %prep -%setup -n yast2-tune-2.14.0 +%setup -n yast2-tune-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,11 @@ %doc %{prefix}/share/doc/packages/yast2-tune %changelog -n yast2-tune +* Wed Dec 13 2006 - lslezak@suse.cz +- append /dev name to device name (#164823) +- translate more keys +- display better progress popup when probing devices +- 2.15.0 * Mon Nov 13 2006 - lslezak@suse.cz - 2.14.0 * Fri Oct 20 2006 - lslezak@suse.cz ++++++ yast2-tune-2.14.0.tar.bz2 -> yast2-tune-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/Makefile.am new/yast2-tune-2.15.0/Makefile.am --- old/yast2-tune-2.14.0/Makefile.am 2006-11-13 13:54:51.000000000 +0100 +++ new/yast2-tune-2.15.0/Makefile.am 2006-12-13 16:48:28.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/Makefile.in new/yast2-tune-2.15.0/Makefile.in --- old/yast2-tune-2.14.0/Makefile.in 2006-11-13 13:55:00.000000000 +0100 +++ new/yast2-tune-2.15.0/Makefile.in 2006-12-13 16:48:36.000000000 +0100 @@ -137,6 +137,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ @@ -203,15 +204,14 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english @@ -222,7 +222,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/VERSION new/yast2-tune-2.15.0/VERSION --- old/yast2-tune-2.14.0/VERSION 2006-11-13 13:53:54.000000000 +0100 +++ new/yast2-tune-2.15.0/VERSION 2006-12-13 16:46:54.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/configure new/yast2-tune-2.15.0/configure --- old/yast2-tune-2.14.0/configure 2006-11-13 13:54:56.000000000 +0100 +++ new/yast2-tune-2.15.0/configure 2006-12-13 16:48:32.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-tune 2.14.0. +# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-tune' PACKAGE_TARNAME='yast2-tune' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-tune 2.14.0' +PACKAGE_VERSION='2.15.0' +PACKAGE_STRING='yast2-tune 2.15.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -661,6 +661,7 @@ LN_S PKG_CONFIG_PATH XGETTEXT +Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE @@ -1182,7 +1183,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-tune 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-tune 2.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1253,7 +1254,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-tune 2.14.0:";; + short | recursive ) echo "Configuration of yast2-tune 2.15.0:";; esac cat <<\_ACEOF @@ -1331,7 +1332,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-tune configure 2.14.0 +yast2-tune configure 2.15.0 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1345,7 +1346,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-tune $as_me 2.14.0, which was +It was created by yast2-tune $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2146,7 +2147,7 @@ # Define the identity of the package. PACKAGE='yast2-tune' - VERSION='2.14.0' + VERSION='2.15.0' cat >>confdefs.h <<_ACEOF @@ -2373,7 +2374,7 @@ -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -2631,6 +2632,8 @@ { (exit 1); exit 1; }; } fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` + devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -2809,6 +2812,34 @@ echo "$as_me: error: ycpc is not installed" >&2;} { (exit 1); exit 1; }; } fi +as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 +echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then + : +else + + { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5 +echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;} + +fi + ac_config_files="$ac_config_files Makefile hwinfo/doc/autodocs/Makefile hwinfo/doc/Makefile hwinfo/src/Makefile hwinfo/scrconf/Makefile hwinfo/Makefile idedma/doc/autodocs/Makefile idedma/doc/Makefile idedma/src/Makefile idedma/testsuite/Makefile idedma/scrconf/Makefile idedma/Makefile" @@ -3247,7 +3278,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-tune $as_me 2.14.0, which was +This file was extended by yast2-tune $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3290,7 +3321,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-tune config.status 2.14.0 +yast2-tune config.status 2.15.0 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -3557,7 +3588,7 @@ LN_S!$LN_S$ac_delim PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim XGETTEXT!$XGETTEXT$ac_delim -CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim +Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -3599,6 +3630,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim @@ -3614,7 +3646,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/configure.in new/yast2-tune-2.15.0/configure.in --- old/yast2-tune-2.14.0/configure.in 2006-11-13 13:54:51.000000000 +0100 +++ new/yast2-tune-2.15.0/configure.in 2006-12-13 16:48:27.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-tune dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tune, 2.14.0, http://bugs.opensuse.org/, yast2-tune) +AC_INIT(yast2-tune, 2.15.0, http://bugs.opensuse.org/, yast2-tune) 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.0" +VERSION="2.15.0" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -112,6 +112,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -144,6 +146,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile hwinfo/doc/autodocs/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/Makefile.in new/yast2-tune-2.15.0/hwinfo/Makefile.in --- old/yast2-tune-2.14.0/hwinfo/Makefile.in 2006-11-13 13:54:57.000000000 +0100 +++ new/yast2-tune-2.15.0/hwinfo/Makefile.in 2006-12-13 16:48:34.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/doc/Makefile.in new/yast2-tune-2.15.0/hwinfo/doc/Makefile.in --- old/yast2-tune-2.14.0/hwinfo/doc/Makefile.in 2006-11-13 13:54:57.000000000 +0100 +++ new/yast2-tune-2.15.0/hwinfo/doc/Makefile.in 2006-12-13 16:48:34.000000000 +0100 @@ -106,6 +106,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/doc/autodocs/Makefile.in new/yast2-tune-2.15.0/hwinfo/doc/autodocs/Makefile.in --- old/yast2-tune-2.14.0/hwinfo/doc/autodocs/Makefile.in 2006-11-13 13:54:57.000000000 +0100 +++ new/yast2-tune-2.15.0/hwinfo/doc/autodocs/Makefile.in 2006-12-13 16:48:34.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/scrconf/Makefile.in new/yast2-tune-2.15.0/hwinfo/scrconf/Makefile.in --- old/yast2-tune-2.14.0/hwinfo/scrconf/Makefile.in 2006-11-13 13:54:58.000000000 +0100 +++ new/yast2-tune-2.15.0/hwinfo/scrconf/Makefile.in 2006-12-13 16:48:34.000000000 +0100 @@ -107,6 +107,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/Makefile.in new/yast2-tune-2.15.0/hwinfo/src/Makefile.in --- old/yast2-tune-2.14.0/hwinfo/src/Makefile.in 2006-11-13 13:54:58.000000000 +0100 +++ new/yast2-tune-2.15.0/hwinfo/src/Makefile.in 2006-12-13 16:48:34.000000000 +0100 @@ -118,6 +118,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/hwinfo.ycp new/yast2-tune-2.15.0/hwinfo/src/hwinfo.ycp --- old/yast2-tune-2.14.0/hwinfo/src/hwinfo.ycp 2006-09-21 15:48:33.000000000 +0200 +++ new/yast2-tune-2.15.0/hwinfo/src/hwinfo.ycp 2006-12-13 16:48:17.000000000 +0100 @@ -6,7 +6,7 @@ * Ladislav Slezak <lslezak@suse.cz> * Michal Svec <msvec@suse.cz> * - * $Id: hwinfo.ycp 24252 2005-07-22 10:06:54Z lslezak $ + * $Id: hwinfo.ycp 34944 2006-12-13 15:48:12Z lslezak $ */ { @@ -15,6 +15,7 @@ import "Wizard"; import "Label"; import "Arch"; +import "Directory"; //include "hwinfo/classnames.ycp"; include "hwinfo/routines.ycp"; @@ -24,6 +25,20 @@ */ boolean abortPressed = false; +term Icon (string icon_name) { + map ui_info = UI::GetDisplayInfo(); + if ((boolean) ui_info["HasLocalImageSupport"]:false == false) return `Empty(); + + return `Image ( + sformat ( + "%1/current/icons/22x22/apps/%2.png", + Directory::themedir, + icon_name + ), + "[x]" + ); +} + /* * open progress bar window */ @@ -32,10 +47,10 @@ `VSpacing(7), `VBox( `HSpacing(40), - // popup dialog header - `Label(_("Probing")), `HBox( - `HWeight(1, `Label(`id(`initLab), "")) + `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), + // translators: popup heading + `Left (`Heading(`id(`heading), _("Probing Hardware..."))) ), // progress bar label `ProgressBar(`id(`initProg), _("Progress"), 1000, 0), @@ -142,7 +157,7 @@ string node = afterLast(p); string node_translated = trans_str(node); - UI::ChangeWidget(`id(`initLab), `Value, node_translated); + UI::ChangeWidget(`id(`initProg), `Label, node_translated); y2milestone("Probing %1 (%2)...", node, node_translated); path pat = topath(p); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/routines.ycp new/yast2-tune-2.15.0/hwinfo/src/routines.ycp --- old/yast2-tune-2.14.0/hwinfo/src/routines.ycp 2006-10-12 10:32:54.000000000 +0200 +++ new/yast2-tune-2.15.0/hwinfo/src/routines.ycp 2006-12-13 16:48:17.000000000 +0100 @@ -2,7 +2,7 @@ * File: routines.ycp * * Author: Ladislav Slezak <lslezak@suse.cz> - * $Id: routines.ycp 33338 2006-10-12 08:32:52Z lslezak $ + * $Id: routines.ycp 34944 2006-12-13 15:48:12Z lslezak $ * * Functions used in hwinfo and in init_hwinfo modules. */ @@ -72,6 +72,66 @@ // tree node string - location of hardware in the machine "slot_id" : _("Slot ID"), // tree node string + "length" : _("Length"), + // tree node string + "width" : _("Width"), + // tree node string + "height" : _("Height"), + // tree node string + "active" : _("Active"), + // tree node string + "dev_names" : _("Device Names"), + // tree node string (number of colors) + "color" : _("Colors"), + // tree node string (harddisk parameter) + "disk_log_geo" : _("Logical Geometry"), + // tree node string + "count" : _("Count"), + // tree node string + "mode" : _("Mode"), + // tree node string (interrupt request) + "irq" : _("IRQ"), + // tree node string + "io" : _("IO Port"), + // tree node string + "mem" : _("Memory"), + // tree node string (direct memory access) + "dma" : _("DMA"), + // tree node string + "bus_hwcfg" : _("Hwcfg Bus"), + // tree node string + "sysfs_bus_id" : _("Sysfs ID"), + // tree node string + "parent_unique_key" : _("Parent Unique ID"), + // tree node string + "udi" : _("UDI"), + // tree node string + "uniqueid" : _("Unique ID"), + // tree node string (monitor parameter) + "vfreq" : _("Vertical Frequency"), + // tree node string (monitor parameter) + "max_hsync" : _("Max. Horizontal Frequency"), + // tree node string (monitor parameter) + "max_vsync" : _("Max. Vertical Frequency"), + // tree node string (monitor parameter) + "min_hsync" : _("Min. Horizontal Frequency"), + // tree node string (monitor parameter) + "min_vsync" : _("Min. Vertical Frequency"), + // tree node string + "dvd" : _("DVD"), + // tree node string + "driver_module" : _("Kernel Driver"), + // tree node string + "hwaddr" : _("HW Address"), + // tree node string + "bios_id" : _("BIOS ID"), + // tree node string + "enabled" : _("Enabled"), + // tree node string (monitor resolution e.g. 1280x1024) + "monitor_resol" : _("Resolution"), + // tree node string + "size" : _("Size"), + // tree node string "old_unique_key" : _("Old Unique Key"), // tree node string "sub_class_id" : _("Class (spec)"), @@ -434,6 +494,20 @@ { out = classtostring("dummy", m); } + else if (key_name == "device") + { + out = m[key_name]:""; + if (haskey(m, "dev_name")) + { + string device = m["dev_name"]:""; + + if (device != "") + { + // tree node string - %1 is device name, %2 is /dev file + out = sformat(_("%1 (%2)"), out, device); + } + } + } else { out = trans_str(sformat("%1", m[key_name]:nil)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/Makefile.in new/yast2-tune-2.15.0/idedma/Makefile.in --- old/yast2-tune-2.14.0/idedma/Makefile.in 2006-11-13 13:54:58.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/Makefile.in 2006-12-13 16:48:35.000000000 +0100 @@ -106,6 +106,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/doc/Makefile.in new/yast2-tune-2.15.0/idedma/doc/Makefile.in --- old/yast2-tune-2.14.0/idedma/doc/Makefile.in 2006-11-13 13:54:58.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/doc/Makefile.in 2006-12-13 16:48:35.000000000 +0100 @@ -118,6 +118,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/doc/autodocs/Makefile.in new/yast2-tune-2.15.0/idedma/doc/autodocs/Makefile.in --- old/yast2-tune-2.14.0/idedma/doc/autodocs/Makefile.in 2006-11-13 13:54:58.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/doc/autodocs/Makefile.in 2006-12-13 16:48:35.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/scrconf/Makefile.in new/yast2-tune-2.15.0/idedma/scrconf/Makefile.in --- old/yast2-tune-2.14.0/idedma/scrconf/Makefile.in 2006-11-13 13:54:59.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/scrconf/Makefile.in 2006-12-13 16:48:35.000000000 +0100 @@ -107,6 +107,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/src/Makefile.in new/yast2-tune-2.15.0/idedma/src/Makefile.in --- old/yast2-tune-2.14.0/idedma/src/Makefile.in 2006-11-13 13:54:59.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/src/Makefile.in 2006-12-13 16:48:35.000000000 +0100 @@ -118,6 +118,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/testsuite/Makefile.in new/yast2-tune-2.15.0/idedma/testsuite/Makefile.in --- old/yast2-tune-2.14.0/idedma/testsuite/Makefile.in 2006-11-13 13:54:59.000000000 +0100 +++ new/yast2-tune-2.15.0/idedma/testsuite/Makefile.in 2006-12-13 16:48:36.000000000 +0100 @@ -103,6 +103,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org