Hello community,
here is the log from the commit of package yast2-storage
checked in at Fri Nov 28 12:23:44 CET 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-11-25 15:19:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-11-28 12:15:35.506006000 +0100
@@ -1,0 +2,26 @@
+Fri Nov 28 11:52:52 CET 2008 - aschnell@suse.de
+
+- fixed comparisons of libstorage backup states (bnc #438076)
+- 2.17.57
+
+-------------------------------------------------------------------
+Thu Nov 27 17:01:04 CET 2008 - locilka@suse.cz
+
+- Guessing real number of Storage SlideShow steps in respect to the
+ value returned by Storage::ActionsCount (bnc #449792).
+
+-------------------------------------------------------------------
+Thu Nov 27 15:10:37 CET 2008 - aschnell@suse.de
+
+- don't set partition type to 0x0 (bnc #449205)
+- 2.17.55
+
+-------------------------------------------------------------------
+Wed Nov 26 17:41:16 CET 2008 - kmachalkova@suse.cz
+
+- Partition/LVM resizing:
+ * place numbers (used/unused/free space) outside the graph and
+ make them readable at all times (bnc#445590)
+ * more intuitive layout for ncurses (bnc#410956)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.17.54.tar.bz2
New:
----
yast2-storage-2.17.57.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Y13703/_old 2008-11-28 12:22:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Y13703/_new 2008-11-28 12:22:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.54)
+# spec file for package yast2-storage (Version 2.17.57)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.54
+Version: 2.17.57
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.54.tar.bz2
+Source0: yast2-storage-2.17.57.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup
@@ -57,7 +57,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.17.54
+%setup -n yast2-storage-2.17.57
%build
%{prefix}/bin/y2tool y2autoconf
@@ -182,6 +182,20 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Fri Nov 28 2008 aschnell@suse.de
+- fixed comparisons of libstorage backup states (bnc #438076)
+- 2.17.57
+* Thu Nov 27 2008 locilka@suse.cz
+- Guessing real number of Storage SlideShow steps in respect to the
+ value returned by Storage::ActionsCount (bnc #449792).
+* Thu Nov 27 2008 aschnell@suse.de
+- don't set partition type to 0x0 (bnc #449205)
+- 2.17.55
+* Wed Nov 26 2008 kmachalkova@suse.cz
+- Partition/LVM resizing:
+ * place numbers (used/unused/free space) outside the graph and
+ make them readable at all times (bnc#445590)
+ * more intuitive layout for ncurses (bnc#410956)
* Tue Nov 25 2008 aschnell@suse.de
- mark text for translation (bnc #446478)
- 2.17.54
++++++ yast2-storage-2.17.54.tar.bz2 -> yast2-storage-2.17.57.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/configure new/yast2-storage-2.17.57/configure
--- old/yast2-storage-2.17.54/configure 2008-11-25 15:19:09.000000000 +0100
+++ new/yast2-storage-2.17.57/configure 2008-11-28 12:12:12.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.54.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.57.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.17.54'
-PACKAGE_STRING='yast2-storage 2.17.54'
+PACKAGE_VERSION='2.17.57'
+PACKAGE_STRING='yast2-storage 2.17.57'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,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-storage 2.17.54 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.17.57 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.17.54:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.17.57:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.17.54
+yast2-storage configure 2.17.57
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1644,7 +1644,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-storage $as_me 2.17.54, which was
+It was created by yast2-storage $as_me 2.17.57, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2465,7 +2465,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.17.54'
+ VERSION='2.17.57'
cat >>confdefs.h <<_ACEOF
@@ -2693,7 +2693,7 @@
-VERSION="2.17.54"
+VERSION="2.17.57"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -21746,7 +21746,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.17.54, which was
+This file was extended by yast2-storage $as_me 2.17.57, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21799,7 +21799,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.17.54
+yast2-storage config.status 2.17.57
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/configure.in new/yast2-storage-2.17.57/configure.in
--- old/yast2-storage-2.17.54/configure.in 2008-11-25 15:18:54.000000000 +0100
+++ new/yast2-storage-2.17.57/configure.in 2008-11-28 12:11:57.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.17.54, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.57, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.54"
+VERSION="2.17.57"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/AppUtil.cc new/yast2-storage-2.17.57/libstorage/src/AppUtil.cc
--- old/yast2-storage-2.17.54/libstorage/src/AppUtil.cc 2008-11-21 11:51:24.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/AppUtil.cc 2008-11-27 11:39:02.000000000 +0100
@@ -377,6 +377,14 @@
void
+prepareLogStream(std::ostringstream& s)
+{
+ s.imbue(std::locale::classic());
+ s.setf(std::ios::showbase);
+}
+
+
+void
logMsg(LogLevel level, const char* file, unsigned line, const char* func,
const string& str)
{
@@ -643,7 +651,7 @@
const string str_trimmed = boost::trim_copy(str, loc);
double f = 1.0;
-
+
for (int i = 0; i < numSuffixes(); i++)
{
for (int j = 0; j < (classic ? 1 : 2); j++)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/AppUtil.h new/yast2-storage-2.17.57/libstorage/src/AppUtil.h
--- old/yast2-storage-2.17.54/libstorage/src/AppUtil.h 2008-11-12 12:37:08.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/AppUtil.h 2008-11-27 11:49:10.000000000 +0100
@@ -69,6 +69,8 @@
const char* func, const char* format, ...)
__attribute__ ((format(printf, 5, 6)));
+void prepareLogStream(std::ostringstream& s);
+
#define y2debug(format, ...) \
logMsgVaArgs(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__)
#define y2milestone(format, ...) \
@@ -88,7 +90,7 @@
if (storage::testLogLevel(level)) \
{ \
std::ostringstream __buf; \
- storage::classic(__buf); \
+ storage::prepareLogStream(__buf); \
__buf << op; \
storage::logMsg(level, file, line, function, __buf.str()); \
} \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/Disk.cc new/yast2-storage-2.17.57/libstorage/src/Disk.cc
--- old/yast2-storage-2.17.54/libstorage/src/Disk.cc 2008-11-24 14:53:44.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/Disk.cc 2008-11-27 11:15:31.000000000 +0100
@@ -1732,9 +1732,11 @@
return( ret );
}
-int Disk::changePartitionId( unsigned nr, unsigned id )
- {
- y2milestone( "begin nr:%u id:%x", nr, id );
+
+int
+Disk::changePartitionId(unsigned nr, unsigned id)
+{
+ y2mil("begin nr:" << nr << " id:" << hex << id);
int ret = 0;
PartPair p = partPair( notDeleted );
PartIter i = p.begin();
@@ -1752,11 +1754,12 @@
}
if( ret==0 )
{
- i->changeId( id );
+ ret = i->changeId( id );
}
y2mil("ret:" << ret);
- return( ret );
- }
+ return ret;
+}
+
int Disk::forgetChangePartitionId( unsigned nr )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/Partition.cc new/yast2-storage-2.17.57/libstorage/src/Partition.cc
--- old/yast2-storage-2.17.54/libstorage/src/Partition.cc 2008-11-12 22:35:01.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/Partition.cc 2008-11-27 10:53:44.000000000 +0100
@@ -177,21 +177,31 @@
}
}
-void Partition::changeId( unsigned new_id )
+
+int
+Partition::changeId(unsigned new_id)
+{
+ int ret = 0;
+ if (new_id == 0)
+ {
+ ret = DISK_INVALID_PARTITION_ID;
+ }
+ if (ret == 0 && new_id != idt)
{
- if( new_id!=idt )
- {
if( orig_id==idt )
- {
+ {
orig_id = idt;
- }
+ }
idt = new_id;
if( created() )
- {
+ {
orig_id = idt;
- }
}
}
+ y2mil("ret:" << ret);
+ return ret;
+}
+
void Partition::changeIdDone()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/Partition.h new/yast2-storage-2.17.57/libstorage/src/Partition.h
--- old/yast2-storage-2.17.54/libstorage/src/Partition.h 2008-10-28 19:52:10.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/Partition.h 2008-11-27 10:48:48.000000000 +0100
@@ -46,7 +46,7 @@
void changeRegion( unsigned long Start, unsigned long CSize,
unsigned long long SizeK );
void changeNumber( unsigned new_num );
- void changeId( unsigned id );
+ int changeId(unsigned id);
void changeIdDone();
void unChangeId();
string removeText( bool doing=true ) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/Storage.cc new/yast2-storage-2.17.57/libstorage/src/Storage.cc
--- old/yast2-storage-2.17.54/libstorage/src/Storage.cc 2008-11-24 17:54:02.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/Storage.cc 2008-11-28 12:05:42.000000000 +0100
@@ -3427,7 +3427,7 @@
{
ret = vol->setEncryption( true );
}
- if( ret==0 and !mp.empty() )
+ if( ret==0 && !mp.empty() )
{
ret = vol->changeMount( mp );
}
@@ -5657,12 +5657,12 @@
const Container* const c;
};
+
bool
-Storage::equalBackupStates( const string& lhs, const string& rhs,
- bool verbose_log ) const
- {
- y2milestone( "lhs:%s rhs:%s verbose:%d", lhs.c_str(), rhs.c_str(),
- verbose_log );
+Storage::equalBackupStates(const string& lhs, const string& rhs,
+ bool verbose_log) const
+{
+ y2mil("lhs:" << lhs << " rhs:" << rhs << " verbose:" << verbose_log);
map::const_iterator i;
const CCont* l = NULL;
const CCont* r = NULL;
@@ -5704,7 +5704,7 @@
while( (ret||verbose_log) && i!=r->end() )
{
j = find_if( l->begin(), l->end(), equal_co( *i ) );
- if( j==r->end() )
+ if( j==l->end() )
{
ret = false;
if( verbose_log )
@@ -5714,8 +5714,9 @@
}
}
y2mil("ret:" << ret);
- return( ret );
- }
+ return ret;
+}
+
string
Storage::backupStates() const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/libstorage/src/StorageInterface.h new/yast2-storage-2.17.57/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.17.54/libstorage/src/StorageInterface.h 2008-11-07 12:03:49.000000000 +0100
+++ new/yast2-storage-2.17.57/libstorage/src/StorageInterface.h 2008-11-27 10:49:31.000000000 +0100
@@ -495,6 +495,7 @@
DISK_CREATE_PARTITION_NO_SPACE = -1026,
DISK_REMOVE_USED_BY = -1027,
DISK_INIT_NOT_POSSIBLE = -1028,
+ DISK_INVALID_PARTITION_ID = -1029,
STORAGE_DISK_NOT_FOUND = -2000,
STORAGE_VOLUME_NOT_FOUND = -2001,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.17.57/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.17.54/storage/src/include/custom_part_check_generated.ycp 2008-11-18 17:18:31.000000000 +0100
+++ new/yast2-storage-2.17.57/storage/src/include/custom_part_check_generated.ycp 2008-11-28 11:16:48.000000000 +0100
@@ -47,7 +47,7 @@
boolean check_created_partition_table(const map targetMap, boolean installation)
{
- y2milestone("now checking generated target map installation:%2", installation);
+ y2milestone("now checking generated target map installation:%1", installation);
boolean show_all_popups = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.17.57/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.17.54/storage/src/include/ep-dialogs.ycp 2008-11-25 14:57:30.000000000 +0100
+++ new/yast2-storage-2.17.57/storage/src/include/ep-dialogs.ycp 2008-11-28 11:38:29.000000000 +0100
@@ -9,7 +9,6 @@
textdomain "storage";
-
string MiniWorkflowStepFormatMountHelptext()
{
// helptext
@@ -112,6 +111,7 @@
data["format"] = true;
data["fsid"] = Partitions::fsid_native;
+ data["ori_fsid"] = Partitions::fsid_native;
data["used_fs"] = used_fs;
//set globals
@@ -561,6 +561,7 @@
string device = data["device"]:"error";
symbol used_fs = data["used_fs"]:`none;
+ boolean onLvm = ( data["type"]:`unknown == `lvm);
integer used_k = FileSystems::MinFsSizeK(used_fs);
@@ -610,7 +611,7 @@
string heading = "";
- list <string> BarGraphLabels(list<integer> values_k)
+ list <string> BarGraphLabels( boolean newlines )
{
string used = "";
string free = "";
@@ -620,41 +621,31 @@
{
case `primary:
case `logical:
- // Labels for bar graph. "%1" will be replace with a size value.
- used = sformat(_("Used\nSpace\n%1 "), Storage::KByteToHumanString(values_k[0]:0));
+ // Labels for bar graph/text field. Keep it short
+ used = newlines ? _("Used\nSpace") : _("Used Space: ");
if (used_fs == `swap)
- // Labels for bar graph. "%1" will be replace with a size value.
- free = sformat(_("Swap\nSpace\n%1 "), Storage::KByteToHumanString(values_k[1]:0));
+ // Labels for bar graph/text field. Keep it short
+ free = newlines? _("Swap\nSpace") : _("Swap Space: ");
else
- // Labels for bar graph. "%1" will be replace with a size value.
- free = sformat(_("Free\nSpace\n%1 "), Storage::KByteToHumanString(values_k[1]:0));
- // Labels for bar graph. "%1" will be replace with a size value.
- available = sformat(_("Unused\nDisk\n%1 "), Storage::KByteToHumanString(values_k[2]:0));
+ // Labels for bar graph/text field. Keep it short
+ free = newlines ? _("Free\nSpace") : _("Free Space: ");
+ // Labels for bar graph. Keep it short
+ available = newlines ? _("Unused\nDisk") : _("Unused Disk: ");
break;
case `lvm:
- // Labels for bar graph. "%1" will be replace with a size value.
- used = sformat(_("LV\nUsed\n%1"), Storage::KByteToHumanString(values_k[0]:0));
- // Labels for bar graph. "%1" will be replace with a size value.
- free = sformat(_("LV\nFree\n%1"), Storage::KByteToHumanString(values_k[1]:0));
- // Labels for bar graph. "%1" will be replace with a size value.
- available = sformat(_("VG\nFree\n%1"), Storage::KByteToHumanString(values_k[2]:0));
+ // Labels for bar graph/text field. LV stands for 'Logical volume'. Keep it short
+ used = newlines ? _("LV\nUsed") : _("LV Used: ");
+ // Labels for bar graph/text field. LV stands for 'Logical volume'. Keep it short
+ free = newlines ? _("LV\nFree") : _("LV Free: ");
+ // Labels for bar graph/text field. VG stands for 'Volume group'. Keep it short
+ available = newlines ? _("VG\nFree") : _("VG Free: ");
break;
}
return [ used, free, available ];
}
-
- string FreeSpaceLabel()
- {
- if (used_fs == `swap)
- return _("Swap Space");
- else
- return _("Remaining Free Space");
- }
-
-
switch (data["type"]:`unknown)
{
case `primary:
@@ -692,37 +683,75 @@
integer slider_min_size_k = min_size_k / factor;
integer slider_max_size_k = max_size_k / factor;
-
- term content = `Empty();
+ term extra_content = `Empty();
+ //Spinbox label - %1 will be substituted by unit (GB and alike)
+ string newsz = onLvm ? _("New Logical Volume Size (in %1)") : _("New Partition Size (in %1)");
if (UI::HasSpecialWidget(`BarGraph) && UI::HasSpecialWidget(`Slider))
{
- content = `VBox(
+ extra_content = `VBox(
`BarGraph(`id(`graph), `opt(`vstretch), [ slider_min_size_k, slider_size_k - slider_min_size_k,
- slider_max_size_k - slider_size_k ],
- BarGraphLabels([ min_size_k, size_k - min_size_k, max_size_k - size_k ])),
- `Slider(`id(`new_size), `opt(`notify), sformat(_("New Partition Size (in %1)"), unit),
+ slider_max_size_k - slider_size_k ], BarGraphLabels( true ) ),
+ `VSpacing(0.5),
+ `Slider(`id(`new_size), `opt(`notify), sformat( newsz, unit),
slider_min_size_k, slider_max_size_k, slider_size_k)
);
}
else
{
- // TODO: something nicer for ncurses, this layout sucks - #410956
- content = `Frame("",
- `IntField(`id(`new_size), `opt(`notify), sformat(_("New Partition Size (in %1)"), unit),
- slider_min_size_k, slider_max_size_k, slider_size_k)
- );
+ extra_content = `IntField( `id(`new_size), `opt(`notify), sformat(newsz, unit ),
+ slider_min_size_k, slider_max_size_k, slider_size_k );
}
+ //without newlines
+ list <string> other_labels = BarGraphLabels( false );
+
UI::OpenDialog(
`VBox(
`Left(`Heading(heading)),
`HSpacing(60),
- content,
- `Left(`Label(`id(`free), sformat("%1: %2 ", FreeSpaceLabel(), Storage::KByteToHumanString(size_k - used_k)))),
+ `VBox(
+ //Frame label
+ `Frame( onLvm ? _("Space on Logical Volume ") : _("Space on the Partition"),
+ `MarginBox( 0.5, 0.5,
+ `Left(`HBox(
+ ( used_fs != `swap) ? (
+ `HBox(
+ `Label( other_labels[0]:""),
+ `Label(`id(`used), `opt(`outputField), Storage::KByteToHumanString( min_size_k)),
+ `HSpacing(0.5))
+ ) : `Empty(),
+
+ `Label( other_labels[1]:""),
+ `ReplacePoint(`id(`r2),
+ `Label(`id(`free),`opt(`outputField), Storage::KByteToHumanString(size_k - min_size_k))
+ ),
+ `HSpacing(0.5),
+
+ `Label( other_labels[2]:""),
+ `ReplacePoint(`id(`r3),
+ `Label(`id(`unused),`opt(`outputField), Storage::KByteToHumanString( max_size_k - size_k))
+ )
+ ))
+ )
+ )
+ ),
+ extra_content,
`VSpacing(1.0),
- `Left(`Label(sformat(_("Minimum Partition Size: %1 %2"), Storage::KByteToHumanString(min_size_k), ""))),
- `Left(`Label(sformat(_("Maximum Partition Size: %1 %2"), Storage::KByteToHumanString(max_size_k), ""))),
+ //Frame label
+ `Frame ( onLvm ? _("LV Size Restrictions") : _("Partition Size Restrictions"),
+ `MarginBox(0.5, 0.5,
+ `Left(`HBox(
+ //text field label
+ `Label( onLvm ? _("Minimum LV Size") : _("Minimum Partition Size: ")),
+ `Label(`opt(`outputField), Storage::KByteToHumanString(min_size_k)),
+ `HSpacing(0.5),
+ //text field label
+ `Label( onLvm ? _("Maximum LV Size") : _("Maximum Partition Size: ")),
+ `Label(`opt(`outputField), Storage::KByteToHumanString(max_size_k))
+ ))
+ )
+ ),
`ButtonBox(
`PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()),
`PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()),
@@ -732,7 +761,7 @@
);
// help text
- string help_text = _("<p>Choose the new size by draging the slider or by entering a
+ string help_text = _("<p>Choose the new size by dragging the slider or by entering a
numeric value in either input field.</p>");
UI::ChangeWidget(`help, `HelpText, help_text);
@@ -756,15 +785,12 @@
UI::ChangeWidget(`id(`graph), `Values, [ slider_min_size_k, slider_size_k - slider_min_size_k,
slider_max_size_k - slider_size_k ]);
- UI::ChangeWidget(`id(`graph), `Labels, BarGraphLabels([ min_size_k, size_k - min_size_k, max_size_k - size_k ]));
- // TODO: make two lables (size and free) and hide free for swap
- if (used_fs == `swap)
- UI::ChangeWidget(`id(`free), `Value, sformat("%1: %2", FreeSpaceLabel(),
- Storage::KByteToHumanString(size_k)));
- else
- UI::ChangeWidget(`id(`free), `Value, sformat("%1: %2", FreeSpaceLabel(),
- Storage::KByteToHumanString(size_k - used_k)));
+ //Replacing widgets, rather than just changing value. It is clumsy, but UI sets value
+ //of the label without adjusting its size. RecalcLayout makes ncurses flicker insanely.
+ //ReplaceWidget does, too, but not so much
+ UI::ReplaceWidget(`id(`r2), `Label(`opt(`outputField), Storage::KByteToHumanString( size_k - min_size_k )) );
+ UI::ReplaceWidget(`id(`r3), `Label(`opt(`outputField), Storage::KByteToHumanString( max_size_k - size_k )) );
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/storage/src/inst_prepdisk.ycp new/yast2-storage-2.17.57/storage/src/inst_prepdisk.ycp
--- old/yast2-storage-2.17.54/storage/src/inst_prepdisk.ycp 2008-10-30 14:59:13.000000000 +0100
+++ new/yast2-storage-2.17.57/storage/src/inst_prepdisk.ycp 2008-11-27 17:11:44.000000000 +0100
@@ -21,7 +21,7 @@
* possible return values: `back, `abort `next
*
- * $Id: inst_prepdisk.ycp 52739 2008-10-30 13:59:13Z aschnell $
+ * $Id: inst_prepdisk.ycp 53664 2008-11-27 16:03:40Z locilka $
*/
// TODO: - check for errors on non i386
@@ -114,7 +114,10 @@
SlideShow::OpenDialog();
}
- StorageClients::total_actions = Storage::ActionsCount();
+ // They are usually more than twice the reported value
+ // create, format, mount ...
+ StorageClients::total_actions = Storage::ActionsCount() * 2.5;
+ y2milestone ("StorageClients::total_actions: %1", StorageClients::total_actions);
SlideShow::MoveToStage( "disk" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.54/VERSION new/yast2-storage-2.17.57/VERSION
--- old/yast2-storage-2.17.54/VERSION 2008-11-25 15:08:16.000000000 +0100
+++ new/yast2-storage-2.17.57/VERSION 2008-11-28 12:05:42.000000000 +0100
@@ -1 +1 @@
-2.17.54
+2.17.57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org