Hello community,
here is the log from the commit of package yast2-fingerprint-reader
checked in at Wed Oct 8 12:07:40 CEST 2008.
--------
--- yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-10-06 16:23:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-10-07 16:22:01.904587000 +0200
@@ -1,0 +2,8 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-fingerprint-reader-2.17.4.tar.bz2
New:
----
yast2-fingerprint-reader-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fingerprint-reader.spec ++++++
--- /var/tmp/diff_new_pack.y19914/_old 2008-10-08 12:06:58.000000000 +0200
+++ /var/tmp/diff_new_pack.y19914/_new 2008-10-08 12:06:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-fingerprint-reader (Version 2.17.4)
+# spec file for package yast2-fingerprint-reader (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-fingerprint-reader
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-fingerprint-reader-2.17.4.tar.bz2
+Source0: yast2-fingerprint-reader-2.17.5.tar.bz2
Prefix: /usr
Requires: yast2 yast2-pam
BuildRequires: libfprint-devel libfprint0 libusb-devel
@@ -43,7 +43,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-fingerprint-reader-2.17.4
+%setup -n yast2-fingerprint-reader-2.17.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -79,6 +79,11 @@
%{_libdir}/YaST2/plugin/libpy2ag_fprint.*
%doc %{prefix}/share/doc/packages/yast2-fingerprint-reader
%changelog
+* Tue Oct 07 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 06 2008 jsuchome@suse.de
- removed Supplements from spec file (package will be recommended
by pam_fp)
++++++ yast2-fingerprint-reader-2.17.4.tar.bz2 -> yast2-fingerprint-reader-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.4/src/dialogs.ycp new/yast2-fingerprint-reader-2.17.5/src/dialogs.ycp
--- old/yast2-fingerprint-reader-2.17.4/src/dialogs.ycp 2008-10-06 15:09:30.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.5/src/dialogs.ycp 2008-10-07 16:07:40.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: dialogs.ycp 50860 2008-09-09 09:14:56Z jsuchome $
+ * $Id: dialogs.ycp 51876 2008-10-06 14:24:06Z jsuchome $
*/
{
@@ -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;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.4/src/fingerprint-reader.ycp new/yast2-fingerprint-reader-2.17.5/src/fingerprint-reader.ycp
--- old/yast2-fingerprint-reader-2.17.4/src/fingerprint-reader.ycp 2008-06-26 15:37:45.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.5/src/fingerprint-reader.ycp 2008-10-07 15:34:33.000000000 +0200
@@ -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 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.4/src/FingerprintReader.ycp new/yast2-fingerprint-reader-2.17.5/src/FingerprintReader.ycp
--- old/yast2-fingerprint-reader-2.17.4/src/FingerprintReader.ycp 2008-10-06 14:01:14.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.5/src/FingerprintReader.ycp 2008-10-07 15:33:03.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: FingerprintReader settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: FingerprintReader.ycp 50860 2008-09-09 09:14:56Z jsuchome $
+ * $Id: FingerprintReader.ycp 51876 2008-10-06 14:24:06Z jsuchome $
*
* Representation of the configuration of fingerprint-reader.
* Input and output routines.
@@ -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
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.4/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.17.5/src/users_plugin_fingerprint_reader.ycp
--- old/yast2-fingerprint-reader-2.17.4/src/users_plugin_fingerprint_reader.ycp 2008-10-06 15:00:19.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.5/src/users_plugin_fingerprint_reader.ycp 2008-10-07 12:48:28.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Jiri Suchomel
*
- * $Id: users_plugin_fingerprint_reader.ycp 51759 2008-10-01 14:10:27Z jsuchome $
+ * $Id: users_plugin_fingerprint_reader.ycp 51876 2008-10-06 14:24:06Z jsuchome $
*/
{
@@ -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)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.17.4/VERSION new/yast2-fingerprint-reader-2.17.5/VERSION
--- old/yast2-fingerprint-reader-2.17.4/VERSION 2008-10-06 16:11:07.000000000 +0200
+++ new/yast2-fingerprint-reader-2.17.5/VERSION 2008-10-07 12:50:41.000000000 +0200
@@ -1 +1 @@
-2.17.4
+2.17.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org