summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-02-21 12:34:51 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-02-21 12:34:51 (GMT)
commitcef2e5062022907dcf70ca23fbd345fdf545dbb9 (patch)
treee8577d4bc53081529d3e7b21ec7ed0bc9d5cee56 /Swift/QtUI
parent04189fc42e2eea17b8387976b5b70d72d6c4a5ce (diff)
downloadswift-cef2e5062022907dcf70ca23fbd345fdf545dbb9.zip
swift-cef2e5062022907dcf70ca23fbd345fdf545dbb9.tar.bz2
Tidy up of subscription notification dialog.
Change-Id: I648da78b1590578beae1ef9c3e0c173d12176dc3
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
index d22cbd0..7c1577b 100644
--- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp
+++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
@@ -15,10 +15,13 @@
namespace Swift {
QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) : QDialog(parent), event_(event) {
- QString text = QString(tr("%1 would like to add you to their contact list.\n Would you like to add them to your contact list and share your status when you're online? \n\nIf you choose to defer this choice, you will be asked again when you next login.")).arg(event->getJID().toString().c_str());
+ QString text = QString(tr("%1 would like to add you to their contact list.")).arg(event->getJID().toString().c_str());
QVBoxLayout* layout = new QVBoxLayout();
QLabel* label = new QLabel(text, this);
layout->addWidget(label);
+ label = new QLabel(tr("Would you like to add them to your contact list and share your status when you're online?"));
+ //layout->addWidget(new QLabel);
+ layout->addWidget(label);
if (event_->getConcluded()) {
QLabel* doneLabel = new QLabel(tr("You have already replied to this request"));
@@ -27,10 +30,10 @@ QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<Subsc
layout->addWidget(doneLabel);
layout->addWidget(okButton);
} else {
- QPushButton* yesButton = new QPushButton(tr("Yes"), this);
+ QPushButton* yesButton = new QPushButton(tr("Accept"), this);
yesButton->setDefault(true);
connect(yesButton, SIGNAL(clicked()), this, SLOT(handleYes()));
- QPushButton* noButton = new QPushButton(tr("No"), this);
+ QPushButton* noButton = new QPushButton(tr("Reject"), this);
connect(noButton, SIGNAL(clicked()), this, SLOT(handleNo()));
QPushButton* deferButton = new QPushButton(tr("Defer"), this);
deferButton->setShortcut(QKeySequence(Qt::Key_Escape));
@@ -40,8 +43,11 @@ QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<Subsc
buttonLayout->addWidget(yesButton);
buttonLayout->addWidget(noButton);
buttonLayout->addWidget(deferButton);
-
+ layout->addWidget(new QLabel);
layout->addLayout(buttonLayout);
+ layout->addWidget(new QLabel);
+ QLabel *footer = new QLabel(tr("(If you choose to defer this choice, you will be asked again when you next login.)"));
+ layout->addWidget(footer);
}
setLayout(layout);