October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41512 - in /branches/SuSE-SLE-10-SP1-Branch/sound: VERSION package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: lslezak Date: Mon Oct 22 15:16:22 2007 New Revision: 41512 URL: http://svn.opensuse.org/viewcvs/yast?rev=41512&view=rev Log: - Initialize "Speaker" and "Beep" channels (needed on Lenovo Thinkpad R61) (#309247) - 2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/sound/VERSION branches/SuSE-SLE-10-SP1-Branch/sound/package/yast2-sound.changes branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/Sound.ycp branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/sound/VERSION Mon Oct 22 15:16:22 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/sound/package/yast2-sound.changes Mon Oct 22 15:16:22 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 15:08:32 CEST 2007 - lslezak(a)suse.cz + +- Initialize "Speaker" and "Beep" channels (needed on Lenovo + Thinkpad R61) (#309247) +- 2.13.19 + +------------------------------------------------------------------- Fri Jan 12 13:24:37 CET 2007 - lslezak(a)suse.cz - updated the sound card database (snd-intel-hda PCI IDs) Modified: branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/Sound.ycp Mon Oct 22 15:16:22 2007 @@ -1190,7 +1190,7 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70 ]; + map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "Speaker":70, "Beep":70 ]; y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list Modified: branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/sound/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/sound/sound/src/volume.ycp Mon Oct 22 15:16:22 2007 @@ -131,6 +131,10 @@ setVolume ("Master Mono", card_id, vol); // some systems use Front (#72971) setVolume ("Front", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Speaker", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Beep", card_id, vol); symbol ui = nil; do @@ -144,6 +148,8 @@ setVolume ("Headphone", card_id, vol); setVolume ("Master Mono", card_id, vol); setVolume ("Front", card_id, vol); + setVolume ("Speaker", card_id, vol); + setVolume ("Beep", card_id, vol); } else if (ui == `test) { @@ -364,6 +370,14 @@ { setVolume ("Master Mono", card_id, Sound::default_volume); } + if (haskey (devs, "Speaker")) + { + setVolume ("Speaker", card_id, Sound::default_volume); + } + if (haskey (devs, "Beep")) + { + setVolume ("Beep", card_id, Sound::default_volume); + } if (Sound::conf_joystick == true && Sound::use_ui) { -- 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] r41511 - /tags/stable-2_16_0/fingerprint-reader/
by jsuchome＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: jsuchome Date: Mon Oct 22 13:33:30 2007 New Revision: 41511 URL: http://svn.opensuse.org/viewcvs/yast?rev=41511&view=rev Log: Created tag stable-2_16_0 for fingerprint-reader Added: tags/stable-2_16_0/fingerprint-reader/ - copied from r41510, trunk/fingerprint-reader/ -- 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] r41510 - in /trunk/fingerprint-reader: VERSION package/yast2-fingerprint-reader.changes src/FingerprintReader.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: jsuchome Date: Mon Oct 22 13:33:23 2007 New Revision: 41510 URL: http://svn.opensuse.org/viewcvs/yast?rev=41510&view=rev Log: fixed wrong widget id (#333670) - check for presence of bir files in import directory (#333670) - 2.16.0 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/FingerprintReader.ycp trunk/fingerprint-reader/src/dialogs.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=4… ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Mon Oct 22 13:33:23 2007 @@ -1 +1 @@ -2.15.2 +2.16.0 Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Oct 22 13:33:23 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 10:18:32 CEST 2007 - jsuchome(a)suse.cz + +- fixed wrong widget id (#333670) +- check for presence of bir files in import directory (#333670) +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 15 09:12:05 CEST 2007 - jsuchome(a)suse.cz - use Pam module to check the status and FingerprintReader.ycp for Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/Fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Mon Oct 22 13:33:23 2007 @@ -166,12 +166,19 @@ SCR::Execute (.target.mkdir, bir_dir); } map out = (map) SCR::Execute (.target.bash_output, - sformat ("/bin/cp %1/*.bir %2/", import_dir, bir_dir)); - if (out["stderr"]:"" != "") + sformat ("find \"%1\" -maxdepth 1 -name \"*.gz\" | wc -l", + import_dir)); + integer count = tointeger(deletechars(out["stdout"]:"0","\n")); + if (count != nil && count > 0) { - // error popup - Popup::ErrorDetails (_("Importing fingerprint files failed."), - out["stderr"]:""); + out = (map) SCR::Execute (.target.bash_output, + sformat ("/bin/cp %1/*.bir %2/", import_dir, bir_dir)); + if (out["stderr"]:"" != "") + { + // error popup + Popup::ErrorDetails (_("Importing fingerprint files failed."), + out["stderr"]:""); + } } } Modified: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.y… ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Mon Oct 22 13:33:23 2007 @@ -146,7 +146,7 @@ { if ((findlastof (dir, "/") + 1) == size(dir)) dir = substring (dir, 0, size(dir)-1); - UI::ChangeWidget (`id(`home), `Value, dir); + UI::ChangeWidget (`id(`import_dir), `Value, dir); } } else if (ret == `next) { -- 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] r41509 - /tags/stable-2_16_0/country/
by jsuchome＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: jsuchome Date: Mon Oct 22 13:11:00 2007 New Revision: 41509 URL: http://svn.opensuse.org/viewcvs/yast?rev=41509&view=rev Log: Created tag stable-2_16_0 for country Added: tags/stable-2_16_0/country/ - copied from r41508, trunk/country/ -- 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] r41508 - in /trunk/country: VERSION console/data/consolefonts.ycp language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: jsuchome Date: Mon Oct 22 13:10:54 2007 New Revision: 41508 URL: http://svn.opensuse.org/viewcvs/yast?rev=41508&view=rev Log: - in firstboot, do not show list with secondary languages (F302520) - correct console font for Hungarian (#335246) - 2.16.0 Modified: trunk/country/VERSION trunk/country/console/data/consolefonts.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=41508&r1=415… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Oct 22 13:10:54 2007 @@ -1 +1 @@ -2.15.20 +2.16.0 Modified: trunk/country/console/data/consolefonts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/console/data/consolefont… ============================================================================== --- trunk/country/console/data/consolefonts.ycp (original) +++ trunk/country/console/data/consolefonts.ycp Mon Oct 22 13:10:54 2007 @@ -80,9 +80,9 @@ "sk" : [ "lat2-16.psfu", "", "trivial", "(K" ], "sk_SK.UTF-8" : [ "lat2-16.psfu", "", "trivial", "(K" ], - "hu_HU" : [ "lat2-16.psfu", "", "trivial", "(K" ], - "hu" : [ "lat2-16.psfu", "", "trivial", "(K" ], - "hu_HU.UTF-8" : [ "lat2-16.psfu", "", "trivial", "(K" ], + "hu_HU" : [ "lat2a-16.psfu", "", "trivial", "(K" ], + "hu" : [ "lat2a-16.psfu", "", "trivial", "(K" ], + "hu_HU.UTF-8" : [ "lat2a-16.psfu", "", "trivial", "(K" ], "lt_LT" : [ "lat7a-16.psf", "", "trivial", "(K" ], "lt" : [ "lat7a-16.psf", "", "trivial", "(K" ], Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Mon Oct 22 13:10:54 2007 @@ -206,7 +206,7 @@ string preselected = Language::preselected; - if (Stage::initial () && preselected != "en_US" && set_default) + if (preselected != "en_US" && set_default) { if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog")) { @@ -244,7 +244,7 @@ // heading text string heading_text = _("Languages"); - if (Stage::initial () && set_default && !Mode::repair ()) + if (set_default && !Mode::repair ()) { // heading text heading_text = _("Language"); @@ -255,7 +255,7 @@ heading_text = _("Welcome to System Repair"); } - if (Stage::initial () && set_default) + if (set_default) { show_expert = false; more_languages = false; @@ -295,6 +295,14 @@ (language == codelist[1]:"")))) ); + if (Stage::firstboot ()) + languagesel = `SelectionBox (`id(`language), `opt(`notify), "", + maplist (string trans_lang, lsort (lang_list), { + string code = lang2code [trans_lang]:""; + return `item (`id (code), trans_lang, language == code); + }) + ); + // this type of contents will be shown only for initial installation dialog term contents = `HVCenter ( `BackgroundPixmap ("wallpapers/welcome.jpg"), @@ -468,9 +476,9 @@ UI::SetFocus(`id(`language)); // adapt keyboard for language? - boolean kbd_adapt = (Stage::initial () && set_default && !Mode::config ()); + boolean kbd_adapt = (set_default && !Mode::config ()); // adapt timezone for language? - boolean tmz_adapt = (Stage::initial () && set_default && !Mode::config ()); + boolean tmz_adapt = (set_default && !Mode::config ()); repeat @@ -558,7 +566,7 @@ } - if (Stage::initial () && set_default) + if (set_default) { Timezone::ResetZonemap (); } @@ -621,7 +629,7 @@ if (kbd_adapt) { Keyboard::SetKeyboardForLanguage (language); - if (Stage::initial () && set_default) + if (set_default) { Keyboard::SetKeyboardDefault(); } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Oct 22 13:10:54 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 11:58:15 CEST 2007 - jsuchome(a)suse.cz + +- in firstboot, do not show list with secondary languages (F302520) +- correct console font for Hungarian (#335246) +- 2.16.0 + +------------------------------------------------------------------- Wed Sep 19 12:42:10 CEST 2007 - jsuchome(a)suse.cz - save correct system time from ntpdate to HW clock (#309583") -- 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] r41507 - /trunk/storage/storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: fehr Date: Mon Oct 22 11:55:14 2007 New Revision: 41507 URL: http://svn.opensuse.org/viewcvs/yast?rev=41507&view=rev Log: add code that proves that storage constructor does not do time consuming tasks Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Oct 22 11:55:14 2007 @@ -2108,7 +2108,8 @@ global define void Storage() ``{ - y2milestone( "constructor Storage()" ); + map m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); + y2milestone( "constructor Storage() time:%1", m["stdout"]:"" ); StorageMap[targets_backup_key] = $[]; StorageMap[targets_backup_l_key] = $[]; StorageMap[targets_backup_m_key] = $[]; @@ -2130,6 +2131,8 @@ Storage::SetPartProposalActive( false ); } InstallCallbacks(); + m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); + y2milestone( "constructor Storage() end time:%1", m["stdout"]:"" ); } -- 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] r41506 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPopupMenu.cc README_mod-ui
by gs＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: gs Date: Mon Oct 22 11:53:39 2007 New Revision: 41506 URL: http://svn.opensuse.org/viewcvs/yast?rev=41506&view=rev Log: check item pointer Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Mon Oct 22 11:53:39 2007 @@ -80,8 +80,7 @@ case KEY_RIGHT: { YMenuItem * item = menu->findItem( startIndex + getCurrentItem() ); - YUI_CHECK_PTR( item ); - if ( item->hasChildren() ) + if ( item && item->hasChildren() ) ret = NCursesEvent::button; break; } Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Mon Oct 22 11:53:39 2007 @@ -122,7 +122,8 @@ ------------------------ what about default button? FIXME: only dummy rebuildMenuTree() added - + current item after closing submenu with KEY_LEFT not set correctly + NCPkgPopupDiskspace ------------------- -TODO: call addItem() for partition table (NCPkgPopupDiskSpace.cc line 181) \ No newline at end of file +TODO: addItem() for partition table not yet called (NCPkgPopupDiskSpace.cc line 181) -- 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] r41505 - /branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui
by gs＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: gs Date: Mon Oct 22 11:44:30 2007 New Revision: 41505 URL: http://svn.opensuse.org/viewcvs/yast?rev=41505&view=rev Log: more comments Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Mon Oct 22 11:44:30 2007 @@ -121,9 +121,8 @@ NCMenuButton/NCPopupMenu ------------------------ what about default button? -FIXME: not yet working correctly for submenus - only dummy rebuildMenuTree() added +FIXME: only dummy rebuildMenuTree() added NCPkgPopupDiskspace ------------------- -addItem( string ) for partition table missing! (line with comment -> //FIXME ) +TODO: call addItem() for partition table (NCPkgPopupDiskSpace.cc line 181) \ No newline at end of file -- 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] r41504 - /branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc
by gs＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: gs Date: Mon Oct 22 11:40:40 2007 New Revision: 41504 URL: http://svn.opensuse.org/viewcvs/yast?rev=41504&view=rev Log: handle KEX_RIGHT correctly Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Mon Oct 22 11:40:40 2007 @@ -45,7 +45,6 @@ { YMenuItem * item = dynamic_cast<YMenuItem *> (*it); YUI_CHECK_PTR( item ); - row[0] = item->label(); row[1] = item->hasChildren() ? "..." : ""; YItem *tableItem = new YTableItem( row[0], row[1] ); @@ -79,9 +78,13 @@ NCursesEvent ret; switch ( ch ) { case KEY_RIGHT: - if ( menu->findItem(getCurrentItem()+1 )->hasChildren() ) - ret = NCursesEvent::button; - break; + { + YMenuItem * item = menu->findItem( startIndex + getCurrentItem() ); + YUI_CHECK_PTR( item ); + if ( item->hasChildren() ) + ret = NCursesEvent::button; + break; + } case KEY_LEFT: ret = NCursesEvent::cancel; ret.detail = NCursesEvent::CONTINUE; -- 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] r41503 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPopup.cc NCPopupMenu.cc NCPopupMenu.h
by gs＠svn.opensuse.org 22 Oct '07

22 Oct '07

Author: gs Date: Mon Oct 22 10:58:28 2007 New Revision: 41503 URL: http://svn.opensuse.org/viewcvs/yast?rev=41503&view=rev Log: store startIndex Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc Mon Oct 22 10:58:28 2007 @@ -105,7 +105,7 @@ if ( returnevent ) *returnevent = postevent; - NCMIL << "Return: " << postevent.detail << endl; + NCMIL << "Return event.detail: " << postevent.detail << endl; return postevent.detail; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Mon Oct 22 10:58:28 2007 @@ -33,13 +33,19 @@ NCPopupMenu::NCPopupMenu( const wpos at, NCMenuButton * menuButton, YItemIterator begin, YItemIterator end ) : NCPopupTable( at ) , menu( menuButton ) + , startIndex( 0 ) { vector<string> row( 2 ); createList( row ); + YMenuItem * startItem = dynamic_cast<YMenuItem *> (*begin); + YUI_CHECK_PTR( startItem ); + startIndex = startItem->index(); + for ( YItemIterator it = begin; it != end; ++it ) { YMenuItem * item = dynamic_cast<YMenuItem *> (*it); YUI_CHECK_PTR( item ); + row[0] = item->label(); row[1] = item->hasChildren() ? "..." : ""; YItem *tableItem = new YTableItem( row[0], row[1] ); @@ -101,14 +107,14 @@ bool again = false; int selection = ( postevent == NCursesEvent::button ) ? getCurrentItem() : -1; - - YMenuItem * item = menu->findItem( selection + 1 ); + YMenuItem * item = menu->findItem( startIndex + selection ); if ( !item ) return again; - if ( selection != -1 ) { - if ( item->hasChildren() ) { + if ( selection != -1 ) + { + if ( item->hasChildren() ) { // post submenu wpos at( ScreenPos() + wpos( selection, inparent.Sze.W - 1 ) ); NCPopupMenu * dialog = new NCPopupMenu( at, @@ -118,7 +124,8 @@ YUI_CHECK_NEW( dialog ); again = (dialog->post( &postevent ) == NCursesEvent::CONTINUE); - YDialog::deleteTopmostDialog(); + if ( !again ) + YDialog::deleteTopmostDialog(); } else { // store selection //postevent.detail = menu.itemList()[selection]->getIndex(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Mon Oct 22 10:58:28 2007 @@ -41,7 +41,8 @@ private: NCMenuButton * menu; - + int startIndex; + protected: virtual NCursesEvent wHandleInput( wint_t ch ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0