Changes: make output of timedemo independent from the locale

RevBy: Kuisma Salonen

Details:
Right now the output of the timedemo differs if the locale is
changed. To get te same output no matter what we introduce new methods
to define the string representations of a page in the timedemo output.

45 files changed, 149 insertions, 12 deletions

diff --git a/demos/widgetsgallery/applicationmenupage.cpp b/demos/widgetsgallery/applicationmenupage.cpp
index d2118037..b247036d 100644
--- a/demos/widgetsgallery/applicationmenupage.cpp
+++ b/demos/widgetsgallery/applicationmenupage.cpp
@@ -49,6 +49,11 @@ ApplicationMenuPage::~ApplicationMenuPage()
 {
 }
 
+QString ApplicationMenuPage::timedemoTitle()
+{
+    return "ApplicationMenu";
+}
+
 void ApplicationMenuPage::retranslateUi()
 {
     //% "Application Menu"
diff --git a/demos/widgetsgallery/applicationmenupage.h b/demos/widgetsgallery/applicationmenupage.h
index e3d84af2..23961f6a 100644
--- a/demos/widgetsgallery/applicationmenupage.h
+++ b/demos/widgetsgallery/applicationmenupage.h
@@ -33,6 +33,7 @@ class ApplicationMenuPage : public TemplatePage
 public:
     ApplicationMenuPage();
     virtual ~ApplicationMenuPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 
 public Q_SLOTS:
diff --git a/demos/widgetsgallery/checkboxpage.cpp b/demos/widgetsgallery/checkboxpage.cpp
index 12ab89ac..32c5a5cb 100644
--- a/demos/widgetsgallery/checkboxpage.cpp
+++ b/demos/widgetsgallery/checkboxpage.cpp
@@ -43,6 +43,11 @@ CheckboxPage::~CheckboxPage()
 {
 }
 
+QString CheckboxPage::timedemoTitle()
+{
+    return "Checkbox";
+}
+
 void CheckboxPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/checkboxpage.h b/demos/widgetsgallery/checkboxpage.h
index e3b69cca..e9ca6fbc 100644
--- a/demos/widgetsgallery/checkboxpage.h
+++ b/demos/widgetsgallery/checkboxpage.h
@@ -37,6 +37,7 @@ class CheckboxPage : public TemplatePage
 public:
     CheckboxPage();
     virtual ~CheckboxPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 protected:
     virtual void retranslateUi();
diff --git a/demos/widgetsgallery/comboboxpage.cpp b/demos/widgetsgallery/comboboxpage.cpp
index c382ca24..1eb7e023 100644
--- a/demos/widgetsgallery/comboboxpage.cpp
+++ b/demos/widgetsgallery/comboboxpage.cpp
@@ -36,13 +36,17 @@ ComboBoxPage::ComboBoxPage()
       proxyModel(0)
 {
     gid = TemplatePage::ListsGridsAndMenus;
-
 }
 
 ComboBoxPage::~ComboBoxPage()
 {
 }
 
+QString ComboBoxPage::timedemoTitle()
+{
+    return "ComboBox";
+}
+
 void ComboBoxPage::createContent()
 {
     DuiApplicationPage::createContent();
diff --git a/demos/widgetsgallery/comboboxpage.h b/demos/widgetsgallery/comboboxpage.h
index 2f6471c6..55b117f3 100644
--- a/demos/widgetsgallery/comboboxpage.h
+++ b/demos/widgetsgallery/comboboxpage.h
@@ -36,6 +36,7 @@ class ComboBoxPage : public TemplatePage
 public:
     ComboBoxPage();
     virtual ~ComboBoxPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/containerpage.cpp b/demos/widgetsgallery/containerpage.cpp
index 4c212044..d3c440c7 100644
--- a/demos/widgetsgallery/containerpage.cpp
+++ b/demos/widgetsgallery/containerpage.cpp
@@ -34,6 +34,11 @@ ContainerPage::~ContainerPage()
 {
 }
 
+QString ContainerPage::timedemoTitle()
+{
+    return "Container";
+}
+
 void ContainerPage::createContent()
 {
     DuiApplicationPage::createContent();
diff --git a/demos/widgetsgallery/containerpage.h b/demos/widgetsgallery/containerpage.h
index 3b162ea5..8c3ef4fd 100644
--- a/demos/widgetsgallery/containerpage.h
+++ b/demos/widgetsgallery/containerpage.h
@@ -28,6 +28,7 @@ class ContainerPage : public TemplatePage
 public:
     ContainerPage();
     virtual ~ContainerPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/dialogsandnotificationspage.cpp b/demos/widgetsgallery/dialogsandnotificationspage.cpp
index 050ad3bf..a62f232d 100644
--- a/demos/widgetsgallery/dialogsandnotificationspage.cpp
+++ b/demos/widgetsgallery/dialogsandnotificationspage.cpp
@@ -63,6 +63,11 @@ DialogsAndNotificationsPage::~DialogsAndNotificationsPage()
     delete nestedMessageBox;
 }
 
+QString DialogsAndNotificationsPage::timedemoTitle()
+{
+    return "DialogsAndNotifications";
+}
+
 void DialogsAndNotificationsPage::createContent()
 {
     DuiApplicationPage::createContent();
diff --git a/demos/widgetsgallery/dialogsandnotificationspage.h b/demos/widgetsgallery/dialogsandnotificationspage.h
index ead2f998..b0dfe2be 100644
--- a/demos/widgetsgallery/dialogsandnotificationspage.h
+++ b/demos/widgetsgallery/dialogsandnotificationspage.h
@@ -34,6 +34,7 @@ class DialogsAndNotificationsPage : public TemplatePage
 public:
     DialogsAndNotificationsPage();
     virtual ~DialogsAndNotificationsPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/duilistpage.cpp b/demos/widgetsgallery/duilistpage.cpp
index 4cee729f..f03427c8 100644
--- a/demos/widgetsgallery/duilistpage.cpp
+++ b/demos/widgetsgallery/duilistpage.cpp
@@ -57,6 +57,11 @@ DuiListPage::~DuiListPage()
     delete model;
 }
 
+QString DuiListPage::timedemoTitle()
+{
+    return "List";
+}
+
 class DuiContentItemCreator : public DuiAbstractCellCreator<DuiContentItem>
 {
 public:
diff --git a/demos/widgetsgallery/duilistpage.h b/demos/widgetsgallery/duilistpage.h
index d4957480..d16b1119 100644
--- a/demos/widgetsgallery/duilistpage.h
+++ b/demos/widgetsgallery/duilistpage.h
@@ -54,6 +54,7 @@ public:
 
     DuiListPage();
     virtual ~DuiListPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/feedbackpage.cpp b/demos/widgetsgallery/feedbackpage.cpp
index 7c63d9cf..652104f8 100644
--- a/demos/widgetsgallery/feedbackpage.cpp
+++ b/demos/widgetsgallery/feedbackpage.cpp
@@ -47,6 +47,11 @@ FeedbackPage::~FeedbackPage()
 {
 }
 
+QString FeedbackPage::timedemoTitle()
+{
+    return "InputFeedback";
+}
+
 void FeedbackPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/feedbackpage.h b/demos/widgetsgallery/feedbackpage.h
index 8957da3b..c2b9d76d 100644
--- a/demos/widgetsgallery/feedbackpage.h
+++ b/demos/widgetsgallery/feedbackpage.h
@@ -37,6 +37,7 @@ class FeedbackPage : public TemplatePage
 public:
     FeedbackPage();
     virtual ~FeedbackPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 protected:
     virtual void retranslateUi();
diff --git a/demos/widgetsgallery/iconbuttonpage.cpp b/demos/widgetsgallery/iconbuttonpage.cpp
index 111af910..754e1908 100644
--- a/demos/widgetsgallery/iconbuttonpage.cpp
+++ b/demos/widgetsgallery/iconbuttonpage.cpp
@@ -43,6 +43,11 @@ IconButtonPage::~IconButtonPage()
 {
 }
 
+QString IconButtonPage::timedemoTitle()
+{
+    return "IconButton";
+}
+
 void IconButtonPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/iconbuttonpage.h b/demos/widgetsgallery/iconbuttonpage.h
index d0c6c4be..17887bfa 100644
--- a/demos/widgetsgallery/iconbuttonpage.h
+++ b/demos/widgetsgallery/iconbuttonpage.h
@@ -37,6 +37,7 @@ class IconButtonPage : public TemplatePage
 public:
     IconButtonPage();
     virtual ~IconButtonPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 protected:
     virtual void retranslateUi();
diff --git a/demos/widgetsgallery/imagepage.cpp b/demos/widgetsgallery/imagepage.cpp
index 022bd30d..b718a0b0 100644
--- a/demos/widgetsgallery/imagepage.cpp
+++ b/demos/widgetsgallery/imagepage.cpp
@@ -54,6 +54,11 @@ ImagePage::~ImagePage()
 {
 }
 
+QString ImagePage::timedemoTitle()
+{
+    return "Image";
+}
+
 void ImagePage::createContent()
 {
     DuiApplicationPage::createContent();
diff --git a/demos/widgetsgallery/imagepage.h b/demos/widgetsgallery/imagepage.h
index c544d1df..32f3a486 100644
--- a/demos/widgetsgallery/imagepage.h
+++ b/demos/widgetsgallery/imagepage.h
@@ -43,6 +43,7 @@ public:
 
     ImagePage();
     virtual ~ImagePage();
+    virtual QString timedemoTitle();
     virtual void createContent();
     void setImageZoom(float zoom);
     void setImageOpacity(float opacity);
diff --git a/demos/widgetsgallery/labelpage.cpp b/demos/widgetsgallery/labelpage.cpp
index fdb8556f..c682c32e 100644
--- a/demos/widgetsgallery/labelpage.cpp
+++ b/demos/widgetsgallery/labelpage.cpp
@@ -51,6 +51,11 @@ LabelPage::~LabelPage()
     delete commonHighlighter;
 }
 
+QString LabelPage::timedemoTitle()
+{
+    return "Label";
+}
+
 void LabelPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/labelpage.h b/demos/widgetsgallery/labelpage.h
index 6c1b1b25..0ae8f2f9 100644
--- a/demos/widgetsgallery/labelpage.h
+++ b/demos/widgetsgallery/labelpage.h
@@ -32,6 +32,7 @@ class LabelPage : public TemplatePage
 public:
     LabelPage();
     virtual ~LabelPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/languagepage.cpp b/demos/widgetsgallery/languagepage.cpp
index dc767ea1..b4de9959 100644
--- a/demos/widgetsgallery/languagepage.cpp
+++ b/demos/widgetsgallery/languagepage.cpp
@@ -44,6 +44,11 @@ LanguagePage::~LanguagePage()
 {
 }
 
+QString LanguagePage::timedemoTitle()
+{
+    return "Language";
+}
+
 void LanguagePage::createContent()
 {
     DuiApplicationPage::createContent();
diff --git a/demos/widgetsgallery/languagepage.h b/demos/widgetsgallery/languagepage.h
index 7e69bf11..db7f1c70 100644
--- a/demos/widgetsgallery/languagepage.h
+++ b/demos/widgetsgallery/languagepage.h
@@ -34,6 +34,7 @@ class LanguagePage : public TemplatePage
 public:
     LanguagePage();
     virtual ~LanguagePage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/listpage.cpp b/demos/widgetsgallery/listpage.cpp
index 987b1e01..67ae409f 100644
--- a/demos/widgetsgallery/listpage.cpp
+++ b/demos/widgetsgallery/listpage.cpp
@@ -112,6 +112,11 @@ ListPage::~ListPage()
 {
 }
 
+QString ListPage::timedemoTitle()
+{
+    return "MainPage";
+}
+
 void ListPage::createContent()
 {
     DuiApplicationPage::createContent();
@@ -282,7 +287,7 @@ void ListPage::showPageByIndex(int index)
     showPage(findPageByIndex(index));
 }
 
-DuiApplicationPage *ListPage::findPageByIndex(int index) const
+TemplatePage *ListPage::findPageByIndex(int index) const
 {
     if (index >= 0 && index < pages.count()) {
         return pages[ index ];
diff --git a/demos/widgetsgallery/listpage.h b/demos/widgetsgallery/listpage.h
index 75851658..88e594fb 100644
--- a/demos/widgetsgallery/listpage.h
+++ b/demos/widgetsgallery/listpage.h
@@ -53,12 +53,13 @@ class ListPage : public TimedemoPage
 public:
     ListPage(const QString &title = "");
     virtual ~ListPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
     void addPage(TemplatePage *page);
     int pageCount() const;
-    DuiApplicationPage *findPageByIndex(int index) const;
+    TemplatePage *findPageByIndex(int index) const;
 
     static DuiGridLayoutPolicy *createAndSetupGridPolicy(DuiWidget *panel);
 
diff --git a/demos/widgetsgallery/navigationbarpage.cpp b/demos/widgetsgallery/navigationbarpage.cpp
index 0ffa1a67..6957d765 100644
--- a/demos/widgetsgallery/navigationbarpage.cpp
+++ b/demos/widgetsgallery/navigationbarpage.cpp
@@ -42,6 +42,11 @@ NavigationBarPage::~NavigationBarPage()
 {
 }
 
+QString NavigationBarPage::timedemoTitle()
+{
+    return "NavigationBar";
+}
+
 void NavigationBarPage::createContent()
 {
     QGraphicsLinearLayout *lytMain = new QGraphicsLinearLayout(Qt::Vertical);
diff --git a/demos/widgetsgallery/navigationbarpage.h b/demos/widgetsgallery/navigationbarpage.h
index fe052a63..a668251e 100644
--- a/demos/widgetsgallery/navigationbarpage.h
+++ b/demos/widgetsgallery/navigationbarpage.h
@@ -44,6 +44,7 @@ public:
 
     NavigationBarPage();
     virtual ~NavigationBarPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/objectmenupage.cpp b/demos/widgetsgallery/objectmenupage.cpp
index e94afdfc..a1a12642 100644
--- a/demos/widgetsgallery/objectmenupage.cpp
+++ b/demos/widgetsgallery/objectmenupage.cpp
@@ -45,6 +45,11 @@ ObjectMenuPage::~ObjectMenuPage()
 {
 }
 
+QString ObjectMenuPage::timedemoTitle()
+{
+    return "ObjectMenu";
+}
+
 void ObjectMenuPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/objectmenupage.h b/demos/widgetsgallery/objectmenupage.h
index b1fc8767..130ed6b5 100644
--- a/demos/widgetsgallery/objectmenupage.h
+++ b/demos/widgetsgallery/objectmenupage.h
@@ -30,6 +30,7 @@ class ObjectMenuPage : public TemplatePage
 public:
     ObjectMenuPage();
     virtual ~ObjectMenuPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/progressbarpage.cpp b/demos/widgetsgallery/progressbarpage.cpp
index e4fa636d..52740909 100644
--- a/demos/widgetsgallery/progressbarpage.cpp
+++ b/demos/widgetsgallery/progressbarpage.cpp
@@ -43,6 +43,11 @@ ProgressBarPage::~ProgressBarPage()
 {
 }
 
+QString ProgressBarPage::timedemoTitle()
+{
+    return "ProgressBar";
+}
+
 void ProgressBarPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/progressbarpage.h b/demos/widgetsgallery/progressbarpage.h
index cdb0a8e5..e82337cc 100644
--- a/demos/widgetsgallery/progressbarpage.h
+++ b/demos/widgetsgallery/progressbarpage.h
@@ -35,6 +35,7 @@ class ProgressBarPage : public TemplatePage
 public:
     ProgressBarPage();
     virtual ~ProgressBarPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 public slots:
     void timeout();
diff --git a/demos/widgetsgallery/pushbuttonpage.cpp b/demos/widgetsgallery/pushbuttonpage.cpp
index ba2a10d1..957b48c4 100644
--- a/demos/widgetsgallery/pushbuttonpage.cpp
+++ b/demos/widgetsgallery/pushbuttonpage.cpp
@@ -43,6 +43,11 @@ PushButtonPage::~PushButtonPage()
 {
 }
 
+QString PushButtonPage::timedemoTitle()
+{
+    return "PushButton";
+}
+
 void PushButtonPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/pushbuttonpage.h b/demos/widgetsgallery/pushbuttonpage.h
index 861cce41..96fec31d 100644
--- a/demos/widgetsgallery/pushbuttonpage.h
+++ b/demos/widgetsgallery/pushbuttonpage.h
@@ -37,6 +37,7 @@ class PushButtonPage : public TemplatePage
 public:
     PushButtonPage();
     virtual ~PushButtonPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 protected:
     virtual void retranslateUi();
diff --git a/demos/widgetsgallery/sliderpage.cpp b/demos/widgetsgallery/sliderpage.cpp
index 5fe46b80..47b0fe33 100644
--- a/demos/widgetsgallery/sliderpage.cpp
+++ b/demos/widgetsgallery/sliderpage.cpp
@@ -52,6 +52,11 @@ SliderPage::~SliderPage()
 {
 }
 
+QString SliderPage::timedemoTitle()
+{
+    return "Slider";
+}
+
 void SliderPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/sliderpage.h b/demos/widgetsgallery/sliderpage.h
index 0b12d427..306a85bb 100644
--- a/demos/widgetsgallery/sliderpage.h
+++ b/demos/widgetsgallery/sliderpage.h
@@ -34,6 +34,7 @@ class SliderPage : public TemplatePage
 public:
     SliderPage();
     virtual ~SliderPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
 
diff --git a/demos/widgetsgallery/spinnerpage.cpp b/demos/widgetsgallery/spinnerpage.cpp
index 860ce9a7..baa491ff 100644
--- a/demos/widgetsgallery/spinnerpage.cpp
+++ b/demos/widgetsgallery/spinnerpage.cpp
@@ -53,6 +53,11 @@ SpinnerPage::~SpinnerPage()
 {
 }
 
+QString SpinnerPage::timedemoTitle()
+{
+    return "Spinner";
+}
+
 void SpinnerPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/spinnerpage.h b/demos/widgetsgallery/spinnerpage.h
index b78dfe74..6b039be1 100644
--- a/demos/widgetsgallery/spinnerpage.h
+++ b/demos/widgetsgallery/spinnerpage.h
@@ -42,6 +42,7 @@ class SpinnerPage : public TemplatePage
 public:
     SpinnerPage();
     virtual ~SpinnerPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 public slots:
     void inContainerMainArea();
diff --git a/demos/widgetsgallery/staticpagebenchmark.cpp b/demos/widgetsgallery/staticpagebenchmark.cpp
index d6f1b32d..589178ee 100644
--- a/demos/widgetsgallery/staticpagebenchmark.cpp
+++ b/demos/widgetsgallery/staticpagebenchmark.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-    const int pageDuration = 4000;
+    const int pageDuration = 3000;
 }
 
 StaticPageBenchmark::StaticPageBenchmark(DuiApplicationPage *applicationPage, Timedemo *timedemo, Dui::OrientationAngle targetOrientationAngle)
diff --git a/demos/widgetsgallery/switchpage.cpp b/demos/widgetsgallery/switchpage.cpp
index 172edc20..d0b841f9 100644
--- a/demos/widgetsgallery/switchpage.cpp
+++ b/demos/widgetsgallery/switchpage.cpp
@@ -47,6 +47,11 @@ SwitchPage::~SwitchPage()
 {
 }
 
+QString SwitchPage::timedemoTitle()
+{
+    return "Switch";
+}
+
 void SwitchPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/switchpage.h b/demos/widgetsgallery/switchpage.h
index 8642516e..521b7d45 100644
--- a/demos/widgetsgallery/switchpage.h
+++ b/demos/widgetsgallery/switchpage.h
@@ -37,6 +37,7 @@ class SwitchPage : public TemplatePage
 public:
     SwitchPage();
     virtual ~SwitchPage();
+    virtual QString timedemoTitle();
     virtual void createContent();
 protected:
     virtual void retranslateUi();
diff --git a/demos/widgetsgallery/textentrypage.cpp b/demos/widgetsgallery/textentrypage.cpp
index 5308ab08..0628e57a 100644
--- a/demos/widgetsgallery/textentrypage.cpp
+++ b/demos/widgetsgallery/textentrypage.cpp
@@ -213,6 +213,10 @@ TextEntryPage::~TextEntryPage()
     delete m_completer;
 }
 
+QString TextEntryPage::timedemoTitle()
+{
+    return "TextEntry";
+}
 
 void TextEntryPage::createContent()
 {
diff --git a/demos/widgetsgallery/textentrypage.h b/demos/widgetsgallery/textentrypage.h
index 2adc2379..256bca64 100644
--- a/demos/widgetsgallery/textentrypage.h
+++ b/demos/widgetsgallery/textentrypage.h
@@ -42,6 +42,7 @@ class TextEntryPage : public TemplatePage
 public:
     TextEntryPage();
     virtual ~TextEntryPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();
     DuiGridLayoutPolicy *createAndSetupGridPolicy(DuiWidget *panel);
diff --git a/demos/widgetsgallery/timedemo.cpp b/demos/widgetsgallery/timedemo.cpp
index 76d9fde3..fe8d6050 100644
--- a/demos/widgetsgallery/timedemo.cpp
+++ b/demos/widgetsgallery/timedemo.cpp
@@ -21,6 +21,7 @@
 #include "timingscene.h"
 #include "listpage.h"
 #include "timedemobenchmark.h"
+#include "templatepage.h"
 
 
 #include <DuiApplicationPage>
@@ -168,7 +169,7 @@ void Timedemo::displayBenchmarkResults()
         csvFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
         csv.setDevice(&csvFile);
 
-    const int pageTitleWidth = 30;
+    int pageTitleWidth = 0;
     const int fpsWidth = 5;
     const int fpsUnitWidth = 5;
     const int runtimeWidth = 5;
@@ -176,6 +177,13 @@ void Timedemo::displayBenchmarkResults()
     const int benchmarkWidth = fpsWidth + fpsUnitWidth + runtimeWidth + runtimeUnitWidth;
     QHash<QString, int> actualWidth;
 
+    for (int i = 0; i < benchmarkResults.count(); ++i) {
+        TimedemoPage *page = (i < m_pFrontPage->pageCount()) ? static_cast<TimedemoPage*>(m_pFrontPage->findPageByIndex(i)) : static_cast<TimedemoPage*>(m_pFrontPage);
+        QString title = page->timedemoTitle();
+        pageTitleWidth = qMax(pageTitleWidth, title.length());
+    }
+    pageTitleWidth += 2;
+
     log.setRealNumberNotation(QTextStream::FixedNotation);
     log.setRealNumberPrecision(2);
     log << left << qSetFieldWidth(pageTitleWidth) << "Page name";
@@ -192,12 +200,9 @@ void Timedemo::displayBenchmarkResults()
     csv << '\n';
 
     for (int i = 0; i < benchmarkResults.count(); ++i) {
-        DuiApplicationPage *page = (i < m_pFrontPage->pageCount()) ? m_pFrontPage->findPageByIndex(i) : m_pFrontPage;
-        QString title = page->title();
-        if (title.length() > pageTitleWidth) {
-            title.truncate(pageTitleWidth - 5);
-            title.append("...");
-        }
+        TimedemoPage *page = (i < m_pFrontPage->pageCount()) ? static_cast<TimedemoPage*>(m_pFrontPage->findPageByIndex(i)) : static_cast<TimedemoPage*>(m_pFrontPage);
+        QString title = page->timedemoTitle();
+
         log << qSetFieldWidth(pageTitleWidth) << title;
         csv << "\"" << title << "\"";
 
diff --git a/demos/widgetsgallery/timedemopage.h b/demos/widgetsgallery/timedemopage.h
index 94acd0e9..bae8b883 100644
--- a/demos/widgetsgallery/timedemopage.h
+++ b/demos/widgetsgallery/timedemopage.h
@@ -29,13 +29,21 @@ public:
     virtual void createBenchmarks(Timedemo *timedemo);
 
     /**
+      * For visualizing the timedemo results this method should return an
+      * unique identifier for the page. Make sure to never change the
+      * returned title once your page has been in a release as this would
+      * invalidate older results.
+      * \return the title to show when visualizing timedemo results
+      */
+    virtual QString timedemoTitle() = 0;
+
+    /**
       * Returns the benchmarks for this page.
       */
     QVector<QSharedPointer<TimedemoBenchmark> > benchmarks();
 
 protected:
     QVector<QSharedPointer<TimedemoBenchmark> > m_benchmarks;
-
 };
 
 #endif // TIMEDEMOPAGE_H
diff --git a/demos/widgetsgallery/toolbarpage.cpp b/demos/widgetsgallery/toolbarpage.cpp
index 20a9fdc7..d44d1d22 100644
--- a/demos/widgetsgallery/toolbarpage.cpp
+++ b/demos/widgetsgallery/toolbarpage.cpp
@@ -36,6 +36,11 @@ ToolBarPage::~ToolBarPage()
 {
 }
 
+QString ToolBarPage::timedemoTitle()
+{
+    return "ToolBar";
+}
+
 void ToolBarPage::createContent()
 {
     TemplatePage::createContent();
diff --git a/demos/widgetsgallery/toolbarpage.h b/demos/widgetsgallery/toolbarpage.h
index 04f263a0..8fa66a81 100644
--- a/demos/widgetsgallery/toolbarpage.h
+++ b/demos/widgetsgallery/toolbarpage.h
@@ -32,6 +32,7 @@ class ToolBarPage : public TemplatePage
 public:
     ToolBarPage();
     virtual ~ToolBarPage();
+    virtual QString timedemoTitle();
 
     virtual void createContent();