Hello community,
here is the log from the commit of package yast2-dhcp-server
checked in at Mon Jun 5 18:38:50 CEST 2006.
--------
--- yast2-dhcp-server/yast2-dhcp-server.changes 2006-05-16 12:37:26.000000000 +0200
+++ yast2-dhcp-server/yast2-dhcp-server.changes 2006-06-05 11:06:12.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 5 11:01:51 CEST 2006 - locilka@suse.cz
+
+- Fixing UI visibility, especially Time Units ComboBox (#181146).
+- 2.13.4
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-2.13.3.tar.bz2
New:
----
yast2-dhcp-server-2.13.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.Umup7b/_old 2006-06-05 18:38:39.000000000 +0200
+++ /var/tmp/diff_new_pack.Umup7b/_new 2006-06-05 18:38:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-dhcp-server (Version 2.13.3)
+# spec file for package yast2-dhcp-server (Version 2.13.4)
#
# 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-dhcp-server
-Version: 2.13.3
+Version: 2.13.4
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-dhcp-server-2.13.3.tar.bz2
+Source0: yast2-dhcp-server-2.13.4.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2 perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
@@ -34,7 +34,7 @@
Jiri Srain
%prep
-%setup -n yast2-dhcp-server-2.13.3
+%setup -n yast2-dhcp-server-2.13.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,9 @@
%doc %{prefix}/share/doc/packages/yast2-dhcp-server
%changelog -n yast2-dhcp-server
+* Mon Jun 05 2006 - locilka@suse.cz
+- Fixing UI visibility, especially Time Units ComboBox (#181146).
+- 2.13.4
* Tue May 16 2006 - locilka@suse.cz
- Call NetworkDevices->Read() also in Mode->autoinst() (#173861).
- 2.13.3
++++++ yast2-dhcp-server-2.13.3.tar.bz2 -> yast2-dhcp-server-2.13.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.3/VERSION new/yast2-dhcp-server-2.13.4/VERSION
--- old/yast2-dhcp-server-2.13.3/VERSION 2006-05-16 12:35:13.000000000 +0200
+++ new/yast2-dhcp-server-2.13.4/VERSION 2006-06-05 11:00:30.000000000 +0200
@@ -1 +1 @@
-2.13.3
+2.13.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.3/configure new/yast2-dhcp-server-2.13.4/configure
--- old/yast2-dhcp-server-2.13.3/configure 2006-05-16 12:38:59.000000000 +0200
+++ new/yast2-dhcp-server-2.13.4/configure 2006-06-05 11:06:48.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-dhcp-server 2.13.3.
+# Generated by GNU Autoconf 2.59 for yast2-dhcp-server 2.13.4.
#
-# Report bugs to http://bugs.opensuse.org/.
+# Report bugs to http://www.suse.de/feedback.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,9 +269,9 @@
# Identity of this package.
PACKAGE_NAME='yast2-dhcp-server'
PACKAGE_TARNAME='yast2-dhcp-server'
-PACKAGE_VERSION='2.13.3'
-PACKAGE_STRING='yast2-dhcp-server 2.13.3'
-PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
+PACKAGE_VERSION='2.13.4'
+PACKAGE_STRING='yast2-dhcp-server 2.13.4'
+PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@@ -728,7 +728,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-dhcp-server 2.13.3 to adapt to many kinds of systems.
+\`configure' configures yast2-dhcp-server 2.13.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-dhcp-server 2.13.3:";;
+ short | recursive ) echo "Configuration of yast2-dhcp-server 2.13.4:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://bugs.opensuse.org/.
+Report bugs to http://www.suse.de/feedback.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-dhcp-server configure 2.13.3
+yast2-dhcp-server configure 2.13.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-dhcp-server $as_me 2.13.3, which was
+It was created by yast2-dhcp-server $as_me 2.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-dhcp-server'
- VERSION='2.13.3'
+ VERSION='2.13.4'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.3"
+VERSION="2.13.4"
RPMNAME="yast2-dhcp-server"
MAINTAINER="Lukas Ocilka "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-dhcp-server $as_me 2.13.3, which was
+This file was extended by yast2-dhcp-server $as_me 2.13.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-dhcp-server config.status 2.13.3
+yast2-dhcp-server config.status 2.13.4
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-dhcp-server-2.13.3/configure.in new/yast2-dhcp-server-2.13.4/configure.in
--- old/yast2-dhcp-server-2.13.3/configure.in 2006-05-16 12:38:55.000000000 +0200
+++ new/yast2-dhcp-server-2.13.4/configure.in 2006-06-05 11:06:41.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-dhcp-server
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-dhcp-server, 2.13.3, http://bugs.opensuse.org/, yast2-dhcp-server)
+AC_INIT(yast2-dhcp-server, 2.13.4, http://www.suse.de/feedback, yast2-dhcp-server)
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.13.3"
+VERSION="2.13.4"
RPMNAME="yast2-dhcp-server"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.13.3/src/dialogs2.ycp new/yast2-dhcp-server-2.13.4/src/dialogs2.ycp
--- old/yast2-dhcp-server-2.13.3/src/dialogs2.ycp 2006-02-03 08:52:53.000000000 +0100
+++ new/yast2-dhcp-server-2.13.4/src/dialogs2.ycp 2006-06-05 11:01:29.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Vladimír Bobek
*
- * $Id: dialogs2.ycp 24553 2005-08-03 09:25:53Z locilka $
+ * $Id: dialogs2.ycp 31309 2006-06-05 09:01:23Z locilka $
*/
{
@@ -34,7 +34,7 @@
/* Start of common configuration section */
-define list time_combo_items = [
+define list <term> time_combo_items = [
// combo box item
`item(`id("days"), _("Days")),
// combo box item
@@ -45,6 +45,17 @@
`item(`id("seconds"), _("Seconds"))
];
+define integer TimeComboLabelLength () {
+ integer max_length = 0;
+ foreach (term combo_item, time_combo_items, {
+ string combo_label = (string) combo_item[1]:" ";
+ integer current_length = size(combo_label);
+ if (current_length > max_length) max_length = current_length;
+ });
+
+ return max_length;
+}
+
define integer time2seconds (integer count, string unit) {
if (unit == "days")
{
@@ -255,59 +266,58 @@
* @return term for Get_CommonDialog()
*/
term Common_GlobalSettingsDialog() {
-// Textentry with primary name server
-string xxx = _("Primary Name Server");
-// Textentry with secondary name server
-xxx = _("Secondary Name Server");
term ldap = `Empty();
+
if (expert_ui) ldap = `VBox(
// configuration will be saved in ldap?
`Left(`CheckBox(`id("ldap"), `opt( `notify), _("LDAP Support"), true)),
`VSpacing(2)
);
+
term dialog = `VBox(
ldap,
`HBox(
- `HWeight(43, `VBox(
- // Textentry with name of the domain
+ `VBox(
+ // Textentry with name of the domain
`Left(`TextEntry(`id("domainname"), _("&Domain Name"))),
- // Textentry with IP address of primary name server
+ // Textentry with IP address of primary name server
`Left(`TextEntry(`id("primarydnsip"), _("&Primary Name Server IP"))),
- // Textentry with IP address of secondary name server
+ // Textentry with IP address of secondary name server
`Left(`TextEntry(`id("secondarydnsip"), _("&Secondary Name Server IP"))),
- // Textentry with IP address of default router
+ // Textentry with IP address of default router
`Left(`TextEntry(`id("defaultgw"), _("Default &Gateway (Router) ")))
- )),
- `HWeight(14, `VBox(
- `HStretch()
- )),
- `HWeight(43, `VBox(
- // Textentry with IP address of time server
+ ),
+ `HSpacing(2),
+ `VBox(
+ // Textentry with IP address of time server
`Left(`TextEntry(`id("timeserver"), _("NTP &Time Server"))),
- // Textentry with IP address of print server
+ // Textentry with IP address of print server
`Left(`TextEntry(`id("printserver"), _("&Print Server"))),
- // Textentry with IP address of WINS (Windows Internet Naming Service) server
+ // Textentry with IP address of WINS (Windows Internet Naming Service) server
`Left(`TextEntry(`id("winsserver"), _("&WINS Server"))),
- `HBox(
- // Textentry with default lease time of IP address from dhcp server
- `Left(`TextEntry(`id("defaultleasetime"), _("Default &Lease Time"))),
- `HSpacing(1),
- // Units for defaultleasetime
- `Right(`ComboBox(`id("defaultleasetimeunits"), `opt( `hstretch), "", time_combo_items))
+ `Left(
+ `HBox(
+ // Textentry with default lease time of IP address from dhcp server
+ `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("Default &Lease Time")),
+ `HSpacing(0.1),
+ `MinWidth(
+ TimeComboLabelLength(),
+ // Units for defaultleasetime
+ `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "", time_combo_items)
+ )
+ )
)
-
- ))
+ )
),
`VStretch()
);
-
return dialog;
}
@@ -617,28 +627,39 @@
) )
),
`VSpacing (1),
- // frame
- `Frame(_("Lease Time"),
- `VBox(
- `HBox(
- `HBox(
- // Textentry label - lease time for IPs in the range
- `Left(`TextEntry(`id("defaultleasetime"), _("&Default"))),
- // Combobox - type of units for lease time
- `Left(`ComboBox(`id("defaultleasetimeunits"), "",
+ `Frame(
+ // frame label
+ _("Lease Time"),
+ `HBox(
+ `opt(`hstretch),
+ `HWeight(
+ // Textentry label - lease time for IPs in the range
+ 3, `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("&Default"))
+ ),
+ `HWeight(
+ 2, `MinWidth(
+ TimeComboLabelLength(),
+ // Combobox - type of units for lease time
+ `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "",
time_combo_items
- ))
- ),
- `HBox(
- //TextEntryLabel - max. time for leasing of IPs from the range
- `Left(`TextEntry(`id("maxleasetime"), _("&Maximum"))),
- // Combobox - type of units for max lease time
- `Left(`ComboBox(`id("maxleasetimeunits"), "",
- time_combo_items
- ))
- )
- )
- )
+ )
+ )
+ ),
+ `HSpacing(1),
+ `HWeight(
+ // TextEntryLabel - max. time for leasing of IPs from the range
+ 3, `TextEntry(`id("maxleasetime"), `opt(`hsquash), _("&Maximum"))
+ ),
+ `HWeight(
+ 2, `MinWidth(
+ TimeComboLabelLength(),
+ // Combobox - type of units for max lease time
+ `ComboBox(`id("maxleasetimeunits"), `opt(`hsquash), "",
+ time_combo_items
+ )
+ )
+ )
+ )
),
`VStretch()
);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org