aboutsummaryrefslogtreecommitdiff
path: root/demos/widgetsgallery
diff options
context:
space:
mode:
authorduisymbio <dui-team@fi.symbio.com>2010-08-24 14:23:49 +0300
committerSergiy Dubovik <sergiy.dubovik@nokia.com>2010-09-01 10:22:33 +0300
commit9ca53fe1321d7828089ed7fdcdea8555ef9eb260 (patch)
treeb931310adb4bacc810c5ce5e5f6de274fbcca886 /demos/widgetsgallery
parent62ad57fff81ded06d88941cf2d8915127a5d044a (diff)
Fixes: NB#182384 MLabel doesn't render rich text correctly
Details: Conversion of '\n' to <br> in rich label removed
Diffstat (limited to 'demos/widgetsgallery')
-rw-r--r--demos/widgetsgallery/buttongrouppage.cpp2
-rw-r--r--demos/widgetsgallery/checkboxpage.cpp2
-rw-r--r--demos/widgetsgallery/feedbackpage.cpp2
-rw-r--r--demos/widgetsgallery/iconbuttonpage.cpp2
-rw-r--r--demos/widgetsgallery/labelpage.cpp2
-rw-r--r--demos/widgetsgallery/objectmenupage.cpp2
-rw-r--r--demos/widgetsgallery/pushbuttonpage.cpp2
-rw-r--r--demos/widgetsgallery/sliderpage.cpp2
-rw-r--r--demos/widgetsgallery/spinnerpage.cpp2
-rw-r--r--demos/widgetsgallery/switchpage.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/demos/widgetsgallery/buttongrouppage.cpp b/demos/widgetsgallery/buttongrouppage.cpp
index 3722785b..2665053c 100644
--- a/demos/widgetsgallery/buttongrouppage.cpp
+++ b/demos/widgetsgallery/buttongrouppage.cpp
@@ -177,7 +177,7 @@ void ButtonGroupPage::retranslateUi()
"of the buttons can be selected at a time. If a group is not exclusive, "
"multiple options from the group can be selected."
*/
- infoLabel->setText("<a></a>" + qtTrId("xx_button_group_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_button_group_page_info_label").replace('\n', "<br>"));
//% "Horizontal group"
hLabel1->setText(qtTrId("xx_button_group_page_hlabel1"));
diff --git a/demos/widgetsgallery/checkboxpage.cpp b/demos/widgetsgallery/checkboxpage.cpp
index 90a4dfc2..135a947e 100644
--- a/demos/widgetsgallery/checkboxpage.cpp
+++ b/demos/widgetsgallery/checkboxpage.cpp
@@ -84,7 +84,7 @@ void CheckboxPage::retranslateUi()
//% "values, On and Off.\n\nCheckbox essentially does the "
//% "same thing as the Switch button, so please consider "
//% "using a Switch instead."
- infoLabel->setText("<a></a>" + qtTrId("xx_checkbox_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_checkbox_page_info_label").replace('\n', "<br>"));
//% "I have read and understood the instructions."
checkboxLabel->setText("<a></a>" + qtTrId("xx_checkbox_page_checkbox_label"));
diff --git a/demos/widgetsgallery/feedbackpage.cpp b/demos/widgetsgallery/feedbackpage.cpp
index 88d64a8f..48555b79 100644
--- a/demos/widgetsgallery/feedbackpage.cpp
+++ b/demos/widgetsgallery/feedbackpage.cpp
@@ -96,7 +96,7 @@ void FeedbackPage::retranslateUi()
//% "effect (piezo, vibra) depending on the product.\n\n"
//% "Input feedbacks can be easily configured for "
//% "different purposes using the theming system."
- infoLabel->setText("<a></a>" + qtTrId("xx_input_feedback_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_input_feedback_page_info_label").replace('\n', "<br>"));
//% "Default"
feedbackButton1->setText(qtTrId("xx_input_feedback_page_button1"));
//% "Different"
diff --git a/demos/widgetsgallery/iconbuttonpage.cpp b/demos/widgetsgallery/iconbuttonpage.cpp
index b907cc33..a5fba0d3 100644
--- a/demos/widgetsgallery/iconbuttonpage.cpp
+++ b/demos/widgetsgallery/iconbuttonpage.cpp
@@ -87,7 +87,7 @@ void IconButtonPage::retranslateUi()
//% "Icon button differs from push button by its visual presentation: "
//% "it does not have button-style edges like a Push Button does.\n\n "
//% "Icon Buttons are used in e.g. Toolbars."
- infoLabel->setText("<a></a>" + qtTrId("xx_icon_button_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_icon_button_page_info_label").replace('\n', "<br>"));
//% "Lorem ipsum"
iconButton2->setText(qtTrId("xx_icon_button_page_icon_button2"));
}
diff --git a/demos/widgetsgallery/labelpage.cpp b/demos/widgetsgallery/labelpage.cpp
index 6c449dc2..dbb6c3dd 100644
--- a/demos/widgetsgallery/labelpage.cpp
+++ b/demos/widgetsgallery/labelpage.cpp
@@ -115,7 +115,7 @@ void LabelPage::retranslateUi()
//% "All Labels can be aligned left, right or center and will be "
//% "automatically truncated if the text does not fit inside "
//% "the given area."
- infoLabel->setText("<a></a>" + qtTrId("xx_label_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_label_page_info_label").replace('\n', "<br>"));
//% "Simple Label"
simpleLabel->setText(qtTrId("xx_simple_label"));
//% "Rich Label <b>bold</b>, <i>italic</i>, "
diff --git a/demos/widgetsgallery/objectmenupage.cpp b/demos/widgetsgallery/objectmenupage.cpp
index fabc5476..6957b048 100644
--- a/demos/widgetsgallery/objectmenupage.cpp
+++ b/demos/widgetsgallery/objectmenupage.cpp
@@ -171,7 +171,7 @@ void ObjectMenuPage::retranslateUi()
//% "The primary (single short tap) action of the "
//% "element should not be duplicated in the Object "
//% "Menu."
- infoLabel->setText("<a></a>" + qtTrId("xx_objectmenu_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_objectmenu_page_info_label").replace('\n', "<br>"));
//% "Friends"
containerFriends->setTitle(qtTrId("xx_objectmenu_page_container_friends"));
diff --git a/demos/widgetsgallery/pushbuttonpage.cpp b/demos/widgetsgallery/pushbuttonpage.cpp
index ad75f83f..abcdc0db 100644
--- a/demos/widgetsgallery/pushbuttonpage.cpp
+++ b/demos/widgetsgallery/pushbuttonpage.cpp
@@ -77,7 +77,7 @@ void PushButtonPage::retranslateUi()
//% "to invoke actions.\n\n"
//% "A Push Button generally looks like a traditional button, "
//% "with button-style edges."
- infoLabel->setText("<a></a>" + qtTrId("xx_push_button_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_push_button_page_info_label").replace('\n', "<br>"));
//% "Lorem"
pushButton1->setText(qtTrId("xx_push_button_page_button1"));
//% "Ipsum"
diff --git a/demos/widgetsgallery/sliderpage.cpp b/demos/widgetsgallery/sliderpage.cpp
index 092f01f7..fa79fe4e 100644
--- a/demos/widgetsgallery/sliderpage.cpp
+++ b/demos/widgetsgallery/sliderpage.cpp
@@ -176,7 +176,7 @@ void SliderPage::retranslateUi()
//% "among which user can choose one value.\n\n"
//% "Seekbar is a special type of Slider used for "
//% "displaying playback status for multimedia content."
- infoLabel->setText("<a></a>" + qtTrId("xx_slider_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_slider_page_info_label").replace('\n', "<br>"));
//% "Personal data"
ageContainer->setTitle(qtTrId("xx_slider_personal_data_label"));
diff --git a/demos/widgetsgallery/spinnerpage.cpp b/demos/widgetsgallery/spinnerpage.cpp
index 3acd8b0e..ccab5720 100644
--- a/demos/widgetsgallery/spinnerpage.cpp
+++ b/demos/widgetsgallery/spinnerpage.cpp
@@ -106,7 +106,7 @@ void SpinnerPage::retranslateUi()
//% "Spinners can also be used in situations when duration is known, "
//% "but available space on screen does not permit using a Progress bar.\n\n"
//% "See the menu for examples of different use cases."
- infoLabel->setText("<a></a>" + qtTrId("xx_spinner_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_spinner_page_info_label").replace('\n', "<br>"));
//% "In application main area"
actionInMainArea->setText(qtTrId("xx_spinner_page_application_main_area"));
diff --git a/demos/widgetsgallery/switchpage.cpp b/demos/widgetsgallery/switchpage.cpp
index 3dbf9300..188a2b53 100644
--- a/demos/widgetsgallery/switchpage.cpp
+++ b/demos/widgetsgallery/switchpage.cpp
@@ -134,7 +134,7 @@ void SwitchPage::retranslateUi()
//% "another view or will not perform any other actions except "
//% "to toggle the state of the button.\n\n"
//% "Switches are used to indicate e.g. settings values"
- infoLabel->setText("<a></a>" + qtTrId("xx_switch_page_info_label"));
+ infoLabel->setText("<a></a>" + qtTrId("xx_switch_page_info_label").replace('\n', "<br>"));
//% "Headlights"
label1->setText(qtTrId("xx_switch_page_switch1"));