k_f 15/03/01 22:30:54 Added: pinentry-0.9.0-accessibility.patch Log: Fix for bug #541400 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xFED5002857C1ABFA!)
Revision Changes Path 1.1 app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch?rev=1.1&content-type=text/plain Index: pinentry-0.9.0-accessibility.patch =================================================================== diff --git a/qt4/main.cpp b/qt4/main.cpp index 106999e..b2a69f2 100644 --- a/qt4/main.cpp +++ b/qt4/main.cpp @@ -217,8 +217,9 @@ qt_cmd_handler (pinentry_t pe) for ( size_t i = 0 ; i < sizeof buttonLabels / sizeof *buttonLabels ; ++i ) if ( (buttons & buttonLabels[i].button) && !buttonLabels[i].label.isEmpty() ) { box.button( buttonLabels[i].button )->setText( buttonLabels[i].label ); +#ifndef QT_NO_ACCESSIBILITY box.button( buttonLabels[i].button )->setAccessibleDescription ( buttonLabels[i].label ); - +#endif } box.setIconPixmap( icon() ); diff --git a/qt4/pinentryconfirm.cpp b/qt4/pinentryconfirm.cpp index dfbd19f..6b3d545 100644 --- a/qt4/pinentryconfirm.cpp +++ b/qt4/pinentryconfirm.cpp @@ -30,8 +30,10 @@ PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title, connect(_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); _timer->start(timeout*1000); } +#ifndef QT_NO_ACCESSIBILITY setAccessibleDescription (desc); setAccessibleName (title); +#endif raiseWindow (this); } diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp index 3a6dacc..456f022 100644 --- a/qt4/pinentrydialog.cpp +++ b/qt4/pinentrydialog.cpp @@ -217,7 +217,9 @@ void PinEntryDialog::setDescription( const QString& txt ) { _desc->setVisible( !txt.isEmpty() ); _desc->setText( txt ); +#ifndef QT_NO_ACCESSIBILITY _desc->setAccessibleDescription ( txt ); +#endif _icon->setPixmap( icon() ); setError( QString::null ); } @@ -231,7 +233,9 @@ void PinEntryDialog::setError( const QString& txt ) { if( !txt.isNull() )_icon->setPixmap( icon( QStyle::SP_MessageBoxCritical ) ); _error->setText( txt ); +#ifndef QT_NO_ACCESSIBILITY _error->setAccessibleDescription ( txt ); +#endif _error->setVisible( !txt.isEmpty() ); } @@ -264,14 +268,18 @@ QString PinEntryDialog::prompt() const void PinEntryDialog::setOkText( const QString& txt ) { _ok->setText( txt ); +#ifndef QT_NO_ACCESSIBILITY _ok->setAccessibleDescription ( txt ); +#endif _ok->setVisible( !txt.isEmpty() ); } void PinEntryDialog::setCancelText( const QString& txt ) { _cancel->setText( txt ); +#ifndef QT_NO_ACCESSIBILITY _cancel->setAccessibleDescription ( txt ); +#endif _cancel->setVisible( !txt.isEmpty() ); } @@ -279,7 +287,9 @@ void PinEntryDialog::setQualityBar( const QString& txt ) { if (_have_quality_bar) { _quality_bar_label->setText( txt ); +#ifndef QT_NO_ACCESSIBILITY _quality_bar_label->setAccessibleDescription ( txt ); +#endif } }
