Index: rbutil/rbutilqt/rbutilqt.cpp
===================================================================
--- rbutil/rbutilqt/rbutilqt.cpp (revision 20895)
+++ rbutil/rbutilqt/rbutilqt.cpp (working copy)
@@ -35,6 +35,7 @@
#include "sysinfo.h"
#include "detect.h"
#include "rbsettings.h"
+#include "accessibilityfix.h"
#include "progressloggerinterface.h"
@@ -123,6 +124,12 @@
connect(ui.actionInstall_Rockbox_Utility_on_player, SIGNAL(triggered()), this, SLOT(installPortable()));
#endif
+ //fix acessibility
+ // create Fix object
+ new AccessibleFix(this);
+ // add as fake factory
+ QAccessible::installFactory(accessibilityFactory);
+
}
Index: rbutil/rbutilqt/rbutilqt.pro
===================================================================
--- rbutil/rbutilqt/rbutilqt.pro (revision 20895)
+++ rbutil/rbutilqt/rbutilqt.pro (working copy)
@@ -83,8 +83,9 @@
base/bootloaderinstallsansa.cpp \
base/bootloaderinstallfile.cpp \
../../tools/mkboot.c \
- ../../tools/iriver.c
-
+ ../../tools/iriver.c \
+ accessibilityfix.cpp
+
HEADERS += rbutilqt.h \
install.h \
base/httpget.h \
@@ -135,7 +136,8 @@
base/bootloaderinstallsansa.h \
base/bootloaderinstallfile.h \
../../tools/mkboot.h \
- ../../tools/iriver.h
+ ../../tools/iriver.h \
+ accessibilityfix.h
# Needed by QT on Win
INCLUDEPATH = . irivertools zip zlib ../ipodpatcher ../sansapatcher ../../tools/rbspeex ../../tools
@@ -151,7 +153,7 @@
}
!dbg {
CONFIG += release thread qt
- DEFINES += QT_NO_DEBUG_OUTPUT
+ DEFINES -= QT_NO_DEBUG_OUTPUT
message("release")
}
Index: rbutil/rbutilqt/encttscfggui.cpp
===================================================================
--- rbutil/rbutilqt/encttscfggui.cpp (revision 20895)
+++ rbutil/rbutilqt/encttscfggui.cpp (working copy)
@@ -91,6 +91,7 @@
case EncTtsSetting::eDOUBLE:
{
QDoubleSpinBox *spinBox = new QDoubleSpinBox(this);
+ spinBox->setAccessibleName(setting->name());
spinBox->setMinimum(setting->min().toDouble());
spinBox->setMaximum(setting->max().toDouble());
spinBox->setSingleStep(0.01);
@@ -102,6 +103,7 @@
case EncTtsSetting::eINT:
{
QSpinBox *spinBox = new QSpinBox(this);
+ spinBox->setAccessibleName(setting->name());
spinBox->setMinimum(setting->min().toInt());
spinBox->setMaximum(setting->max().toInt());
spinBox->setValue(setting->current().toInt());
@@ -112,6 +114,7 @@
case EncTtsSetting::eSTRING:
{
QLineEdit *lineEdit = new QLineEdit(this);
+ lineEdit->setAccessibleName(setting->name());
lineEdit->setText(setting->current().toString());
connect(lineEdit,SIGNAL(textChanged(QString)),this,SLOT(updateSetting()));
value = lineEdit;
@@ -125,6 +128,7 @@
case EncTtsSetting::eSTRINGLIST:
{
QComboBox *comboBox = new QComboBox(this);
+ comboBox->setAccessibleName(setting->name());
comboBox->addItems(setting->list());
int index = comboBox->findText(setting->current().toString());
comboBox->setCurrentIndex(index);
@@ -135,6 +139,7 @@
case EncTtsSetting::eBOOL:
{
QCheckBox *checkbox = new QCheckBox(this);
+ checkbox->setAccessibleName(setting->name());
checkbox->setCheckState(setting->current().toBool() == true ? Qt::Checked : Qt::Unchecked);
connect(checkbox,SIGNAL(stateChanged(int)),this,SLOT(updateSetting()));
value = checkbox;
Index: rbutil/rbutilqt/createvoicefrm.ui
===================================================================
--- rbutil/rbutilqt/createvoicefrm.ui (revision 20895)
+++ rbutil/rbutilqt/createvoicefrm.ui (working copy)
@@ -43,7 +43,11 @@
-
-
+
+
+ Language
+
+
-
@@ -155,6 +159,9 @@
-
+
+ Wavtrim Threshold
+
5000
@@ -168,7 +175,9 @@
+ comboLanguage
change
+ wavtrimthreshold
buttonOk
buttonCancel
Index: rbutil/rbutilqt/rbutilqtfrm.ui
===================================================================
--- rbutil/rbutilqt/rbutilqtfrm.ui (revision 20895)
+++ rbutil/rbutilqt/rbutilqtfrm.ui (working copy)
@@ -133,9 +133,6 @@
&Quick Start
-
- Welcome
-
-
@@ -227,9 +224,6 @@
&Installation
-
- Basic Rockbox installation
-
-
@@ -324,9 +318,6 @@
&Extras
-
- Install extras for Rockbox
-
-
@@ -438,9 +429,6 @@
&Accessibility
-
- Install accessibility add-ons
-
-
@@ -550,9 +538,6 @@
&Uninstallation
-
- Uninstall Rockbox
-
-
@@ -644,9 +629,6 @@
&Manual
-
- View and download the manual
-
-
Index: rbutil/rbutilqt/configure.cpp
===================================================================
--- rbutil/rbutilqt/configure.cpp (revision 20895)
+++ rbutil/rbutilqt/configure.cpp (working copy)
@@ -659,7 +659,7 @@
int index = ui.comboTts->currentIndex();
TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString());
- EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(RbSettings::value(RbSettings::Tts).toString()));
+ EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(ui.comboTts->itemData(index).toString()));
gui.exec();
updateTtsState(ui.comboTts->currentIndex());
}
Index: rbutil/rbutilqt/installtalkfrm.ui
===================================================================
--- rbutil/rbutilqt/installtalkfrm.ui (revision 20895)
+++ rbutil/rbutilqt/installtalkfrm.ui (working copy)
@@ -37,7 +37,11 @@
-
-
+
+
+ Talkfile Folder
+
+
-