Author: fehr Date: Mon Aug 29 14:44:52 2011 New Revision: 65424 URL: http://svn.opensuse.org/viewcvs/yast?rev=65424&view=rev Log: use less space for proposal in ncurses (bnc#713314) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_disk_proposal.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=65424&r1=65423&r2=65424&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 29 14:44:52 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 29 14:37:26 CEST 2011 - fehr@suse.de + +- use less space for proposal in ncurses (bnc#713314) + +------------------------------------------------------------------- Mon Aug 22 16:01:19 CEST 2011 - fehr@suse.de - forbid to use LVM for /boot (bnc#713176) Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_proposal.ycp?rev=65424&r1=65423&r2=65424&view=diff ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Mon Aug 29 14:44:52 2011 @@ -193,6 +193,7 @@ `PushButton( `id(`modify), modify_str ) ); +float space = StorageProposal::SaveHeight()?1:2; term contents = `VBox( @@ -202,7 +203,7 @@ `VBox( `MinHeight(8, `RichText(`id(`richtext), changes)), rframe, - `VSpacing(2), + `VSpacing(space), bframe, `VStretch() ), Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=65424&r1=65423&r2=65424&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Mon Aug 29 14:44:52 2011 @@ -4097,9 +4097,21 @@ return ret; } +global boolean SaveHeight() + { + map display_info = UI::GetDisplayInfo(); + boolean ret = false; + if( display_info["TextMode"]:false && display_info["Height"]:24 < 40 ) + ret = true; + return(ret); + } + global term AddCommonWidgets() { term vb = `VBox(); + float space = 0.5; + if( SaveHeight() ) + space = 0; vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), // Label text @@ -4108,19 +4120,19 @@ `Left(`HBox(`HSpacing(7), `CheckBox(`id(`encrypt), `opt(`notify), // Label text _("Encr&ypt Volume Group"), GetProposalEncrypt())))); - vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, `VSpacing(space) ); vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), `opt(`notify), // Label text _("Propose Separate &Home Partition"), GetProposalHome() )))); - vb = add( vb, `VSpacing(0.5) ); + vb = add( vb, `VSpacing(space) ); vb = add( vb, `Left(`HBox(`HSpacing(3), `CheckBox(`id(`btrfs), `opt(`notify), // Label text _("Use &Btrfs as default Filesystem"), GetProposalBtrfs() )))); - term frame = `VBox( `VSpacing(1.5), + term frame = `VBox( `VSpacing(3*space), `HVCenter( `VBox( `Left(`Label( `opt(`boldFont), _("Proposal settings"))), `VSpacing(0.3), `HVCenter(vb)) )); //`HVCenter(`Frame( _("Proposal settings"), `HVCenter(vb) ))); y2milestone( "AddCommonWidgets Home:%1 Btrfs:%2", GetProposalHome(), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org