diff options
| -rw-r--r-- | src/views/mcomboboxview.cpp | 4 | ||||
| -rw-r--r-- | tests/ut_mcombobox/ut_mcombobox.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/views/mcomboboxview.cpp b/src/views/mcomboboxview.cpp index 70f7dbfa..21083cd1 100644 --- a/src/views/mcomboboxview.cpp +++ b/src/views/mcomboboxview.cpp @@ -76,10 +76,8 @@ void MComboBoxViewPrivate::updateSubtitle(int currentIndex) if (currentIndex != -1) { buttonWidget()->setSubtitle(controller->itemText(currentIndex)); } else { - //~ uispec-document DirectUI_Common_Strings_UI_Specification_0.7.doc - //: default value for Popup List button sublabel when nothing has been selected yet //% "Tap to Select" - buttonWidget()->setSubtitle(qtTrId("xx_ComboBoxSubtitle")); + buttonWidget()->setSubtitle(qtTrId("qtn_comm_popup_default")); } } diff --git a/tests/ut_mcombobox/ut_mcombobox.cpp b/tests/ut_mcombobox/ut_mcombobox.cpp index 54dbe536..b5206734 100644 --- a/tests/ut_mcombobox/ut_mcombobox.cpp +++ b/tests/ut_mcombobox/ut_mcombobox.cpp @@ -289,7 +289,7 @@ void Ut_MComboBox::testBuiltinModel() // remove current item m_combobox->removeItem(1); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeLast()[0], QVariant(-1)); // check that after removing items everything looks ok @@ -350,7 +350,7 @@ void Ut_MComboBox::testModelSwitching() // model changed selection should reset QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeLast()[0], QVariant(-1)); @@ -378,7 +378,7 @@ void Ut_MComboBox::testStringListModel() // remove current item strListModel->removeRow(1); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); // check that after removing items everything looks ok QCOMPARE(m_combobox->count(), 2); m_combobox->setCurrentIndex(1); @@ -413,7 +413,7 @@ void Ut_MComboBox::testStringListModelSetStringList() // change string list completely strListModel->setStringList(QStringList() << "bar0" << "bar1" << "bar2" << "bar3"); QCOMPARE(m_combobox->currentIndex(), -1); - QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("xx_ComboBoxSubtitle")); + QCOMPARE(viewPrivate->button->subtitleWidget()->text(), qtTrId("qtn_comm_popup_default")); QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeFirst()[0], QVariant(-1)); } |