June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48550 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: juhliarik Date: Thu Jun 26 16:55:06 2008 New Revision: 48550 URL: http://svn.opensuse.org/viewcvs/yast?rev=48550&view=rev Log: new version 2.17.1 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=48550&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu Jun 26 16:55:06 2008 @@ -1 +1 @@ -2.16.20 +2.17.1 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Jun 26 16:55:06 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 26 16:51:00 CEST 2008 - juhliarik(a)suse.cz +- added support for better detection Vista in MBR +- added fix for installing generic code if MBR is uknown (bnc #400062) +- added fix for detection MBR if sw-raid is used (bnc #398356) +- 2.17.1 + +------------------------------------------------------------------- Mon Jun 9 13:35:26 CEST 2008 - juhliarik(a)suse.cz - added fix for problem with booting Vista bnc #396444 - 2.16.20 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48549 - in /trunk/bootloader: scripts/examine_mbr.pl src/grub/misc.ycp src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: juhliarik Date: Thu Jun 26 16:50:07 2008 New Revision: 48549 URL: http://svn.opensuse.org/viewcvs/yast?rev=48549&view=rev Log: - added fix for installation generic code if MBR is uknown - added fix for detecting MBR if SW Raid is used (MD Raid) - better detection of Vista MBR M bootloader/src/grub/misc.ycp * support of detection MBR for SW Raid M bootloader/src/routines/lilolike.ycp * support of detection MBR for SW Raid M bootloader/scripts/examine_mbr.pl * added better detection of Vista MBR Modified: trunk/bootloader/scripts/examine_mbr.pl trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/scripts/examine_mbr.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/examine_mbr.p… ============================================================================== --- trunk/bootloader/scripts/examine_mbr.pl (original) +++ trunk/bootloader/scripts/examine_mbr.pl Thu Jun 26 16:50:07 2008 @@ -55,7 +55,7 @@ if (substr($MBR, 4, 20) =~ m,LILO,) { print "LILO stage1\n"; - exit 1; + exit 254; } if (substr($MBR, 12, 500) =~ m,NTLDR is missing,) { @@ -63,7 +63,7 @@ exit 0; } -if (substr($MBR, 320, 126) =~ +if (substr($MBR, 0, 440) =~ m,invalid partition table.*Error loading operating system,i) { print "Vista MBR\n"; exit 0; @@ -71,5 +71,5 @@ print "unknown\n"; -exit 0; +exit 254; Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev… ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Thu Jun 26 16:50:07 2008 @@ -475,6 +475,40 @@ } /** + * function check all partitions and it tries to find /boot partition + * if it is MD Raid and soft-riad return correct device for analyse MBR + * @param list<map> list of partitions + * @return string device for analyse MBR + */ +define string soft_MDraid_boot_disk(list<map> partitions) +{ + string result = ""; + string boot_device = ""; + if ((BootCommon::BootPartitionDevice != nil) && (BootCommon::BootPartitionDevice != "")) + boot_device = BootCommon::BootPartitionDevice; + else + boot_device = BootCommon::RootPartitionDevice; + + foreach(map p, partitions, { + if (p["device"]:"" == boot_device) + { + if ((p["type"]:nil == `sw_raid) && (p["fstype"]:"" == "MD Raid")) + { + string device_1 = p["devices",0]:""; + y2debug("device_1: %1", device_1); + map dp = Storage::GetDiskPartition (device_1); + y2debug("dp: %1", dp); + result = dp["disk"]:""; + } + } + }); + y2milestone("Device for analyse MBR from soft-raid (MD-Raid only): %1", result); + return result; +} + + + +/** * grub_ConfigureLocation() * Where to install the bootloader. * Returns the type of device where to install: one of `boot `root `mbr `extended `mbr_md @@ -580,8 +614,15 @@ // contain boot code // - 0 for a "Generic MBR" (DOS MBR) // - 254 for a GRUB or lilo "stage 1" - // - 0 for an unknown MBR + // - 254 for an unknown MBR // - 0 for Vista MBR + + // check if there is raid and if it soft-raid select correct device for analyse MBR + // bnc #398356 + if (size (underlying_boot_partition_devices) > 1) + boot_partition_disk = soft_MDraid_boot_disk(partitions_on_boot_partition_disk); + if (boot_partition_disk == "") + boot_partition_disk = dp["disk"]:""; map out = (map)SCR::Execute (.target.bash_output, sformat ( "/usr/lib/YaST2/bin/examine_mbr.pl %1", boot_partition_disk)); y2milestone ("MBR examining script returned %1", out); Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Jun 26 16:50:07 2008 @@ -125,6 +125,42 @@ return boot_disk; } + + +/** + * function check all partitions and it tries to find /boot partition + * if it is MD Raid and soft-riad return correct device for analyse MBR + * @param list<map> list of partitions + * @return string device for analyse MBR + */ +define string soft_MDraid_boot_disk(list<map> partitions) +{ + string result = ""; + string boot_device = ""; + if ((BootCommon::BootPartitionDevice != nil) && (BootCommon::BootPartitionDevice != "")) + boot_device = BootCommon::BootPartitionDevice; + else + boot_device = BootCommon::RootPartitionDevice; + + foreach(map p, partitions, { + if (p["device"]:"" == boot_device) + { + if ((p["type"]:nil == `sw_raid) && (p["fstype"]:"" == "MD Raid")) + { + string device_1 = p["devices",0]:""; + y2debug("device_1: %1", device_1); + map dp = Storage::GetDiskPartition (device_1); + y2debug("dp: %1", dp); + result = dp["disk"]:""; + } + } + }); + y2milestone("Device for analyse MBR from soft-raid (MD-Raid only): %1", result); + return result; +} + + + /** * ConfigureLocation() * Where to install the bootloader. @@ -219,8 +255,17 @@ // contain boot code // - 0 for a "Generic MBR" (DOS MBR) // - 254 for a GRUB or lilo "stage 1" - // - 0 for an unknown MBR + // - 254 for an unknown MBR // - 0 for a Vista MBR + + + // check if there is raid and if it soft-raid select correct device for analyse MBR + // bnc #398356 + if (size (needed_devices) > 1) + disk = soft_MDraid_boot_disk(partitions); + if (disk == "") + disk = dp["disk"]:""; + map out = (map)SCR::Execute (.target.bash_output, sformat ( "/usr/lib/YaST2/bin/examine_mbr.pl %1", disk)); y2milestone ("MBR examining script returned %1", out); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48548 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_automatic_configuration.ycp
by locilka＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: locilka Date: Thu Jun 26 16:48:17 2008 New Revision: 48548 URL: http://svn.opensuse.org/viewcvs/yast?rev=48548&view=rev Log: Fixed 'Do not panic!' text (bnc #388251) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 26 16:48:17 2008 @@ -2,6 +2,7 @@ Thu Jun 26 16:43:32 CEST 2008 - locilka(a)suse.cz - Fixed help text for deploying images (bnc #391086). +- Fixed 'Do not panic!' text (bnc #388251). ------------------------------------------------------------------- Wed Jun 25 16:44:33 CEST 2008 - ug(a)suse.de Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au… ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Thu Jun 26 16:48:17 2008 @@ -126,14 +126,14 @@ // the installation has failed. _(" -*********************************************************** +****************************************************** -Do not panic! + Do not panic! -X11 Configuration must have switched to console for a while -to do detect your videocard properly... + X11 Configuration must switch to console for a while + to do detect your videocard properly... -*********************************************************** +****************************************************** ") ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48547 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_deploy_image.ycp
by locilka＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: locilka Date: Thu Jun 26 16:44:57 2008 New Revision: 48547 URL: http://svn.opensuse.org/viewcvs/yast?rev=48547&view=rev Log: Fixed help text for deploying images Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_deploy_image.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jun 26 16:44:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 26 16:43:32 CEST 2008 - locilka(a)suse.cz + +- Fixed help text for deploying images (bnc #391086). + +------------------------------------------------------------------- Wed Jun 25 16:44:33 CEST 2008 - ug(a)suse.de - proposal selection possible via autoyast profile (fate#302946) Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de… ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Thu Jun 26 16:44:57 2008 @@ -226,7 +226,7 @@ // TRANSLATORS: help idi#3 _("<p>Installation from images is faster than installation from RPM packages -because it does not need to handle with with RPM database, locks etc. +because it does not need to handle with RPM database, locks etc. One of the images also contains the joint RPM database and other metadata.</p>") + // TRANSLATORS: help idi#4 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48546 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-dm-lib.ycp ep-hd-lib.ycp ep-lvm-lib.ycp ep-raid-lib.ycp
by aschnell＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: aschnell Date: Thu Jun 26 14:45:42 2008 New Revision: 48546 URL: http://svn.opensuse.org/viewcvs/yast?rev=48546&view=rev Log: - added checks Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm-lib.ycp Thu Jun 26 14:45:42 2008 @@ -10,6 +10,12 @@ void EpEditDmDevice(string device) { + if (device == nil) + { + Error(_("No DM device selected.")); + return; + } + if (DlgEditDmVolume(device)) { UpdateNavigationTree(nil); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-lib.ycp Thu Jun 26 14:45:42 2008 @@ -10,6 +10,12 @@ void EpCreatePartitionTable(string disk_device) { + if (disk_device == nil) + { + Error(_("No hard disk selected.")); + return; + } + if (YesNo(sformat(_("Really create new partition table on %1? This will delete all data on %1 and all RAIDs and Volume Groups using %1."), disk_device))) { @@ -64,6 +70,12 @@ */ void EpCreatePartition(string disk_device) { + if (disk_device == nil) + { + Error(_("No hard disk selected.")); + return; + } + map<string, map> target_map = Storage::GetTargetMap(); map disk = target_map[disk_device]:$[]; @@ -96,6 +108,12 @@ void EpEditPartition(string device) { + if (device == nil) + { + Error(_("No partition selected.")); + return; + } + if (DlgEditPartition(device)) { UpdateNavigationTree(nil); @@ -106,12 +124,24 @@ void EpResizePartition(string device) { + if (device == nil) + { + Error(_("No partition selected.")); + return; + } + DlgResizePartition(device); } void EpDeletePartition(string device) { + if (device == nil) + { + Error(_("No partition selected.")); + return; + } + string parent = ParentDevice(device); if (EpDeleteDevice(device)) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp Thu Jun 26 14:45:42 2008 @@ -25,6 +25,12 @@ void EpResizeVolumeGroup(string device) { + if (device == nil) + { + Error(_("No volume group selected.")); + return; + } + if (DlgResizeVolumeGroup(device)) { UpdateNavigationTree(nil); @@ -35,6 +41,12 @@ void EpDeleteVolumeGroup(string device) { + if (device == nil) + { + Error(_("No volume group selected.")); + return; + } + string vgname = substring(device, 5); map<string,map> tg = Storage::GetTargetMap(); @@ -65,6 +77,12 @@ void EpCreateLogicalVolume(string device) { + if (device == nil) + { + Error(_("No logical volume selected.")); + return; + } + if (DlgCreateLogicalVolume(device)) { UpdateNavigationTree(nil); @@ -75,6 +93,12 @@ void EpEditLogicalVolume(string device) { + if (device == nil) + { + Error(_("No logical volume selected.")); + return; + } + if (DlgEditLogicalVolume(device)) { UpdateNavigationTree(nil); @@ -85,12 +109,24 @@ void EpResizeLogicalVolume(string device) { + if (device == nil) + { + Error(_("No logical volume selected.")); + return; + } + DlgResizeLogicalVolumeNew(device); } void EpDeleteLogicalVolume(string device) { + if (device == nil) + { + Error(_("No logical volume selected.")); + return; + } + string parent = ParentDevice(device); if (EpDeleteDevice(device)) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp Thu Jun 26 14:45:42 2008 @@ -25,6 +25,12 @@ void EpEditRaid(string device) { + if (device == nil) + { + Error(_("No RAID selected.")); + return; + } + if (DlgEditRaid(device)) { UpdateNavigationTree(nil); @@ -35,6 +41,12 @@ void EpResizeRaid(string device) { + if (device == nil) + { + Error(_("No RAID selected.")); + return; + } + map<string, map> target_map = Storage::GetTargetMap(); map<string, any> data = Storage::GetPartition(target_map, device); @@ -51,6 +63,12 @@ void EpDeleteRaid(string device) { + if (device == nil) + { + Error(_("No RAID selected.")); + return; + } + if (EpDeleteDevice(device)) { UpdateNavigationTree(`md); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48545 - /trunk/doc/_build-www.sh
by locilka＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: locilka Date: Thu Jun 26 12:18:22 2008 New Revision: 48545 URL: http://svn.opensuse.org/viewcvs/yast?rev=48545&view=rev Log: Building docu on 11.1 Modified: trunk/doc/_build-www.sh Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=48545&r1=4… ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Thu Jun 26 12:18:22 2008 @@ -160,7 +160,8 @@ make -f Makefile.cvs >> ${BUILDLOG} checkforerrors make clean >> ${BUILDLOG} -make ${MAKE_PARAMS} >> ${BUILDLOG} || (echo "2 exiting..." && exit 42) +# not needed for docu +# make ${MAKE_PARAMS} >> ${BUILDLOG} || (echo "2 exiting..." && exit 42) checkforerrors # Creates XML documentation from installation @@ -188,6 +189,7 @@ cd ${SRCDIR} cd core/libycp/doc echo "| Current directory: "`pwd` +rm -rf html make clean >> ${BUILDLOG} make ${MAKE_PARAMS} >> ${BUILDLOG} || (echo "5 exiting..." && exit 42) checkforerrors @@ -255,7 +257,7 @@ echo "| Current directory: "`pwd` make clean >> ${BUILDLOG} checkforerrors -make >> ${BUILDLOG} || (echo "11 exiting..." && exit 42) +make html >> ${BUILDLOG} || (echo "11 exiting..." && exit 42) checkforerrors # BUILDING -onefile documents -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48544 - /branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes
by mlandres＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: mlandres Date: Thu Jun 26 11:56:38 2008 New Revision: 48544 URL: http://svn.opensuse.org/viewcvs/yast?rev=48544&view=rev Log: changes Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes Modified: branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/qt-pkg… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes (original) +++ branches/SuSE-Linux-11_0-Branch/qt-pkg/package/yast2-qt-pkg.changes Thu Jun 26 11:56:38 2008 @@ -7,9 +7,9 @@ ------------------------------------------------------------------- Thu May 29 15:29:40 CEST 2008 - ma(a)suse.de -- Revert 'fix persistent locks saving (bnc#332853)' because the - approach is wrong. Persistent locks are saved during commit. - It's not the UI's task to do this. +- Revert 'fix persistent locks saving (bnc#332853,bnc#395040)' + because the approach is wrong. Persistent locks are saved during + commit. It's not the UI's task to do this. - V 2.16.47 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48543 - /branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: aschnell Date: Thu Jun 26 10:56:18 2008 New Revision: 48543 URL: http://svn.opensuse.org/viewcvs/yast?rev=48543&view=rev Log: - added fs_id field Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Thu Jun 26 10:56:18 2008 @@ -120,6 +120,11 @@ header = add(header, `Right(_("End"))); break; + case `fs_id: + // Column header + header = add(header, `Right(_("FS Id"))); + break; + case `uuid: // Column header header = add(header, _("UUID")); @@ -553,6 +558,17 @@ return sformat(_("End Cylinder: %1"), value); } + case `fs_id: + { + integer fs_id = data["fsid"]:0; + string value = Partitions::ToHexString(fs_id) + " " + Partitions::FsIdToString(fs_id); + if (style == `table) + return value; + else + return sformat(_("FS Id: %1"), value); + } + break; + case `file_path: { string value = data["fpath"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48542 - /trunk/ncurses/src/NCDumbTab.cc
by gs＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: gs Date: Thu Jun 26 10:46:57 2008 New Revision: 48542 URL: http://svn.opensuse.org/viewcvs/yast?rev=48542&view=rev Log: better style for nonactive tab Modified: trunk/ncurses/src/NCDumbTab.cc Modified: trunk/ncurses/src/NCDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDumbTab.cc?rev=485… ============================================================================== --- trunk/ncurses/src/NCDumbTab.cc (original) +++ trunk/ncurses/src/NCDumbTab.cc Thu Jun 26 10:46:57 2008 @@ -196,8 +196,8 @@ if ( !nonActive ) { (*listIt).drawAt( *win, - A_REVERSE, - A_REVERSE, + widgetStyle( ).data, + widgetStyle( ).data, wpos( 0, labelPos ), wsze( 1, winWidth ), NC::TOPLEFT, false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48541 - in /trunk/ncurses/src: NCDumbTab.cc NCDumbTab.h
by gs＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: gs Date: Thu Jun 26 10:11:47 2008 New Revision: 48541 URL: http://svn.opensuse.org/viewcvs/yast?rev=48541&view=rev Log: createMenuEvent added Modified: trunk/ncurses/src/NCDumbTab.cc trunk/ncurses/src/NCDumbTab.h Modified: trunk/ncurses/src/NCDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDumbTab.cc?rev=485… ============================================================================== --- trunk/ncurses/src/NCDumbTab.cc (original) +++ trunk/ncurses/src/NCDumbTab.cc Thu Jun 26 10:11:47 2008 @@ -92,7 +92,6 @@ NCursesEvent NCDumbTab::wHandleInput( wint_t key ) { NCursesEvent ret = NCursesEvent::none; - YItem * item; switch ( key ) { @@ -102,13 +101,7 @@ currentIndex--; wRedraw(); - ret = NCursesEvent::menu; - item = itemAt( currentIndex ); - if ( item ) - { - yuiMilestone() << "Show tab: " << item->label() << endl; - ret.selection = (YMenuItem *)item; - } + ret = createMenuEvent( currentIndex ); } break; @@ -118,31 +111,34 @@ currentIndex++; wRedraw(); - ret = NCursesEvent::menu; - item = itemAt( currentIndex ); - if ( item ) - { - yuiMilestone() << "Show tab: " << item->label() << endl; - ret.selection = (YMenuItem *)item; - } + ret = createMenuEvent( currentIndex ); } break; -#if 0 + case KEY_RETURN: - ret = NCursesEvent::menu; - item = itemAt( currentIndex ); - if ( item ) - { - yuiMilestone() << "Show tab: " << item->label() << endl; - ret.selection = (YMenuItem *)item; - } + ret = createMenuEvent( currentIndex ); break; -#endif + } return ret; } +NCursesEvent NCDumbTab::createMenuEvent( unsigned int index ) +{ + NCursesEvent ret = NCursesEvent::menu; + YItem * item; + + item = itemAt( index ); + if ( item ) + { + yuiMilestone() << "Show tab: " << item->label() << endl; + ret.selection = (YMenuItem *)item; + } + + return ret; +} + void NCDumbTab::addItem( YItem * item ) { YDumbTab::addItem( item ); Modified: trunk/ncurses/src/NCDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDumbTab.h?rev=4854… ============================================================================== --- trunk/ncurses/src/NCDumbTab.h (original) +++ trunk/ncurses/src/NCDumbTab.h Thu Jun 26 10:11:47 2008 @@ -36,7 +36,7 @@ vector <NClabel> tabList; unsigned int currentIndex; - + protected: virtual const char * location() const { return "NCDumbTab"; } @@ -69,6 +69,7 @@ return true; } + NCursesEvent createMenuEvent( unsigned int index); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0