Author: aschnell
Date: Fri Jun 19 14:23:08 2009
New Revision: 57661
URL: http://svn.opensuse.org/viewcvs/yast?rev=57661&view=rev
Log:
- changed checkbox for device encryption (fate #305633)
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/custom_part_dialogs.ycp
trunk/storage/storage/src/include/custom_part_lib.ycp
trunk/storage/storage/src/include/ep-dialogs.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=57661&r1=57660&r2=57661&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Fri Jun 19 14:23:08 2009
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jun 16 15:35:16 CEST 2009 - aschnell@suse.de
+
+- changed checkbox for device encryption (fate #305633)
+
+-------------------------------------------------------------------
Tue Jun 09 14:48:30 CEST 2009 - aschnell@suse.de
- visualise encrypted devices by icon in tables
Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=57661&r1=57660&r2=57661&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Jun 19 14:23:08 2009
@@ -902,27 +902,31 @@
fs_sel[`swap,"selected"]:false ));
}
- term CryptWidget = `Empty();
- if( !Arch::s390 () )
- {
+ return `VBox(
+ `ComboBox(`id(`fs), `opt(`hstretch, `notify),
+ // label text
+ _("File &system"), filesystems),
+ `PushButton(`id(`fs_options), `opt(`hstretch),
+ // button text
+ _("O&ptions..."))
+ );
+ }
+
+
+ term CryptButton(map new_val)
+ {
+ if (Arch::s390())
+ return `Empty();
+
boolean cr = new_val["enc_type"]:`none != `none;
- CryptWidget = `VBox( // `VSpacing(0.7),
- `Left(`CheckBox(`id(`crypt_fs), `opt(`notify),
- // button text
- _("&Encrypt file system"), cr )));
- }
- return `VBox(
- `ReplacePoint( `id(`type_dlg_rp),
- `ComboBox(`id(`fs), `opt(`hstretch, `notify),
- // label text
- _("File &system"), filesystems )),
- `PushButton( `id(`fs_options ), `opt(`hstretch),
- // button text
- _("O&ptions...") ),
- CryptWidget );
+ return `VBox(
+ `Left(`CheckBox(`id(`crypt_fs), `opt(`notify),
+ // button text
+ _("&Encrypt device"), cr)));
}
+
/**
* Dialogpart: Filesystem ID
* @parm new_val map that contains a partition
@@ -979,6 +983,7 @@
};
+// used by autoyast
define term FormatDlg( map new_val, map