Author: jsuchome Date: Tue Oct 7 16:22:10 2008 New Revision: 51924 URL: http://svn.opensuse.org/viewcvs/yast?rev=51924&view=rev Log: - show the number of successfull swipes as a feedback - enable calling Users module after fingerprint-reader finish - adapted help texts - 2.17.5 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 trunk/fingerprint-reader/src/fingerprint-reader.ycp trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Tue Oct 7 16:22:10 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Tue Oct 7 16:22:10 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 7 12:49:39 CEST 2008 - jsuchome@suse.de + +- show the number of successfull swipes as a feedback +- enable calling Users module after fingerprint-reader finish +- adapted help texts +- 2.17.5 + +------------------------------------------------------------------- Mon Oct 6 16:05:44 CEST 2008 - jsuchome@suse.de - removed Supplements from spec file (package will be recommended Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/FingerprintReader.ycp?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Tue Oct 7 16:22:10 2008 @@ -48,6 +48,9 @@ */ global boolean modified = false; +// if yast2-users should be called after fingerprint is set up + +global boolean run_users = false; /** * Required packages for this module to operate */ Modified: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.ycp?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Tue Oct 7 16:22:10 2008 @@ -82,12 +82,10 @@ string help_text = _("<p> <b>Fingerprint Authentication</b><br> The fingerprint reader configuration updates your PAM settings to enable authentication with fingerprints.</p> -"); +") - /* // help text, cont. - sformat (_("<p>To <b>Import Fingerprint Files</b> from different installations, choose the directory where the original files are located. The files will be copied to directory %1.</p>"), FingerprintReader::bir_dir); - */ + + _("<p>To configure user fingerprints, start YaST User Management and see the Plug-Ins tab of selected user. When <b>Start User Management after finish</b> is checked, it will be opened automatically after the device configuration is done.</p>"); term con = `HBox (`HSpacing (3), `VBox ( // frame label @@ -105,18 +103,11 @@ ), `VSpacing (0.5) ), `HSpacing (0.5))), - `VSpacing () - /* FIXME: no import? - `HBox ( - // textentry label - `TextEntry (`id(`import_dir), - _("Directory with fingerprint files for import")), - `VBox ( - `Label (""), - `PushButton (`id (`browse), Label::BrowseButton ()) - ) + `VSpacing (), + `Left ( + // button label + `CheckBox (`id (`users), _("&Start User Management after finish")) ) - */ ), `HSpacing(3)); Wizard::SetContentsButtons (caption, con, help_text, @@ -127,51 +118,27 @@ if (!Stage::cont ()) Wizard::HideAbortButton (); -// UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); -// UI::ChangeWidget (`id (`browse), `Enabled, use_pam); + UI::ChangeWidget (`id (`users), `Enabled, use_pam); any ret = nil; while (true) { ret = UI::UserInput(); -// string import_dir = (string)UI::QueryWidget (`id (`import_dir), `Value); if (ret == `pamyes || ret == `pamno) { use_pam = (ret == `pamyes); - /* - UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); - UI::ChangeWidget (`id (`browse), `Enabled, use_pam); - */ + UI::ChangeWidget (`id (`users), `Enabled, use_pam); } if (ret == `abort || ret == `cancel || ret == `back) { if(ReallyAbort()) break; else continue; } - /* - else if (ret == `browse) { - string dir = UI::AskForExistingDirectory (import_dir, ""); - if (dir != nil) - { - if ((findlastof (dir, "/") + 1) == size(dir)) - dir = substring (dir, 0, size(dir)-1); - UI::ChangeWidget (`id(`import_dir), `Value, dir); - } + else if (ret == `users) { + // temporary enable pam module } - */ else if (ret == `next) { - /* - if (use_pam && import_dir != "" && - !FileUtils::IsDirectory (import_dir)) - { - // error popup - Report::Error (_("The path to fingerprint files -does not point to the valid directory.")); - UI::SetFocus (`id (`import_dir)); - continue; - } - */ if (use_pam && !Package::InstallAll (FingerprintReader::UpdatedArchPackages ( FingerprintReader::required_packages)) @@ -179,18 +146,16 @@ { use_pam = false; UI::ChangeWidget (`id (`rd), `Value, `pamno); - /* - UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); - UI::ChangeWidget (`id (`browse), `Enabled, use_pam); - */ + UI::ChangeWidget (`id (`users), `Enabled, false); continue; } if (use_pam != FingerprintReader::use_pam) { FingerprintReader::modified = true; FingerprintReader::use_pam = use_pam; -// FingerprintReader::import_dir = import_dir; } + if (use_pam && UI::QueryWidget (`id (`users), `Value) == true) + FingerprintReader::run_users = true; break; } } Modified: trunk/fingerprint-reader/src/fingerprint-reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/fingerprint-reader.ycp?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/src/fingerprint-reader.ycp (original) +++ trunk/fingerprint-reader/src/fingerprint-reader.ycp Tue Oct 7 16:22:10 2008 @@ -127,6 +127,13 @@ y2milestone("FingerprintReader module finished with %1", ret); y2milestone("----------------------------------------"); +if (FingerprintReader::run_users) +{ + y2milestone ("users should be called after FingerprintReader"); + ret = WFM::CallFunction ("users", WFM::Args ()); + y2milestone ("Users module returned %1", ret); +} + return ret; /* EOF */ Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp?rev=51924&r1=51923&r2=51924&view=diff ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Tue Oct 7 16:22:10 2008 @@ -70,6 +70,7 @@ ), `ReplacePoint (`id (`rpstatus), `VSpacing ()), `PushButton (`id (`cancel), Label::CancelButton ()), + `ReplacePoint (`id (`rpswipes), `VSpacing ()), `VSpacing (0.5) ), `HSpacing (1.5) @@ -116,12 +117,12 @@ return ex; } + // update the status about fingerprint reader void status_message (string label, string message) { UI::ReplaceWidget (`id (`rp), `Label (label)); UI::ReplaceWidget (`id (`rpstatus), `Label (message)); } - if (SCR::Execute (.fprint.enroll, fingerprint_dir) != true) { ui = `cancel; @@ -167,6 +168,10 @@ _("Enroll stage passed."), // status message _("Swipe finger again.")); + UI::ReplaceWidget (`id (`rpswipes), `Label ( + // status message (%1 is number) + sformat (_("Successful swipes: %1"), swipe_success) + )); break; } case 101: { // FP_ENROLL_RETRY_TOO_SHORT: @@ -194,7 +199,7 @@ // status label _("Scan failed."), // status message - _("Remove your finger and try again.")); + _("Remove your finger from the sensor and try again.")); break; } case -1: { // FP_ENROLL_FAIL @@ -238,6 +243,7 @@ } sleep (100); } + UI::ReplaceWidget (`id (`rpswipes), `VSpacing ()); y2milestone ("agent exit status: %1", exit_status); if (exit_status == 1) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org