From d91e382c9e7d024b017c9178773b0750122a08f7 Mon Sep 17 00:00:00 2001 From: Jaroslav Barton Date: Fri, 27 Mar 2009 16:56:04 +0100 Subject: [PATCH] Use of new enroll dialog. --- CMakeLists.txt | 2 ++ src/FingerManagerWindow.cpp | 34 +++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8c4c6e..c721376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,12 +7,14 @@ SET( FPRINT_ASK_SOURCES ./src/FingerManagerWindow.cpp ./src/FMDbusConn.cpp ./src/FingerManagerDevicesModel.cpp + ./src/FMEnroll.cpp ) SET( FPRINT_ASK_HEADERS ./src/FingerManagerWindow.h ./src/FMDbusConn.h ./src/FingerManagerDevicesModel.h + ./src/FMEnroll.h ) ADD_DEFINITIONS( -Wall -std=c++98 ) diff --git a/src/FingerManagerWindow.cpp b/src/FingerManagerWindow.cpp index 04c95ba..275cb74 100644 --- a/src/FingerManagerWindow.cpp +++ b/src/FingerManagerWindow.cpp @@ -16,6 +16,7 @@ #include "FingerManagerDevicesModel.h" #include "FMDbusConn.h" #include "FingerNames.h" +#include "FMEnroll.h" int y_base; @@ -27,21 +28,28 @@ void FingerManagerWindow::fingerSelected(int idx) { if (devid > -1) { qDebug("%s: %d", fingerNames[idx].iface, fingers[idx]->isChecked()); if (fingers[idx]->isChecked()) { - KMessageBox::sorry(this, i18n("Deletion of single fingerprint is not supported in fprintd D-Bus daemon")); + KMessageBox::sorry(this, i18n("Deletion of single " + "fingerprint is not supported in fprintd D-Bus " + "daemon")); fingers[idx]->setChecked(true);fingers[idx]->setChecked(true); } else { - QString device = ((FingerManagerDevicesModel*)devices->model())-> - getDeviceName(devid); - QString msg = QString(i18n("Enroll finger \"%1\" on device \"%2\" for user \"%3\"?")); - msg = msg.arg(fingerNames[idx].name, device, getlogin()); - int result = KMessageBox::questionYesNo(this, - msg, - i18n("Enroll?")); - if (result == KMessageBox::Yes) { - fingers[idx]->setChecked(true); - } else { - fingers[idx]->setChecked(false); - } +// QString device = ((FingerManagerDevicesModel*)devices->model())-> +// getDeviceName(devid); +// QString msg = QString(i18n("Enroll finger \"%1\" on device \"%2\" for user \"%3\"?")); +// msg = msg.arg(fingerNames[idx].name, device, getlogin()); +// int result = KMessageBox::questionYesNo(this, +// msg, +// i18n("Enroll?")); +// if (result == KMessageBox::Yes) { +// fingers[idx]->setChecked(true); +// } else { +// fingers[idx]->setChecked(false); +// } + FMEnroll *e = new FMEnroll( + ((FingerManagerDevicesModel*)devices->model())->getDeviceModel(devid), + idx, + this); + e->exec(); } } } -- 2.11.4.GIT