Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-16975] Fixed alert dialog button indexes in click event #237

Merged
merged 1 commit into from
May 22, 2014
Merged

[TIMOB-16975] Fixed alert dialog button indexes in click event #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
140 changes: 87 additions & 53 deletions src/tibb/src/Modules/UI/BlackBerry/AlertDialog/TiUIAlertDialogProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ static bool _alertShowing = false;

namespace TiUI {

TiUIAlertDialogProxy::TiUIAlertDialogProxy(const char* name) : TiProxy(name)
TiUIAlertDialogProxy::TiUIAlertDialogProxy(const char* name) : TiProxy(name), _cancel(-1)
{
_alert = new bb::system::SystemDialog("OK");
_eventHandler = new TiUIAlertDialogEventHandler(this);

QObject::connect(_alert, SIGNAL(finished(bb::system::SystemUiResult::Type)), _eventHandler, SLOT(buttonSelected(bb::system::SystemUiResult::Type)));
QObject::connect(_alert, SIGNAL(finished(bb::system::SystemUiResult::Type)), _eventHandler, SLOT(buttonSelected(bb::system::SystemUiResult::Type)));

createPropertySetterGetter("buttonNames", _setButtonNames, _getButtonNames);
createPropertySetterGetter("cancel", _setCancel, _getCancel);
Expand All @@ -40,35 +40,57 @@ TiUIAlertDialogProxy::~TiUIAlertDialogProxy()
delete _eventHandler;
}

TI_GETTER_DEFER(TiUIAlertDialogProxy, getButtonNames)
Ti::TiValue TiUIAlertDialogProxy::getButtonNames()
{
Ti::TiValue val;
QList<Ti::TiValue> array;
foreach(QString name, _buttonNames)
{
Ti::TiValue btn;
btn.setString(name);
array.append(btn);
}
val.setList(array);
return val;
}

void TiUIAlertDialogProxy::setButtonNames(Ti::TiValue val)
{
if(val.isNull())
{
_alert->clearButtons();
_alert->confirmButton()->setLabel("OK");
return;
}
if(!val.isList())
{
return;
}

_alert->confirmButton()->setLabel(QString::null);
_alert->cancelButton()->setLabel(QString::null);
_alert->clearButtons();

foreach (Ti::TiValue value, val.toList())
{
bb::system::SystemUiButton* button = new bb::system::SystemUiButton();
button->setLabel(value.toString());
_alert->appendButton(button);
}
}

TI_GETTER_DEFER(TiUIAlertDialogProxy, getCancel)
void TiUIAlertDialogProxy::setCancel(Ti::TiValue)
if(val.isNull())
{
_alert->clearButtons();
_alert->confirmButton()->setLabel("OK");
return;
}
if(!val.isList())
{
return;
}

_alert->confirmButton()->setLabel(QString::null);
_alert->cancelButton()->setLabel(QString::null);
_alert->clearButtons();
_buttonNames.clear();
foreach(Ti::TiValue current, val.toList())
{
bb::system::SystemUiButton* button = new bb::system::SystemUiButton();
QString title = current.toString();
_buttonNames.append(title);
button->setLabel(title);
_alert->appendButton(button);
}
}

Ti::TiValue TiUIAlertDialogProxy::getCancel()
{
Ti::TiValue val;
val.setNumber(_cancel);
return val;
}

void TiUIAlertDialogProxy::setCancel(Ti::TiValue val)
{
_cancel = val.toNumber();
}

TI_GETTER_DEFER(TiUIAlertDialogProxy, getMessage)
Expand Down Expand Up @@ -109,19 +131,22 @@ Ti::TiValue TiUIAlertDialogProxy::show(Ti::TiValue)
}

Ti::TiValue val;
val.setUndefined();
val.setUndefined();
return val;
}
Ti::TiValue TiUIAlertDialogProxy::hide(Ti::TiValue)
{
_alert->cancel();
_alertQueue.removeOne(_alert);
if(_alertQueue.isEmpty()) {
_alertShowing = false;
} else {
_alertQueue.last()->show();
}
makeWeak();
_alertQueue.removeOne(_alert);
if(_alertQueue.isEmpty())
{
_alertShowing = false;
}
else
{
_alertQueue.last()->show();
}
makeWeak();
Ti::TiValue val;
val.setUndefined();
return val;
Expand All @@ -132,26 +157,35 @@ TiUIAlertDialogEventHandler::TiUIAlertDialogEventHandler(TiUIAlertDialogProxy* p

}

void TiUIAlertDialogEventHandler::buttonSelected(bb::system::SystemUiResult::Type) {

bb::system::SystemDialog* dialog = static_cast<bb::system::SystemDialog*>(sender());
bb::system::SystemUiButton* selectedButton = dialog->buttonSelection();
void TiUIAlertDialogEventHandler::buttonSelected(bb::system::SystemUiResult::Type type)
{
bb::system::SystemDialog* dialog = static_cast<bb::system::SystemDialog*>(sender());
bb::system::SystemUiButton* selectedButton = dialog->buttonSelection();

_alertQueue.removeOne(dialog);
_alertQueue.removeOne(dialog);
int index = -1;

QVariant index = selectedButton->property("index");
QVariant cancel = selectedButton->property("cancel");
for(int i = 0, len = dialog->buttonCount(); i < len; i++) {
if(dialog->buttonAt(i) == selectedButton) {
index = i;
break;
}
}
bool cancel = index == (int)_proxy->getCancel().toNumber();

Ti::TiEventParameters eventParams;
eventParams.addParam("index", index.toInt(NULL));
eventParams.addParam("cancel", cancel.toBool());
_proxy->fireEvent(Ti::TiConstants::EventClick, eventParams);
Ti::TiEventParameters eventParams;
eventParams.addParam("index", index);
eventParams.addParam("cancel", cancel);
_proxy->fireEvent(Ti::TiConstants::EventClick, eventParams);

if(_alertQueue.isEmpty()) {
_alertShowing = false;
} else {
_alertQueue.last()->show();
}
_proxy->makeWeak();
if(_alertQueue.isEmpty())
{
_alertShowing = false;
}
else
{
_alertQueue.last()->show();
}
_proxy->makeWeak();
}
}
2 changes: 2 additions & 0 deletions src/tibb/src/Modules/UI/BlackBerry/AlertDialog/TiUIAlertDialogProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class TiUIAlertDialogProxy : public Ti::TiProxy
private:
bb::system::SystemDialog *_alert;
TiUIAlertDialogEventHandler* _eventHandler;
QList<QString> _buttonNames;
int _cancel;
};

class TiUIAlertDialogEventHandler : public QObject
Expand Down