Author: kmachalkova Date: Tue May 5 16:57:18 2009 New Revision: 57075 URL: http://svn.opensuse.org/viewcvs/yast?rev=57075&view=rev Log: HandleHdButtons based on the context (all disks - nil user_data, or individual disk - HD name as user data) ... fixes "Add" button function in individual disk branch Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd.ycp?rev=57075&r1=57074&r2=57075&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue May 5 16:57:18 2009 @@ -69,12 +69,22 @@ ); } - void HandleHdButtons( string device, map event ) + void HandleHdButtons( any user_data, string device, map event ) { - map dev = Storage::GetDiskPartition( device ); - string disk = (string) dev["disk"]:nil; - // FIXME: is this necessary & sufficient condition? - boolean is_disk = (dev["nr"]:"" == ""); + string disk = ""; + boolean is_disk = false; + + if (user_data == nil) + { + map dev = Storage::GetDiskPartition( device ); + disk = (string) dev["disk"]:nil; + // FIXME: is this necessary & sufficient condition? + is_disk = dev["nr"]:nil == ""; + } + else + { + disk = (string) user_data; + } switch (Event::IsWidgetActivated(event)) { @@ -152,7 +162,7 @@ { string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); - HandleHdButtons( device, event ); + HandleHdButtons( user_data, device, event ); switch (Event::IsWidgetContextMenuActivated(event)) { @@ -323,7 +333,7 @@ string disk_device = (string) user_data; string part_device = (string) UI::QueryWidget(`id(`table), `CurrentItem); - HandleHdButtons( part_device, event ); + HandleHdButtons( disk_device, part_device, event ); switch (Event::IsMenu(event)) { @@ -461,7 +471,7 @@ { string part_device = (string) user_data; - HandleHdButtons( part_device, event); + HandleHdButtons( nil, part_device, event); UI::SetFocus(`id(`text)); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org