Mailinglist Archive: opensuse-commit (1306 mails)
| < Previous | Next > |
commit yast2-network
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 25 Jul 2007 23:09:42 +0200
- Message-id: <20070725210942.B848C6781B8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-network
checked in at Wed Jul 25 23:09:42 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-07-23 22:52:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-07-25 17:10:48.095073000 +0200
@@ -1,0 +2,16 @@
+Wed Jul 25 16:44:14 CEST 2007 - kmachalkova@xxxxxxx
+
+- A better layout of internet test dialog (#292621, also in 80x25
+ console)
+- Splitting off devel-doc package, containing autogenerated docu
+ (FaTE #302461)
+- 2.15.53
+
+-------------------------------------------------------------------
+Tue Jul 24 15:05:58 CEST 2007 - mzugec@xxxxxxx
+
+- fixed command line
+- fixed help for ipv6
+- 2.15.52
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.51.tar.bz2
New:
----
yast2-network-2.15.53.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.G25274/_old 2007-07-25 23:09:32.000000000 +0200
+++ /var/tmp/diff_new_pack.G25274/_new 2007-07-25 23:09:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.51)
+# spec file for package yast2-network (Version 2.15.53)
#
# 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-network
-Version: 2.15.51
-Release: 2
+Version: 2.15.53
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.51.tar.bz2
+Source0: yast2-network-2.15.53.tar.bz2
prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -42,6 +42,17 @@
# carrier detection
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
+%package devel-doc
+Version: 2.15.53
+Release: 1
+License: GPL v2 or later
+Group: System/YaST
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0: yast2-network-2.15.53.tar.bz2
+prefix: /usr
+Requires: yast2-network >= 2.15.53
+Provides: yast2-devel-doc
+Summary: Developer documentation for yast2-network
%description
This package contains the YaST2 component for network configuration.
@@ -52,8 +63,18 @@
--------
Michal Svec <msvec@xxxxxxx>
+
+%description devel-doc
+This package contains autogenerated documentation for yast2-network
+
+
+
+Authors:
+--------
+ Michal Svec <msvec@xxxxxxx>
+
%prep
-%setup -n yast2-network-2.15.51
+%setup -n yast2-network-2.15.53
%build
%{prefix}/bin/y2tool y2autoconf
@@ -104,12 +125,33 @@
%{prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/scrconf/*.scr
/usr/lib/YaST2/servers_non_y2/ag_udev_persistent
-%doc %{prefix}/share/doc/packages/yast2-network
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
+%dir %{prefix}/share/doc/packages/yast2-network
+%{prefix}/share/doc/packages/yast2-network/COPYING
+%{prefix}/share/doc/packages/yast2-network/COPYRIGHT.english
+
+%readme %{prefix}/share/doc/packages/yast2-network/README
+
+%files devel-doc
+%defattr(-,root,root)
+%doc %{prefix}/share/doc/packages/yast2-network
+%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
+%exclude %{prefix}/share/doc/packages/yast2-network/COPYRIGHT.english
+%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Wed Jul 25 2007 - kmachalkova@xxxxxxx
+- A better layout of internet test dialog (#292621, also in 80x25
+ console)
+- Splitting off devel-doc package, containing autogenerated docu
+ (FaTE #302461)
+- 2.15.53
+* Tue Jul 24 2007 - mzugec@xxxxxxx
+- fixed command line
+- fixed help for ipv6
+- 2.15.52
* Mon Jul 23 2007 - mzugec@xxxxxxx
- improved text in remote.desktop (#230145)
* Mon Jul 23 2007 - mzugec@xxxxxxx
++++++ yast2-network-2.15.51.tar.bz2 -> yast2-network-2.15.53.tar.bz2 ++++++
++++ 6022 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/configure.in new/yast2-network-2.15.53/configure.in
--- old/yast2-network-2.15.51/configure.in 2007-07-23 22:49:24.000000000 +0200
+++ new/yast2-network-2.15.53/configure.in 2007-07-03 09:49:40.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.15.51, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.15.47, http://bugs.opensuse.org/, yast2-network)
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.51"
+VERSION="2.15.47"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/missing new/yast2-network-2.15.53/missing
--- old/yast2-network-2.15.51/missing 2007-07-23 22:49:29.000000000 +0200
+++ new/yast2-network-2.15.53/missing 2007-07-03 09:49:46.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/src/installation/dialogs.ycp new/yast2-network-2.15.53/src/installation/dialogs.ycp
--- old/yast2-network-2.15.51/src/installation/dialogs.ycp 2007-05-31 17:46:35.000000000 +0200
+++ new/yast2-network-2.15.53/src/installation/dialogs.ycp 2007-07-25 16:43:21.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: dialogs.ycp 38227 2007-05-31 15:46:34Z mzugec $
+ * $Id: dialogs.ycp 39675 2007-07-25 14:43:22Z kmachalkova $
*/
{
@@ -135,7 +135,8 @@
/* Steps dialog contents */
term contents = `HBox(
- `HSpacing(5),
+// `HSpacing(5),
+ `HStretch(),
`VBox(
`Left(`Label(label)),
`VSpacing(1),
@@ -144,15 +145,19 @@
`VSpacing(1),
steps,
`VSpacing(2),
- /* Frame label */
- `Frame(_("Select:"), `RadioButtonGroup(`id(`rb), `HBox(
- `HSpacing(2),
- buttons,
- `HSpacing(2)
- ))),
+ `Left( `HSquash(
+ /* Frame label */
+ `Frame(_("Select:"), `RadioButtonGroup(`id(`rb), `HBox(
+ `HSpacing(2),
+ buttons,
+ `HSpacing(2)
+ ))
+ )
+ )),
`VSpacing(1)
),
- `HSpacing(5)
+// `HSpacing(5)
+ `HStretch()
);
Wizard::SetContents(caption, contents, help, true, true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/src/lan/cmdline.ycp new/yast2-network-2.15.53/src/lan/cmdline.ycp
--- old/yast2-network-2.15.51/src/lan/cmdline.ycp 2007-07-02 16:53:54.000000000 +0200
+++ new/yast2-network-2.15.53/src/lan/cmdline.ycp 2007-07-25 11:12:32.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: cmdline.ycp 39111 2007-07-02 14:53:49Z mzugec $
+ * $Id: cmdline.ycp 39636 2007-07-24 13:12:11Z mzugec $
*/
{
@@ -19,17 +19,20 @@
import "Report";
import "NetworkModules";
import "LanItems";
+import "Map";
list <map<string, any> > getConfigList(){
list <map<string, any> > confList = [];
- integer count = 0;
- list<map<string,any> > overview = (list<map<string,any> >)LanItems::Overview();
- foreach(map<string, any> row, overview, {
- confList = add(confList, $[tostring(count) : $["id" : row["id"]:"",
- "rich_descr" : row["rich_descr"]:"",
- "descr" : row["table_descr", 0]:"",
- "addr" : row["table_descr", 1]:""]]);
- count = count + 1;
+ //integer count = 0;
+ LanItems::BuildLanOverview();
+ //list<map<string,any> > overview = (list<map<string,any> >)LanItems::Overview();
+ foreach(integer position,any row, LanItems::Items, {
+ LanItems::current = position;
+ confList = add(confList, $[tostring(size(confList )) : $["id" : position,
+ "rich_descr" : LanItems::getCurrentItem()["table_descr", "rich_descr"]:"",
+ "descr" : LanItems::getCurrentItem()["table_descr", "table_descr", 0]:"",
+ "addr" : LanItems::getCurrentItem()["table_descr", "table_descr", 1]:""]]);
+// count = count + 1;
});
return confList;
}
@@ -47,14 +50,13 @@
return true;
}
-string getDev(map<string, string> options, list <map<string, any> > config){
- string dev="";
+integer getItem(map<string, string> options, list <map<string, any> > config){
+ integer ret = -1;
foreach(map<string, any> row, config, {
- foreach(string row_num, map<string,any> dev_map, (map<string, map<string, any> > )row, {
- if(options["id"]:"0"==row_num) dev = dev_map["id"]:"";
- });
+ if(options["id"]:"0" == Map::Keys(row)[0]:"") ret = tointeger(Map::Keys(row)[0]:"-1");
});
- return dev;
+ if(ret==-1)y2error("Device not matched!");
+ return ret;
}
@@ -141,22 +143,6 @@
}
- map<string, any> settings = $[
- "STARTMODE": LanItems::startmode,
- "USERCONTROL": LanItems::usercontrol,
- // problems when renaming the interface?
- "FWZONE": "EXT",
- "MTU": LanItems::mtu,
- "BOOTPROTO": LanItems::bootproto,
- "IPADDR": LanItems::ipaddr,
- "NETMASK": LanItems::netmask,
- "REMOTEIP": LanItems::remoteip,
- "IFCFGTYPE": LanItems::type,
- "IFCFGID": LanItems::device,
- ];
-
-
-y2internal("%1", settings);
CommandLine::Print(LanItems::type);
CommandLine::Print(LanItems::bootproto);
CommandLine::Print(LanItems::ipaddr);
@@ -188,9 +174,19 @@
*/
define boolean EditHandler(map<string, string> options) {
list <map<string, any> > config = getConfigList();
+
if (validateId(options, config)==false) return false;
- string dev=getDev(options, config);
+ LanItems::current = getItem(options, config);
+ LanItems::SetItem();
+
+ if (!(size(LanItems::getCurrentItem()["ifcfg"]:"")>0)){
+ NetworkDevices::Add();
+ LanItems::operation = `edit;
+ LanItems::interfacename=LanItems::getCurrentItem()["hwinfo", "dev_name"]:"";
+ }
+
+/*
if (substring (dev, 0, 1) == "-") // unconfigured
{
integer i = tointeger (substring (dev, 1));
@@ -218,6 +214,7 @@
LanItems::startmode = "ifplugd";
}
}
+*/
LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
@@ -238,20 +235,6 @@
return false;
}
- map<string, any> settings = $[
- "STARTMODE": LanItems::startmode,
- "USERCONTROL": LanItems::usercontrol,
- // problems when renaming the interface?
- "FWZONE": "EXT",
- "MTU": LanItems::mtu,
- "BOOTPROTO": LanItems::bootproto,
- "IPADDR": LanItems::ipaddr,
- "NETMASK": LanItems::netmask,
- "REMOTEIP": LanItems::remoteip,
- "IFCFGTYPE": LanItems::type,
- "IFCFGID": LanItems::device,
- ];
- CommandLine::Print(sformat("%1 : %2", _("Changing Configuration for"), dev));
CommandLine::Print(sformat("%1 :\t%2", _("Device Type"), LanItems::type));
CommandLine::Print(sformat("%1 :\t%2", _("Bootproto"), LanItems::bootproto));
CommandLine::Print(sformat("%1 :\t%2",_("IP Address"), LanItems::ipaddr));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/src/lan/help.ycp new/yast2-network-2.15.53/src/lan/help.ycp
--- old/yast2-network-2.15.51/src/lan/help.ycp 2007-06-08 17:38:01.000000000 +0200
+++ new/yast2-network-2.15.53/src/lan/help.ycp 2007-07-25 11:12:32.000000000 +0200
@@ -57,8 +57,8 @@
_("<p><b><big>IPv6 Protocol Settings</big></b></p>
<p>Check <b>Enable IPv6</b> to enable ipv6 module in the kernel.
It is possible to use IPv6 together with IPv4. This is default option.
-To disable IPv6, uncheck this option and disable autoload of the kernel
-module for ipv6. When ipv6 protocol is not used on your network, response
+To disable IPv6, uncheck this option (this will blacklist kernel
+module for ipv6). When ipv6 protocol is not used on your network, response
time can be faster.")
+
_("<p>All changes will be applied after reboot.</p>"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/src/routines/widgets.ycp new/yast2-network-2.15.53/src/routines/widgets.ycp
--- old/yast2-network-2.15.51/src/routines/widgets.ycp 2007-07-20 18:25:35.000000000 +0200
+++ new/yast2-network-2.15.53/src/routines/widgets.ycp 2007-07-25 16:43:21.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: widgets.ycp 39561 2007-07-20 11:37:50Z kmachalkova $
+ * $Id: widgets.ycp 39675 2007-07-25 14:43:22Z kmachalkova $
*/
{
@@ -191,18 +191,19 @@
}
y2milestone ("device_name %1", device_name);
//avoid too long device names
- if (size(device_name) > 30) {
- device_name = substring (device_name, 0, 27) + "...";
- }
+ //if (size(device_name) > 30) {
+ // device_name = substring (device_name, 0, 27) + "...";
+ //}
string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ?
- // TRANSLATORS: Informs that the IP address is assigned via DHCP
+ // TRANSLATORS: Part of label, device with IP address assigned by DHCP
_("DHCP address") :
+ // TRANSLATORS: Part of label, device with static IP address
NetworkDevices::GetValue(device_id, "IPADDR"));
if ( (ip_addr == nil) || (ip_addr == "")) {
//TRANSLATORS: Informs that no IP has been assigned to the device
ip_addr = _("No IP address assigned");
}
- string output = sformat(_("%1 - %2 (%3)"),
+ string output = sformat(_("%1 \n%2 - %3"),
device_name, NetworkDevices::GetDeviceType(device_id), ip_addr);
return output;
}
@@ -230,11 +231,15 @@
term getDeviceContens(string selected){
return `VBox(
- `VSpacing(1),
- `Left(`Label(`id(`net_device), GetDeviceDescription(selected))),
- `Right(`PushButton(`id(`net_expert), _("&Change Device")))
- // `VSpacing(1)
- );
+ `VSpacing(0.5),
+ `HBox(
+ `HSpacing(3),
+ `MinWidth(30, `Label(`id(`net_device), `opt(`hstretch), GetDeviceDescription(selected) )),
+ `HSpacing(1),
+ `PushButton(`id(`net_expert), _("&Change Device"))
+ ),
+ `VSpacing(0.5)
+ );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.15.51/VERSION new/yast2-network-2.15.53/VERSION
--- old/yast2-network-2.15.51/VERSION 2007-07-23 12:55:48.000000000 +0200
+++ new/yast2-network-2.15.53/VERSION 2007-07-25 16:39:21.000000000 +0200
@@ -1 +1 @@
-2.15.51
+2.15.53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |