homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp
--- a/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Mon Sep 13 13:03:23 2010 +0300
+++ b/homescreenapp/stateplugins/hsmenuworkerstateplugin/src/hscollectionnamedialog.cpp Mon Sep 20 10:19:07 2010 +0300
@@ -135,10 +135,31 @@
unsigned int numToAppend(1);
- while (mOtherCollectionsNames.contains(newName)) {
- newName = hbTrId("txt_applib_dialog_entry_collectionl1").arg(
+ bool defaultCollection = false;
+ if (newName == hbTrId("txt_applib_dialog_entry_collection")) {
+ defaultCollection = true;
+ }
+ if (defaultCollection) {
+ while (mOtherCollectionsNames.contains(newName)) {
+ newName = hbTrId("txt_applib_dialog_entry_collectionl1").arg(
numToAppend);
- numToAppend++;
+ numToAppend++;
+ }
+ }
+ else {
+ QString textMap = hbTrId(
+ "txt_applib_dialog_collection_name_entry_1_l1");
+ // TODO: Temporary workaround.
+ // The "if" instruction below can be removed when
+ // a text map "txt_applib_dialog_collection_name_entry_1_l1"
+ // is available in the platform.
+ if (textMap == "txt_applib_dialog_collection_name_entry_1_l1") {
+ textMap = "%2 (%L1)";
+ }
+ while (mOtherCollectionsNames.contains(newName)) {
+ newName = textMap.arg(numToAppend).arg(name);
+ numToAppend++;
+ }
}
HSMENUTEST_FUNC_EXIT("HsInputDialog::newName");