diff options
Diffstat (limited to 'demos/widgetsgallery')
71 files changed, 5779 insertions, 3078 deletions
diff --git a/demos/widgetsgallery/applicationmenupage.cpp b/demos/widgetsgallery/applicationmenupage.cpp index 3999d021..fab1ff21 100644 --- a/demos/widgetsgallery/applicationmenupage.cpp +++ b/demos/widgetsgallery/applicationmenupage.cpp @@ -40,9 +40,11 @@ #include <MComboBox> ApplicationMenuPage::ApplicationMenuPage() + : TemplatePage(TemplatePage::ApplicationView) + , m_textIndex(2) + , policy(0) + , comboBox(0) { - gid = TemplatePage::ViewsAndDialogs; - m_textIndex = 2; } ApplicationMenuPage::~ApplicationMenuPage() @@ -57,7 +59,7 @@ QString ApplicationMenuPage::timedemoTitle() void ApplicationMenuPage::retranslateUi() { //% "Application Menu" - setTitle(qtTrId("xx_viewmenu_page_title")); + setTitle(qtTrId("xx_applicationmenu_page_title")); if (!isContentCreated()) return; @@ -79,10 +81,17 @@ void ApplicationMenuPage::retranslateUi() void ApplicationMenuPage::createContent() { - TemplatePage::createContent(); + MApplicationPage::createContent(); QGraphicsWidget *panel = centralWidget(); + infoLabel = new MLabel(panel); + infoLabel->setMinimumWidth(0); + infoLabel->setPreferredWidth(0); + infoLabel->setWordWrap(true); + infoLabel->setAlignment(Qt::AlignTop); + infoLabel->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + MAction *action = new MAction("Italic", panel); action->setLocation(MAction::ApplicationMenuLocation); addAction(action); @@ -114,36 +123,14 @@ void ApplicationMenuPage::createContent() connect(action, SIGNAL(triggered()), this, SLOT(toggleWindowIconVisibility())); insertAction(action, widgetAction); - action = new MAction("icon-m-list", "", panel); - action->setLocation(MAction::ApplicationMenuLocation); - action->setStyleAction(true); - action->setCheckable(true); - action->setChecked(true); - addAction(action); - connect(action, SIGNAL(triggered()), this, SLOT(showButtonsAsList())); + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); - action = new MAction("icon-m-grid", "", panel); - action->setLocation(MAction::ApplicationMenuLocation); - action->setStyleAction(true); - addAction(action); - connect(action, SIGNAL(triggered()), this, SLOT(showButtonsAsGrid())); - - // for more readability - listPolicy = containerPolicy; - gridPolicy = new MGridLayoutPolicy(containerLayout); - - MButton *button = new MButton("Item 1", container); - containerPolicy->addItem(button); - gridPolicy->addItem(button, 0, 0); - button = new MButton("Item 2", container); - containerPolicy->addItem(button); - gridPolicy->addItem(button, 0, 1); - button = new MButton("Item 3", container); - containerPolicy->addItem(button); - gridPolicy->addItem(button, 1, 0); - button = new MButton("Item 4", container); - containerPolicy->addItem(button); - gridPolicy->addItem(button, 1, 1); + policy->addItem(infoLabel); retranslateUi(); } @@ -186,18 +173,8 @@ void ApplicationMenuPage::toggleWindowIconVisibility() } QString oldIconID = window->windowIconID(); if (oldIconID.isEmpty()) { - window->setWindowIconID("Icon-browser"); + window->setWindowIconID("icon-m-toolbar-gallery"); } else { window->setWindowIconID(""); } } - -void ApplicationMenuPage::showButtonsAsList() -{ - containerLayout->setPolicy(listPolicy); -} - -void ApplicationMenuPage::showButtonsAsGrid() -{ - containerLayout->setPolicy(gridPolicy); -} diff --git a/demos/widgetsgallery/applicationmenupage.h b/demos/widgetsgallery/applicationmenupage.h index 346d2df3..cac401c1 100644 --- a/demos/widgetsgallery/applicationmenupage.h +++ b/demos/widgetsgallery/applicationmenupage.h @@ -40,16 +40,13 @@ public Q_SLOTS: void makeTextItalic(); void makeTextNormal(); void toggleWindowIconVisibility(); - void showButtonsAsList(); - void showButtonsAsGrid(); protected: virtual void retranslateUi(); private: int m_textIndex; - MGridLayoutPolicy *gridPolicy; - MLinearLayoutPolicy *listPolicy; + MLinearLayoutPolicy *policy; MComboBox *comboBox; void showText(int index); }; diff --git a/demos/widgetsgallery/bannerspage.cpp b/demos/widgetsgallery/bannerspage.cpp new file mode 100644 index 00000000..1b1708f3 --- /dev/null +++ b/demos/widgetsgallery/bannerspage.cpp @@ -0,0 +1,151 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "bannerspage.h" + +#include <MAbstractCellCreator> +#include <MContentItem> +#include <MInfoBanner> +#include <MLayout> +#include <MList> +#include <MLinearLayoutPolicy> + +#include <QStringListModel> +#include <QTimer> + +class BannersPageCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + BannersPageCellCreator() : MAbstractCellCreator<MContentItem>() { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainPageCategoryItem"); + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +BannersPage::BannersPage() + : TemplatePage(TemplatePage::DialogsAndBanners) +{ +} + +QString BannersPage::timedemoTitle() +{ + return "BannersPage"; +} + +void BannersPage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); + + populateLayout(); +} + +void BannersPage::populateLayout() +{ + QStringList bannerTypes; + //% "Event Banner" + bannerTypes << qtTrId("xx_wg_banners_page_event_banner"); + //% "Information Banner" + bannerTypes << qtTrId("xx_wg_banners_page_information_banner"); + //% "System Information Banner" + bannerTypes << qtTrId("xx_wg_banners_page_system_information_banner"); + + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new BannersPageCellCreator()); + list->setItemModel(new QStringListModel(bannerTypes)); + policy->addItem(list, Qt::AlignCenter); + + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(itemClicked(QModelIndex))); +} + +void BannersPage::itemClicked(const QModelIndex &index) +{ + if (index.row() == 0) + showEventBanner(); + else if (index.row() == 1) + showInformationBanner(); + else if (index.row() == 2) + showSystemInformationBanner(); +} + +void BannersPage::showEventBanner() +{ + MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Event); + infoBanner->setImageID("icon-m-content-email"); + infoBanner->setBodyText( + //% "<b>Ida Taipale</b><br/>Have you seen my dog?" + qtTrId("xx_dialogs_and_notifications_event_banner")); + infoBanner->setIconID("icon-m-content-mms"); + connect(infoBanner, SIGNAL(clicked()), this, SLOT(openMessageBox())); + infoBanner->appear(MSceneWindow::DestroyWhenDone); + QTimer::singleShot(3000, infoBanner, SLOT(disappear())); +} + +void BannersPage::showInformationBanner() +{ + MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Information); + infoBanner->setImageID("icon-m-startup-help"); + infoBanner->setBodyText( + //% "<b>Battery is running low</b>" + qtTrId("xx_dialogs_and_notifications_information_banner")); + infoBanner->appear(MSceneWindow::DestroyWhenDone); + QTimer::singleShot(3000, infoBanner, SLOT(disappear())); +} + +void BannersPage::showSystemInformationBanner() +{ + MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Information); + infoBanner->setImageID("icon-m-telephony-call-answer"); + infoBanner->setBodyText( + //% "<b>Incoming call</b>" + qtTrId("xx_dialogs_and_notifications_system_information_banner")); + //% "Accept" + infoBanner->setButtonText(qtTrId("xx_dialogs_and_notifications_system_information_banner_accept")); + connect(infoBanner, SIGNAL(buttonClicked()), this, SLOT(openMessageBox())); + infoBanner->appear(MSceneWindow::DestroyWhenDone); + QTimer::singleShot(3000, infoBanner, SLOT(disappear())); +} diff --git a/demos/widgetsgallery/bannerspage.h b/demos/widgetsgallery/bannerspage.h new file mode 100644 index 00000000..428b333c --- /dev/null +++ b/demos/widgetsgallery/bannerspage.h @@ -0,0 +1,53 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef BANNERSPAGE_H +#define BANNERSPAGE_H + +#include "templatepage.h" + +#include <QModelIndex> + +class MList; + +class BannersPage : public TemplatePage +{ + Q_OBJECT + +public: + BannersPage(); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + + void showEventBanner(); + void showInformationBanner(); + void showSystemInformationBanner(); + +private Q_SLOTS: + void itemClicked(const QModelIndex &index); + +private: + MLinearLayoutPolicy *policy; + MList *list; +}; + +#endif // BANNERSPAGE_H diff --git a/demos/widgetsgallery/bubblelistmodel.cpp b/demos/widgetsgallery/bubblelistmodel.cpp new file mode 100644 index 00000000..69430197 --- /dev/null +++ b/demos/widgetsgallery/bubblelistmodel.cpp @@ -0,0 +1,55 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "bubblelistmodel.h" + +#include <QStringList> +#include <QTime> +#include <QDir> + +BubbleListModel::BubbleListModel( QObject* parent ) + : QAbstractListModel(parent) +{ + + QString avatar_1(QDir(CONTACTS_DIR).canonicalPath() + QDir::separator() +"avatar-jets.png"); + QString avatar_2(QDir(CONTACTS_DIR).canonicalPath() + QDir::separator() +"avatar-butterfly.png"); + + chatMessages + << new ChatMessageEntry( "Hi!", "Manager", avatar_1,"Yesterday, "+QTime::currentTime().toString() ) + << new ChatMessageEntry( "Hi, what's up.", "", avatar_2,QTime::currentTime().toString() ) + << new ChatMessageEntry( "Where is the layout for the speech bubble?", "Manager", avatar_1,QTime::currentTime().toString() ) + << new ChatMessageEntry( "I am working on it. It will be ready on Friday ... seriously, I promise!", "", avatar_2,QTime::currentTime().toString() ) + << new ChatMessageEntry( "Just make sure it's the best speech bubble ever, OK?", "Manager", avatar_1,QTime::currentTime().toString() ) + << new ChatMessageEntry( "Sure. This will be better than sliced bread. I'll just finish it really quick and add it to git. If there are problems, call me at <a href=\"#35802298784\">+35802298784</a>.", "", avatar_2,QTime::currentTime().toString() ) + ; +} + +int BubbleListModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent); + return chatMessages.size(); +} + +QVariant BubbleListModel::data(const QModelIndex &index, int role) const +{ + if (role == Qt::DisplayRole) + return QVariant::fromValue( (void*) chatMessages.at( index.row() ) ); + + return QVariant(); +} diff --git a/demos/widgetsgallery/bubblelistmodel.h b/demos/widgetsgallery/bubblelistmodel.h new file mode 100644 index 00000000..11a5bb40 --- /dev/null +++ b/demos/widgetsgallery/bubblelistmodel.h @@ -0,0 +1,51 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef BUBBLEMODEL_H +#define BUBBLEMODEL_H + +#include <QAbstractItemModel> +#include <QList> + +struct ChatMessageEntry { + QString message; + QString sendername; + QString avatar; + QString timestamp; + + ChatMessageEntry( QString _message, QString _sendername, QString _avatar, QString _timestamp ) + : message(_message), sendername(_sendername), avatar(_avatar), timestamp(_timestamp) + {} +}; + +class BubbleListModel : public QAbstractListModel +{ + Q_OBJECT + +public: + BubbleListModel(QObject *parent = 0); + + int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role) const; + +private: + QList<ChatMessageEntry*> chatMessages; +}; + +#endif // MODEL_H diff --git a/demos/widgetsgallery/bubblepage.cpp b/demos/widgetsgallery/bubblepage.cpp new file mode 100644 index 00000000..0b7f4cce --- /dev/null +++ b/demos/widgetsgallery/bubblepage.cpp @@ -0,0 +1,167 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include <QDir> +#include <QGraphicsLinearLayout> +#include <QGraphicsGridLayout> +#include <QTime> + +#include <MContentItem> +#include <MImageWidget> +#include <MAbstractCellCreator> +#include <MLabel> +#include <MMessageBox> +#include <MBubbleItem> + +#include "utils.h" +#include "bubblepage.h" +#include "bubblelistmodel.h" + +class BubbleItemCreator +{ +public: + MBubbleItem *createBubbleItem(const QModelIndex& index) const; +}; + +MBubbleItem *BubbleItemCreator::createBubbleItem(const QModelIndex& index) const +{ + MBubbleItem* bi = new MBubbleItem; + QVariant data = index.data(Qt::DisplayRole); + ChatMessageEntry* me = static_cast<ChatMessageEntry*>(data.value<void *>()); + + bi->setMessage(me->message); + bi->setSenderName(me->sendername); + bi->setTimeStamp(me->timestamp); + bi->setAvatar(me->avatar); + + if(me->sendername.isEmpty()) + bi->setMessageType(MBubbleItem::Outgoing); + + return bi; +} + +BubblePage::BubblePage() + : TemplatePage(TemplatePage::ListsGridsAndPopups) +{ +} + +BubblePage::~BubblePage() +{ +} + +void BubblePage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget * panel = centralWidget(); + QGraphicsLinearLayout * layout = new QGraphicsLinearLayout(Qt::Vertical); + panel->setLayout(layout); + + BubbleItemCreator * cellCreator = new BubbleItemCreator(); + BubbleListModel * model = new BubbleListModel; + + for (int i = 0; i < model->rowCount(); ++i) + { + MBubbleItem *item = cellCreator->createBubbleItem(model->index(i,0)); + connect(item, SIGNAL(linkActivated(QString)), this, SLOT(bubbleLinkActivated(QString))); + layout->addItem(item); + } + + MBubbleItem* expandedItem = new MBubbleItem(); + connect(expandedItem, SIGNAL(bubbleClicked()), this, SLOT(speechBubbleClicked())); + expandedItem->setMessage("Here are some nice pictures to enjoy while you're working."); + expandedItem->setSenderName("Tester"); + MImageWidget *avatar = new MImageWidget(expandedItem); + avatar->setPixmap(QPixmap(QString(MEDIA_DIR) + QDir::separator() + "avatar-cat.png")); + expandedItem->setAvatar(avatar); + expandedItem->setTimeStamp("5 min ago"); + + QPixmap* p0 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_001.jpg"); + MImageWidget* i0 = new MImageWidget(p0); + QPixmap* p1 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_002.jpg"); + MImageWidget* i1 = new MImageWidget(p1); + QPixmap* p2 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_003.jpg"); + MImageWidget* i2 = new MImageWidget(p2); + MWidget* widget = new MWidget; + widget->setObjectName("centralWidget"); + QGraphicsGridLayout* gl = new QGraphicsGridLayout(widget); + gl->setSpacing(30); + gl->addItem(i0, 0,0); + gl->addItem(i1, 0,1); + gl->addItem(i2, 0,2); + + expandedItem->setCentralWidget(widget); + layout->addItem(expandedItem); + + MBubbleItem* secondExpandedItem = new MBubbleItem(); + connect(secondExpandedItem, SIGNAL(bubbleClicked()), this, SLOT(speechBubbleClicked())); + secondExpandedItem->setMessage("And here are some of my favorites. Works great!"); + secondExpandedItem->setMessageType(MBubbleItem::Outgoing); + secondExpandedItem->setSenderName(""); + secondExpandedItem->setTimeStamp("5 min ago"); + + QPixmap* p4 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_004.jpg"); + MImageWidget* i4 = new MImageWidget(p4); + QPixmap* p5 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_005.jpg"); + MImageWidget* i5 = new MImageWidget(p5); + QPixmap* p6 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_006.jpg"); + MImageWidget* i6 = new MImageWidget(p6); + MWidget* widget2 = new MWidget; + widget2->setObjectName("secondCentralWidget"); + QGraphicsGridLayout* gl2 = new QGraphicsGridLayout(widget2); + gl2->setSpacing(30); + gl2->addItem(i4, 0,0); + gl2->addItem(i5, 0,1); + gl2->addItem(i6, 0,2); + + secondExpandedItem->setCentralWidget(widget2); + + secondExpandedItem->setCommentsString("+3"); + secondExpandedItem->setThumbsUpString("+6"); + layout->addItem(secondExpandedItem); + + retranslateUi(); +} + +void BubblePage::retranslateUi() +{ + //% "Speech Bubble" + setTitle(qtTrId("xx_bubblepage_title")); + if (!isContentCreated()) + return; +} + +QString BubblePage::timedemoTitle() +{ + return "SpeechBubble"; +} + +void BubblePage::bubbleLinkActivated(QString url) +{ + //% "Link activated" + messageBox = new MMessageBox(qtTrId("xx_wg_bubblepage_linkactivated") + " " + url); + messageBox->appear(MSceneWindow::DestroyWhenDone); +} + +void BubblePage::speechBubbleClicked() +{ + //% "Speech buuble clicked" + messageBox = new MMessageBox(qtTrId("xx_wg_bubblepage_bubbleclicked")); + messageBox->appear(MSceneWindow::DestroyWhenDone); +} diff --git a/demos/widgetsgallery/bubblepage.h b/demos/widgetsgallery/bubblepage.h new file mode 100644 index 00000000..ee8f3851 --- /dev/null +++ b/demos/widgetsgallery/bubblepage.h @@ -0,0 +1,51 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef BUBBLEPAGE_H +#define BUBBLEPAGE_H + +#include "templatepage.h" + +#include <QPointer> + +class MMessageBox; + +class BubblePage: public TemplatePage +{ + Q_OBJECT + +public: + BubblePage(); + virtual ~BubblePage(); + + virtual void createContent(); + virtual QString timedemoTitle(); + +protected Q_SLOTS: + void bubbleLinkActivated(QString url); + void speechBubbleClicked(); + +protected: + void retranslateUi(); + +private: + QPointer<MMessageBox> messageBox; +}; + +#endif diff --git a/demos/widgetsgallery/checkboxpage.cpp b/demos/widgetsgallery/checkboxpage.cpp index 69e5f4b9..fe809875 100644 --- a/demos/widgetsgallery/checkboxpage.cpp +++ b/demos/widgetsgallery/checkboxpage.cpp @@ -31,11 +31,10 @@ #include <QGraphicsLinearLayout> CheckboxPage::CheckboxPage() : - TemplatePage(), + TemplatePage(TemplatePage::Buttons), checkbox(0), checkboxLabel(0) { - gid = TemplatePage::Buttons; } CheckboxPage::~CheckboxPage() @@ -57,8 +56,13 @@ void CheckboxPage::createContent() checkbox->setCheckable(true); checkboxLabel = new MLabel(); checkboxLabel->setWordWrap(true); - checkboxLabel->setTextElide(true); + checkboxLabel->setTextElide(false); + checkboxLabel->setMinimumWidth(0); + checkboxLabel->setPreferredWidth(0); + checkboxLabel->setAlignment( Qt::AlignCenter ); + checkboxLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + // Layout for checkbox and it's infolabel QGraphicsLinearLayout *l = new QGraphicsLinearLayout(Qt::Horizontal); l->addItem(checkbox); @@ -84,7 +88,7 @@ void CheckboxPage::retranslateUi() //% "using a Switch instead." infoLabel->setText("<a></a>" + qtTrId("xx_checkbox_page_info_label")); - //% "I have read and understood the\ninstructions." + //% "I have read and understood the instructions." checkboxLabel->setText("<a></a>" + qtTrId("xx_checkbox_page_checkbox_label")); } diff --git a/demos/widgetsgallery/checkboxpage.h b/demos/widgetsgallery/checkboxpage.h index d9d066b6..e2eb7b49 100644 --- a/demos/widgetsgallery/checkboxpage.h +++ b/demos/widgetsgallery/checkboxpage.h @@ -20,7 +20,7 @@ #ifndef CHECKBOXPAGE_H #define CHECKBOXPAGE_H -#include "listpage.h" +#include "mainpage.h" #include "templatepage.h" #include <MApplicationPage> #include <MLayout> diff --git a/demos/widgetsgallery/comboboxpage.cpp b/demos/widgetsgallery/comboboxpage.cpp index 74c447ae..07793659 100644 --- a/demos/widgetsgallery/comboboxpage.cpp +++ b/demos/widgetsgallery/comboboxpage.cpp @@ -33,10 +33,10 @@ #include <QTimer> ComboBoxPage::ComboBoxPage() - : model1(0), + : TemplatePage(TemplatePage::ListsGridsAndPopups), + model1(0), proxyModel(0) { - gid = TemplatePage::ListsGridsAndMenus; } ComboBoxPage::~ComboBoxPage() @@ -59,17 +59,17 @@ void ComboBoxPage::createContent() containerLayout->setPolicy(containerPolicy); QStringList list; - for (int i = 0; i < 100; ++i) { - list << QString::number(10000 + i); + for (int i = 0; i < 130; ++i) { + list << QString::number(1970 + i); } comboBox1 = new MComboBox; - comboBox1->setIconID("Icon-pictures"); + comboBox1->setIconID("icon-m-camera-scene-portrait"); comboBox1->addItems(list); - comboBox1->setCurrentIndex(50); + comboBox1->setCurrentIndex(40); comboBox2 = new MComboBox; - comboBox2->setIconID("Icon-pictures"); + comboBox2->setIconID("icon-m-camera-shutter"); model1 = new QStringListModel(this); model1->setStringList(list); @@ -81,13 +81,13 @@ void ComboBoxPage::createContent() comboBox2->setItemModel(proxyModel); comboBox3 = new MComboBox; - comboBox3->setIconID("Icon-music"); + comboBox3->setIconID("icon-m-startup-clock"); comboBox3->setTitle("Time-consuming setting"); - comboBox3->addItem("Setting 1"); - comboBox3->addItem("Setting 2"); - comboBox3->addItem("Setting 3"); - comboBox3->addItem("Setting 4"); - comboBox3->addItem("Setting 5"); + comboBox3->addItem("Wash your car"); + comboBox3->addItem("Cook dinner"); + comboBox3->addItem("Join a funk band"); + comboBox3->addItem("Run for president"); + comboBox3->addItem("Hop, skip, and jump"); QTimer* timer = new QTimer(this); timer->setSingleShot(true); diff --git a/demos/widgetsgallery/containerpage.cpp b/demos/widgetsgallery/containerpage.cpp index a96bbb63..0499bde5 100644 --- a/demos/widgetsgallery/containerpage.cpp +++ b/demos/widgetsgallery/containerpage.cpp @@ -25,9 +25,8 @@ #include <MLocale> #include <QGraphicsLinearLayout> -ContainerPage::ContainerPage() +ContainerPage::ContainerPage() : TemplatePage(TemplatePage::SimpleWidgets) { - gid = TemplatePage::ContainersAndApplets; } ContainerPage::~ContainerPage() diff --git a/demos/widgetsgallery/contentitemspage.cpp b/demos/widgetsgallery/contentitemspage.cpp new file mode 100644 index 00000000..8a75378f --- /dev/null +++ b/demos/widgetsgallery/contentitemspage.cpp @@ -0,0 +1,216 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "contentitemspage.h" +#include "utils.h" + +#include <MAbstractCellCreator> +#include <MLayout> +#include <MLinearLayoutPolicy> +#include <MList> + +#include <MDebug> + +class ContentItemsPageCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + ContentItemsPageCellCreator(MContentItem::ContentItemStyle style) + : itemStyle(style), + defaultImage(Utils::imagesDir() + "DefaultAvatar.png") + { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(itemStyle); + cell->setObjectName("wgContentItemsPageItem"); + + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + + switch (itemStyle) { + case MContentItem::IconAndTwoTextLabels: + //% "Subtitle" + item->setSubtitle(qtTrId("xx_content_items_subtitle")); + item->setImage(defaultImage); + break; + case MContentItem::IconAndSingleTextLabel: + item->setImage(defaultImage); + break; + case MContentItem::TwoTextLabels: + //% "Subtitle" + item->setSubtitle(qtTrId("xx_content_items_subtitle")); + break; + case MContentItem::SingleIcon: + item->setImage(defaultImage); + break; + case MContentItem::IconAndSingleTextLabelVertical: + item->setImage(defaultImage); + break; + case MContentItem::IconAndTwoTextLabelsVertical: + //% "Subtitle" + item->setSubtitle(qtTrId("xx_content_items_subtitle")); + item->setImage(defaultImage); + break; + case MContentItem::TwoIconsTwoWidgets: + item->setImage(defaultImage); + item->setOptionalImage(defaultImage); + item->enableProgressBar(); + dynamic_cast<MProgressIndicator*>(item->additionalItem())->setValue(25 * index.row()); + //% "Subtitle" + item->setSubtitle(qtTrId("xx_content_items_subtitle")); + break; + default: + break; + }; + + const_cast<ContentItemsPageCellCreator*>(this)->updateCellSize(item); + } + + void updateCellSize(const MWidget *cell) { + size = cell->effectiveSizeHint(Qt::PreferredSize); + mDebug("") << size; + } + + QSizeF cellSize() const { + return size; + } + +private: + QSizeF size; + MContentItem::ContentItemStyle itemStyle; + QImage defaultImage; +}; + +class ContentItemsPageModel : public QAbstractItemModel { +public: + ContentItemsPageModel(const QString &title) + : QAbstractItemModel(), + headerTitle(title) + { + } + + QModelIndex parent(const QModelIndex &child) const { + Q_UNUSED(child); + + if (child.internalId() == 0) + return index(0, 0); + + return QModelIndex(); + } + + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const { + if (parent.isValid()) + return createIndex(row, column, 0); + else + return createIndex(row, column, 1); + } + + int rowCount(const QModelIndex &parent) const { + if (parent.isValid()) + return 2; + + return 1; + } + + int columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + + return 1; + } + + QVariant data(const QModelIndex &index, int role) const { + if (role == Qt::DisplayRole) { + if (!index.parent().isValid()) + return QVariant::fromValue(headerTitle); + else + return QVariant::fromValue(QString(headerTitle + " %1").arg(index.row())); + } + + return QVariant(); + } + +private: + QString headerTitle; +}; + +ContentItemsPage::ContentItemsPage() + : TemplatePage(TemplatePage::ListsGridsAndPopups) +{ +} + +QString ContentItemsPage::timedemoTitle() +{ + return "ContentItems"; +} + +void ContentItemsPage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); + + populateLayout(); +} + +void ContentItemsPage::populateLayout() +{ + contentItemLists.append(createList("Icon and Two Text Labels", MContentItem::IconAndTwoTextLabels)); + contentItemLists.append(createList("Single Text Label", MContentItem::SingleTextLabel)); + contentItemLists.append(createList("Icon and Single Text Label", MContentItem::IconAndSingleTextLabel)); + contentItemLists.append(createList("Two Text Labels", MContentItem::TwoTextLabels)); + contentItemLists.append(createList("Single Icon", MContentItem::SingleIcon)); + contentItemLists.append(createList("Icon and Single Text Label Vertical", MContentItem::IconAndSingleTextLabelVertical)); + contentItemLists.append(createList("Icon and Two Text Labels Vertical", MContentItem::IconAndTwoTextLabelsVertical)); + contentItemLists.append(createList("Two Icons Two Widgets", MContentItem::TwoIconsTwoWidgets)); +} + +MList *ContentItemsPage::createList(const QString &title, MContentItem::ContentItemStyle style) +{ + QAbstractItemModel *model = new ContentItemsPageModel(title); + + MList *list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new ContentItemsPageCellCreator(style)); + list->setItemModel(model); + list->setShowGroups(true); + policy->addItem(list, Qt::AlignCenter); + + return list; +} diff --git a/demos/widgetsgallery/contentitemspage.h b/demos/widgetsgallery/contentitemspage.h new file mode 100644 index 00000000..5e23833b --- /dev/null +++ b/demos/widgetsgallery/contentitemspage.h @@ -0,0 +1,45 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef CONTENTITEMSPAGE_H +#define CONTENTITEMSPAGE_H + +#include "templatepage.h" +#include <MContentItem> + +class MList; + +class ContentItemsPage : public TemplatePage +{ +public: + ContentItemsPage(); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + + MList *createList(const QString &title, MContentItem::ContentItemStyle style); + +private: + QList<MList*> contentItemLists; + MLinearLayoutPolicy *policy; +}; + +#endif // CONTENTITEMSPAGE_H diff --git a/demos/widgetsgallery/dialogsandnotificationspage.cpp b/demos/widgetsgallery/dialogsandnotificationspage.cpp deleted file mode 100644 index c19f9812..00000000 --- a/demos/widgetsgallery/dialogsandnotificationspage.cpp +++ /dev/null @@ -1,414 +0,0 @@ -/*************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (directui@nokia.com) -** -** This file is part of libmeegotouch. -** -** If you have questions regarding the use of this file, please contact -** Nokia at directui@nokia.com. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation -** and appearing in the file LICENSE.LGPL included in the packaging -** of this file. -** -****************************************************************************/ - -#include "dialogsandnotificationspage.h" - -#include "listpage.h" -#include <QTimer> -#include <MDialog> -#include <MLayout> -#include <MLocale> -#include <MButton> -#include <MMessageBox> -#include <MInfoBanner> -#include <MLabel> -#include <MTextEdit> -#include <QDebug> -#include <MContainer> -#include <MLinearLayoutPolicy> -#include <MWidget> -#include <QGraphicsLinearLayout> - -DialogsAndNotificationsPage::DialogsAndNotificationsPage() - : TemplatePage(), - dialog(0), - nestedDialog(0), - nestedMessageBox(0), - label1(0), - label2(0), - label3(0), - button1(0), - button2(0), - button3(0), - button4(0), - button5(0), - button6(0), - button7(0), - buttonStackedDialogs(0), - buttonSystemModalDialog(0) -{ - gid = TemplatePage::ViewsAndDialogs; -} - -DialogsAndNotificationsPage::~DialogsAndNotificationsPage() -{ -} - -QString DialogsAndNotificationsPage::timedemoTitle() -{ - return "DialogsAndNotifications"; -} - -void DialogsAndNotificationsPage::createContent() -{ - MApplicationPage::createContent(); - - MLayout *layout = new MLayout(centralWidget()); - MLinearLayoutPolicy *layoutPolicy = new MLinearLayoutPolicy(layout, Qt::Vertical); - populateLayout(layoutPolicy); - - retranslateUi(); -} - -void DialogsAndNotificationsPage::openQuestionDialog() -{ - if (dialog) - return; - - dialog = new MDialog( - //% "Question Dialog Title" - qtTrId("xx_dialogs_and_notifications_question_dialog_title"), - M::YesButton | M::NoButton); - dialog->setCentralWidget( - //% "Lorem ipsum dolor sit amet?" - new MLabel(qtTrId("xx_dialogs_and_notifications_question_dialog_content"))); - - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openEntryDialog() -{ - if (dialog) - return; - - MWidget *centralWidget = new MWidget; - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); - //% "Name" - MLabel *label = new MLabel(qtTrId("xx_dialogs_and_notifications_entry_dialog_label"), centralWidget); - MTextEdit *textEdit = new MTextEdit(MTextEditModel::SingleLine, - QString(), - centralWidget); - centralWidget->setLayout(layout); - - layout->addItem(label); - layout->addItem(textEdit); - - //% "Please enter your name" - dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_entry_dialog_title"), - M::OkButton | M::ResetButton); - dialog->setCentralWidget(centralWidget); - - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openLongDialog() -{ - if (dialog) - return; - - MWidget *centralWidget = new MWidget; - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); - - //% "Select printer" - dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_long_dialog_title"), M::CancelButton); - dialog->setCentralWidget(centralWidget); - MButton *button = 0; - - centralWidget->setLayout(layout); - -#define ADD_PRINTER_BUTTON(NAME) \ - button = new MButton(NAME, centralWidget); \ - connect(button, SIGNAL(clicked()), dialog, SLOT(accept())); \ - layout->addItem(button); - - ADD_PRINTER_BUTTON("Lexmark A"); - ADD_PRINTER_BUTTON("Lexmark B"); - ADD_PRINTER_BUTTON("Lexmark C"); - ADD_PRINTER_BUTTON("Lexmark D"); - ADD_PRINTER_BUTTON("Canon Alpha"); - ADD_PRINTER_BUTTON("Canon Beta"); - ADD_PRINTER_BUTTON("Canon Gama"); - ADD_PRINTER_BUTTON("Canon Zeta"); - ADD_PRINTER_BUTTON("Brother 1"); - ADD_PRINTER_BUTTON("Brother 2"); - ADD_PRINTER_BUTTON("Brother 3"); - ADD_PRINTER_BUTTON("Brother 4"); - ADD_PRINTER_BUTTON("Xerox I"); - ADD_PRINTER_BUTTON("Xerox II"); - ADD_PRINTER_BUTTON("Xerox III"); - ADD_PRINTER_BUTTON("Xerox IV"); - ADD_PRINTER_BUTTON("Dell Roger"); - ADD_PRINTER_BUTTON("Dell Charlie"); - ADD_PRINTER_BUTTON("Dell Bravo"); - ADD_PRINTER_BUTTON("Dell Tango"); - ADD_PRINTER_BUTTON("HP X"); - ADD_PRINTER_BUTTON("HP Y"); - ADD_PRINTER_BUTTON("HP Z"); - ADD_PRINTER_BUTTON("HP Plus"); - ADD_PRINTER_BUTTON("Epson Stylus"); - ADD_PRINTER_BUTTON("Epson Pro"); - ADD_PRINTER_BUTTON("Epson Office"); - ADD_PRINTER_BUTTON("Epson Extra"); - -#undef ADD_PRINTER_BUTTON - - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openStackedDialogs() -{ - if (dialog) - return; - - //% "Click to spawn a nested dialog" - MButton *button = new MButton(qtTrId("xx_dialogs_and_notifications_stacked_dialog_button")); - //% "Stacked dialogs" - dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_stacked_dialog_title"), M::CancelButton); - dialog->setCentralWidget(button); - - connect(button, SIGNAL(clicked()), SLOT(openNestedDialog())); - - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openNestedDialog() -{ - if (nestedDialog) - return; - - //% "Click to open a nested message box" - MButton *button = new MButton(qtTrId("xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox")); - //% "This is a nested dialog" - nestedDialog = new MDialog(qtTrId("xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"), M::CancelButton); - nestedDialog->setCentralWidget(button); - connect(button, SIGNAL(clicked()), SLOT(openNestedMessageBox())); - - nestedDialog->appear(MSceneWindow::DestroyWhenDone); - -} - -void DialogsAndNotificationsPage::openNestedMessageBox() -{ - if (nestedMessageBox) - return; - - //% "I'm a nested message box" - nestedMessageBox = new MMessageBox(qtTrId("xx_dialogs_and_notifications_stacked_dialog_messagebox_text")); - nestedMessageBox->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openSystemModalDialog() -{ - if (dialog) - return; - - dialog = new MDialog( - //% "System Modal Dialog" - qtTrId("xx_dialogs_and_notifications_system_modal_dialog_title"), - M::OkButton); - - dialog->setCentralWidget( - //% "I'm a window modal dialog.\n" - //% "There's no way around me!\n" - //% "Muwhahaha... [evil laugh]" - new MLabel(qtTrId("xx_dialogs_and_notifications_system_modal_dialog_label"))); - - dialog->setSystemModal(true); - - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openDialogWithProgressIndicator() -{ - if (dialog) - return; - - MButton *button = new MButton(); - button->setViewType(MButton::switchType); - button->setCheckable(true); - button->setChecked(true); - connect(button, SIGNAL(toggled(bool)), this, SLOT(setDialogProgressIndicatorVisible(bool))); - - //% "Progress Indicator" - MLabel *label = new MLabel(qtTrId("xx_dialogs_and_notifications_progress_indicator")); - - QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Horizontal); - layout->addStretch(); - layout->addItem(label); - layout->addItem(button); - layout->addStretch(); - - dialog = new MDialog("Lorem ipsum", M::NoStandardButton); - dialog->centralWidget()->setLayout(layout); - dialog->setProgressIndicatorVisible(true); - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::openMessageBox() -{ - if (dialog) - return; - - //% "Hello World!" - dialog = new MMessageBox(qtTrId("xx_dialogs_and_notifications_message_box_text"), M::OkButton); - dialog->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::showEventBanner() -{ - MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Event); - infoBanner->setImageID("icon-m-content-email"); - infoBanner->setBodyText( - //% "<b>Ida Taipale</b><br/>Have you seen my dog?" - qtTrId("xx_dialogs_and_notifications_event_banner")); - infoBanner->setIconID("Icon-new-SMS"); - connect(infoBanner, SIGNAL(clicked()), this, SLOT(openMessageBox())); - infoBanner->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::showInformationBanner() -{ - MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Information); - infoBanner->setImageID("icon-m-startup-help"); - infoBanner->setBodyText( - //% "<b>Battery is running low</b>" - qtTrId("xx_dialogs_and_notifications_information_banner")); - infoBanner->appear(MSceneWindow::DestroyWhenDone); -} - -void DialogsAndNotificationsPage::showSystemInformationBanner() -{ - MInfoBanner *infoBanner = new MInfoBanner(MInfoBanner::Information); - infoBanner->setImageID("icon-m-telephony-call-answer"); - infoBanner->setBodyText( - //% "<b>Incoming call</b>" - qtTrId("xx_dialogs_and_notifications_system_information_banner")); - //% "Accept" - infoBanner->setButtonText(qtTrId("xx_dialogs_and_notifications_system_information_banner_accept")); - connect(infoBanner, SIGNAL(buttonClicked()), this, SLOT(openMessageBox())); - infoBanner->appear(MSceneWindow::DestroyWhenDone); -} - - - -void DialogsAndNotificationsPage::populateLayout(MLinearLayoutPolicy *layoutPolicy) -{ - // Dialogs - - dialogsContainer = new MContainer(); - QGraphicsLinearLayout *dialogsLayout = new QGraphicsLinearLayout(Qt::Vertical, dialogsContainer->centralWidget()); - - layoutPolicy->addItem(dialogsContainer); - - - - button1 = new MButton(centralWidget()); - connect(button1, SIGNAL(clicked()), this, SLOT(openQuestionDialog())); - dialogsLayout->addItem(button1); - - button2 = new MButton(centralWidget()); - connect(button2, SIGNAL(clicked()), this, SLOT(openEntryDialog())); - dialogsLayout->addItem(button2); - - button3 = new MButton(centralWidget()); - connect(button3, SIGNAL(clicked()), this, SLOT(openLongDialog())); - dialogsLayout->addItem(button3); - - buttonStackedDialogs = new MButton(centralWidget()); - connect(buttonStackedDialogs, SIGNAL(clicked()), this, SLOT(openStackedDialogs())); - dialogsLayout->addItem(buttonStackedDialogs); - - buttonSystemModalDialog = new MButton(centralWidget()); - connect(buttonSystemModalDialog, SIGNAL(clicked()), this, SLOT(openSystemModalDialog())); - dialogsLayout->addItem(buttonSystemModalDialog); - - buttonDialogWithProgressIndicator = new MButton(centralWidget()); - connect(buttonDialogWithProgressIndicator, SIGNAL(clicked()), this, SLOT(openDialogWithProgressIndicator())); - dialogsLayout->addItem(buttonDialogWithProgressIndicator); - - button4 = new MButton(centralWidget()); - connect(button4, SIGNAL(clicked()), this, SLOT(openMessageBox())); - dialogsLayout->addItem(button4); - - // Notifications - - notificationsContainer = new MContainer(); - QGraphicsLinearLayout *notificationsLayout = new QGraphicsLinearLayout(Qt::Vertical, notificationsContainer->centralWidget()); - - layoutPolicy->addItem(notificationsContainer); - - button5 = new MButton(centralWidget()); - connect(button5, SIGNAL(clicked()), this, SLOT(showEventBanner())); - notificationsLayout->addItem(button5); - - button6 = new MButton(centralWidget()); - connect(button6, SIGNAL(clicked()), this, SLOT(showInformationBanner())); - notificationsLayout->addItem(button6); - - button7 = new MButton(centralWidget()); - button7->connect(button7, SIGNAL(clicked()), this, SLOT(showSystemInformationBanner())); - notificationsLayout->addItem(button7); - - - //notificationsLayout->addItem(button8); -} - -void DialogsAndNotificationsPage::retranslateUi() -{ - //% "Dialogs and Notifications" - setTitle(qtTrId("xx_dialogs_and_notifications_title")); - if (!isContentCreated()) - return; - //% "Dialog examples" - dialogsContainer->setTitle(qtTrId("xx_dialogs_and_notifications_label_dialogs")); - //% "Question Dialog" - button1->setText(qtTrId("xx_dialogs_and_notifications_query_dialog")); - //% "Entry Dialog" - button2->setText(qtTrId("xx_dialogs_and_notifications_entry_dialog")); - //% "A Long Dialog" - button3->setText(qtTrId("xx_dialogs_and_notifications_long_dialog")); - - //% "Stacked Dialogs" - buttonStackedDialogs->setText(qtTrId("xx_dialogs_and_notifications_stacked_dialogs")); - - //% "System Modal Dialog" - buttonSystemModalDialog->setText(qtTrId("xx_dialogs_and_notifications_system_modal_dialog")); - - //% "Dialog With Progress Indicator" - buttonDialogWithProgressIndicator->setText(qtTrId("xx_dialogs_and_notifications_dialog_with_progress_indicator")); - - //% "Notifications and messages" - notificationsContainer->setTitle(qtTrId("xx_dialogs_and_notifications_label_notifications")); - //% "Simple Message Box" - button4->setText(qtTrId("xx_dialogs_and_notifications_messagebox")); - //% "Event Banner" - button5->setText(qtTrId("xx_dialogs_and_notifications_label_event_banner")); - //% "Information Banner" - button6->setText(qtTrId("xx_dialogs_and_notifications_label_information_banner")); - //% "System Information Banner" - button7->setText(qtTrId("xx_dialogs_and_notifications_label_system_information_banner")); - -} - -void DialogsAndNotificationsPage::setDialogProgressIndicatorVisible(bool visible) -{ - if (dialog) { - dialog->setProgressIndicatorVisible(visible); - } -} diff --git a/demos/widgetsgallery/dialogsandnotificationspage.h b/demos/widgetsgallery/dialogsandnotificationspage.h deleted file mode 100644 index 96e3fe69..00000000 --- a/demos/widgetsgallery/dialogsandnotificationspage.h +++ /dev/null @@ -1,88 +0,0 @@ -/*************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (directui@nokia.com) -** -** This file is part of libmeegotouch. -** -** If you have questions regarding the use of this file, please contact -** Nokia at directui@nokia.com. -** -** This library is free software; you can redistribute it and/or -** modify it under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation -** and appearing in the file LICENSE.LGPL included in the packaging -** of this file. -** -****************************************************************************/ - -#ifndef DIALOGSANDNOTIFICATIONSPAGE_H -#define DIALOGSANDNOTIFICATIONSPAGE_H - -#include "templatepage.h" - -#include <QPointer> - -class MGridLayoutPolicy; -class MDialog; -class MButton; -class MLabel; -class MContainer; - -class DialogsAndNotificationsPage : public TemplatePage -{ - Q_OBJECT -public: - DialogsAndNotificationsPage(); - virtual ~DialogsAndNotificationsPage(); - virtual QString timedemoTitle(); - - virtual void createContent(); - -protected: - virtual void retranslateUi(); - -private slots: - void openQuestionDialog(); - void openEntryDialog(); - void openLongDialog(); - void openStackedDialogs(); - void openNestedDialog(); - void openNestedMessageBox(); - void openSystemModalDialog(); - void openDialogWithProgressIndicator(); - void openMessageBox(); - void showEventBanner(); - void showInformationBanner(); - void showSystemInformationBanner(); - void setDialogProgressIndicatorVisible(bool); - -private: - void populateLayout(MLinearLayoutPolicy *layoutPolicy); - - QPointer<MDialog> dialog; - QPointer<MDialog> nestedDialog; - QPointer<MDialog> nestedMessageBox; - - MLabel *label1; - MLabel *label2; - MLabel *label3; - - MContainer *dialogsContainer; - MContainer *notificationsContainer; - - MButton *button1; - MButton *button2; - MButton *button3; - MButton *button4; - MButton *button5; - MButton *button6; - MButton *button7; - - MButton *buttonStackedDialogs; - MButton *buttonSystemModalDialog; - MButton *buttonDialogWithProgressIndicator; -}; - -#endif // DIALOGSANDNOTIFICATIONSPAGE_H diff --git a/demos/widgetsgallery/displaymodespage.cpp b/demos/widgetsgallery/displaymodespage.cpp index 5e8339b9..304fc547 100644 --- a/demos/widgetsgallery/displaymodespage.cpp +++ b/demos/widgetsgallery/displaymodespage.cpp @@ -33,9 +33,8 @@ #include <QStringList> #include <QTimer> -DisplayModesPage::DisplayModesPage() +DisplayModesPage::DisplayModesPage() : TemplatePage(TemplatePage::ApplicationView) { - gid = TemplatePage::ViewsAndDialogs; } DisplayModesPage::~DisplayModesPage() @@ -125,22 +124,22 @@ void DisplayModesPage::addExampleActions() { MAction *action; - action = new MAction("Icon-video", "Video", this); + action = new MAction("icon-m-toolbar-new-chat", "Chat", this); action->setLocation(MAction::ToolBarLocation); addAction(action); - action = new MAction("Icon-new-SMS", "SMS", this); + action = new MAction("icon-m-toolbar-send-sms", "SMS", this); action->setLocation(MAction::ToolBarLocation); addAction(action); - action = new MAction("Icon-contacts", "Contacts", this); + action = new MAction("icon-m-toolbar-send-email", "Mail", this); action->setLocation(MAction::ToolBarLocation); addAction(action); } void DisplayModesPage::retranslateUi() { - //% "Display Modes and Full Screen" + //% "Display Modes" setTitle(qtTrId("xx_displaymodes_page_title")); if (!isContentCreated()) return; diff --git a/demos/widgetsgallery/feedbackpage.cpp b/demos/widgetsgallery/feedbackpage.cpp index 27686676..88d64a8f 100644 --- a/demos/widgetsgallery/feedbackpage.cpp +++ b/demos/widgetsgallery/feedbackpage.cpp @@ -31,7 +31,7 @@ #include <MApplication> FeedbackPage::FeedbackPage() : - TemplatePage(), + TemplatePage(TemplatePage::UserInput), feedbackButton1(0), feedbackButton2(0), feedbackButton3(0), @@ -39,7 +39,6 @@ FeedbackPage::FeedbackPage() : feedbackButton5(0), feedbackButton6(0) { - gid = TemplatePage::InputFeedback; } FeedbackPage::~FeedbackPage() diff --git a/demos/widgetsgallery/feedbackpage.h b/demos/widgetsgallery/feedbackpage.h index 836b5597..cdeb23d4 100644 --- a/demos/widgetsgallery/feedbackpage.h +++ b/demos/widgetsgallery/feedbackpage.h @@ -20,7 +20,7 @@ #ifndef FEEDBACKPAGE_H #define FEEDBACKPAGE_H -#include "listpage.h" +#include "mainpage.h" #include "templatepage.h" #include <MApplicationPage> #include <MLayout> diff --git a/demos/widgetsgallery/iconbuttonpage.cpp b/demos/widgetsgallery/iconbuttonpage.cpp index 2bda9b60..9cd0e336 100644 --- a/demos/widgetsgallery/iconbuttonpage.cpp +++ b/demos/widgetsgallery/iconbuttonpage.cpp @@ -31,11 +31,10 @@ #include <QGraphicsLinearLayout> IconButtonPage::IconButtonPage() : - TemplatePage(), + TemplatePage(TemplatePage::SimpleWidgets), iconButton1(0), iconButton2(0) { - gid = TemplatePage::Buttons; } IconButtonPage::~IconButtonPage() @@ -70,7 +69,7 @@ void IconButtonPage::createContent() iconButton2->setViewType(MButton::iconType); iconButton2->setIconID("icon-m-toolbar-locked"); iconButton2->setMaximumWidth(175); - + containerPolicy->addItem(iconButton2, Qt::AlignCenter); containerPolicy->addStretch(); retranslateUi(); diff --git a/demos/widgetsgallery/iconbuttonpage.h b/demos/widgetsgallery/iconbuttonpage.h index 0f205123..952a68e1 100644 --- a/demos/widgetsgallery/iconbuttonpage.h +++ b/demos/widgetsgallery/iconbuttonpage.h @@ -20,7 +20,7 @@ #ifndef ICONBUTTONPAGE_H #define ICONBUTTONPAGE_H -#include "listpage.h" +#include "mainpage.h" #include "templatepage.h" #include <MApplicationPage> #include <MLayout> diff --git a/demos/widgetsgallery/imagepage.cpp b/demos/widgetsgallery/imagepage.cpp index 62757053..afd5111e 100644 --- a/demos/widgetsgallery/imagepage.cpp +++ b/demos/widgetsgallery/imagepage.cpp @@ -37,7 +37,7 @@ #include "utils.h" ImagePage::ImagePage() : - TemplatePage(), + TemplatePage(TemplatePage::SimpleWidgets), propertiesLabel(NULL), propertiesComboBox(NULL), visual(NULL), @@ -45,8 +45,6 @@ ImagePage::ImagePage() : slider(NULL), originalScaleFactor(10) { - gid = TemplatePage::LayoutsAndVisuals; - // Initial values for image property sliders sliderValues[ImageZoom] = 10; sliderValues[ImageTransparency] = 0; @@ -89,7 +87,7 @@ void ImagePage::createContent() // Image properties comboBox propertiesComboBox = new MComboBox(); - propertiesComboBox->setIconID("Icon-pictures"); + propertiesComboBox->setIconID("icon-m-gallery-image-edit"); // Image property slider slider = new MSlider(); @@ -223,7 +221,7 @@ void ImagePage::setImageCrop(float width, float height) void ImagePage::pinchGestureEvent(QGestureEvent *event, QPinchGesture *gesture) { if (gesture->state() == Qt::GestureStarted) { - propertiesComboBox->setCurrentIndex(0); + propertiesComboBox->setCurrentIndex(0); originalScaleFactor = slider->value(); //If the current scale factor is 0, the we would not be scaling anything. diff --git a/demos/widgetsgallery/itemdetailpage.cpp b/demos/widgetsgallery/itemdetailpage.cpp index 568be012..98052f75 100644 --- a/demos/widgetsgallery/itemdetailpage.cpp +++ b/demos/widgetsgallery/itemdetailpage.cpp @@ -27,6 +27,7 @@ #include <QTimer> #include <QPropertyAnimation> #include <QParallelAnimationGroup> +#include <QPinchGesture> #include <MImageWidget> #include <MLabel> @@ -70,7 +71,7 @@ MyVideoOverlayToolbar::MyVideoOverlayToolbar(QGraphicsItem *parent) landscapePolicy = new MGridLayoutPolicy(layout); landscapePolicy->setContentsMargins(0, 0, 0, 0); landscapePolicy->setSpacing(0); - + portraitPolicy = new MGridLayoutPolicy(layout); portraitPolicy->setContentsMargins(0, 0, 0, 0); portraitPolicy->setSpacing(0); @@ -97,15 +98,19 @@ void MyVideoOverlayToolbar::addItem(QGraphicsLayoutItem* button) #endif ItemDetailPage::ItemDetailPage() : + slider(0), + image(0), #ifdef HAVE_GSTREAMER video(0), #endif - slider(0), - image(0), hideAnimation(0), - showAnimation(0) + showAnimation(0), + scaleFactor(10.0), + lastScaleFactor(1.0) { setObjectName("itemDetailPage"); + setAcceptTouchEvents(true); + grabGesture(Qt::PinchGesture); } ItemDetailPage::~ItemDetailPage() @@ -115,7 +120,7 @@ ItemDetailPage::~ItemDetailPage() #endif delete slider; delete image; - + delete hideAnimation; delete showAnimation; } @@ -125,11 +130,20 @@ QString ItemDetailPage::timedemoTitle() return "ItemDetailPage"; } +bool ItemDetailPage::event(QEvent *e) +{ + if (e->type() == QEvent::TouchBegin) { + lastScaleFactor = 1.0; + e->setAccepted(true); + return true; + } + return TimedemoPage::event(e); +} void ItemDetailPage::createContent() { mWarning("ItemDetailPage::createContent()"); - + inactivityTimer.setInterval(INACTIVITY_TIMEOUT); connect(&inactivityTimer, SIGNAL(timeout()), this, SLOT(hideOverlay()), @@ -137,18 +151,19 @@ void ItemDetailPage::createContent() QGraphicsWidget *panel = centralWidget(); layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); #ifdef HAVE_GSTREAMER if( !videoId.isEmpty() ) { - QFileInfo info(videoId); + QFileInfo info(videoId); setTitle(info.fileName()); setObjectName("video-detail-page"); video = new MyVideoWidget(panel); connect(video, SIGNAL(videoReady()), this, SLOT(videoReady())); -//set video to fullscreen mode immediately only on device where the -//Xv rendering with color-key is supported for sure, to avoid flickering +//set video to fullscreen mode immediately only on device where the +//Xv rendering with color-key is supported for sure, to avoid flickering //on desktop machines that does not support color-keying. #ifdef __arm__ video->setFullscreen(true); @@ -162,7 +177,7 @@ void ItemDetailPage::createContent() button->setObjectName("video-player-button"); button->setIconID("icon-m-toolbar-mediacontrol-pause"); connect(button, SIGNAL(clicked(bool)), this, SLOT(buttonClicked())); - + MButton* bPrev = new MButton(panel); bPrev->setViewType(MButton::iconType); bPrev->setObjectName("video-player-button"); @@ -174,7 +189,7 @@ void ItemDetailPage::createContent() bNext->setObjectName("video-player-button"); bNext->setIconID("icon-m-toolbar-mediacontrol-next"); connect(bNext, SIGNAL(clicked(bool)), this, SLOT(buttonClicked())); - + slider = new MSlider(panel); slider->setObjectName("video-player-slider"); connect(slider, SIGNAL(valueChanged(int)), this, SLOT(videoSliderValueChanged(int))); @@ -182,7 +197,7 @@ void ItemDetailPage::createContent() connect(slider, SIGNAL(sliderReleased()), this, SLOT(sliderReleased())); slider->setMinLabelVisible(true); slider->setMaxLabelVisible(true); - + cContainer = new MyVideoOverlayToolbar(panel); cContainer->addItem(bPrev); cContainer->addItem(button); @@ -214,7 +229,7 @@ void ItemDetailPage::createContent() hideAnimation = new QParallelAnimationGroup(); showAnimation = new QParallelAnimationGroup(); - + QPropertyAnimation* animation = new QPropertyAnimation(cContainer, "opacity"); animation->setDuration(ANIMATION_TIME); animation->setEndValue(0.0); @@ -244,7 +259,7 @@ void ItemDetailPage::createContent() animation->setDuration(ANIMATION_TIME); animation->setEndValue(1.0); showAnimation->addAnimation(animation); - + relayout(); } else if( !imageId.isEmpty() ) { #else @@ -252,54 +267,16 @@ void ItemDetailPage::createContent() #endif policy = new MLinearLayoutPolicy(layout, Qt::Horizontal); policy->setSpacing(0.0); - layout->setLandscapePolicy(policy); - layout->setPortraitPolicy(policy); - - MButton* button0 = new MButton; - button0->setText("-"); - connect(button0, SIGNAL(clicked()),this,SLOT(rateNoneButtonClicked())); - - MButton* button1 = new MButton; - button1->setText("*"); - connect(button1, SIGNAL(clicked()),this,SLOT(rateOneButtonClicked())); - - MButton* button2 = new MButton; - button2->setText("**"); - connect(button2, SIGNAL(clicked()),this,SLOT(rateTwoButtonClicked())); - - MButton* button3 = new MButton; - button3->setText("***"); - connect(button3, SIGNAL(clicked()),this,SLOT(rateThreeButtonClicked())); - - MButton* button4 = new MButton; - button4->setText("****"); - connect(button4, SIGNAL(clicked()),this,SLOT(rateFourButtonClicked())); - - MButton* button5 = new MButton; - button5->setText("*****"); - connect(button5, SIGNAL(clicked()),this,SLOT(rateFiveButtonClicked())); + layout->setPolicy(policy); image = new MImageWidget(panel); image->setImage(QImage(imageId)); policy->addItem(image); - MLayout* bl = new MLayout; - bl->setSizePolicy(QSizePolicy::Maximum,QSizePolicy::MinimumExpanding); - MLinearLayoutPolicy* blp = new MLinearLayoutPolicy(bl,Qt::Vertical); - blp->addItem(button0); - blp->addItem(button1); - blp->addItem(button2); - blp->addItem(button3); - blp->addItem(button4); - blp->addItem(button5); - bl->setLandscapePolicy(blp); - - policy->addItem(bl); - setTitle(QFileInfo(imageId).fileName()); // go fullscreen - setComponentsDisplayMode(MApplicationPage::AllComponents, + setComponentsDisplayMode(MApplicationPage::NavigationBar, MApplicationPageModel::AutoHide); } retranslateUi(); @@ -315,6 +292,26 @@ void ItemDetailPage::resizeEvent(QGraphicsSceneResizeEvent *event) relayout(); } +void ItemDetailPage::pinchGestureEvent(QGestureEvent *event, QPinchGesture *gesture) +{ + if (gesture->state() == Qt::GestureStarted) { + lastScaleFactor = 1.0; + } + + image->setZoomFactor(scaleFactor / 10.0); + image->update(); + scaleFactor = scaleFactor * (gesture->scaleFactor() - lastScaleFactor + 1); + + lastScaleFactor = gesture->scaleFactor(); + + if (scaleFactor < 1) + scaleFactor = 1; + else if (scaleFactor > 50) + scaleFactor = 50; + + event->accept(gesture); +} + void ItemDetailPage::relayout() { #ifdef HAVE_GSTREAMER @@ -326,11 +323,11 @@ void ItemDetailPage::relayout() (s.height() - bContainer->size().height())); QPoint tPos = QPoint(((s.width() / 2) - (tContainer->size().width()/2)), 0); - + cContainer->setPos(cPos); bContainer->setPos(bPos); tContainer->setPos(tPos); - + video->setGeometry(QRectF(0,0,s.width(), s.height())); } #endif @@ -370,10 +367,10 @@ void ItemDetailPage::videoReady() QTimer::singleShot(100, this, SLOT(updatePosition())); int minutes = (video->length() / 1000) / 60; - int seconds = (video->length() / 1000) % 60; + int seconds = (video->length() / 1000) % 60; slider->setMinLabel("0:00"); slider->setMaxLabel(QString("%1:%2").arg(minutes).arg(seconds, 2, 10, QChar('0'))); - + setPannable(false); setAutoMarginsForComponentsEnabled(false); setComponentsDisplayMode(MApplicationPage::NavigationBar, MApplicationPageModel::Hide); @@ -425,9 +422,9 @@ void ItemDetailPage::buttonClicked() video->play(); button->setIconID("icon-m-toolbar-mediacontrol-pause"); } - } else + } else video->setFullscreen(!video->isFullscreen()); - } + } #endif } diff --git a/demos/widgetsgallery/itemdetailpage.h b/demos/widgetsgallery/itemdetailpage.h index 9745be29..156db237 100644 --- a/demos/widgetsgallery/itemdetailpage.h +++ b/demos/widgetsgallery/itemdetailpage.h @@ -40,19 +40,19 @@ class QParallelAnimationGroup; //video widget which emits clicked signal class MyVideoWidget : public MVideoWidget -{ +{ Q_OBJECT - + public: MyVideoWidget(QGraphicsItem *parent = 0); Q_SIGNALS: void clicked(); - + protected: - + virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - + private: }; @@ -118,6 +118,10 @@ signals: protected: virtual void retranslateUi(); virtual void resizeEvent(QGraphicsSceneResizeEvent *event); + + virtual void pinchGestureEvent(QGestureEvent *event, QPinchGesture *gesture); + virtual bool event(QEvent *e); + private: void relayout(); @@ -145,4 +149,7 @@ private: QString videoId; QTimer inactivityTimer; + + qreal scaleFactor; + qreal lastScaleFactor; }; diff --git a/demos/widgetsgallery/labelpage.cpp b/demos/widgetsgallery/labelpage.cpp index d4346656..6c449dc2 100644 --- a/demos/widgetsgallery/labelpage.cpp +++ b/demos/widgetsgallery/labelpage.cpp @@ -31,16 +31,14 @@ #include <mlabelhighlighter.h> LabelPage::LabelPage() - : TemplatePage(), + : TemplatePage(TemplatePage::SimpleWidgets), simpleLabel(0), - richLabel(0) + richLabel(0), + phoneHighlighter(0), + urlHighlighter(0), + emailHighlighter(0), + commonHighlighter(0) { - gid = TemplatePage::LayoutsAndVisuals; - - phoneHighlighter = NULL; - emailHighlighter = NULL; - urlHighlighter = NULL; - commonHighlighter = NULL; } LabelPage::~LabelPage() @@ -70,15 +68,6 @@ void LabelPage::createContent() richLabel->setWordWrap(true); containerPolicy->addItem(richLabel); - textEdit = new MTextEdit(MTextEditModel::MultiLine); - containerPolicy->addItem(textEdit); - - MButton *b = new MButton("Highlight"); - containerPolicy->addItem(b); - - connect(b, SIGNAL(clicked()), this, SLOT(applySearch())); - - QRegExp phoneregexp("[\\+]{0,1}(\\d{8,13}|[\\(][\\+]{0,1}\\d{2,}[\\)]*\\d{5,13}|\\d{2,6}[\\-]{1}\\d{2,13}[\\-]*\\d{3,13})", Qt::CaseInsensitive); QRegExp emailregexp("([0-9A-Z]([-\\.\\w]*[0-9A-Z])*@([0-9A-Z][-\\w]*[0-9A-Z]\\.)+[A-Z]{2,9})", @@ -165,17 +154,3 @@ void LabelPage::urlClicked(const QString &link) { mDebug("LabelPage::urlClicked()") << link; } - - -void LabelPage::applySearch() -{ - mDebug("LabelPage::applySearch()") << textEdit->text(); - - richLabel->removeHighlighter(commonHighlighter); - delete commonHighlighter; - - commonHighlighter = new MCommonLabelHighlighter(QRegExp(textEdit->text())); - - richLabel->addHighlighter(commonHighlighter); - -} diff --git a/demos/widgetsgallery/labelpage.h b/demos/widgetsgallery/labelpage.h index 1b68d56d..d3f37260 100644 --- a/demos/widgetsgallery/labelpage.h +++ b/demos/widgetsgallery/labelpage.h @@ -47,7 +47,6 @@ protected slots: void urlClicked(const QString &link); void urlLongPressed(const QString &link); - void applySearch(); private: MLabel *simpleLabel; MLabel *richLabel; @@ -56,8 +55,6 @@ private: MLabelHighlighter *urlHighlighter; MLabelHighlighter *emailHighlighter; MLabelHighlighter *commonHighlighter; - - MTextEdit *textEdit; }; #endif // LABELPAGE_H diff --git a/demos/widgetsgallery/languagepage.cpp b/demos/widgetsgallery/languagepage.cpp index 9ef431b7..f0112d8a 100644 --- a/demos/widgetsgallery/languagepage.cpp +++ b/demos/widgetsgallery/languagepage.cpp @@ -37,7 +37,8 @@ #include <QDateTime> LanguagePage::LanguagePage() - : comboBoxLanguage(0), + : TemplatePage(TemplatePage::ApplicationView), + comboBoxLanguage(0), modelLanguage(0), comboBoxLcTime(0), modelLcTime(0), @@ -57,7 +58,6 @@ LanguagePage::LanguagePage() labelExampleTranslation3(0), labelFontTest(0) { - gid = TemplatePage::UserInput; } LanguagePage::~LanguagePage() @@ -76,16 +76,11 @@ void LanguagePage::createContent() MLayout *layout = new MLayout(panel); MGridLayoutPolicy *policy = new MGridLayoutPolicy(layout); comboBoxLanguage = new MComboBox; - comboBoxLanguage->setIconID("Icon-browser"); policy->addItem(comboBoxLanguage, 1, 1); comboBoxLcTime = new MComboBox; - comboBoxLcTime->setIconID("Icon-browser"); comboBoxLcCollate = new MComboBox; - comboBoxLcCollate->setIconID("Icon-browser"); comboBoxLcNumeric = new MComboBox; - comboBoxLcNumeric->setIconID("Icon-browser"); comboBoxLcMonetary = new MComboBox; - comboBoxLcMonetary->setIconID("Icon-browser"); labelHaveGconf = new MLabel; labelHaveIcu = new MLabel; labelExampleNumber = new MLabel; diff --git a/demos/widgetsgallery/main.cpp b/demos/widgetsgallery/main.cpp index f34137ab..b4572112 100644 --- a/demos/widgetsgallery/main.cpp +++ b/demos/widgetsgallery/main.cpp @@ -31,7 +31,7 @@ #include <MGConfItem> #include <MSceneManager> -#include "listpage.h" +#include "mainpage.h" #include "timedemo.h" #include "swaphook.h" #include "widgetsgalleryretranslator.h" @@ -69,7 +69,7 @@ int main(int argc, char **argv) MApplicationWindow window; window.show(); - ListPage listPage; + MainPage mainPage; Timedemo *timedemo = 0; if (qApp->arguments().indexOf("-timedemo") >= 0) { QStringList demoPages; @@ -78,7 +78,7 @@ int main(int argc, char **argv) demoPages = qApp->arguments()[idx + 1].split(','); } - timedemo = new Timedemo(&listPage, demoPages); + timedemo = new Timedemo(&mainPage, demoPages); idx = qApp->arguments().indexOf("-outputcsv"); if (idx >= 0 && idx + 1 < qApp->arguments().count()) { @@ -93,7 +93,7 @@ int main(int argc, char **argv) int index = qApp->arguments().indexOf("-initialpage"); if (index >= 0) { if (index + 1 < qApp->arguments().count()) { - listPage.setInitialPageToShow(qApp->arguments()[index + 1]); + mainPage.setInitialPageToShow(qApp->arguments()[index + 1]); } } @@ -103,7 +103,7 @@ int main(int argc, char **argv) mainLoopHelper.triggerTermination(EmptyMainLoopHelper::QuitOnEmpty); } - window.sceneManager()->appearSceneWindowNow(&listPage); + window.sceneManager()->appearSceneWindowNow(&mainPage); int exitCode = application.exec(); delete timedemo; diff --git a/demos/widgetsgallery/maincategorypage.cpp b/demos/widgetsgallery/maincategorypage.cpp new file mode 100644 index 00000000..95b36179 --- /dev/null +++ b/demos/widgetsgallery/maincategorypage.cpp @@ -0,0 +1,107 @@ +#include "maincategorypage.h" +#include "mainpage.h" + +#include <MAbstractCellCreator> +#include <MContentItem> +#include <MLayout> +#include <MLinearLayoutPolicy> +#include <MList> + +class WidgetsGalleryCategoryDataModel : public QAbstractListModel { +public: + WidgetsGalleryCategoryDataModel(QAbstractItemModel *parentModel, const QModelIndex &parentIndex) + : QAbstractListModel(), widgetsGalleryModel(parentModel), categoryIndex(parentIndex) { + + } + + QModelIndex parent(const QModelIndex &child) const { + Q_UNUSED(child); + + return categoryIndex; + } + + int rowCount(const QModelIndex &index) const { + Q_UNUSED(index); + + return widgetsGalleryModel->rowCount(categoryIndex); + } + + QVariant data(const QModelIndex &index, int role) const { + return widgetsGalleryModel->data(index, role); + } +private: + QAbstractItemModel *widgetsGalleryModel; + QModelIndex categoryIndex; +}; + +class WidgetGalleryCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + WidgetGalleryCellCreator() : MAbstractCellCreator<MContentItem>() { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainCategoryPageGalleryItem"); + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +MainCategoryPage::MainCategoryPage(QAbstractItemModel *demosDataModel, const QModelIndex &parentIndex) : + dataModel(new WidgetsGalleryCategoryDataModel(demosDataModel, parentIndex)) +{ +} + +QString MainCategoryPage::timedemoTitle() +{ + return "MainCategoryPage"; +} + +void MainCategoryPage::createContent() +{ + TimedemoPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setSpacing(0); + + populateLayout(); +} + +void MainCategoryPage::populateLayout() +{ + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new WidgetGalleryCellCreator()); + list->setItemModel(dataModel); + + policy->addItem(list, Qt::AlignCenter); + + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(galleryPageItemClicked(QModelIndex))); +} + +void MainCategoryPage::galleryPageItemClicked(const QModelIndex &index) +{ + TemplatePage *page = static_cast<TemplatePage *>(index.data(MainPage::Page).value<void *>()); + page->setParent(this); + page->appear(); +} diff --git a/demos/widgetsgallery/maincategorypage.h b/demos/widgetsgallery/maincategorypage.h new file mode 100644 index 00000000..b7443918 --- /dev/null +++ b/demos/widgetsgallery/maincategorypage.h @@ -0,0 +1,34 @@ +#ifndef MAINCATEGORYPAGE_H +#define MAINCATEGORYPAGE_H + +#include "templatepage.h" + +#include <QModelIndex> + +class MLinearLayoutPolicy; +class MList; + +class QAbstractItemModel; + +class MainCategoryPage : public TimedemoPage +{ + Q_OBJECT +public: + MainCategoryPage(QAbstractItemModel* demosDataModel, const QModelIndex &parentIndex); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + +private Q_SLOTS: + void galleryPageItemClicked(const QModelIndex &index); + +private: + QAbstractItemModel *dataModel; + MList *list; + + MLinearLayoutPolicy *policy; +}; + +#endif // MAINCATEGORYPAGE_H diff --git a/demos/widgetsgallery/listpage.cpp b/demos/widgetsgallery/mainpage.cpp index 7588fd8b..000d4e8c 100644 --- a/demos/widgetsgallery/listpage.cpp +++ b/demos/widgetsgallery/mainpage.cpp @@ -17,13 +17,13 @@ ** ****************************************************************************/ -#include "listpage.h" +#include "mainpage.h" +#include "maincategorypage.h" #include "templatepage.h" #include "labelpage.h" #include "pushbuttonpage.h" #include "iconbuttonpage.h" #include "switchpage.h" -#include "dialogsandnotificationspage.h" #include "imagepage.h" #include "applicationmenupage.h" #include "toolbarpage.h" @@ -40,6 +40,12 @@ #include "displaymodespage.h" #include "languagepage.h" #include "feedbackpage.h" +#include "contentitemspage.h" +#include "singleselectiondialogspage.h" +#include "multipleselectiondialogspage.h" +#include "querydialogspage.h" +#include "bannerspage.h" +#include "bubblepage.h" #include <QGraphicsLayoutItem> #include <QGraphicsLinearLayout> @@ -48,9 +54,12 @@ #include <QPointer> #include <QDebug> #include <QSettings> +#include <QStringListModel> #include <QDir> #include <MApplication> +#include <MAbstractCellCreator> +#include <MContentItem> #include <MLocale> #include <MLayout> #include <MButton> @@ -67,90 +76,227 @@ #include <MGConfItem> #endif -MyContainer::MyContainer(QGraphicsItem *parent) - : MContainer(parent) -{ - MLayout *layout = new MLayout(centralWidget()); +class WidgetsGalleryDataModel : public QAbstractItemModel { +public: + typedef QList<TemplatePage*> TemplatePageList; + typedef QList<QString> TemplatePageNameList; +public: + WidgetsGalleryDataModel() : QAbstractItemModel() { + //% "Application View" + addCategory(qtTrId("xx_wg_categories_application_view"), new MainCategoryPage(this, createIndex(0,0))); + //% "Application Menu" + addGalleryPage(index(0,0), qtTrId("xx_wg_application_view_view_menu"), new ApplicationMenuPage()); + //% "Display Modes" + addGalleryPage(index(0,0), qtTrId("xx_wg_application_view_display_modes"), new DisplayModesPage()); + //% "Toolbar (including Tab Bar)" + addGalleryPage(index(0,0), qtTrId("xx_wg_application_view_toolbar_incl_tab_bar"), new ToolBarPage()); + + + //% "Simple Widgets" + addCategory(qtTrId("xx_wg_categories_simple_widgets"), new MainCategoryPage(this, createIndex(1,0))); + //% "Labels" + addGalleryPage(index(1,0), qtTrId("xx_wg_simple_widgets_labels"), new LabelPage()); + //% "Image" + addGalleryPage(index(1,0), qtTrId("xx_wg_simple_widgets_image"), new ImagePage()); + //% "Progress Bar" + addGalleryPage(index(1,0), qtTrId("xx_wg_simple_widgets_progress_bar"), new ProgressBarPage()); + //% "Container" + addGalleryPage(index(1,0), qtTrId("xx_wg_simple_widgets_container"), new ContainerPage()); + //% "Spinner" + addGalleryPage(index(1,0), qtTrId("xx_wg_simple_widgets_spinner"), new SpinnerPage()); + + //% "Buttons" + addCategory(qtTrId("xx_wg_categories_buttons"), new MainCategoryPage(this, createIndex(2,0))); + //% "Push Button" + addGalleryPage(index(2,0), qtTrId("xx_wg_buttons_push_button"), new PushButtonPage()); + //% "Icon Button" + addGalleryPage(index(2,0), qtTrId("xx_wg_buttons_icon_button"), new IconButtonPage()); + //% "Switch" + addGalleryPage(index(2,0), qtTrId("xx_wg_buttons_switch"), new SwitchPage()); + //% "Checkbox" + addGalleryPage(index(2,0), qtTrId("xx_wg_buttons_checkbox"), new CheckboxPage()); + + //% "Dialogs and Banners" + addCategory(qtTrId("xx_wg_categories_dialogs_and_banners"), new MainCategoryPage(this, createIndex(3,0))); + //% "Single Selection Dialog" + addGalleryPage(index(3,0), qtTrId("xx_wg_dialogs_and_banners_single_selection_dialog"), new SingleSelectionDialogsPage()); + //% "Multiple Selection Dialog" + addGalleryPage(index(3,0), qtTrId("xx_wg_dialogs_and_banners_multiple_selection_dialog"), new MultipleSelectionDialogsPage()); + //% "Query Dialog" + addGalleryPage(index(3,0), qtTrId("xx_wg_dialogs_and_banners_query_dialog"), new QueryDialogsPage()); + //% "Banner" + addGalleryPage(index(3,0), qtTrId("xx_wg_dialogs_and_banners_banner"), new BannersPage()); + + //% "Lists, Grids and Popups" + addCategory(qtTrId("xx_wg_categories_lists_grids_and_popups"), new MainCategoryPage(this, createIndex(4,0))); + //% "List" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_list"), new MListPage()); + //% "Grid" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_grid"), new MGridPage()); + //% "Object Menu" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_object_menu"), new ObjectMenuPage()); + //% "ComboBox" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_combobox"), new ComboBoxPage()); + //% "ContentItems" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_contentitems"), new ContentItemsPage()); + //% "Speech bubble" + addGalleryPage(index(4,0), qtTrId("xx_wg_lists_grids_and_popups_bubble"), new BubblePage()); + + //% "User Input" + addCategory(qtTrId("xx_wg_categories_user_input"), new MainCategoryPage(this, createIndex(5,0))); + //% "Text Entries" + addGalleryPage(index(5,0), qtTrId("xx_wg_user_input_text_entries"), new TextEntryPage()); + //% "Slider" + addGalleryPage(index(5,0), qtTrId("xx_wg_user_input_slider"), new SliderPage()); + //% "Input Feedback" + addGalleryPage(index(5,0), qtTrId("xx_wg_user_input_input_feedback"), new FeedbackPage()); - landscapePolicy = new MGridLayoutPolicy(layout); - landscapePolicy->setContentsMargins(0, 0, 0, 0); - landscapePolicy->setSpacing(0); - //To make sure that both columns have the same width, give them the same preferred width. - landscapePolicy->setColumnPreferredWidth(0, 800); - landscapePolicy->setColumnPreferredWidth(1, 800); + } - portraitPolicy = new MLinearLayoutPolicy(layout, Qt::Vertical); - portraitPolicy->setContentsMargins(0, 0, 0, 0); - portraitPolicy->setSpacing(0); + QModelIndex parent(const QModelIndex &child) const { + Q_UNUSED(child); - layout->setLandscapePolicy(landscapePolicy); - layout->setPortraitPolicy(portraitPolicy); -} + if (child.internalId() >= 0) + return index(child.internalId(), 0); -MyContainer::~MyContainer() -{ -} + return QModelIndex(); + } + + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const { + if (parent.isValid()) + return createIndex(row, column, parent.row()); + else + return createIndex(row, column, -1); + } + + int columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + + return 1; + } + + int rowCount(const QModelIndex &parent) const { + Q_UNUSED(parent); + + if (parent.isValid()) + return galleryPages[parent.row()].count(); + else + return categoryPageNames.count(); + } + + QVariant data(const QModelIndex &index, int role) const { + Q_UNUSED(index); + + if (index.isValid()) { + if (role == Qt::DisplayRole || role == MainPage::PageName) { + return getName(index); + } else if (role == MainPage::Page) { + return QVariant::fromValue((void *)getPage(index)); + } else if (role == MainPage::PageTimedemoName) { + return getTimedemoName(index); + } + } + + return QVariant(); + } -void MyContainer::addItem(QGraphicsLayoutItem *button) +private: + void addCategory(const QString &name, MainCategoryPage *page) { + page->setTitle(name); + + categoryPageNames.append(name); + categoryPages.append(page); + } + + void addGalleryPage(const QModelIndex &parent, const QString &name, TemplatePage *page) { + galleryPageNames[parent.row()].append(name); + galleryPages[parent.row()].append(page); + } + + MApplicationPage *getPage(const QModelIndex &index) const { + if (index.parent().isValid()) + return galleryPages[index.parent().row()].at(index.row()); + else + return categoryPages[index.row()]; + } + + const QString &getName(const QModelIndex &index) const { + if (index.parent().isValid()) + return galleryPageNames[index.parent().row()].at(index.row()); + else + return categoryPageNames[index.row()]; + } + + QString getTimedemoName(const QModelIndex &index) const { + if (index.parent().isValid()) + return galleryPages[index.parent().row()].at(index.row())->timedemoTitle(); + + return QString(); + } + +private: + QList<QString> categoryPageNames; + QList<MainCategoryPage*> categoryPages; + QMap<int, TemplatePageList> galleryPages; + QMap<int, TemplatePageNameList> galleryPageNames; +}; + +class WidgetGalleryCategoryCellCreator : public MAbstractCellCreator<MContentItem> { - int count = landscapePolicy->count(); +public: + WidgetGalleryCategoryCellCreator() : MAbstractCellCreator<MContentItem>() { + } - int row = count / 2; - int column = count % 2; + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); - landscapePolicy->addItem(button, row, column); - portraitPolicy->addItem(button); -} + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainPageCategoryItem"); + } + updateCell(index, cell); -ListPage::ListPage(const QString &title) - : shownPage(NULL) + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +MainPage::MainPage(const QString &title) + : shownPage(NULL), languageSettingsPage(NULL) { setTitle(title); connect(this, SIGNAL(appeared()), this, SLOT(showInitialPage())); } -ListPage::~ListPage() +MainPage::~MainPage() { } -QString ListPage::timedemoTitle() +QString MainPage::timedemoTitle() { return "MainPage"; } -void ListPage::createContent() +void MainPage::createContent() { MApplicationPage::createContent(); - addPage(new ApplicationMenuPage); - addPage(new ObjectMenuPage); - addPage(new DialogsAndNotificationsPage); - addPage(new DisplayModesPage); - addPage(new ToolBarPage); - addPage(new ContainerPage); - addPage(new LabelPage); - addPage(new ImagePage); - addPage(new PushButtonPage); - addPage(new IconButtonPage); - addPage(new SwitchPage); - addPage(new ProgressBarPage); - addPage(new SpinnerPage); - addPage(new MListPage); - addPage(new MGridPage); - addPage(new CheckboxPage); - addPage(new ComboBoxPage); - addPage(new TextEntryPage); - addPage(new SliderPage); - addPage(new LanguagePage); - addPage(new FeedbackPage); - QGraphicsWidget *panel = centralWidget(); MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); panel->setLayout(layout); policy = new MLinearLayoutPolicy(layout, Qt::Vertical); - policy->setContentsMargins(6, 6, 6, 6); + policy->setContentsMargins(0, 0, 0, 0); policy->setSpacing(0); populateLayout(); @@ -170,99 +316,41 @@ void ListPage::createContent() this->addAction(action); connect(action, SIGNAL(triggered()), SLOT(toggleFps())); + action = new MAction("Language Settings", this); + action->setLocation(MAction::ApplicationMenuLocation); + this->addAction(action); + connect(action, SIGNAL(triggered()), SLOT(showLanguageSettingsPage())); + retranslateUi(); } -void ListPage::retranslateUi() +void MainPage::retranslateUi() { //% "Widgets Gallery" setTitle(qtTrId("xx_application_title")); - QList<MButton *> keys = buttons.keys(); - const int keysCount = keys.count(); - for (int i = 0; i < keysCount; ++i) { - MButton *button = keys[i]; - MApplicationPage *page = buttons.value(button); - if (!page) continue; - - // the retranslateUi() is normally only executed when a - // page is visible, but because we need the new translations - // of the titles, we have to do this hack here. - // we call retranslateUi for the pages. - QEvent ev(QEvent::LanguageChange); - qApp->sendEvent(page, &ev); - - button->setText(page->title()); - } - if (!isContentCreated()) return; - - QStringList groupNames = TemplatePage::groupNames(); - const int count = groupNames.count(); - for (int i = 0; i < count; ++i) - containers[i]->setTitle(groupNames[i]); - } -MGridLayoutPolicy *ListPage::createAndSetupGridPolicy(MWidget *panel) -{ - MLayout *layout = new MLayout(panel); - MGridLayoutPolicy *policy = new MGridLayoutPolicy(layout); - policy->setContentsMargins(6, 6, 6, 6); - policy->setSpacing(0); - return policy; -} - -void ListPage::setInitialPageToShow(const QString& initialPageToShow) +void MainPage::setInitialPageToShow(const QString& initialPageToShow) { this->initialPageToShow = initialPageToShow; } -void ListPage::populateLayout() +void MainPage::populateLayout() { - QStringList groupNames = TemplatePage::groupNames(); - - const int pageCount = pages.count(); - const int groupNamesCount = groupNames.count(); - for (int i = 0; i < groupNamesCount; ++i) { - - MyContainer *container = new MyContainer; - containers.append(container); - policy->addItem(container); - - int numButtons = 0; - for (int j = 0; j < pageCount; ++j) { - TemplatePage *page = qobject_cast<TemplatePage *>(pages[j]); - if (!page || page->groupID() != i) continue; - - MButton *listItem = new MButton(page->title()); - container->addItem(listItem); - numButtons++; + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new WidgetGalleryCategoryCellCreator()); + list->setItemModel(new WidgetsGalleryDataModel()); + policy->addItem(list, Qt::AlignCenter); - listItem->connect(listItem, SIGNAL(clicked()), this, SLOT(handleListItemClick())); - buttons.insert(listItem, page); - } - //If we only have one item, add an empty spacer widget to ensure that we have two columns - if (numButtons == 1) { - QGraphicsWidget *widget = new QGraphicsWidget; - widget->setMinimumSize(80, 0); - container->addItem(widget); - } - } - - centralWidget()->setContentsMargins(0, 0, 0, 25); -} - -void ListPage::addPage(TemplatePage *page) -{ - // Take ownership of page - page->setParent(this); - pages.append(page); + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(categoryItemClicked(QModelIndex))); } -void ListPage::handleListItemClick() +void MainPage::handleListItemClick() { QObject *sender_object = sender(); if (sender_object) { @@ -275,12 +363,7 @@ void ListPage::handleListItemClick() } } -int ListPage::pageCount() const -{ - return pages.count(); -} - -void ListPage::showPage(MApplicationPage *page) +void MainPage::showPage(MApplicationPage *page) { if (page) { page->appear(); @@ -288,31 +371,46 @@ void ListPage::showPage(MApplicationPage *page) } } -void ListPage::showPageByIndex(int index) +void MainPage::showLanguageSettingsPage() { - showPage(findPageByIndex(index)); + if (!languageSettingsPage) { + languageSettingsPage = new LanguagePage(); + languageSettingsPage->setParent(this); + } + languageSettingsPage->appear(); } -TemplatePage *ListPage::findPageByIndex(int index) const +TemplatePage *MainPage::findPageByTimedemoTitle(const QString& title) const { - if (index >= 0 && index < pages.count()) { - return pages[ index ]; + QAbstractItemModel *model = list->itemModel(); + for (int i = 0; i < model->rowCount(); ++i) { + QModelIndex parent = model->index(i, 0); + for (int j = 0; j < model->rowCount(parent); j++) { + QModelIndex item = model->index(j, 0, parent); + QString pageTitle = item.data(MainPage::PageTimedemoName).toString(); + if (pageTitle == title) { + return static_cast<TemplatePage *>(item.data(MainPage::Page).value<void *>()); + } + } } - return 0; } -TemplatePage *ListPage::findPageByTimedemoTitle(const QString& title) const +QList<TemplatePage *> MainPage::demoPages() { - for (int i = 0; i < pages.size(); ++i) { - if (pages.at(i)->timedemoTitle() == title) { - return pages.at(i); + QList<TemplatePage *> pages; + QAbstractItemModel *model = list->itemModel(); + for (int i = 0; i < model->rowCount(); ++i) { + QModelIndex parent = model->index(i, 0); + for (int j = 0; j < model->rowCount(parent); j++) { + QModelIndex item = model->index(j, 0, parent); + pages.append(static_cast<TemplatePage *>(item.data(MainPage::Page).value<void *>())); } } - return 0; + return pages; } -void ListPage::showPageByTimedemoTitle(const QString& name) +void MainPage::showPageByTimedemoTitle(const QString& name) { TemplatePage *page = findPageByTimedemoTitle(name); if (page) { @@ -397,7 +495,7 @@ QList<ThemeInfo> findAvailableThemes() extern void M_changeTheme(const QString &theme); #endif -void ListPage::showThemeSelectionDialog() +void MainPage::showThemeSelectionDialog() { QList<ThemeInfo> themes = findAvailableThemes(); @@ -435,7 +533,7 @@ void ListPage::showThemeSelectionDialog() delete dialog; } -void ListPage::showOrientationSelectionDialog() +void MainPage::showOrientationSelectionDialog() { QPointer<MDialog> dialog = new MDialog("Select orientation (angle)", M::OkButton | M::CancelButton); @@ -507,7 +605,7 @@ void ListPage::showOrientationSelectionDialog() applicationWindow()->setOrientationLocked(false); } else if (mode == portrait) { applicationWindow()->setOrientationAngleLocked(false); - applicationWindow()->setOrientationAngle(M::Angle90); + applicationWindow()->setOrientationAngle(M::Angle270); applicationWindow()->setOrientationLocked(true); } else if (mode == landscape) { applicationWindow()->setOrientationAngleLocked(false); @@ -535,14 +633,20 @@ void ListPage::showOrientationSelectionDialog() delete dialog; } -void ListPage::toggleFps() +void MainPage::toggleFps() { MApplication::instance()->setShowFps(!MApplication::showFps()); } -void ListPage::showInitialPage() +void MainPage::showInitialPage() { if (!initialPageToShow.isEmpty()) { showPageByTimedemoTitle(initialPageToShow); } } + +void MainPage::categoryItemClicked(const QModelIndex &index) +{ + MainCategoryPage *page = static_cast<MainCategoryPage *>(index.data(MainPage::Page).value<void *>()); + showPage(page); +} diff --git a/demos/widgetsgallery/listpage.h b/demos/widgetsgallery/mainpage.h index 35950eb5..58d1a7ab 100644 --- a/demos/widgetsgallery/listpage.h +++ b/demos/widgetsgallery/mainpage.h @@ -17,65 +17,59 @@ ** ****************************************************************************/ -#ifndef LISTPAGE_H -#define LISTPAGE_H +#ifndef MAINPAGE_H +#define MAINPAGE_H -#include <MContainer> #include <QHash> +#include <QModelIndex> -#include "timedemopage.h" +#include "templatepage.h" -class TemplatePage; class QGraphicsLayoutItem; class MGridLayoutPolicy; class MLinearLayoutPolicy; class MLabel; +class MList; class MButton; class QSettings; -class MyContainer : public MContainer -{ -public: - MyContainer(QGraphicsItem *parent = 0); - virtual ~MyContainer(); - - MGridLayoutPolicy *landscapePolicy; - MLinearLayoutPolicy *portraitPolicy; - - void addItem(QGraphicsLayoutItem *button); - -}; +class LanguagePage; -class ListPage : public TimedemoPage +class MainPage : public TimedemoPage { Q_OBJECT public: - ListPage(const QString &title = ""); - virtual ~ListPage(); + typedef QHash<QString, TemplatePage*> TemplatePageHashMap; + + enum DataRole { + Page = Qt::UserRole, + PageName, + PageTimedemoName + }; + +public: + MainPage(const QString &title = ""); + virtual ~MainPage(); virtual QString timedemoTitle(); virtual void createContent(); - void addPage(TemplatePage *page); - int pageCount() const; - TemplatePage *findPageByIndex(int index) const; + QList<TemplatePage*> demoPages(); TemplatePage *findPageByTimedemoTitle(const QString& title) const; void showPageByTimedemoTitle(const QString& name); - static MGridLayoutPolicy *createAndSetupGridPolicy(MWidget *panel); - void setInitialPageToShow(const QString& initialPageToShow); - QList<TemplatePage *> pages; - public slots: void handleListItemClick(); void showThemeSelectionDialog(); - void showPageByIndex(int index); void showOrientationSelectionDialog(); void toggleFps(); void showInitialPage(); + void showLanguageSettingsPage(); + + void categoryItemClicked(const QModelIndex &index); protected: virtual void retranslateUi(); @@ -85,11 +79,11 @@ private: void showPage(MApplicationPage *page); private: - QList<MLabel *> groupLabels; - QList<MContainer *> containers; + MList *list; MApplicationPage *shownPage; MLinearLayoutPolicy *policy; + LanguagePage *languageSettingsPage; QHash<MButton *, TemplatePage *> buttons; diff --git a/demos/widgetsgallery/mgridpage.cpp b/demos/widgetsgallery/mgridpage.cpp index bee02d64..9da214b9 100644 --- a/demos/widgetsgallery/mgridpage.cpp +++ b/demos/widgetsgallery/mgridpage.cpp @@ -23,6 +23,8 @@ #include <QGraphicsSceneContextMenuEvent> #include <QPointer> +#include <MApplication> +#include <MApplicationWindow> #include <MContentItem> #include <MAbstractCellCreator> #include <MLabel> @@ -142,12 +144,12 @@ QSizeF ContentItemCreator::cellSize() const } MGridPage::MGridPage() - : pageShown(false), - m_itemSize(10,10), - m_columnsPortrait(2), - m_columnsLandscape(4) + : TemplatePage(TemplatePage::ListsGridsAndPopups), + pageShown(false), + m_itemSize(10,10), + m_columnsPortrait(2), + m_columnsLandscape(4) { - gid = TemplatePage::ListsGridsAndMenus; setObjectName("gridPage"); } @@ -160,9 +162,9 @@ void MGridPage::createContent() MApplicationPage::createContent(); MTheme::addPixmapDirectory(QDir(CONTACTS_DIR).canonicalPath()); - QGraphicsWidget * panel = centralWidget(); + QGraphicsWidget *panel = centralWidget(); - MLayout* layout = new MLayout(panel); + MLayout *layout = new MLayout(panel); layout->setContentsMargins(0,0,0,0); panel->setLayout(layout); @@ -173,24 +175,30 @@ void MGridPage::createContent() layout->setPortraitPolicy(portraitPolicy); list = new MList(panel); - list->setObjectName( "wgList" ); + list->setObjectName("wgList"); landscapePolicy->addItem(list); portraitPolicy->addItem(list); - connect( this, SIGNAL(appeared()), this, SLOT(configureGrid()) ); + if (MApplication::activeApplicationWindow()->orientation() == M::Landscape) { + list->setColumns(m_columnsLandscape); + m_itemSize.setWidth(exposedContentRect().width() / m_columnsLandscape); + } else { + list->setColumns(m_columnsPortrait); + m_itemSize.setWidth(exposedContentRect().width() / m_columnsPortrait); + } + m_itemSize.setHeight(m_itemSize.width()); - ContentItemCreator * cellCreator = new ContentItemCreator(this); - list->setCellCreator(cellCreator); + connect(this, SIGNAL(appeared()), this, SLOT(configureGrid())); - m_itemSize.setWidth( geometry().width() / m_columnsLandscape ); - m_itemSize.setHeight( m_itemSize.width() ); + ContentItemCreator *cellCreator = new ContentItemCreator(this); + list->setCellCreator(cellCreator); - GridModel * model = new GridModel(m_itemSize.toSize(), Utils::mediaArtDir()); + GridModel *model = new GridModel(m_itemSize.toSize(), Utils::mediaArtDir()); list->setItemModel(model); - connect( this, SIGNAL(rate(MediaType::Rating,QString)), model, SLOT(rateImage(MediaType::Rating,QString)) ); + connect(this, SIGNAL(rate(MediaType::Rating,QString)), model, SLOT(rateImage(MediaType::Rating,QString))); //% "Configuration" - MAction* configurationAction = new MAction(qtTrId("xx_gridpage_configuration"), this); + MAction *configurationAction = new MAction(qtTrId("xx_gridpage_configuration"), this); configurationAction->setLocation(MAction::ApplicationMenuLocation); connect(configurationAction, SIGNAL(triggered()), this, SLOT(showGridConfigurationDialog())); addAction(configurationAction); @@ -267,18 +275,24 @@ void MGridPage::orientationChangeEvent(MOrientationChangeEvent *event) { MApplicationPage::orientationChangeEvent(event); - connect( sceneManager(), SIGNAL(orientationChangeFinished(M::Orientation)), this, SLOT(orientationChanged(M::Orientation))); + orientationChanged(event->orientation()); } void MGridPage::configureGrid() { - if( sceneManager()->orientation() == M::Portrait ) { - m_itemSize.setHeight( list->geometry().width() / m_columnsPortrait ); + configureGrid(sceneManager()->orientation()); +} + +void MGridPage::configureGrid(M::Orientation orientation) +{ + if (orientation == M::Portrait) { + m_itemSize.setHeight(list->geometry().width() / m_columnsPortrait); list->setColumns(m_columnsPortrait); } else { - m_itemSize.setHeight( list->geometry().width() / m_columnsLandscape ); + m_itemSize.setHeight(list->geometry().width() / m_columnsLandscape); list->setColumns(m_columnsLandscape); } + m_itemSize.setWidth(m_itemSize.height()); updateGeometry(); update(); @@ -344,6 +358,5 @@ void MGridPage::modifyRowsSliderHandle(int newValue) void MGridPage::orientationChanged(M::Orientation orientation) { - Q_UNUSED(orientation) - configureGrid(); + configureGrid(orientation); } diff --git a/demos/widgetsgallery/mgridpage.h b/demos/widgetsgallery/mgridpage.h index 9bdb09d0..1e5df706 100644 --- a/demos/widgetsgallery/mgridpage.h +++ b/demos/widgetsgallery/mgridpage.h @@ -66,6 +66,7 @@ protected: private slots: void backButtonClicked(); void configureGrid(); + void configureGrid(M::Orientation orientation); private: MList *list; diff --git a/demos/widgetsgallery/mlistpage.cpp b/demos/widgetsgallery/mlistpage.cpp index ddb74f39..fa73a4f1 100644 --- a/demos/widgetsgallery/mlistpage.cpp +++ b/demos/widgetsgallery/mlistpage.cpp @@ -36,13 +36,18 @@ #include <MButton> #include <MTheme> #include <MAction> +#include <MSortFilterProxyModel> #include <MComboBox> #include <MDebug> -#include <MContentItem> #include <MWidgetAction> +#include "phonebookcell.h" + +#include <MListFilter> +#include <MTextEdit> +#include <MPannableViewport> #include "utils.h" @@ -53,16 +58,16 @@ #endif MListPage::MListPage() - : model(NULL), + : TemplatePage(TemplatePage::ListsGridsAndPopups), + model(NULL), #ifndef HAVE_N900 proxyModel(NULL), #endif imageLoader(NULL), - list(NULL), - currentSortingIndex(0), + list(NULL), + currentSortingIndex(0), currentListModeIndex(0) { - gid = TemplatePage::ListsGridsAndMenus; } MListPage::~MListPage() @@ -76,49 +81,67 @@ QString MListPage::timedemoTitle() return "List"; } -class MListContentItemCreator : public MAbstractCellCreator<MContentItem> +class MListContentItemCreator : public MAbstractCellCreator<PhoneBookCell> { public: - MListContentItemCreator() : amountOfColumns(1) { - + MListContentItemCreator() : amountOfColumns(1), highlightText("") { } - + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const + { + // FIXME: It's a workaround against a bug, that if the layout is created and + // set in constructor then the pixmaps are properly loaded. + PhoneBookCell *cell = dynamic_cast<PhoneBookCell *>(recycler.take(PhoneBookCell::staticMetaObject.className())); + if (cell == NULL) { + cell = new PhoneBookCell; + cell->initLayout(); + } + updateCell(index, cell); + return cell; + } + void updateCell(const QModelIndex &index, MWidget *cell) const { - MContentItem *contentItem = qobject_cast<MContentItem *>(cell); - if (contentItem == NULL) // TODO This is shouldn't happen, list must know what it doing, but with multiple columns it happens sometimes + PhoneBookCell *listCell = qobject_cast<PhoneBookCell*>(cell); + if (listCell == NULL) // TODO This is shouldn't happen, list must know what it doing, but with multiple columns it happens sometimes return; - + QVariant data = index.data(Qt::DisplayRole); - + #ifdef HAVE_N900 Contact *contact = data.value<Contact*>(); - contentItem->setTitle(contact->getName()); + listCell->setTitle(contact->getName()); QStringList numbers = contact->getPhoneNumbers(); if (numbers.size() > 0) { - contentItem->setSubtitle(numbers[0]); + listCell->setSubtitle(numbers[0]); } else { QStringList addresses = contact->getEmailAddresses(); if (addresses.size() > 0) { - contentItem->setSubtitle(addresses[0]); + listCell->setSubtitle(addresses[0]); } else { - contentItem->setSubtitle(QString()); + listCell->setSubtitle(QString()); } } - contentItem->setPixmap(contact->getAvatar()); + cellContent->setImage(contact->getAvatar().toImage()); #else PhoneBookEntry *entry = static_cast<PhoneBookEntry *>(data.value<void *>()); - contentItem->setTitle(entry->fullName); - contentItem->setSubtitle(entry->phoneNumber); - contentItem->setImage(entry->thumbnail); -#endif - contentItem->boundingRect(); + if(highlightText == "") + listCell->setTitle(entry->fullName); + else { + QString highlightedTitle = entry->fullName; + highlightedTitle.replace(highlightText, "<b>" + highlightText + "</b>"); + listCell->setTitle(highlightedTitle); + } - updateContentItemMode(index, contentItem); - } + listCell->setSubtitle(entry->phoneNumber); + listCell->setImage(entry->thumbnail); +#endif - void updateContentItemMode(const QModelIndex &index, MContentItem *contentItem) const { + updateContentItemMode(index, listCell); + } + + void updateContentItemMode(const QModelIndex &index, MListItem *contentItem) const { int flatRow = index.row(); int row = flatRow / amountOfColumns; int column = flatRow % amountOfColumns; @@ -134,48 +157,48 @@ public: if (columns == 1) { if (rows > 1){ if (row == 0) - contentItem->setItemMode(MContentItem::SingleColumnTop); + contentItem->setLayoutPosition(M::VerticalTopPosition); else if (row < rows - 1) - contentItem->setItemMode(MContentItem::SingleColumnCenter); + contentItem->setLayoutPosition(M::VerticalCenterPosition); else - contentItem->setItemMode(MContentItem::SingleColumnBottom); + contentItem->setLayoutPosition(M::VerticalBottomPosition); } else { - contentItem->setItemMode(MContentItem::Single); + contentItem->setLayoutPosition(M::DefaultPosition); } } else if (columns > 1) { if (rows > 1) { if (row == 0) { if (column == 0) - contentItem->setItemMode(MContentItem::TopLeft); + contentItem->setLayoutPosition(M::TopLeftPosition); else if (column > 0 && column < columns - 1 && !last) - contentItem->setItemMode(MContentItem::Top); + contentItem->setLayoutPosition(M::TopCenterPosition); else - contentItem->setItemMode(MContentItem::TopRight); + contentItem->setLayoutPosition(M::TopRightPosition); } else if (row < rows - 1) { if (column == 0) - contentItem->setItemMode(MContentItem::Left); + contentItem->setLayoutPosition(M::CenterLeftPosition); else if (column > 0 && column < columns - 1 && !last) - contentItem->setItemMode(MContentItem::Center); + contentItem->setLayoutPosition(M::CenterPosition); else if (flatRow + columns > totalItems) - contentItem->setItemMode(MContentItem::BottomRight); + contentItem->setLayoutPosition(M::BottomRightPosition); else - contentItem->setItemMode(MContentItem::Right); + contentItem->setLayoutPosition(M::CenterRightPosition); } else { if (column == 0) - contentItem->setItemMode(MContentItem::BottomLeft); + contentItem->setLayoutPosition(M::BottomLeftPosition); else if (column > 0 && column < columns - 1 && !last) - contentItem->setItemMode(MContentItem::Bottom); + contentItem->setLayoutPosition(M::BottomCenterPosition); else - contentItem->setItemMode(MContentItem::BottomRight); + contentItem->setLayoutPosition(M::BottomRightPosition); } } else { if (column == 0) - contentItem->setItemMode(MContentItem::SingleRowLeft); + contentItem->setLayoutPosition(M::HorizontalLeftPosition); else if (column > 0 && column < columns - 1 && !last) - contentItem->setItemMode(MContentItem::SingleRowCenter); + contentItem->setLayoutPosition(M::HorizontalCenterPosition); else - contentItem->setItemMode(MContentItem::SingleRowRight); + contentItem->setLayoutPosition(M::HorizontalRightPosition); } } } @@ -185,8 +208,13 @@ public: amountOfColumns = columns; } + void highlightByText(QString text) { + highlightText = text; + } + private: int amountOfColumns; + QString highlightText; }; void MListPage::loadPicturesInVisibleItems() @@ -206,9 +234,13 @@ void MListPage::setPlainListModel() imageLoader = new ContactImageLoader(); #else model = new PhoneBookModel(); - - proxyModel = new PhoneBookSortedModel(); + + proxyModel = new MSortFilterProxyModel(); + proxyModel->setSortRole(PhoneBookModel::PhoneBookSortRole); + proxyModel->setFilterRole(PhoneBookModel::PhoneBookFilterRole); proxyModel->setSourceModel(model); + + list->setItemModel(proxyModel); imageLoader = new PhoneBookImageLoader; @@ -297,6 +329,12 @@ void MListPage::createActions() listIndexModes << "Hidden" << "Visible"; combo = createComboBoxAction("List index mode", listIndexModes); connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(changeListIndexVisibility(int))); + + QStringList liveFilteringModes; + liveFilteringModes << "Off" << "On"; + combo = createComboBoxAction("Live Filtering", liveFilteringModes); + combo->setCurrentIndex(1); // live filtering is enabled by default + connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLiveFilteringMode(int))); } void MListPage::scrollToBottom() @@ -315,18 +353,10 @@ void MListPage::changeSortingOrder(int index) case None: break; case Ascending: -#ifdef HAVE_N900 - model->sort(0, Qt::AscendingOrder); -#else proxyModel->sort(0, Qt::AscendingOrder); -#endif break; case Descending: -#ifdef HAVE_N900 - model->sort(0, Qt::DescendingOrder); -#else - proxyModel->sort(0, Qt::DescendingOrder); -#endif + proxyModel->sort(0, Qt::DescendingOrder); break; } currentSortingIndex = index; @@ -339,7 +369,6 @@ void MListPage::changeAmountOfItemInList(int index) Q_ASSERT(index >= 0 && index < 4); if(currentListModeIndex == Grouped) { - proxyModel->setShowGroups(false); list->setShowGroups(false); } @@ -360,15 +389,14 @@ void MListPage::changeListMode(int index) case Plain: list->setShowGroups(false); #ifndef HAVE_N900 - proxyModel->setShowGroups(false); + model->setGrouped(false); #endif - break; case Grouped: list->setShowGroups(true); #ifndef HAVE_N900 - proxyModel->setShowGroups(true); + model->setGrouped(true); #endif break; } @@ -421,6 +449,25 @@ void MListPage::changeListIndexVisibility(int index) list->setIndexVisible(indexVisible); } +void MListPage::changeLiveFilteringMode(int index) +{ + Q_ASSERT(index >= 0 && index <= 1); + bool enableLF = (index == 1); + + if(enableLF) { + list->filtering()->setEnabled(true); + list->filtering()->setFilterRole(PhoneBookModel::PhoneBookFilterRole); + list->filtering()->editor()->setVisible(false); + connect(list->filtering(), SIGNAL(listPannedUpFromTop()), this, SLOT(filteringVKB())); + connect(list->filtering()->editor(), SIGNAL(textChanged()), this, SLOT(liveFilteringTextChanged())); + } else { + disconnect(list->filtering(), SIGNAL(listPannedUpFromTop()), this, SLOT(filteringVKB())); + disconnect(list->filtering()->editor(), SIGNAL(textChanged()), this, SLOT(liveFilteringTextChanged())); + list->filtering()->setEnabled(false); + showTextEdit(false); + } +} + void MListPage::itemClick(const QModelIndex &index) { mDebug("MListPage::itemClick") << "Row was clicked: " << index.row(); @@ -436,7 +483,9 @@ void MListPage::removeListItem() { if(longTappedIndex.isValid()) { mDebug("MListPage::removeListItem") << "Row about to be removed: " << longTappedIndex.row(); - model->removeRow(longTappedIndex.row(), longTappedIndex.parent()); +#ifndef HAVE_N900 + proxyModel->removeRow(longTappedIndex.row(), longTappedIndex.parent()); +#endif } } @@ -445,6 +494,42 @@ void MListPage::editListItem() mDebug("MListPage::editListItem") << "Not implemented yet."; } +void MListPage::liveFilteringTextChanged() +{ + // With HWKB live filtering text edit is shown when user enters text + if(list->filtering()->enabled() && list->filtering()->editor()->text() != "" && !list->filtering()->editor()->isOnDisplay()) + showTextEdit(true); + + // Highlighting matching live filtering text can be done by + // passing the text to cell creator and updating visible items + cellCreator->highlightByText(list->filtering()->editor()->text()); + static_cast<PhoneBookModel*>(model)->updateData(list->firstVisibleItem(), list->lastVisibleItem()); +} + +void MListPage::filteringVKB() +{ + // With VKB live filtering text edit is shown when user pans the list up starting from top position + if(!list->filtering()->editor()->isOnDisplay()) { + showTextEdit(true); + list->filtering()->editor()->setFocus(); + } +} + +void MListPage::showTextEdit(bool show) { + QGraphicsWidget* panel = centralWidget(); + QGraphicsLinearLayout* layout = (QGraphicsLinearLayout*) panel->layout(); + MTextEdit* textEdit = list->filtering()->editor(); + if(show && !textEdit->isOnDisplay()) { + layout->insertItem(0, textEdit); + textEdit->setVisible(true); + pannableViewport()->setPosition(QPointF(0,0)); + } else if(textEdit->isOnDisplay()) { + textEdit->setVisible(false); + layout->removeAt(0); + textEdit->setText(""); + } +} + void MListPage::createContent() { MApplicationPage::createContent(); @@ -476,6 +561,10 @@ void MListPage::createContent() connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(itemClick(QModelIndex))); connect(list, SIGNAL(itemLongTapped(QModelIndex)), this, SLOT(itemLongTapped(QModelIndex))); + + changeLiveFilteringMode(1); // live filtering is enabled by default + + retranslateUi(); } void MListPage::retranslateUi() diff --git a/demos/widgetsgallery/mlistpage.h b/demos/widgetsgallery/mlistpage.h index cd196ea1..92052d9e 100644 --- a/demos/widgetsgallery/mlistpage.h +++ b/demos/widgetsgallery/mlistpage.h @@ -34,13 +34,14 @@ class ContactModel; class ContactImageLoader; #else class PhoneBookModel; -class PhoneBookSortedModel; +class MSortFilterProxyModel; class PhoneBookImageLoader; #endif class MList; class MComboBox; class MListContentItemCreator; +class MAbstractItemModel; class MListPage: public TemplatePage { @@ -79,6 +80,7 @@ public slots: void changeSelectionMode(int index); void changeSeparatorsMode(int index); void changeListIndexVisibility(int index); + void changeLiveFilteringMode(int index); void scrollToBottom(); void scrollToTop(); @@ -89,11 +91,15 @@ public slots: void removeListItem(); void editListItem(); + void liveFilteringTextChanged(); + void filteringVKB(); + protected: void retranslateUi(); private: MComboBox *createComboBoxAction(const QString &title, const QStringList &itemsList); + void showTextEdit(bool show); private: @@ -101,8 +107,8 @@ private: ContactModel* model; ContactImageLoader* imageLoader; #else - PhoneBookModel *model; - PhoneBookSortedModel *proxyModel; + MAbstractItemModel *model; + MSortFilterProxyModel *proxyModel; PhoneBookImageLoader *imageLoader; #endif diff --git a/demos/widgetsgallery/multipleselectiondialogspage.cpp b/demos/widgetsgallery/multipleselectiondialogspage.cpp new file mode 100644 index 00000000..324ca2aa --- /dev/null +++ b/demos/widgetsgallery/multipleselectiondialogspage.cpp @@ -0,0 +1,126 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "multipleselectiondialogspage.h" + +#include <MAbstractCellCreator> +#include <MButton> +#include <MContentItem> +#include <MDialog> +#include <MLabel> +#include <MLayout> +#include <MList> +#include <MLinearLayoutPolicy> +#include <MMessageBox> + +#include <QGraphicsLinearLayout> +#include <QStringListModel> +#include <QTimer> + +class MultipleSelectionDialogsPageCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + MultipleSelectionDialogsPageCellCreator() : MAbstractCellCreator<MContentItem>() { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainPageCategoryItem"); + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +MultipleSelectionDialogsPage::MultipleSelectionDialogsPage() + : TemplatePage(TemplatePage::DialogsAndBanners) +{ +} + +QString MultipleSelectionDialogsPage::timedemoTitle() +{ + return "MultipleSelectionDialogsPage"; +} + +void MultipleSelectionDialogsPage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); + + populateLayout(); +} + +void MultipleSelectionDialogsPage::populateLayout() +{ + QStringList multipleSelectionDialogTypes; + //% "Question Dialog" + multipleSelectionDialogTypes << qtTrId("xx_wg_multiple_selection_dialogs_page_question_dialog"); + + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new MultipleSelectionDialogsPageCellCreator()); + list->setItemModel(new QStringListModel(multipleSelectionDialogTypes)); + policy->addItem(list, Qt::AlignCenter); + + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(itemClicked(QModelIndex))); +} + +void MultipleSelectionDialogsPage::itemClicked(const QModelIndex &index) +{ + if (index.row() == 0) + openQuestionDialog(); +} + +void MultipleSelectionDialogsPage::openQuestionDialog() +{ + if (dialog) + return; + + dialog = new MDialog( + //% "Question Dialog Title" + qtTrId("xx_dialogs_and_notifications_question_dialog_title"), + M::YesButton | M::NoButton); + dialog->setCentralWidget( + //% "Lorem ipsum dolor sit amet?" + new MLabel(qtTrId("xx_dialogs_and_notifications_question_dialog_content"))); + + dialog->appear(MSceneWindow::DestroyWhenDone); +} + diff --git a/demos/widgetsgallery/multipleselectiondialogspage.h b/demos/widgetsgallery/multipleselectiondialogspage.h new file mode 100644 index 00000000..46745da6 --- /dev/null +++ b/demos/widgetsgallery/multipleselectiondialogspage.h @@ -0,0 +1,55 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef MULTIPLESELECTIONDIALOGSPAGE_H +#define MULTIPLESELECTIONDIALOGSPAGE_H + +#include "templatepage.h" + +#include <QModelIndex> +#include <QPointer> + +class MDialog; +class MList; + +class MultipleSelectionDialogsPage : public TemplatePage +{ + Q_OBJECT + +public: + MultipleSelectionDialogsPage(); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + + void openQuestionDialog(); + +private Q_SLOTS: + void itemClicked(const QModelIndex &index); + +private: + MLinearLayoutPolicy *policy; + MList *list; + + QPointer<MDialog> dialog; +}; + +#endif // MULTIPLESELECTIONDIALOGSPAGE_H diff --git a/demos/widgetsgallery/objectmenupage.cpp b/demos/widgetsgallery/objectmenupage.cpp index 9bda2beb..069815c5 100644 --- a/demos/widgetsgallery/objectmenupage.cpp +++ b/demos/widgetsgallery/objectmenupage.cpp @@ -33,12 +33,11 @@ #include "utils.h" ObjectMenuPage::ObjectMenuPage() : - TemplatePage(), + TemplatePage(TemplatePage::ListsGridsAndPopups), containerFriends(0), containerAlbums(0) { - gid = TemplatePage::ListsGridsAndMenus; } ObjectMenuPage::~ObjectMenuPage() diff --git a/demos/widgetsgallery/phonebookcell.cpp b/demos/widgetsgallery/phonebookcell.cpp new file mode 100644 index 00000000..395bbda7 --- /dev/null +++ b/demos/widgetsgallery/phonebookcell.cpp @@ -0,0 +1,143 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + + +#include "phonebookcell.h" + +#include <MLabel> +#include <MLayout> + +#include <MGridLayoutPolicy> +#include <MLinearLayoutPolicy> +#include <MImageWidget> +#include <MProgressIndicator> + +PhoneBookCell::PhoneBookCell() + : MListItem(), + layout(NULL), + titleLabel(NULL), + subtitleLabel(NULL), + imageWidget(NULL) +{ +} + +PhoneBookCell::~PhoneBookCell() +{ +} + +void PhoneBookCell::initLayout() +{ + setLayout(createLayout()); +} + +MLayout *PhoneBookCell::createLayout() +{ + layout = new MLayout(this); + landscapePolicy = new MGridLayoutPolicy(layout); + landscapePolicy->setContentsMargins(0, 0, 0, 0); + landscapePolicy->setSpacing(0); + + // title + titleLabel = new MLabel(this); + titleLabel->setTextElide(true); + titleLabel->setObjectName("CommonTitle"); + + // subtitle + subtitleLabel = new MLabel(this); + subtitleLabel->setTextElide(true); + subtitleLabel->setObjectName("CommonSubTitle"); + + // icon + imageWidget = new MImageWidget(this); + imageWidget->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + imageWidget->setObjectName("CommonMainIcon"); + imageWidget->setVisible(false); + + // spinner + spinner = new MProgressIndicator(this, MProgressIndicator::spinnerType); + spinner->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + spinner->setUnknownDuration(true); + spinner->setObjectName("CommonMainIcon"); + + // add to layout + landscapePolicy->addItem(spinner, 0, 0, 4, 1); + landscapePolicy->addItem(titleLabel, 1, 1, Qt::AlignTop); + landscapePolicy->addItem(subtitleLabel, 2, 1); + landscapePolicy->addItem(new QGraphicsWidget(), 3, 1); + + portraitPolicy = new MLinearLayoutPolicy(layout, Qt::Horizontal); + portraitPolicy->setContentsMargins(0, 0, 0, 0); + portraitPolicy->setSpacing(0); + portraitPolicy->addItem(spinner); + portraitPolicy->addItem(titleLabel); + + layout->setPortraitPolicy(portraitPolicy); + layout->setLandscapePolicy(landscapePolicy); + + return layout; +} + +QString PhoneBookCell::title() const +{ + return titleLabel->text(); +} + +void PhoneBookCell::setTitle(const QString &title) +{ + titleLabel->setText(title); +} + +QString PhoneBookCell::subtitle() const +{ + return subtitleLabel->text(); +} + +void PhoneBookCell::setSubtitle(const QString &subtitle) +{ + subtitleLabel->setText(subtitle); +} + +QImage PhoneBookCell::image() const +{ + return imageWidget->pixmap()->toImage(); +} + +void PhoneBookCell::setImage(const QImage &image) +{ + imageWidget->setImage(image); + imageWidget->setVisible(true); + + if (layout->policy() == landscapePolicy) { + if (landscapePolicy->itemAt(0, 0) == spinner && !image.isNull()) { + landscapePolicy->removeItem(spinner); + landscapePolicy->addItem(imageWidget, 0, 0, 4, 1); + } else if (landscapePolicy->itemAt(0, 0) == imageWidget && image.isNull()) { + landscapePolicy->removeItem(imageWidget); + landscapePolicy->addItem(spinner, 0, 0, 4, 1); + } + } else if (layout->policy() == portraitPolicy) { + if (portraitPolicy->itemAt(0) == imageWidget && image.isNull()) { + portraitPolicy->removeAt(0); + portraitPolicy->insertItem(0, spinner, Qt::AlignLeft); + } else if (portraitPolicy->itemAt(0) == spinner && !image.isNull()) { + portraitPolicy->removeAt(0); + portraitPolicy->insertItem(0, imageWidget, Qt::AlignLeft); + } + } +} diff --git a/demos/widgetsgallery/phonebookcell.h b/demos/widgetsgallery/phonebookcell.h new file mode 100644 index 00000000..6c3419f4 --- /dev/null +++ b/demos/widgetsgallery/phonebookcell.h @@ -0,0 +1,73 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef PHONEBOOKCELLCONTENT_H +#define PHONEBOOKCELLCONTENT_H + +#include <QGraphicsWidget> +#include <QImage> + +#include <MLayout> +#include <MListItem> + +class MListItem; +class MGridLayoutPolicy; +class MLinearLayoutPolicy; +class MImageWidget; +class MLabel; +class MProgressIndicator; + +class PhoneBookCell : public MListItem +{ + Q_OBJECT + + Q_PROPERTY(QString title READ title WRITE setTitle) + Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle) + Q_PROPERTY(QImage image READ image WRITE setImage) + +public: + PhoneBookCell(); + virtual ~PhoneBookCell(); + + void initLayout(); + + QString title() const; + void setTitle(const QString &title); + + QString subtitle() const; + void setSubtitle(const QString &title); + + QImage image() const; + void setImage(const QImage &image); + +private: + MLayout *createLayout(); + +private: + MLayout *layout; + MGridLayoutPolicy *landscapePolicy; + MLinearLayoutPolicy *portraitPolicy; + + MProgressIndicator *spinner; + MLabel *titleLabel; + MLabel *subtitleLabel; + MImageWidget *imageWidget; +}; + +#endif // PHONEBOOKCONTENTITEM_H diff --git a/demos/widgetsgallery/phonebookmodel.cpp b/demos/widgetsgallery/phonebookmodel.cpp index 17878d85..372cfee3 100644 --- a/demos/widgetsgallery/phonebookmodel.cpp +++ b/demos/widgetsgallery/phonebookmodel.cpp @@ -26,13 +26,13 @@ #include <QTimer> #include <MTheme> +#include <MSortFilterProxyModel> PhoneBookModel::PhoneBookModel() + : MAbstractItemModel() { namesList = loadFakeNames(); imageIdList = loadFakeImageIds(); - defaultThumbnail = QImage(Utils::imagesDir() + "DefaultAvatar.png"); - modelRowCount = 0; } PhoneBookModel::~PhoneBookModel() @@ -40,26 +40,6 @@ PhoneBookModel::~PhoneBookModel() qDeleteAll(phoneBookEntries); } -QVariant PhoneBookModel::data(const QModelIndex &index, int role) const -{ - // This function will be called many times during fast panning, lets - // check boundaries and validnes only in debug mode - Q_ASSERT(index.isValid()); - Q_ASSERT(index.row() < phoneBookEntries.size()); - - if (role == Qt::DisplayRole) { - // Let's store a pointer into QVariant, otherwise QT will make a copy but we are lazy - // and don't want to copy stuff around - return QVariant::fromValue(static_cast<void *>(phoneBookEntries[index.row()])); - } else if (role == PhoneBookModel::PhoneBookSortRole) { - return QVariant::fromValue(phoneBookEntries[index.row()]->lastName); - } else if (role == PhoneBookModel::PhoneBookFilterRole) { - return QVariant::fromValue(phoneBookEntries[index.row()]->fullName); - } - - return QVariant(); -} - QStringList PhoneBookModel::loadFakeNames() { QStringList listNames; @@ -126,34 +106,66 @@ PhoneBookEntry *PhoneBookModel::generateEntry() return entry; } -int PhoneBookModel::rowCount(const QModelIndex &parent) const +int PhoneBookModel::groupCount() const +{ + return groups.count(); +} + +int PhoneBookModel::rowCountInGroup(int group) const { - Q_UNUSED(parent); + if (group < groupsSize.count() && group >= 0) + return groupsSize[group]; + else if (group == -1) + return phoneBookEntries.count(); + + return 0; +} - return modelRowCount; +QString PhoneBookModel::groupTitle(int group) const +{ + if (group < groups.count()) + return groups[group]; + + return QString(); } -int PhoneBookModel::columnCount(const QModelIndex &parent) const +QVariant PhoneBookModel::itemData(int row, int group, int role) const { - Q_UNUSED(parent); + int flatRow = row; + + if (group >= 0 && row >= 0) + flatRow = itemGroupCache[group][row]; - return 1; + // This function will be called many times during fast panning, lets + // check boundaries and validnes only in debug mode + Q_ASSERT(flatRow >= 0); + Q_ASSERT(flatRow < phoneBookEntries.size()); + + if (role == Qt::DisplayRole) + return QVariant::fromValue(static_cast<void *>(phoneBookEntries[flatRow])); + else if (role == PhoneBookSortRole) + return QVariant::fromValue(phoneBookEntries[flatRow]->lastName); + else if (role == PhoneBookFilterRole) + return QVariant::fromValue(phoneBookEntries[flatRow]->fullName); + + return QVariant(); } bool PhoneBookModel::insertRows(int row, int count, const QModelIndex &parent) { emit layoutAboutToBeChanged(); - beginInsertRows(parent, row, row + count - 1); + + beginInsertRows(parent, row, row + count - 1, false); for (int i = phoneBookEntries.size(); i < count; i++) { PhoneBookEntry *entry = generateEntry(); phoneBookEntries.append(entry); } - - if(!parent.isValid()) - modelRowCount += count; + + regenerateModel(); endInsertRows(); + emit layoutChanged(); return true; } @@ -161,40 +173,60 @@ bool PhoneBookModel::insertRows(int row, int count, const QModelIndex &parent) bool PhoneBookModel::removeRows(int row, int count, const QModelIndex &parent) { emit layoutAboutToBeChanged(); + if (count <= 0) return true; //Successfully removed 0 rows. - - beginRemoveRows(parent, row, row + count - 1); - modelRowCount -= count; + + int flatRow = row; + int group = parent.row(); + + if (isGrouped() && group >= 0) + flatRow = itemGroupCache[group][row]; + + beginRemoveRows(parent, row, row + count - 1, true); + + qDeleteAll(phoneBookEntries.begin() + flatRow, phoneBookEntries.begin() + flatRow + count - 1); + phoneBookEntries.remove(flatRow, count); + + regenerateModel(); + endRemoveRows(); emit layoutChanged(); return true; } +void PhoneBookModel::regenerateModel() +{ + groups.clear(); + groupsSize.clear(); + itemGroupCache.clear(); + for (int i = 0; i < phoneBookEntries.count(); i++) { + PhoneBookEntry *entry = phoneBookEntries[i]; + if (!entry) + continue; + + QChar group = entry->fullName[0]; + if (!groups.contains(group)) { + groups.append(group); + groupsSize.append(1); + } else { + groupsSize[groups.indexOf(group)] ++ ; + } + itemGroupCache[groups.indexOf(group)].append(i); + } +} + void PhoneBookModel::thumbnailWasLoaded(const QModelIndex &index) { emit dataChanged(index, index); } -void PhoneBookModel::sort(int column, Qt::SortOrder order) +void PhoneBookModel::updateData(const QModelIndex &first, const QModelIndex &last) { - Q_UNUSED(column); - - for (int i = 0; i < phoneBookEntries.size(); i++) { - for (int j = i + 1; j < phoneBookEntries.size(); j++) { - PhoneBookEntry *iEntry = phoneBookEntries.at(i); - PhoneBookEntry *jEntry = phoneBookEntries.at(j); - if((order == Qt::AscendingOrder && iEntry->fullName > jEntry->fullName) || - (order == Qt::DescendingOrder && iEntry->fullName < jEntry->fullName)) { - phoneBookEntries.replace(i, jEntry); - phoneBookEntries.replace(j, iEntry); - } - } - } + emit dataChanged(first, last); } - PhoneBookImageLoader::PhoneBookImageLoader() { @@ -291,154 +323,22 @@ void PhoneBookImageLoader::processJobQueue() // but this is one way to achieve same result. void PhoneBookImageLoader::notifyModel(const QModelIndex &index) { +#ifndef HAVE_N900 QAbstractItemModel *model = const_cast<QAbstractItemModel *>(index.model()); Q_ASSERT(model); if (model) { - PhoneBookSortedModel *proxyModel = dynamic_cast<PhoneBookSortedModel *>(model); - Q_ASSERT(proxyModel); - proxyModel->thumbnailWasLoaded(index); - } -} - -PhoneBookSortedModel::PhoneBookSortedModel() : QSortFilterProxyModel(NULL), showGroups(false) -{ - // By default QSortFilterProxyModel uses Qt::DisplayRole for sorting and filter however we are - // returning pointer in QVariant so it won't work, to solve that we need to set custom roles - // and in the data() of model, we need to return corresponding QString - setSortRole(PhoneBookModel::PhoneBookSortRole); - setFilterRole(PhoneBookModel::PhoneBookFilterRole); -} - -PhoneBookSortedModel::~PhoneBookSortedModel() -{ - -} - -QModelIndex PhoneBookSortedModel::mapFromSource(const QModelIndex &sourceIndex) const -{ - return QSortFilterProxyModel::mapFromSource(sourceIndex); -} - -QModelIndex PhoneBookSortedModel::mapToSource(const QModelIndex &proxyIndex) const -{ - return QSortFilterProxyModel::mapToSource(proxyIndex); -} - -void PhoneBookSortedModel::thumbnailWasLoaded(const QModelIndex &index) -{ - emit dataChanged(index, index); -} - -void PhoneBookSortedModel::setShowGroups(bool showGroups) -{ - if (this->showGroups != showGroups) { - this->showGroups = showGroups; - if (this->showGroups) { - sort(0, Qt::AscendingOrder); - createGroupedModel(); + MSortFilterProxyModel *sortModel = dynamic_cast<MSortFilterProxyModel *>(model); + Q_ASSERT(sortModel); + PhoneBookModel *phoneBookModel = dynamic_cast<PhoneBookModel *>(sortModel->sourceModel()); + if (phoneBookModel == NULL) { + // Looks like live filtering is enabled + // one more cast step needed to get the + // the correct source index. + MSortFilterProxyModel *filterModel = dynamic_cast<MSortFilterProxyModel *>(sortModel->sourceModel()); + if (filterModel) + phoneBookModel = dynamic_cast<PhoneBookModel *>(filterModel->sourceModel()); } - else - createPlainModel(); + phoneBookModel->thumbnailWasLoaded(sortModel->mapToSource(index)); } -} - - -void PhoneBookSortedModel::createPlainModel() -{ - int plainRowCount = totalRowCount(); - treeHeaderIndex.clear(); - - removeRows(0, rowCount()); - insertRows(0, plainRowCount); -} - -void PhoneBookSortedModel::createGroupedModel() -{ - treeHeaderIndex.clear(); - - QVector<PhoneBookEntry *> phoneBookEntries; - for (int i = 0; i < sourceModel()->rowCount(); i++) { - PhoneBookEntry *entry = static_cast<PhoneBookEntry *>(sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).value<void *>()); - phoneBookEntries.append(entry); - QChar firstLetter = sourceModel()->data(sourceModel()->index(i, 0), PhoneBookModel::PhoneBookSortRole).toString()[0]; - - treeHeaderIndex[firstLetter].push_back(entry); - } - - removeRows(0, rowCount()); - - insertRows(0, treeHeaderIndex.keys().count(), QModelIndex()); - for (int i = 0; i < treeHeaderIndex.keys().count(); i++) { - QChar key = treeHeaderIndex.keys()[i]; - int count = treeHeaderIndex[key].count(); - insertRows(0, count, index(i, 0, QModelIndex())); - } -} - -int PhoneBookSortedModel::totalRowCount() -{ - int totalRowCount = 0; - - foreach(PhoneBookEntryVector entries, treeHeaderIndex.values()) { - totalRowCount += entries.count(); - } - - return totalRowCount; -} - -void PhoneBookSortedModel::sort(int column, Qt::SortOrder order) -{ - Q_UNUSED(column); - - if(showGroups) - return; - - sourceModel()->sort(column, order); - - emit dataChanged(index(0, 0), index(rowCount(), 0)); -} - -QModelIndex PhoneBookSortedModel::parent(const QModelIndex &child) const -{ - return QSortFilterProxyModel::parent(child); -} - -int PhoneBookSortedModel::rowCount(const QModelIndex &parent) const -{ - if (showGroups) { - if (!parent.isValid()) { - return treeHeaderIndex.keys().count(); - } else if (parent.row() < treeHeaderIndex.keys().count()) { - QChar key = treeHeaderIndex.keys().at(parent.row()); - return treeHeaderIndex[key].count(); - } - } - return QSortFilterProxyModel::rowCount(parent); -} - -bool PhoneBookSortedModel::hasChildren(const QModelIndex &parent) const -{ - if (showGroups && parent.isValid() && !parent.parent().isValid()) - return true; - else - return false; -} - -QVariant PhoneBookSortedModel::data(const QModelIndex &index, int role) const -{ - if (showGroups && index.isValid()) { - if (role == Qt::DisplayRole) { - if (!index.parent().isValid()) { - return QVariant::fromValue(treeHeaderIndex.keys().at(index.row())); - } else { - QChar key = treeHeaderIndex.uniqueKeys().at(index.parent().row()); - PhoneBookEntry *entry = treeHeaderIndex[key].at(index.row()); - return QVariant::fromValue(static_cast<void *>(entry)); - } - } - } - if (index.isValid()) - return QSortFilterProxyModel::data(index, role); - - return QVariant(); +#endif } diff --git a/demos/widgetsgallery/phonebookmodel.h b/demos/widgetsgallery/phonebookmodel.h index b3e849ea..0a4570bc 100644 --- a/demos/widgetsgallery/phonebookmodel.h +++ b/demos/widgetsgallery/phonebookmodel.h @@ -26,6 +26,8 @@ #include <QVector> #include <QImage> +#include <MAbstractItemModel> + // Structure which contain data for each row struct PhoneBookEntry { QString firstName; // store first and last names for searching @@ -62,10 +64,10 @@ private: QList<Job> thumbnailLoadingJobs; }; -class PhoneBookModel: public QAbstractTableModel +class PhoneBookModel: public MAbstractItemModel { Q_OBJECT - + public: // Defining roles here which will be used for sorting and filtering in PhoneBookSortedModel enum PhoneBookRoles { @@ -76,61 +78,35 @@ public: PhoneBookModel(); virtual ~PhoneBookModel(); - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int groupCount() const; + int rowCountInGroup(int group) const; + QString groupTitle(int group) const; + QVariant itemData(int row, int group, int role) const; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); void thumbnailWasLoaded(const QModelIndex &index); - - void sort(int column, Qt::SortOrder order); + void updateData(const QModelIndex &first, const QModelIndex &last); + private: QStringList loadFakeNames(); QStringList loadFakeImageIds(); PhoneBookEntry *generateEntry(); QString generatePhoneNumber(); + void regenerateModel(); private: QVector<PhoneBookEntry *> phoneBookEntries; QStringList namesList; QStringList imageIdList; QImage defaultThumbnail; - int modelRowCount; -}; - -class PhoneBookSortedModel : public QSortFilterProxyModel -{ -public: - typedef QVector<PhoneBookEntry*> PhoneBookEntryVector; -public: - PhoneBookSortedModel(); - virtual ~PhoneBookSortedModel(); - void thumbnailWasLoaded(const QModelIndex &index); - void setShowGroups(bool showGroups); - -public: - void sort(int column, Qt::SortOrder order); - QModelIndex parent(const QModelIndex &child) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - -public: - QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; - QModelIndex mapToSource(const QModelIndex &proxyIndex) const; - -private: - void createPlainModel(); - void createGroupedModel(); - - int totalRowCount(); - -private: - bool showGroups; - QMap<QChar, PhoneBookEntryVector> treeHeaderIndex; + QList<QChar> groups; + QList<int> groupsSize; + + typedef QList<int> ListOfInt; + QMap<int, ListOfInt> itemGroupCache; }; #endif diff --git a/demos/widgetsgallery/progressbarpage.cpp b/demos/widgetsgallery/progressbarpage.cpp index c8daf762..8b8f2b3d 100644 --- a/demos/widgetsgallery/progressbarpage.cpp +++ b/demos/widgetsgallery/progressbarpage.cpp @@ -29,14 +29,12 @@ #include <MSceneManager> ProgressBarPage::ProgressBarPage() : - TemplatePage(), - + TemplatePage(TemplatePage::SimpleWidgets), bar1(0), bar2(0), label1(0), label2(0) { - gid = TemplatePage::IndicatorsAndNotifications; } ProgressBarPage::~ProgressBarPage() diff --git a/demos/widgetsgallery/pushbuttonpage.cpp b/demos/widgetsgallery/pushbuttonpage.cpp index 0f8900c7..ad75f83f 100644 --- a/demos/widgetsgallery/pushbuttonpage.cpp +++ b/demos/widgetsgallery/pushbuttonpage.cpp @@ -30,12 +30,11 @@ #include <MApplication> PushButtonPage::PushButtonPage() : - TemplatePage(), + TemplatePage(TemplatePage::Buttons), pushButton1(0), pushButton2(0), pushButton3(0) { - gid = TemplatePage::Buttons; } PushButtonPage::~PushButtonPage() @@ -56,7 +55,7 @@ void PushButtonPage::createContent() containerPolicy->addItem(pushButton1); pushButton2 = new MButton(); - pushButton2->setIconID("icon-m-messaging-smiley-surprised"); + pushButton2->setIconID("icon-m-messaging-smiley-tongue"); containerPolicy->addItem(pushButton2); pushButton3 = new MButton(); diff --git a/demos/widgetsgallery/pushbuttonpage.h b/demos/widgetsgallery/pushbuttonpage.h index 86366ac1..d7a6bb73 100644 --- a/demos/widgetsgallery/pushbuttonpage.h +++ b/demos/widgetsgallery/pushbuttonpage.h @@ -20,7 +20,7 @@ #ifndef PUSHBUTTONPAGE_H #define PUSHBUTTONPAGE_H -#include "listpage.h" +#include "mainpage.h" #include "templatepage.h" #include <MApplicationPage> #include <MLayout> diff --git a/demos/widgetsgallery/querydialogspage.cpp b/demos/widgetsgallery/querydialogspage.cpp new file mode 100644 index 00000000..2e4a2328 --- /dev/null +++ b/demos/widgetsgallery/querydialogspage.cpp @@ -0,0 +1,193 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "querydialogspage.h" + +#include <MAbstractCellCreator> +#include <MButton> +#include <MContentItem> +#include <MDialog> +#include <MLabel> +#include <MLayout> +#include <MList> +#include <MLinearLayoutPolicy> +#include <MMessageBox> +#include <MTextEdit> + +#include <QGraphicsLinearLayout> +#include <QStringListModel> +#include <QTimer> + +class QueryDialogsPageCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + QueryDialogsPageCellCreator() : MAbstractCellCreator<MContentItem>() { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainPageCategoryItem"); + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +QueryDialogsPage::QueryDialogsPage() + : TemplatePage(TemplatePage::DialogsAndBanners) +{ +} + +QString QueryDialogsPage::timedemoTitle() +{ + return "QueryDialogsPage"; +} + +void QueryDialogsPage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); + + populateLayout(); +} + +void QueryDialogsPage::populateLayout() +{ + QStringList queryDialogTypes; + //% "Entry Dialog" + queryDialogTypes << qtTrId("xx_wg_query_dialogs_page_entry_dialog"); + //% "Long Dialog" + queryDialogTypes << qtTrId("xx_wg_query_dialogs_page_long_dialog"); + + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new QueryDialogsPageCellCreator()); + list->setItemModel(new QStringListModel(queryDialogTypes)); + policy->addItem(list, Qt::AlignCenter); + + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(itemClicked(QModelIndex))); +} + +void QueryDialogsPage::itemClicked(const QModelIndex &index) +{ + if (index.row() == 0) + openEntryDialog(); + else if (index.row() == 1) + openLongDialog(); +} + +void QueryDialogsPage::openEntryDialog() +{ + if (dialog) + return; + + MWidget *centralWidget = new MWidget; + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + //% "Name" + MLabel *label = new MLabel(qtTrId("xx_dialogs_and_notifications_entry_dialog_label"), centralWidget); + MTextEdit *textEdit = new MTextEdit(MTextEditModel::SingleLine, + QString(), + centralWidget); + centralWidget->setLayout(layout); + + layout->addItem(label); + layout->addItem(textEdit); + + //% "Please enter your name" + dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_entry_dialog_title"), + M::OkButton | M::ResetButton); + dialog->setCentralWidget(centralWidget); + + dialog->appear(MSceneWindow::DestroyWhenDone); +} + +void QueryDialogsPage::openLongDialog() +{ + if (dialog) + return; + + MWidget *centralWidget = new MWidget; + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical); + + //% "Select printer" + dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_long_dialog_title"), M::CancelButton); + dialog->setCentralWidget(centralWidget); + MButton *button = 0; + + centralWidget->setLayout(layout); + +#define ADD_PRINTER_BUTTON(NAME) \ + button = new MButton(NAME, centralWidget); \ + connect(button, SIGNAL(clicked()), dialog, SLOT(accept())); \ + layout->addItem(button); + + ADD_PRINTER_BUTTON("Lexmark A"); + ADD_PRINTER_BUTTON("Lexmark B"); + ADD_PRINTER_BUTTON("Lexmark C"); + ADD_PRINTER_BUTTON("Lexmark D"); + ADD_PRINTER_BUTTON("Canon Alpha"); + ADD_PRINTER_BUTTON("Canon Beta"); + ADD_PRINTER_BUTTON("Canon Gama"); + ADD_PRINTER_BUTTON("Canon Zeta"); + ADD_PRINTER_BUTTON("Brother 1"); + ADD_PRINTER_BUTTON("Brother 2"); + ADD_PRINTER_BUTTON("Brother 3"); + ADD_PRINTER_BUTTON("Brother 4"); + ADD_PRINTER_BUTTON("Xerox I"); + ADD_PRINTER_BUTTON("Xerox II"); + ADD_PRINTER_BUTTON("Xerox III"); + ADD_PRINTER_BUTTON("Xerox IV"); + ADD_PRINTER_BUTTON("Dell Roger"); + ADD_PRINTER_BUTTON("Dell Charlie"); + ADD_PRINTER_BUTTON("Dell Bravo"); + ADD_PRINTER_BUTTON("Dell Tango"); + ADD_PRINTER_BUTTON("HP X"); + ADD_PRINTER_BUTTON("HP Y"); + ADD_PRINTER_BUTTON("HP Z"); + ADD_PRINTER_BUTTON("HP Plus"); + ADD_PRINTER_BUTTON("Epson Stylus"); + ADD_PRINTER_BUTTON("Epson Pro"); + ADD_PRINTER_BUTTON("Epson Office"); + ADD_PRINTER_BUTTON("Epson Extra"); + +#undef ADD_PRINTER_BUTTON + + dialog->appear(MSceneWindow::DestroyWhenDone); +} diff --git a/demos/widgetsgallery/querydialogspage.h b/demos/widgetsgallery/querydialogspage.h new file mode 100644 index 00000000..62e2daab --- /dev/null +++ b/demos/widgetsgallery/querydialogspage.h @@ -0,0 +1,56 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef QUERYDIALOGSPAGE_H +#define QUERYDIALOGSPAGE_H + +#include "templatepage.h" + +#include <QModelIndex> +#include <QPointer> + +class MDialog; +class MList; + +class QueryDialogsPage : public TemplatePage +{ + Q_OBJECT + +public: + QueryDialogsPage(); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + + void openEntryDialog(); + void openLongDialog(); + +private Q_SLOTS: + void itemClicked(const QModelIndex &index); + +private: + MLinearLayoutPolicy *policy; + MList *list; + + QPointer<MDialog> dialog; +}; + +#endif // QUERYDIALOGSPAGE_H diff --git a/demos/widgetsgallery/singleselectiondialogspage.cpp b/demos/widgetsgallery/singleselectiondialogspage.cpp new file mode 100644 index 00000000..8d149ae2 --- /dev/null +++ b/demos/widgetsgallery/singleselectiondialogspage.cpp @@ -0,0 +1,227 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "singleselectiondialogspage.h" + +#include <MAbstractCellCreator> +#include <MButton> +#include <MContentItem> +#include <MDialog> +#include <MLabel> +#include <MLayout> +#include <MList> +#include <MLinearLayoutPolicy> +#include <MMessageBox> + +#include <QGraphicsLinearLayout> +#include <QStringListModel> +#include <QTimer> + +class SingleSelectionDialogsPageCellCreator : public MAbstractCellCreator<MContentItem> +{ +public: + SingleSelectionDialogsPageCellCreator() : MAbstractCellCreator<MContentItem>() { + } + + MWidget *createCell(const QModelIndex &index, MWidgetRecycler &recycler) const { + Q_UNUSED(index); + + MContentItem *cell = dynamic_cast<MContentItem *>(recycler.take(MContentItem::staticMetaObject.className())); + if (cell == NULL) { + cell = new MContentItem(MContentItem::SingleTextLabel); + cell->setObjectName("wgMainPageCategoryItem"); + } + updateCell(index, cell); + + return cell; + } + + void updateCell(const QModelIndex &index, MWidget *cell) const { + MContentItem *item = qobject_cast<MContentItem*>(cell); + if(!item) + return; + + item->setTitle(index.data().toString()); + } +}; + +SingleSelectionDialogsPage::SingleSelectionDialogsPage() + : TemplatePage(TemplatePage::DialogsAndBanners) +{ +} + +QString SingleSelectionDialogsPage::timedemoTitle() +{ + return "SingleSelectionDialogsPage"; +} + +void SingleSelectionDialogsPage::createContent() +{ + MApplicationPage::createContent(); + + QGraphicsWidget *panel = centralWidget(); + + MLayout *layout = new MLayout(panel); + layout->setContentsMargins(0, 0, 0, 0); + panel->setLayout(layout); + policy = new MLinearLayoutPolicy(layout, Qt::Vertical); + policy->setContentsMargins(0, 0, 0, 0); + policy->setSpacing(0); + + populateLayout(); +} + +void SingleSelectionDialogsPage::populateLayout() +{ + QStringList singleSelectionDialogTypes; + //% "Stacked Dialogs" + singleSelectionDialogTypes << qtTrId("xx_wg_single_selection_dialogs_page_stacked_dialogs"); + //% "System Modal Dialog" + singleSelectionDialogTypes << qtTrId("xx_wg_single_selection_dialogs_page_system_modal_dialog"); + //% "Dialog with Progress Indicator" + singleSelectionDialogTypes << qtTrId("xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"); + //% "Message Box" + singleSelectionDialogTypes << qtTrId("xx_wg_single_selection_dialogs_page_message_box"); + + list = new MList(centralWidget()); + list->setObjectName("wgList"); + list->setCellCreator(new SingleSelectionDialogsPageCellCreator()); + list->setItemModel(new QStringListModel(singleSelectionDialogTypes)); + policy->addItem(list, Qt::AlignCenter); + + connect(list, SIGNAL(itemClicked(QModelIndex)), this, SLOT(itemClicked(QModelIndex))); +} + +void SingleSelectionDialogsPage::itemClicked(const QModelIndex &index) +{ + if (index.row() == 0) + openStackedDialogs(); + else if (index.row() == 1) + openSystemModalDialog(); + else if (index.row() == 2) + openDialogWithProgressIndicator(); + else if (index.row() == 3) + openMessageBox(); +} + +void SingleSelectionDialogsPage::openStackedDialogs() +{ + if (dialog) + return; + + //% "Click to spawn a nested dialog" + MButton *button = new MButton(qtTrId("xx_dialogs_and_notifications_stacked_dialog_button")); + //% "Stacked dialogs" + dialog = new MDialog(qtTrId("xx_dialogs_and_notifications_stacked_dialog_title"), M::CancelButton); + dialog->setCentralWidget(button); + + connect(button, SIGNAL(clicked()), SLOT(openNestedDialog())); + + dialog->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::openNestedDialog() +{ + if (nestedDialog) + return; + + //% "Click to open a nested message box" + MButton *button = new MButton(qtTrId("xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox")); + //% "This is a nested dialog" + nestedDialog = new MDialog(qtTrId("xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"), M::CancelButton); + nestedDialog->setCentralWidget(button); + connect(button, SIGNAL(clicked()), SLOT(openNestedMessageBox())); + + nestedDialog->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::openNestedMessageBox() +{ + if (nestedMessageBox) + return; + + //% "I'm a nested message box" + nestedMessageBox = new MMessageBox(qtTrId("xx_dialogs_and_notifications_stacked_dialog_messagebox_text")); + nestedMessageBox->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::openSystemModalDialog() +{ + if (dialog) + return; + + dialog = new MDialog( + //% "System Modal Dialog" + qtTrId("xx_dialogs_and_notifications_system_modal_dialog_title"), + M::OkButton); + + dialog->setCentralWidget( + //% "I'm a window modal dialog.\n" + //% "There's no way around me!\n" + //% "Muwhahaha... [evil laugh]" + new MLabel(qtTrId("xx_dialogs_and_notifications_system_modal_dialog_label"))); + + dialog->setSystemModal(true); + + dialog->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::openDialogWithProgressIndicator() +{ + if (dialog) + return; + + MButton *button = new MButton(); + button->setViewType(MButton::switchType); + button->setCheckable(true); + button->setChecked(true); + connect(button, SIGNAL(toggled(bool)), this, SLOT(setDialogProgressIndicatorVisible(bool))); + + //% "Progress Indicator" + MLabel *label = new MLabel(qtTrId("xx_dialogs_and_notifications_progress_indicator")); + + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Horizontal); + layout->addStretch(); + layout->addItem(label); + layout->addItem(button); + layout->addStretch(); + + dialog = new MDialog("Lorem ipsum", M::NoStandardButton); + dialog->centralWidget()->setLayout(layout); + dialog->setProgressIndicatorVisible(true); + dialog->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::openMessageBox() +{ + if (dialog) + return; + + //% "Hello World!" + dialog = new MMessageBox(qtTrId("xx_dialogs_and_notifications_message_box_text"), M::OkButton); + dialog->appear(MSceneWindow::DestroyWhenDone); +} + +void SingleSelectionDialogsPage::setDialogProgressIndicatorVisible(bool visible) +{ + if (dialog) { + dialog->setProgressIndicatorVisible(visible); + } +} + diff --git a/demos/widgetsgallery/singleselectiondialogspage.h b/demos/widgetsgallery/singleselectiondialogspage.h new file mode 100644 index 00000000..5ca1a2e7 --- /dev/null +++ b/demos/widgetsgallery/singleselectiondialogspage.h @@ -0,0 +1,63 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libmeegotouch. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#ifndef SINGLESELECTIONDIALOGSPAGE_H +#define SINGLESELECTIONDIALOGSPAGE_H + +#include "templatepage.h" + +#include <QModelIndex> +#include <QPointer> + +class MDialog; +class MList; + +class SingleSelectionDialogsPage : public TemplatePage +{ + Q_OBJECT + +public: + SingleSelectionDialogsPage(); + + QString timedemoTitle(); + + void createContent(); + void populateLayout(); + + void openStackedDialogs(); + void openSystemModalDialog(); + void openDialogWithProgressIndicator(); + void openMessageBox(); + +private Q_SLOTS: + void itemClicked(const QModelIndex &index); + void openNestedDialog(); + void openNestedMessageBox(); + void setDialogProgressIndicatorVisible(bool visible); + +private: + MLinearLayoutPolicy *policy; + MList *list; + + QPointer<MDialog> dialog; + QPointer<MDialog> nestedDialog; + QPointer<MDialog> nestedMessageBox; +}; + +#endif // SINGLESELECTIONDIALOGSPAGE_H diff --git a/demos/widgetsgallery/sliderpage.cpp b/demos/widgetsgallery/sliderpage.cpp index f3fc2e50..980a6402 100644 --- a/demos/widgetsgallery/sliderpage.cpp +++ b/demos/widgetsgallery/sliderpage.cpp @@ -31,7 +31,7 @@ #include <QTimer> SliderPage::SliderPage() : - TemplatePage(), + TemplatePage(TemplatePage::UserInput), ageLabel(0), ageSlider(0), ageContainer(0), @@ -45,7 +45,6 @@ SliderPage::SliderPage() : brightnessSlider(0), brightnessContainer(0) { - gid = TemplatePage::LayoutsAndVisuals; } SliderPage::~SliderPage() diff --git a/demos/widgetsgallery/spinnerpage.cpp b/demos/widgetsgallery/spinnerpage.cpp index ab1c0334..19d1685f 100644 --- a/demos/widgetsgallery/spinnerpage.cpp +++ b/demos/widgetsgallery/spinnerpage.cpp @@ -40,7 +40,7 @@ static const int ImageSize = 64; SpinnerPage::SpinnerPage() : - TemplatePage(), + TemplatePage(TemplatePage::SimpleWidgets), container(NULL), spinner(NULL), spinnerLayout1(NULL), @@ -49,7 +49,6 @@ SpinnerPage::SpinnerPage() : description(NULL), view(Unknown) { - gid = TemplatePage::IndicatorsAndNotifications; } SpinnerPage::~SpinnerPage() @@ -77,10 +76,10 @@ void SpinnerPage::createContent() connect(action, SIGNAL(triggered()), this, SLOT(inContainerHeader())); addAction(action); - //% "In view menu" + //% "In application menu" action = new MAction(qtTrId("xx_spinner_page_menu"), this); action->setLocation(MAction::ApplicationMenuLocation); - connect(action, SIGNAL(triggered()), this, SLOT(inViewmenu())); + connect(action, SIGNAL(triggered()), this, SLOT(inApplicationMenu())); addAction(action); //% "In dialog" @@ -195,7 +194,7 @@ void SpinnerPage::timeout() } } -void SpinnerPage::inViewmenu() +void SpinnerPage::inApplicationMenu() { reset(); view = Menu; diff --git a/demos/widgetsgallery/spinnerpage.h b/demos/widgetsgallery/spinnerpage.h index d8191616..ac1d3d03 100644 --- a/demos/widgetsgallery/spinnerpage.h +++ b/demos/widgetsgallery/spinnerpage.h @@ -49,7 +49,7 @@ public: public slots: void inApplicationMainArea(); void inContainerHeader(); - void inViewmenu(); + void inApplicationMenu(); void inDialog(); void launchDialog(); diff --git a/demos/widgetsgallery/swaphook.cpp b/demos/widgetsgallery/swaphook.cpp index 786df674..ba5c20e0 100644 --- a/demos/widgetsgallery/swaphook.cpp +++ b/demos/widgetsgallery/swaphook.cpp @@ -10,7 +10,9 @@ #include <MWindow> #include "swaphook.h" - +#ifdef EGL +#include <dlfcn.h> +#endif class SwapHookPrivate : public QObject { diff --git a/demos/widgetsgallery/switchpage.cpp b/demos/widgetsgallery/switchpage.cpp index 37c29b2e..3dbf9300 100644 --- a/demos/widgetsgallery/switchpage.cpp +++ b/demos/widgetsgallery/switchpage.cpp @@ -31,7 +31,7 @@ #include <QGraphicsLinearLayout> SwitchPage::SwitchPage() : - TemplatePage(), + TemplatePage(TemplatePage::Buttons), switch1(0), switch2(0), switch3(0), switch4(0), switch5(0), @@ -39,7 +39,6 @@ SwitchPage::SwitchPage() : label3(0), label4(0), label5(0) { - gid = TemplatePage::Buttons; } SwitchPage::~SwitchPage() diff --git a/demos/widgetsgallery/switchpage.h b/demos/widgetsgallery/switchpage.h index bedb1044..1d3f54e1 100644 --- a/demos/widgetsgallery/switchpage.h +++ b/demos/widgetsgallery/switchpage.h @@ -20,7 +20,7 @@ #ifndef SWITCHPAGE_H #define SWITCHPAGE_H -#include "listpage.h" +#include "mainpage.h" #include "templatepage.h" #include <MApplicationPage> #include <MLayout> diff --git a/demos/widgetsgallery/templatepage.cpp b/demos/widgetsgallery/templatepage.cpp index 506223e3..9a72d68d 100644 --- a/demos/widgetsgallery/templatepage.cpp +++ b/demos/widgetsgallery/templatepage.cpp @@ -28,11 +28,10 @@ #include <MLabel> #include <MLocale> -TemplatePage::TemplatePage() : - gid(0), +TemplatePage::TemplatePage(TemplatePage::Category category) : layout(0), landscapePolicy(0), portraitPolicy(0), container(0), separator(0), infoLabel(0), - containerLayout(0), containerPolicy(0) + containerLayout(0), containerPolicy(0), pageCategory(category) { } @@ -40,32 +39,15 @@ TemplatePage::~TemplatePage() { } -QStringList TemplatePage::groupNames() +TemplatePage::Category TemplatePage::category() { - QStringList list; - //% "Views and Dialogs" - list << qtTrId("xx_template_page_views_dialogs"); - //% "Contains and Applets" - list << qtTrId("xx_template_page_contains_applets"); - //% "Layouts and Visuals" - list << qtTrId("xx_template_page_layouts_visuals"); - //% "Buttons" - list << qtTrId("xx_template_page_buttons"); - //% "Indicators and Notifications" - list << qtTrId("xx_template_page_indicators_notifications"); - //% "Lists, Grids and Menus" - list << qtTrId("xx_template_page_lists_grids_menus"); - //% "User input" - list << qtTrId("xx_template_page_user_input"); - //% "Input Feedback" - list << qtTrId("xx_template_page_input_feedback"); - return list; + return pageCategory; } - -int TemplatePage::groupID() +/* +QStringList TemplatePage::groupNames() { - return gid; -} + +}*/ void TemplatePage::createContent() { diff --git a/demos/widgetsgallery/templatepage.h b/demos/widgetsgallery/templatepage.h index dd6d583c..a83b6942 100644 --- a/demos/widgetsgallery/templatepage.h +++ b/demos/widgetsgallery/templatepage.h @@ -37,22 +37,19 @@ class TemplatePage : public TimedemoPage Q_OBJECT public: - enum GroupID { - ViewsAndDialogs = 0, - ContainersAndApplets, - LayoutsAndVisuals, + enum Category { + ApplicationView = 0, + SimpleWidgets, Buttons, - IndicatorsAndNotifications, - ListsGridsAndMenus, - UserInput, - InputFeedback + DialogsAndBanners, + ListsGridsAndPopups, + UserInput }; - TemplatePage(); + TemplatePage(TemplatePage::Category category); virtual ~TemplatePage(); - int groupID(); - static QStringList groupNames(); + TemplatePage::Category category(); virtual void createContent(); @@ -60,8 +57,6 @@ protected: virtual void createLayout(); virtual void retranslateUi(); - int gid; - MLayout *layout; MLinearLayoutPolicy *landscapePolicy; @@ -74,6 +69,9 @@ protected: MLayout *containerLayout; MLinearLayoutPolicy *containerPolicy; + +private: + TemplatePage::Category pageCategory; }; #endif diff --git a/demos/widgetsgallery/textentrypage.cpp b/demos/widgetsgallery/textentrypage.cpp index 3b38bcdc..8d1a77eb 100644 --- a/demos/widgetsgallery/textentrypage.cpp +++ b/demos/widgetsgallery/textentrypage.cpp @@ -257,12 +257,11 @@ bool CustomTextEdit::event(QEvent *event) } TextEntryPage::TextEntryPage() - : TemplatePage(), + : TemplatePage(TemplatePage::UserInput), m_autoCapitalisation(true), m_errorCorrection(true), m_completer(new MCompleter) { - gid = TemplatePage::UserInput; } @@ -661,10 +660,10 @@ void TextEntryPage::changeAutoCapitalisation(bool val) if (val) //% "Auto Capitalisation is active" - Entries.at(4)->setPrompt(qtTrId("xx_auto_true_entry0")); + Entries.at(9)->setPrompt(qtTrId("xx_auto_true_entry0")); else //% "No Auto Capitalisation" - Entries.at(4)->setPrompt(qtTrId("xx_auto_false_entry0")); + Entries.at(9)->setPrompt(qtTrId("xx_auto_false_entry0")); } diff --git a/demos/widgetsgallery/theme/base/style/widgetsgallery.css b/demos/widgetsgallery/theme/base/style/widgetsgallery.css index 752cae00..9e68c014 100644 --- a/demos/widgetsgallery/theme/base/style/widgetsgallery.css +++ b/demos/widgetsgallery/theme/base/style/widgetsgallery.css @@ -1,6 +1,30 @@ @import "../../libmeegotouchcore/style/fonts.css"; @import "../../libmeegotouchcore/style/colors.css"; +MList#wgMainPageCategoryList { + margin-left: 0; + padding-left: 0; + margin-right: 0; + padding-right: 0; + + border-left: 0; + border-right: 0; + border-top: 0; + border-bottom: 0; +} + +MConentItem#wgMainPageCategoryListItem { + margin-left: 0; + padding-left: 0; + margin-right: 0; + padding-right: 0; + + border-left: 0; + border-right: 0; + border-top: 0; + border-bottom: 0; +} + DuiButtonStyle#theme-selection-button { minimum-size: 10mm 10mm; preferred-size: 15mm 15mm; diff --git a/demos/widgetsgallery/timedemo.cpp b/demos/widgetsgallery/timedemo.cpp index 3ead52d1..2c9485de 100644 --- a/demos/widgetsgallery/timedemo.cpp +++ b/demos/widgetsgallery/timedemo.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include "timedemo.h" -#include "listpage.h" +#include "mainpage.h" #include "timedemobenchmark.h" #include "templatepage.h" @@ -38,8 +38,8 @@ namespace const int pageDuration = 5000; } -Timedemo::Timedemo(ListPage *listPage, const QStringList& demoPageTitles) - : m_pFrontPage(listPage) +Timedemo::Timedemo(MainPage *mainPage, const QStringList& demoPageTitles) + : m_pFrontPage(mainPage) , m_currentPageIndex(0) , m_currentBenchmarkIndex(0) , demoPageTitles(demoPageTitles) @@ -87,7 +87,7 @@ void Timedemo::stopTiming() void Timedemo::showFirstPage() { if (demoPageTitles.count() == 0) { - foreach(TimedemoPage *page, m_pFrontPage->pages) { + foreach(TimedemoPage *page, m_pFrontPage->demoPages()) { demoPages.append(page); } } else { diff --git a/demos/widgetsgallery/timedemo.h b/demos/widgetsgallery/timedemo.h index 75e879b2..13cc311e 100644 --- a/demos/widgetsgallery/timedemo.h +++ b/demos/widgetsgallery/timedemo.h @@ -29,7 +29,7 @@ #include "swaphook.h" class QString; -class ListPage; +class MainPage; class SwapHook; class TimedemoPage; class TimedemoBenchmark; @@ -67,7 +67,7 @@ class Timedemo : public QObject { Q_OBJECT public: - Timedemo(ListPage *listPage, const QStringList& demoPageTitles); + Timedemo(MainPage *mainPage, const QStringList& demoPageTitles); void setOutputCsv(const QString &filename); void setFramelog(const QString &filename); @@ -86,7 +86,7 @@ private: void displayBenchmarkResults(); void saveFramelog(); - ListPage *m_pFrontPage; + MainPage *m_pFrontPage; typedef QHash<QString, BenchmarkResult> BenchmarkResultHash; QVector<BenchmarkResultHash> benchmarkResults; diff --git a/demos/widgetsgallery/toolbarpage.cpp b/demos/widgetsgallery/toolbarpage.cpp index eb41ff8e..99fa1ac4 100644 --- a/demos/widgetsgallery/toolbarpage.cpp +++ b/demos/widgetsgallery/toolbarpage.cpp @@ -138,6 +138,7 @@ private: }; ToolBarPage::ToolBarPage() : + TemplatePage(TemplatePage::ApplicationView), callList(0), callModel(0), cellCreator(0), @@ -147,8 +148,6 @@ ToolBarPage::ToolBarPage() : tabViewAction(0), isDefaultView(true) { - gid = TemplatePage::ViewsAndDialogs; - } ToolBarPage::~ToolBarPage() @@ -228,12 +227,12 @@ void ToolBarPage::fourButtons() { clearToolbarActions(); - MAction* action = new MAction("icon-m-list", "", this); + MAction* action = new MAction("icon-m-toolbar-list", "", this); action->setLocation(MAction::ToolBarLocation); addAction(action); connect(action, SIGNAL(triggered()), this, SLOT(showCallDataAsList())); - action = new MAction("icon-m-grid", "", this); + action = new MAction("icon-m-toolbar-grid", "", this); action->setLocation(MAction::ToolBarLocation); addAction(action); connect(action, SIGNAL(triggered()), this, SLOT(showCallDataAsGrid())); @@ -244,12 +243,12 @@ void ToolBarPage::textEntryWithTwoButtons() { clearToolbarActions(); addTextEntry(); - MAction *action = new MAction("Icon-video", "Video", this); + MAction *action = new MAction("icon-m-toolbar-camera", "Camera", this); action->setLocation(MAction::ToolBarLocation); addAction(action); - MAction *actionSMS = new MAction("Icon-new-SMS", "SMS", this); - actionSMS->setLocation(MAction::ToolBarLocation); - insertAction(action, actionSMS); + MAction *actionGallery = new MAction("icon-m-toolbar-gallery", "Gallery", this); + actionGallery->setLocation(MAction::ToolBarLocation); + insertAction(action, actionGallery); } void ToolBarPage::addTextEntry() diff --git a/demos/widgetsgallery/translations/widgetsgallery_ar.ts b/demos/widgetsgallery/translations/widgetsgallery_ar.ts index f7e67c1c..4e4f00f3 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_ar.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_ar.ts @@ -3,53 +3,208 @@ <TS version="2.0" language="ar"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation>طلب عرض</translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation>تطبيق قائمة</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation>طريقة العرض</translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation>شريط الأدوات (بما في ذلك علامة التبويب بار)</translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation>بسيطة القطع</translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation>التسميات</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation>صورة</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation>التقدم بار</translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation>حاوية</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation>الغزال</translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation>أزرار</translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation>زر</translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation>رمز زر</translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation>تحول</translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation>مربع</translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation>الحوارات والرايات</translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation>اختيار واحد حوار</translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation>متعددة الاختيار حوار</translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation>استعلام حوار</translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation>راية</translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation>قوائم وشبكات وبالنوافذ</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation>قائمة</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation>شبكة</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation>كائن قائمة</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation>منسدل</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation>بنود المحتوى</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation>كلمة فقاعة</translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation>مستخدم الإدخال</translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation>نص مداخل</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation>المتزلج</translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation>إدخال تعليقات</translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>معرض الحاجيات</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation>التلقائي</translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation>بورتريه</translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation>المشهد</translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation>0 درجة</translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation>90 درجة في اتجاه عقارب الساعة</translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation>180 درجة في اتجاه عقارب الساعة</translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation>270 درجة في اتجاه عقارب الساعة</translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>تسميات</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -62,72 +217,107 @@ All Labels can be aligned left, right or center and will be automatically trunca جميع تسميات يمكن أن تكون محاذاة إلى اليسار أو اليمين أو الوسط ، وسيتم اقتطاعها تلقائيا إذا كان النص لا تناسب داخل منطقة معينة.</translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation>بسيطة تسمية</translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation>الغنية تسمية <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation>السؤال حوار</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation>السؤال حوار العنوان</translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation>أبجد هوز دولور الجلوس امات؟</translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation>بدء حوار</translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation>حوار طويل</translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation>اسم</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation>الرجاء إدخال اسمك</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation>حدد الطابعة</translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation>مكدسة الحوارات</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation>نظام حوار مشروط</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation>الحوار مع مؤشر التقدم</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation>رسالة الإطار</translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation>انقر لتفرخ الحوار متداخلة</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation>حوارات مرصوف</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation>انقر لفتح متداخلة مربع رسالة</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation>هذا هو الحوار متداخلة</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation>أنا متداخلة مربع رسالة</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation>نافذة حوار مشروط</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -139,264 +329,249 @@ Muwhahaha... [evil laugh]</oldsource> هاهاها... [الشر الضحك]</translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation>مؤشرات التقدم</translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation>مرحبا العالم!</translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation>حدث بانر</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation>معلومات بانر</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation>نظام المعلومات بانر</translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation><b>Ida Taipale</b><br/>هل رأيت كلبي؟</translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation><b>البطارية تتناقص</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation><b>مكالمة واردة</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation>قبول</translation> </message> - <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> - <source>Dialogs and Notifications</source> - <translation>الحوارات والإشعارات</translation> - </message> - <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> - <source>Dialog examples</source> - <translation>أمثلة الحوار</translation> - </message> - <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> - <source>Question Dialog</source> - <translation>الاستعلام حوار</translation> - </message> - <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> - <source>Entry Dialog</source> - <translation>بدء حوار</translation> - </message> - <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> - <source>A Long Dialog</source> - <translation>وهناك حوار طويل</translation> - </message> - <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> - <source>Stacked Dialogs</source> - <translation>حوارات مرصوف</translation> - </message> - <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> - <source>System Modal Dialog</source> - <translation>نافذة حوار مشروط</translation> - </message> - <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> - <source>Dialog With Progress Indicator</source> - <translation>الحوار مع تقدم المؤشر</translation> - </message> - <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> - <source>Simple Message Box</source> - <translation>رسالة بسيطة مربع</translation> - </message> - <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> - <source>Notifications and messages</source> - <translation>الإخطارات والرسائل</translation> - </message> - <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> - <source>Event Banner</source> - <translation>الحدث بانر</translation> - </message> - <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> - <source>Information Banner</source> - <translation>معلومات بانر</translation> - </message> - <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> - <source>System Information Banner</source> - <translation>نظام المعلومات بانر</translation> - </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>الصور</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation>خصائص الصورة</translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation>عمليات صورة</translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation>التكبير</translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation>الشفافية</translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation>المحاصيل</translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation>إزالة</translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation>عدل</translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>قائمة</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>النص مداخل</translation> </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>حرر النص :</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>نص حر (الملثمين) :</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>النص المرجعي :</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>رقم الهاتف :</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>نص البريد الالكتروني :</translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>عنوان النص :</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>متعدد :</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation>أدخل النص هنا</translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation>انقر هنا</translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation>اضغط على أي مفتاح</translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation><i>اضغط على مفتاح</i> مفتاح:</translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation>النص :</translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation><i>الافراج عن مفتاح</i> مفتاح:</translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation>مثال شريط أدوات مخصص 1</translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation>مثال شريط أدوات مخصص 2</translation> + </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation>هذا توولتيب طويلة جدا ، وسيتم قص على الشاشة</translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation>الغنية النص :</translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation>أي وضع الصدى :</translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation>صدى على تحرير :</translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation>مباشرة وضع الإدخال :</translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation>شريط أدوات مخصص 1:</translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation>شريط أدوات مخصص 2:</translation> + </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation>السيارات رسملة نشط</translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation>لا رسملة للسيارات</translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <translation>هذا هو إدخال نص متعدد الأسطر</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation>سطر واحد (حدد جميع)</translation> </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation>القيمة السوقية للسيارات</translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation>تصحيح الخطأ</translation> </message> - <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> <source>Application Menu</source> - <translation>عرض القائمة</translation> + <translation>تطبيق قائمة</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation>تطبيق القائمة هو عنصر القائمة المتاحة لأية وجهة نظر. ويمكن فتحها عن طريق النقر على قائمة عرض عنوان المنطقة. تطبيق القائمة تحتوي على الأوامر والإعدادات لعرض وجهة النظر في مسألة اختيارية ، ومساحة لعرض أوامر نمط. كل عرض للتطبيق ويمكن أن يكون مختلفا عرض محتويات القائمة. @@ -406,82 +581,82 @@ Muwhahaha... [evil laugh]</oldsource> إنهاء المهمة ينبغي أن تكون حاضرة في جميع المشاهدات باستثناء لمشاهدة الرئيسي للتطبيق.</translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation>العنوان</translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation>فرز -- تنازلي</translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation>إعداد الوقت طويلا</translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>الحاوية</translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation>التقدم بار</translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation>شريط تقدم يمكن أن تشير إلى عملية مستمرة سواء مع المدد معروف أو غير معروف.</translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation>المدة غير معروفة -- بار</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation>يعرف المدة -- بار</translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation>المثال 1</translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation>المثال 2</translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation>عرض افتراضي</translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation>عرض التبويب</translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation>أداة بار</translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation>شريط الأدوات هو حاوية والتي يمكن أن تحتوي على ما يصل إلى 4 دلالات أزرار (انقر فوق القائمة → مثال 1) ، أو إدخال نص الميدان مع ما يصل الى 2 دلالات أزرار (انقر فوق القائمة → مثال 2). أنه يحتوي على الإجراءات التي تكون ذات صلة وجهة النظر ولكن لا علاقة لها أي بند من البنود الفردية عرضها مباشرة داخل منطقة محتوى.</translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation>كائن القائمة</translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> @@ -490,57 +665,63 @@ The primary (single short tap) action of the element should not be duplicated in وينبغي في المقام الأول (واحد قصير الصنبور) العمل عنصر لا يكون لها مثيل في القائمة كائن.</translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation>أصدقاء</translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation>المفضلة البومات</translation> </message> <message id="xx_displaymodes_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation>الملاحة بار</translation> </message> <message id="xx_displaymodes_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation>الهروب زر</translation> </message> <message id="xx_displaymodes_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation>زر الصفحة الرئيسية</translation> </message> <message id="xx_displaymodes_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> - <translation>الملاحة بار</translation> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <oldsource>Display Modes and Full Screen</oldsource> + <translation>أنماط العرض وملء الشاشة</translation> </message> <message id="xx_displaymodes_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation>الصفحة تطبيق لوضع العرض :</translation> </message> - <message id="xx_displaymodes_escape_mode_label"> - <location filename="../navigationbarpage.cpp" line="131"/> - <source>Escape Button mode:</source> - <translation>وضع زر الهروب :</translation> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation>نافذة الدولة :</translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation>كامل الشاشة</translation> </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation>يظهر</translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation>السيارات إخفاء</translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation>إخفاء</translation> </message> @@ -695,89 +876,49 @@ The primary (single short tap) action of the element should not be duplicated in <source>Font test:</source> <translation>اختبار الخط :</translation> </message> - <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> - <source>Views and Dialogs</source> - <translation>آراء ومربعات</translation> - </message> - <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> - <source>Contains and Applets</source> - <translation>الحاويات وبريمجات</translation> - </message> - <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> - <source>Layouts and Visuals</source> - <translation>تصاميم وصور</translation> - </message> - <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> - <source>Buttons</source> - <translation>أزرار</translation> - </message> - <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> - <source>Indicators and Notifications</source> - <translation>المؤشرات والإشعارات</translation> - </message> - <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> - <source>Lists, Grids and Menus</source> - <translation>القوائم ، والشبكات والقوائم</translation> - </message> - <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> - <source>User input</source> - <translation>مستخدم الإدخال</translation> - </message> - <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> - <source>Input Feedback</source> - <translation>مدخلات اقتراحات</translation> - </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation>الصورة يسمح موضع الصور على واجهة المستخدم. الصور هي عموما غير عناصر تفاعلية. يمكن متنوع واحدة ومتعددة اللمس التفاعلات يمكن ان تضاف الى عنصر صورة إذا رغبت.</translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation>قالب نموذج</translation> </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation>القالب</translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation>البريد الإلكتروني نص الاقتراح :</translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource> <translation>القطعة MComboBox هو زر مجتمعة وقائمة منبثقة. انها تشبه الى حد بعيد QComboBox ، ولكن لا يسمح بتحرير النص.</translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation>مربع تحرير وسرد</translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation>يقدم اقتراحات عنوان البريد الإلكتروني</translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation>مربع</translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> @@ -786,19 +927,17 @@ Checkbox essentially does the same thing as the Switch button, so please conside الاختيار أساسا يفعل الشيء نفسه على زر التبديل ، لذا يرجى النظر في استخدام التبديل بدلا من ذلك.</translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> - <translation>لقد قرأت وفهمت -تعليمات.</translation> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <translation>لقد قرأت وفهمت التعليمات.</translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation>رمز زر</translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> @@ -807,7 +946,7 @@ instructions.</source> رمز أزرار تستخدم في مثل أشرطة الأدوات.</translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation>أبجد هوز</translation> </message> @@ -843,32 +982,32 @@ sit amet</source> الجلوس امات</translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> + <location filename="../spinnerpage.cpp" line="68"/> <source>In application main area</source> - <translation type="unfinished"></translation> + <translation>في التطبيق المجال الرئيسي</translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation>في حاوية الرأس</translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> - <translation>في عرض القائمة</translation> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <translation>في تطبيق القائمة</translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation>في عرض القائمة</translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation>غزل</translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -880,52 +1019,43 @@ See the menu for examples of different use cases.</source> انظر القائمة للحصول على أمثلة لحالات استخدام مختلفة.</translation> </message> - <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> - <source>From: John Doe -Date: Today -Subject: This is funny stuff!</source> - <translation>From: فلان الفلاني -Date: اليوم -Subject: هذه هي الاشياء مضحك!</translation> - </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> - <translation type="unfinished"></translation> + <translation>ويمكن استخدام سبينر بينما يتم تحميل المحتوى.</translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation>الألبومات على الانترنت</translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation>سبينر يمكن أن تستخدم في رأس حاوية للإشارة إلى أن العناصر الموجودة داخل الحاوية يتم تحديثها ، ولكن عناصر مرئية يمكن تفاعلت مع.</translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation>الدوار في القائمة تطبيق المجال يشير إلى أن وجهة النظر كلها معلقة على التحديث.</translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation>غزل يمكن وضعها في رأس الحوار تشير إلى تغيير المحتوى.</translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation>حدد اتصال بالإنترنت</translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation>تبديل</translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> @@ -934,37 +1064,37 @@ Switches are used to indicate e.g. settings values</source> مفاتيح تستخدم للدلالة على سبيل المثال ضبط القيم</translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation>المصابيح الأمامية</translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation>الطيار الآلي</translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation>محرك الإعوجاج</translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation>مفاعل شيلدز</translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation>لانهائي محرك اللا إحتمالية</translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation>المتزلجون</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -973,33 +1103,33 @@ Seekbar is a special type of Slider used for displaying playback status for mult شريط البحث هو نوع خاص من المتزلج تستخدم لتشغيل مركز لعرض محتوى الوسائط المتعددة.</translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>البيانات الشخصية</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation>من فضلك اختر العمر :</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>لاعب :</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>سطوع :</translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation>مدخلات اقتراحات</translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -1008,54 +1138,77 @@ Input feedbacks can be easily configured for different purposes using the themin الاحصائيات الإدخال يمكن بسهولة تهيئتها لأغراض مختلفة باستخدام نظام الموضوع.</translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation>افتراضي</translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation>مختلفة</translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation>ركود</translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation>لعبة طفل</translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation>الفضاء</translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation>صامت</translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation>التكوين</translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation>شبكة الصفحة</translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> - <source>Video container</source> - <translation>الفيديو الحاويات</translation> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation>تعيين الأعمدة</translation> </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> - <translation>اضغط على الصورة المصغرة للعب الفيديو / وقفة عليه. اضغط على الصورة المصغرة ، وعقد لفتح الفيديو في حجمه الأصلي.</translation> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation>المناظر الطبيعية</translation> </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> - <source>Gallery</source> - <translation>معرض</translation> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation>صورة</translation> + </message> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> + <translation>كلمة فقاعة</translation> + </message> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> + <translation>تنشيط وصلة</translation> + </message> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> + <translation>عنوان فرعي</translation> </message> </context> </TS> diff --git a/demos/widgetsgallery/translations/widgetsgallery_de.ts b/demos/widgetsgallery/translations/widgetsgallery_de.ts index 74840eaf..7e1d4488 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_de.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_de.ts @@ -3,53 +3,208 @@ <TS version="2.0" language="de"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation>Applikationsansicht</translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation>Applikationsmenü</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation>Anzeigemodi</translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation>Werkzeugbalken (mit Tabbalken)</translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation>Einfache Widgets</translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation>Label</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation>Bild</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation>Fortschrittsbalken</translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation>Behälter</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation>Wirbelräder</translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation>Knöpfe</translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation>Druckknopf</translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation>Pictogramm Knopf</translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation>Schalthebel</translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation>Kontrollkästchen</translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation>Dialoge und Banner</translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation>Einfacher Auswahldialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation>Mehrfacher Auswahldialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation>Fragedialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation>Banner</translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation>Listen, Gitter und Popups</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation>Liste</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation>Gitter</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation>Objektmenü</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation>Combobox</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation>Inhaltselement</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation>Sprechblase</translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation>Usereingaben</translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation>Texteinträge</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation>Schieberegler</translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation>Eingaberückmeldung</translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>Dingsbums Galerie</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation>Automatisch</translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation>Hochformat</translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation>Querformat</translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation>0 Grad</translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation>90 Grad im Uhrzeigersinn</translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation>180 Grad im Uhrzeigersinn</translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation>270 Grad im Uhrzeigersinn</translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>Labels</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -58,72 +213,107 @@ All Labels can be aligned left, right or center and will be automatically trunca <translation>Das einfache Label wird hauptsächlicn von anderen Komponenten benutzt, es unterstützt keinerlei Formattierung und keinerlei Interaktion mit dem Benutzer. Das schicke Label unterstützt mehrere Zeilen, HTML-Formattierung und Hervorhebung von Querverweisen. Alle Labels können rechtsbündig oder linksbündig ausgerichtet werden oder auch zentriert werden. Wenn der Text nicht in die vorgegebene Fläche passt, wird er automatisch abgeschnitten</translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation>Einfaches Label</translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation>Schickes Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation>Fragedialog</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation>Fragedialogtitel</translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation>Lorem ipsum dolor sit amet?</translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation>Eingabedialog</translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation>Langer Dialog</translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation>Name</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation>Bitten geben Sie Ihren Namen ein</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation>Wählen Sie einen Drucker aus</translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation>Gestapelte Dialoge</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation>Fenster-modaler Dialog</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation>Dialog mit Fortschrittsanzeige</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation>Meldungskasten</translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation>Klicke um einen verschachtelten Dialog zu öffnen</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation>Gestapelte Dialoge</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation>Klicke um eine verschachtelte Meldungsbox zu öffnen</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation>Dies ist ein verschachtelter Dialog</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation>Ich bin eine verschachtelte Meldungsbox</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation>Fenster-modaler Dialog</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -132,255 +322,234 @@ Es gibt keinen Weg um mich herum! Hihihi...[böses Kichern]</translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation>Fortschrittsanzeige</translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation>Hallo Welt</translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation>Ereignis Banner</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation>Informations Banner</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation>System Informations Banner</translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation><b>Ida Taipale</b><br/>Hast Du meinen Hund gesehen?</translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation><b>Die Batterie ist bald leer</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation><b>Ankommendes Gespräch</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation>Annnehmen</translation> </message> - <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> - <source>Dialogs and Notifications</source> - <translation variants="yes"> - <lengthvariant>Dialoge und Meldungen</lengthvariant> - <lengthvariant>Dialoge u. Meldungen</lengthvariant> - <lengthvariant>Dialoge & Meldungen</lengthvariant> - <lengthvariant>Dialoge/Meldungen</lengthvariant> - <lengthvariant>Dial./Meld.</lengthvariant> - </translation> - </message> - <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> - <source>Dialog examples</source> - <translation>Dialog Beispiele</translation> - </message> - <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> - <source>Question Dialog</source> - <translation>Abfrage Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> - <source>Entry Dialog</source> - <translation>Eingabe Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> - <source>A Long Dialog</source> - <translation>Langer Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> - <source>Stacked Dialogs</source> - <translation>Gestapelte Dialoge</translation> - </message> - <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> - <source>System Modal Dialog</source> - <translation>Fenster-modaler Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> - <source>Dialog With Progress Indicator</source> - <translation>Dialog mit Fortschrittsanzeige</translation> - </message> - <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> - <source>Simple Message Box</source> - <translation>Einfache DuiMessageBox</translation> - </message> - <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> - <source>Notifications and messages</source> - <translation>Benachrichtigungen und Meldungen</translation> - </message> - <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> - <source>Event Banner</source> - <translation>Ereignis Banner</translation> - </message> - <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> - <source>Information Banner</source> - <translation>Informations Banner</translation> - </message> - <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> - <source>System Information Banner</source> - <translation>System Informations Banner</translation> - </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>Bild</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation>Bildeigenschaften</translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation>Bildbearbeitung</translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation>Zoom</translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation>Transparenz</translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation>Abschneiden</translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation>Entfernen</translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation>Editieren</translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>Liste</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>Texteinträge</translation> </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>Freitext:</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>Freitext(maskiert):</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>Numerischer Text:</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>Telefonnummer:</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>E-Mail Text:</translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>URL Text:</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>Mehrzeilig:</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation>Geben Sie hier Text ein</translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation>Hier klicken</translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation>Drücke irgendeine Taste</translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation><i>Tasten gedrückt</i> Taste:</translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation>Text:</translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation><i>Taste losgelassen</i> Taste:</translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation>Beispiel 1 für maßgeschneiderten Werkzeugbalken</translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation>Beispiel 2 für maßgeschneiderten Werkzeugbalken</translation> + </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation>Dieser Tooltip ist recht lang und wird wohl abgeschnitten werden</translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation>Reicher Text</translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation>Kein-Echo Modus:</translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation>Echo beim Editieren:</translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation>Direkteingabe Modus:</translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation>Maßgeschneiderter Toolbar 1:</translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation>Maßgeschneiderter Toolbar 2:</translation> + </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation>Automatische Großschreibung ist aktiv</translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation>Keine automatische Großschreibung</translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <translation>Dies ist eine mehrzeiliger Texteingabe</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation>Einzelne Zeile (alles auswählen)</translation> </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation variants="yes"> <lengthvariant>Automatische Großschreibung</lengthvariant> @@ -389,12 +558,12 @@ Hihihi...[böses Kichern]</translation> </translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation>Fehlerkorrektur</translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation variants="yes"> <lengthvariant>Schieberegler</lengthvariant> @@ -402,28 +571,28 @@ Hihihi...[böses Kichern]</translation> </translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>Persönliche Daten</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation>Bitte wählen Sie Ihr Alter:</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>Helligkeit:</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>Spieler:</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -431,93 +600,93 @@ Seekbar is a special type of Slider used for displaying playback status for mult Ein Suchbalken ist ein spezieller Typ eines Schiebereglers, der benutzt wird um den Abspielstatus von Multimediainhalten anzuzeigen.</translation> </message> - <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> <source>Application Menu</source> - <translation>Guck Menü</translation> + <translation>Applikationsmenü</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation>“Application Menu” ist ein Menüelement, das für jedes “View” zur Verfügung steht. <ul><li>Es kann geöffnet werden, in dem man auf den Titelbereich des Menüs klopft.</li><li>Es enthält Kommandos und “View”-Einstellungen für das relevante “View” und einen optionalen Bereich für Stil Kommandos.</li><li>Jedes “View” der Applikation kann unerschiedliche Menüinhalte haben.</li></ul><b>Richtlinien</b> für zwingend erforderliche Menüeinträge: <ul><li>Einstellungen sollten auf dem Haupt-“View” der Applikation zu finden sein, es sei denn, die Einstellungen sind spezifisch für ein Unter-“View”</li><li>In jedem “View” sollte eine Hilfe verfügbar sein </li><li>“Beenden der Aufgabe” sollte in jedem “View” verfügbar sein, ausgenommen im Haupt-“View” der Applikation.</li></ul></translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation>Titel</translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation>Sortieren — in absteigender Reihenfolge</translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation>Zeitaufwendige Einstellung</translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>Behälter</translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation>Fortschrittsbalken</translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation>Ein Fortschrittsbalken kann zur Zeit ablaufende Vorgänge mit bekannter oder unbekannter Dauer anzeigen</translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation>Installiere tolles Programm</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation>Download vom nettesbild.jpg</translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation>Beispiel 1</translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation>Beispiel 2</translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation>Standardansicht</translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation>Karteireiteransicht</translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation>Werkzeugleiste</translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation>Die <b>Werkzeugleiste</b> dient als ein Behälter für Aktionen. Abhängig von View, das damit verbunden ist, verhält es sich wie eine Karteireiterleiste oder als ein Behälter für Knöpfe und Texteingabefelder. <ul><li>Klicke auf das Menü um die Beispiele anzusehen.</li></ul></translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation>Objektmenü</translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> @@ -526,52 +695,63 @@ The primary (single short tap) action of the element should not be duplicated in Die primäre Aktion (kurzes Einzelklopfen) auf dieses Element sollte nicht im Objectmenü dupliziert werden.</translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation>Freunde</translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation>Lieblings Alben</translation> </message> <message id="xx_displaymodes_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation>Navigationsbalken</translation> </message> <message id="xx_displaymodes_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation>Fluchtknopf</translation> </message> <message id="xx_displaymodes_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation>Heimknopf</translation> </message> <message id="xx_displaymodes_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> - <translation>Navigationsbalken</translation> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <oldsource>Display Modes and Full Screen</oldsource> + <translation>Anzeigemodi und Vollbildanzeige</translation> </message> <message id="xx_displaymodes_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation>Anzeigemodus der Applikationsseite:</translation> </message> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation>Fensterzustand</translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation>Vollbildmodus</translation> + </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation>Zeige</translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation>Auto-Zeigen</translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation>Verstecken</translation> </message> @@ -743,113 +923,72 @@ Die primäre Aktion (kurzes Einzelklopfen) auf dieses Element sollte nicht im O <source>Font test:</source> <translation>Zeichensatzprüfung:</translation> </message> - <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> - <source>Views and Dialogs</source> - <translation>“Views” und Dialoge</translation> - </message> - <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> - <source>Contains and Applets</source> - <translation>Behälter und Applets</translation> - </message> - <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> - <source>Layouts and Visuals</source> - <translation>Layouts und Visualisierungen</translation> - </message> - <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> - <source>Buttons</source> - <translation>Knöpfe</translation> - </message> - <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> - <source>Indicators and Notifications</source> - <translation>Anzeigen und Notifikationen</translation> - </message> - <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> - <source>Lists, Grids and Menus</source> - <translation>Listen, Gitter und Menüs</translation> - </message> - <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> - <source>User input</source> - <translation>Benutzereingaben</translation> - </message> - <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> - <source>Input Feedback</source> - <translation>Eingaberückmeldung</translation> - </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation>“Image” erlaubt das Positionieren von Bildern auf die Benutzeroberfläche. Bilder sind gewöhnlich nicht-interaktive Elemente. Jedoch können auch verschiedene einfache und mehrfache Berührungsaktionen zu einer Bildkomponente hinzugefügt werden, falls gewünscht.</translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation>Beispiel Vorlage</translation> </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation>Vorlage</translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation>E-Mail Vorschlags text:</translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <translation>Das MComboBox Widget ist eine Kombination aus einem Knopf und einer Popup List. Es ist sehr ähnlich zur QComboBox aber erlaubt nicht den Text zu editieren.</translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation>Combobox</translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation>Stellt Vorschläge für E-Mail Adressen zur Verfügung</translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation>Kontrollkästchen</translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> <translation>Das Kontrollkästchen ist eine Variante des Knopfes, das Benutzern erlaubt den Zustand einer Variable oder einer Einstellung zu sehen, die zwei Werte hat, „An“ oder „Aus“.</translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> <translation>Ich habe die Anleitung gelesen und verstanden.</translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation>Pictogramm Knopf</translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> <translation>Pictogrammknöpfe haben ein Piktogramm und können auch ein Text-Label haben. Ein Pictogrammknopf unterscheidet sich von einen Druckknopf durch seine graphische Darstellung: er hat nicht die knopfartigen Ränder wie ein Druckknopf.</translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation>Lorem ipsum</translation> </message> @@ -883,32 +1022,32 @@ sit amet</source> sit amet</translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> - <source>In container main area</source> + <location filename="../spinnerpage.cpp" line="68"/> + <source>In application main area</source> <translation>Im Hauptbereich der Applikation</translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation>Im Kopfbereich des Behälters</translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> - <translation>Im Ansichtsmenü</translation> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <translation>Im Applikationsmenü</translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation>Im Dialog</translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation>Wirbelräder</translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -920,89 +1059,80 @@ Wirbelräder können auch benutzt werden, wenn die Dauer bekannt ist aber der ve Siehe auch das Menü für Beispiele verschiedener Anwendungsfälle.</translation> </message> - <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> - <source>From: John Doe -Date: Today -Subject: This is funny stuff!</source> - <translation>From: Otto Normalverbraucher -Date: Heute -Subject: Dies ist lustig!</translation> - </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> - <translation type="unfinished"></translation> + <translation>Ein Wirbelrad kann benutzt werden während Inhalte geladen werden.</translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation>Online Alben</translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation>Wirbelräder können in Behälterkopfzeilen benutzt werden um anzuzeigen, dass die Dinge im Behälter auf den neuesten Stand gebracht werden, trotzdem kann man mit den sichtbaren Dingen weiter interagieren</translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation>Wirbelräder im Bereich des Applikationsmenüs zeigen, das der gesamte “View” auf den neuesten Stand gebracht wird</translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation>Wirbelräder können in Dialogkopfzeilen sein um sich ändernde Inhalte anzuzeigen</translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation>Wähle die Internetverbindung</translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation>Schalthebel</translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> <translation>Ein Schalthebel unterscheidet sich optisch sowohl von einem Drucknopf als auch von einem Piktogrammknopf. Es sieht aus wie ein Hebel und zeigt so, daß das Umlegen dieses Hebels nicht in einen anderen Dialog wechseln wird und keine anderen Aktionen auslösen wird außer den Zustand dieses Hebels zu änderen.</translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation>Frontscheinwerfer</translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation>Autopilot</translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation>Warpantrieb</translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation>Reaktorschilde</translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation>Unendliche-Unwahrscheinlichkeit-Antrieb</translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation>Eingaberückmeldung</translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -1011,54 +1141,77 @@ Input feedbacks can be easily configured for different purposes using the themin Eingaberückmeldungen können mit Hilfe des Theming-Systems einfach für verschiedene Zwecke konfiguriert werden.</translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation>Voreinstellung</translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation>Anders</translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation>Schwerfällig</translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation>Babyspielzeug</translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation>Weltraum</translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation>Stumm</translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation>Einstellung</translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation>Gitter Seite</translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> - <source>Video container</source> - <translation>Video Behälter</translation> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation>Spalten einstellen</translation> </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> - <translation>Klopfe auf das Video-Miniaturbild um abzuspielen oder anzuhalten. Klopfe und halte das Miniaturbild um das Video in Originalgröße anzusehen</translation> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation>Querformat</translation> + </message> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation>Hochformat</translation> </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> - <source>Gallery</source> - <translation>Galerie</translation> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> + <translation>Sprechblase</translation> + </message> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> + <translation>Link aktiviert</translation> + </message> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> + <translation>Untertitel</translation> </message> </context> </TS> diff --git a/demos/widgetsgallery/translations/widgetsgallery_en.ts b/demos/widgetsgallery/translations/widgetsgallery_en.ts index 62f8e833..132a0fda 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_en.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_en.ts @@ -3,53 +3,208 @@ <TS version="2.0" language="en"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation>Application View</translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation>Application Menu</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation>Display Modes</translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation>Toolbar (including Tab Bar)</translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation>Simple Widgets</translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation>Labels</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation>Image</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation>Progress Bar</translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation>Container</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation>Spinner</translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation>Buttons</translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation>Push Button</translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation>Icon Button</translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation>Switch</translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation>Checkbox</translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation>Dialogs and Banners</translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation>Single Selection Dialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation>Multiple Selection Dialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation>Query Dialog</translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation>Banner</translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation>Lists, Grids and Popups</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation>List</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation>Grid</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation>Object Menu</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation>Combobox</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation>Content items</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation>Speech bubble</translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation>User Input</translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation>Text Entries</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation>Slider</translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation>Input Feedback</translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="180"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>Widgets Gallery</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="449"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation>Automatic</translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="457"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation>Portrait</translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="465"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation>Landscape</translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="473"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation>0 degrees</translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="481"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation>90 degrees clockwise</translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="489"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation>180 degrees clockwise</translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="497"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation>270 degrees clockwise</translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>Labels</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -62,72 +217,107 @@ Rich Label supports multiple lines, HTML formatting and highlighting for links. All Labels can be aligned left, right or center and will be automatically truncated if the text does not fit inside the given area.</translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation>Simple Label</translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation>Question Dialog</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="86"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation>Question Dialog Title</translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="90"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation>Lorem ipsum dolor sit amet?</translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation>Entry Dialog</translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation>Long Dialog</translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="103"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation>Name</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation>Please enter your name</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="129"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation>Select printer</translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation>Stacked Dialogs</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation>System Modal Dialog</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation>Dialog with Progress Indicator</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation>Message Box</translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="180"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation>Click to spawn a nested dialog</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="182"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation>Stacked dialogs</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation>Click to open a nested message box</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="198"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation>This is a nested dialog</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="212"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation>I’m a nested message box</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="223"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation>System Modal Dialog</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="230"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -139,265 +329,224 @@ There's no way around me! Muwhahaha... [evil laugh]</translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="269"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation>Hello World!</translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation>Event Banner</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation>Information Banner</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation>System Information Banner</translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="279"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation><b>Ida Taipale</b><br/>Have you seen my dog?</translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="292"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation><b>Battery is running low</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="303"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation><b>Incoming call</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="305"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation>Accept</translation> </message> - <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> - <source>Dialogs and Notifications</source> - <translation variants="yes"> - <lengthvariant>Dialogs and Notifications</lengthvariant> - <lengthvariant>Dialogs a. Notifications</lengthvariant> - <lengthvariant>Dialogs & Notifications</lengthvariant> - <lengthvariant>Dialogs/Notifications</lengthvariant> - <lengthvariant>Dial./Notific.</lengthvariant> - </translation> - </message> - <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="382"/> - <source>Dialog examples</source> - <translation>Dialog examples</translation> - </message> - <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> - <source>Question Dialog</source> - <translation>Query Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="386"/> - <source>Entry Dialog</source> - <translation>Entry Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="388"/> - <source>A Long Dialog</source> - <translation>A Long Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> - <source>Stacked Dialogs</source> - <translation>Stacked Dialogs</translation> - </message> - <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="394"/> - <source>System Modal Dialog</source> - <translation>System Modal Dialog</translation> - </message> - <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="402"/> - <source>Simple Message Box</source> - <translation>Simple Message Box</translation> - </message> - <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="400"/> - <source>Notifications and messages</source> - <translation>Notifications and messages</translation> - </message> - <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="404"/> - <source>Event Banner</source> - <translation>Event Banner</translation> - </message> - <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="406"/> - <source>Information Banner</source> - <translation>Information Banner</translation> - </message> - <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="408"/> - <source>System Information Banner</source> - <translation>System Information Banner</translation> - </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="249"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation>Progress Indicator</translation> </message> - <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="397"/> - <source>Dialog With Progress Indicator</source> - <translation>Dialog With Progress Indicator</translation> - </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>Image</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation>Image properties</translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="155"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation>Image operations</translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="143"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation>Zoom</translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation>Transparency</translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="147"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation>Crop</translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation>Remove</translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation>Edit</translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>List</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="570"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>Text Entries</translation> </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="586"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>Free text:</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="588"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>Free text(masked):</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="590"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>Number text:</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="592"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>Phone number:</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="594"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>Email text:</translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="605"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation>No Echo mode:</translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="608"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation>Echo on edit:</translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="611"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation>Direct Input Mode:</translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="146"/> - <location filename="../textentrypage.cpp" line="168"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation>Click here</translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="159"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation>Press any key</translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="185"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation><i>Key press</i> key:</translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="188"/> - <location filename="../textentrypage.cpp" line="202"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation>text:</translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="199"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation><i>Key release</i> key:</translation> </message> <message id="xx_tooltip_customtoolbar1"> - <location filename="../textentrypage.cpp" line="507"/> + <location filename="../textentrypage.cpp" line="519"/> <source>Example custom toolbar 1</source> - <translation type="unfinished"></translation> + <translation>Example custom toolbar 1</translation> </message> <message id="xx_tooltip_customtoolbar2"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="532"/> <source>Example custom toolbar 2</source> - <translation type="unfinished"></translation> + <translation>Example custom toolbar 2</translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="596"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>Url text:</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="598"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>Multiline:</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="574"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation>Enter text here</translation> </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="577"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation>This tooltip is quite long and will be clipped on the display</translation> </message> <message id="xx_textentry_custom_toolbar1"> - <location filename="../textentrypage.cpp" line="614"/> + <location filename="../textentrypage.cpp" line="628"/> <source>Custom ToolBar 1:</source> - <translation type="unfinished"></translation> + <translation>Custom ToolBar 1:</translation> </message> <message id="xx_textentry_custom_toolbar2"> - <location filename="../textentrypage.cpp" line="616"/> + <location filename="../textentrypage.cpp" line="630"/> <source>Custom ToolBar 2:</source> - <translation type="unfinished"></translation> + <translation>Custom ToolBar 2:</translation> </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="649"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation>Auto Capitalisation is active</translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="652"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation>No Auto Capitalisation</translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="583"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <oldsource>This is multiline @@ -405,22 +554,22 @@ tooltip</oldsource> <translation>This is a multiline text entry</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="600"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation>Singleline (selectall)</translation> </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="619"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation>Auto capitalisation</translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="621"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation>Error correction</translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation variants="yes"> <lengthvariant>Sliders</lengthvariant> @@ -428,28 +577,28 @@ tooltip</oldsource> </translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>Personal data</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation>Please select your age:</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>Brightness:</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>Player:</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -457,13 +606,13 @@ Seekbar is a special type of Slider used for displaying playback status for mult Seekbar is a special type of Slider used for displaying playback status for multimedia content.</translation> </message> - <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> <source>Application Menu</source> <translation>Application Menu</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></translation> </message> @@ -483,67 +632,67 @@ Seekbar is a special type of Slider used for displaying playback status for mult <translation>Time consuming setting</translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>Container</translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation>Progress Bar</translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation>A Progress Bar can indicate an ongoing process with either known or unknown durations.</translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation>Installing CoolApp</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation>Downloading nicepic.jpg</translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation>Example 1</translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation>Example 2</translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation>Default View</translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation>Tab View</translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation>Tool Bar</translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation>Object menu</translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> @@ -552,57 +701,63 @@ The primary (single short tap) action of the element should not be duplicated in The primary (single short tap) action of the element should not be duplicated in the Object Menu.</translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation>Friends</translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation>Favorite Albums</translation> </message> <message id="xx_displaymodes_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation>Navigation Bar</translation> </message> <message id="xx_displaymodes_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation>Escape Button</translation> </message> <message id="xx_displaymodes_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation>Home Button</translation> </message> <message id="xx_displaymodes_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <oldsource>Display Modes and Full Screen</oldsource> <translation>Display Modes and Full Screen</translation> </message> <message id="xx_displaymodes_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation>Components' display mode:</translation> </message> - <message id="xx_displaymodes_escape_mode_label"> - <location filename="../navigationbarpage.cpp" line="131"/> - <source>Escape Button mode:</source> - <translation>Escape Button mode:</translation> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation>Window state:</translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation>Full Screen</translation> </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation>Show</translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation>Auto Hide</translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation>Hide</translation> </message> @@ -773,63 +928,23 @@ The primary (single short tap) action of the element should not be duplicated in <source>Font test:</source> <translation>Font test:</translation> </message> - <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> - <source>Views and Dialogs</source> - <translation>View and Dialogs</translation> - </message> - <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> - <source>Contains and Applets</source> - <translation>Containers and Applets</translation> - </message> - <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> - <source>Layouts and Visuals</source> - <translation>Layouts and Visuals</translation> - </message> - <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> - <source>Buttons</source> - <translation>Buttons</translation> - </message> - <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> - <source>Indicators and Notifications</source> - <translation>Indicators and Notifications</translation> - </message> - <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> - <source>Lists, Grids and Menus</source> - <translation>Lists, Grids and Menus</translation> - </message> - <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> - <source>User input</source> - <translation>User Input</translation> - </message> - <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> - <source>Input Feedback</source> - <translation>Input Feedback</translation> - </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="162"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation>Sample template</translation> </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation>Template</translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="602"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation>Email suggestion text:</translation> </message> @@ -844,17 +959,17 @@ The primary (single short tap) action of the element should not be duplicated in <translation>ComboBox</translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="580"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation>Provides email address suggestions</translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation>Checkbox</translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> @@ -863,19 +978,17 @@ Checkbox essentially does the same thing as the Switch button, so please conside Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> - <translation>I have read and understood the -instructions.</translation> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <translation>I have read and understood the instructions.</translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation>Icon Button</translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> @@ -884,7 +997,7 @@ instructions.</translation> Icon Buttons are used in e.g. Toolbars.</translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation>Lorem ipsum</translation> </message> @@ -920,33 +1033,34 @@ sit amet</source> sit amet</translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="69"/> + <location filename="../spinnerpage.cpp" line="68"/> <source>In application main area</source> <oldsource>In container main area</oldsource> - <translation type="unfinished">In application main area</translation> + <translation>In container main area</translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="75"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation>In container header</translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="81"/> - <source>In view menu</source> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <oldsource>In view menu</oldsource> <translation>In view menu</translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="87"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation>In dialog</translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="100"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation>Spinner</translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="109"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -958,51 +1072,43 @@ Spinners can also be used in situations when duration is known, but available sp See the menu for examples of different use cases.</translation> </message> - <message id="xx_spinner_page_email_header"> - <source>From: John Doe -Date: Today -Subject: This is funny stuff!</source> - <translation type="obsolete">From: John Doe -Date: Today -Subject: This is funny stuff!</translation> - </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="119"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> <translation>Spinner can be used while content is loading.</translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="152"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation>Online albums</translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="161"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="205"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation>Spinner in the application menu area indicates that the whole view is pending for update.</translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="219"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation>Spinner can be placed in dialog header to indicate changing content.</translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="240"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation>Select Internet connection</translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation>Switch</translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> @@ -1011,37 +1117,37 @@ Switches are used to indicate e.g. settings values</source> Switches are used to indicate e.g. settings values</translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation>Headlights</translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation>Autopilot</translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation>Warp Drive</translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation>Reactor Shields</translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation>Infinite Improbability Drive</translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation>Input Feedback</translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -1050,74 +1156,77 @@ Input feedbacks can be easily configured for different purposes using the themin Input feedbacks can be easily configured for different purposes using the theming system.</translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation>Default</translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation>Different</translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation>Sluggish</translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation>Babytoy</translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation>Space</translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation>Silent</translation> </message> <message id="xx_gridpage_configuration"> - <location filename="../mgridpage.cpp" line="190"/> + <location filename="../mgridpage.cpp" line="193"/> <source>Configuration</source> <translation>Configuration</translation> </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="201"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation>Grid page</translation> </message> <message id="xx_gridpage_set_columns"> - <location filename="../mgridpage.cpp" line="283"/> + <location filename="../mgridpage.cpp" line="290"/> <source>Set columns</source> <translation>Set columns</translation> </message> <message id="xx_gridpage_landscape"> - <location filename="../mgridpage.cpp" line="309"/> + <location filename="../mgridpage.cpp" line="316"/> <source>Landscape</source> <translation>Landscape</translation> </message> <message id="xx_gridpage_portrait"> - <location filename="../mgridpage.cpp" line="314"/> + <location filename="../mgridpage.cpp" line="321"/> <source>Portrait</source> <translation>Portrait</translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="373"/> - <source>Video container</source> - <translation>Video container</translation> - </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="378"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> - <translation>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</translation> - </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="381"/> - <source>Gallery</source> - <translation>Gallery</translation> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> + <translation>Speech Bubble</translation> + </message> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> + <translation>Link activated</translation> + </message> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> + <translation>Subtitle</translation> </message> </context> </TS> diff --git a/demos/widgetsgallery/translations/widgetsgallery_fi.ts b/demos/widgetsgallery/translations/widgetsgallery_fi.ts index f831ddf8..61f4f7ea 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_fi.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_fi.ts @@ -3,53 +3,208 @@ <TS version="2.0" language="fi"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation type="unfinished">Valikko</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation type="unfinished">Otsikoita</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation type="unfinished">Kuva</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation type="unfinished">Säiliö</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation type="unfinished">Lista</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation type="unfinished">Tekstinsyöttö</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation type="unfinished"></translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>Vekotinnäyttely</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>Otsikoita</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -58,72 +213,107 @@ All Labels can be aligned left, right or center and will be automatically trunca <translation type="unfinished"></translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation type="unfinished"></translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation type="unfinished">Näytä dialogi</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -133,157 +323,141 @@ Muwhahaha... [evil laugh]</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation type="unfinished">Eventtibanneri</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation type="unfinished">Informaatiobanneri</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> <source>Dialogs and Notifications</source> - <translation>Dialogeja ja Notifikaatioita</translation> + <translation type="obsolete">Dialogeja ja Notifikaatioita</translation> </message> <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> <source>Dialog examples</source> - <translation type="unfinished">Dialogeja</translation> + <translation type="obsolete">Dialogeja</translation> </message> <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> <source>Question Dialog</source> - <translation>Näytä dialogi</translation> - </message> - <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> - <source>Entry Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> - <source>A Long Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> - <source>Stacked Dialogs</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> - <source>System Modal Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> - <source>Dialog With Progress Indicator</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> - <source>Simple Message Box</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Näytä dialogi</translation> </message> <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> <source>Notifications and messages</source> - <translation type="unfinished">Notifikaatioita</translation> + <translation type="obsolete">Notifikaatioita</translation> </message> <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> <source>Event Banner</source> - <translation>Eventtibanneri</translation> + <translation type="obsolete">Eventtibanneri</translation> </message> <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> <source>Information Banner</source> - <translation>Informaatiobanneri</translation> - </message> - <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> - <source>System Information Banner</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Informaatiobanneri</translation> </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>Kuva</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation type="unfinished"></translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation type="unfinished"></translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation type="unfinished"></translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation type="unfinished"></translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation type="unfinished"></translation> </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation type="unfinished"></translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>Lista</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>Tekstinsyöttö</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <oldsource>This is multiline @@ -291,119 +465,144 @@ tooltip</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation type="unfinished"></translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>Vapaa teksti</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>Vapaa teksti(maskattu)</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>Numeronsyöttö</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>Puhelinnumero</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>Sähköposti</translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>Internet-osoite</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>Usean rivin teksti</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation type="unfinished"></translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation type="unfinished"></translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation type="unfinished"></translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation type="unfinished"></translation> </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation type="unfinished"></translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation variants="yes"> <lengthvariant>Sliders</lengthvariant> @@ -411,28 +610,28 @@ tooltip</oldsource> </translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>Personal data</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation type="unfinished">Valitse ikäsi:</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>Brightness:</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>Player:</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -441,62 +640,66 @@ Seekbar is a special type of Slider used for displaying playback status for mult Seekbar is a special type of Slider used for displaying playback status for multimedia content.</translation> </message> <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> <source>Application Menu</source> - <translation>Valikko</translation> + <translation type="obsolete">Valikko</translation> + </message> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> + <source>Application Menu</source> + <translation type="unfinished">Valikko</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation type="unfinished"></translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation type="unfinished"></translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation type="unfinished"></translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation type="unfinished"></translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <translation type="unfinished"></translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>Säiliö</translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation type="unfinished"></translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation type="unfinished"></translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation type="unfinished">tuntematon aika - palkki</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation type="unfinished">tunnettu aika - palkki</translation> </message> @@ -647,200 +850,151 @@ Seekbar is a special type of Slider used for displaying playback status for mult <source>Font test:</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <message id="xx_displaymodes_navbarcombo"> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <message id="xx_displaymodes_escapebtncombo"> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <message id="xx_displaymodes_homebtncombo"> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> + <message id="xx_displaymodes_page_title"> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <message id="xx_displaymodes_display_mode"> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_escape_mode_label"> - <location filename="../navigationbarpage.cpp" line="131"/> - <source>Escape Button mode:</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_navigationbar_auto"> - <location filename="../navigationbarpage.cpp" line="136"/> - <source>Auto</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_navigationbar_manual_back"> - <location filename="../navigationbarpage.cpp" line="140"/> - <source>Manual Back</source> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> <translation type="unfinished"></translation> </message> - <message id="xx_navigationbar_close_window"> - <location filename="../navigationbarpage.cpp" line="144"/> - <source>Close Window</source> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation type="unfinished"></translation> </message> - <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> - <source>Layouts and Visuals</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> - <source>Buttons</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> - <source>Views and Dialogs</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> - <source>Contains and Applets</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> - <source>Indicators and Notifications</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> - <source>Lists, Grids and Menus</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> - <source>User input</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> - <source>Input Feedback</source> - <translation type="unfinished"></translation> - </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation type="unfinished"></translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <oldsource>I have read and understood the +instructions.</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation type="unfinished"></translation> </message> @@ -873,32 +1027,34 @@ sit amet</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> - <source>In container main area</source> + <location filename="../spinnerpage.cpp" line="68"/> + <source>In application main area</source> + <oldsource>In container main area</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <oldsource>In view menu</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -906,140 +1062,156 @@ Spinners can also be used in situations when duration is known, but available sp See the menu for examples of different use cases.</source> <translation type="unfinished"></translation> </message> - <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> - <source>From: John Doe -Date: Today -Subject: This is funny stuff!</source> - <translation type="unfinished"></translation> - </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation type="unfinished"></translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation type="unfinished"></translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> - <source>Video container</source> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> - <source>Gallery</source> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> <translation type="unfinished"></translation> </message> </context> diff --git a/demos/widgetsgallery/translations/widgetsgallery_hu.ts b/demos/widgetsgallery/translations/widgetsgallery_hu.ts index 2fe3dec9..135dbb82 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_hu.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_hu.ts @@ -3,43 +3,198 @@ <TS version="2.0" language="en"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation type="unfinished">Alkalmazás Menü</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation type="unfinished">Címkék</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation type="unfinished">Kép</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation type="unfinished">Haladó Csík</translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation type="unfinished">Tároló</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation type="unfinished">Tekerő</translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation type="unfinished">Gombok</translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation type="unfinished">Nyomógomb</translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation type="unfinished">Ikon Gomb</translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation type="unfinished">Kapcsoló</translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation type="unfinished">Jelölőnégyzet</translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation type="unfinished">Lista</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation type="unfinished">Rács</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation type="unfinished">Kombó</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation type="unfinished">Feljegyzések</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation type="unfinished">Visszajelzés</translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>Grafikus Elemek Tárlata</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation>Automatikus</translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation>Álló</translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation>Fekvő</translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation>0 fok</translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation>90 fok óramutató irányban</translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation>180 fok óramutató irányban</translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation>270 fok óramutató irányban</translation> </message> @@ -172,12 +327,12 @@ <translation type="obsolete">Rendezetlen</translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>Címkék</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -190,72 +345,107 @@ A Formázott Címkék több sort is tartalmazhatnak, valamint linkek esetén tá A Címkék balra, jobbra vagy középre lehetnek rendezve és az általuk megjelenített szöveg csak részben lesz látható ha a címke nem fér be egy adott területre.</translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation>Egyszerű Címke</translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation type="unfinished">Kérdő Dialógus</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation>Kérdező dialógus címe</translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation>Lorem ipsum dolor sit amet?</translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation type="unfinished">Bemenet Dialógus</translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation>Név</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation>Írd be a neved</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation>Válassz nyomtatót</translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation type="unfinished">Egymásra helyezett dialógusok</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation type="unfinished">Ablak Modális Dialógus</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation>Klikkelj az egymásba helyezett dialógusok létrehozásáshoz</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation>Egymásra helyezett dialógusok</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation>Klikkelj az egymásba helyezett üzenetek megjelenítéséhez</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation>Egymásba helyezett dialógusok</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation>Egymásba helyezett üzenetek</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation>Ablak Modális Dialógus</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -267,34 +457,48 @@ Nem tudsz megkerülni! Muwhahaha... [röhögés]</translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation>Sziasztok!</translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation type="unfinished">Eseményszallag</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation type="unfinished">Informácószallag</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation type="unfinished">Rendszer Információ Szallag</translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation><b>Ida Taipale</b><br/>Már láttad a kutyát?</translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation><b>Akkumulátor kimerülőben</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation><b>Beérkező hívás</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation>Elfogad</translation> </message> <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> <source>Dialogs and Notifications</source> - <translation variants="yes"> + <translation type="obsolete" variants="yes"> <lengthvariant>Dialógusok és Értesítők</lengthvariant> <lengthvariant>Dialógusok és Értesítők</lengthvariant> <lengthvariant>Dialógusok és Értesítők</lengthvariant> @@ -303,81 +507,69 @@ Muwhahaha... [röhögés]</translation> </translation> </message> <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> <source>Dialog examples</source> - <translation>Dialógusok</translation> + <translation type="obsolete">Dialógusok</translation> </message> <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> <source>Question Dialog</source> - <translation>Kérdő Dialógus</translation> + <translation type="obsolete">Kérdő Dialógus</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> <source>Entry Dialog</source> - <translation>Bemenet Dialógus</translation> + <translation type="obsolete">Bemenet Dialógus</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> <source>A Long Dialog</source> - <translation>Egy Hosszú Dialógus</translation> + <translation type="obsolete">Egy Hosszú Dialógus</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> <source>Stacked Dialogs</source> - <translation>Egymásra helyezett dialógusok</translation> + <translation type="obsolete">Egymásra helyezett dialógusok</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> <source>System Modal Dialog</source> - <translation>Ablak Modális Dialógus</translation> + <translation type="obsolete">Ablak Modális Dialógus</translation> </message> <message id="xx_dialogs_and_notifications_label_messagebox"> <source> DuiMessageBox examples</source> <translation type="obsolete">DuiMessageBox examples</translation> </message> <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> <source>Simple Message Box</source> - <translation>Egyszerű üzenetdoboz</translation> + <translation type="obsolete">Egyszerű üzenetdoboz</translation> </message> <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> <source>Notifications and messages</source> - <translation>Értesítések és üzenetek</translation> + <translation type="obsolete">Értesítések és üzenetek</translation> </message> <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> <source>Event Banner</source> - <translation>Eseményszallag</translation> + <translation type="obsolete">Eseményszallag</translation> </message> <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> <source>Information Banner</source> - <translation>Informácószallag</translation> + <translation type="obsolete">Informácószallag</translation> </message> <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> <source>System Information Banner</source> - <translation>Rendszer Információ Szallag</translation> + <translation type="obsolete">Rendszer Információ Szallag</translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation>Haladás Jelző</translation> </message> <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> <source>Dialog With Progress Indicator</source> - <translation>Haladás Jelzős Dialógus</translation> + <translation type="obsolete">Haladás Jelzős Dialógus</translation> </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>Kép</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation>Kép tulajdonságai</translation> </message> @@ -394,27 +586,37 @@ Muwhahaha... [röhögés]</translation> <translation type="obsolete">Megállít</translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation>Képi műveletek</translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation>Nagyítás</translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation>Áttetszőség</translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation>Levág</translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>Lista</translation> </message> @@ -427,109 +629,135 @@ Muwhahaha... [röhögés]</translation> <translation type="obsolete">Egyebek</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>Feljegyzések</translation> </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>Tetszőleges szöveg:</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>Tetszőleges szöveg(letakarva):</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>Szám:</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>Telefonszám:</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>Email cím:</translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>Url cím:</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>Többsoros:</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation>Szöveg</translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation>Klikk ide</translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation>Nyomj le egy billentyűt</translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> - <source><i>Billentyű leütés</i> billentyű:</source> - <translation></translation> + <location filename="../textentrypage.cpp" line="186"/> + <source><i>Key press</i> key:</source> + <oldsource><i>Billentyű leütés</i> billentyű:</oldsource> + <translation type="unfinished"></translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation>szöveg:</translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation><i>Billentyű felengedés</i> billentyű:</translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation type="unfinished"></translation> + </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation>Ez az eszközleíró túl hosszú ezért a megjelenítés során bizonyos részei levágódnak.</translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation>Nincs visszajelzés szerkesztéskor:</translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation>Visszajelzés szerkesztéskor:</translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation>Közvetlen bemenet:</translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation>Automatikus nagybetűhasználat bekapcsolva</translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation>Automatikus nagybetűhasználat kikapcsolva</translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <oldsource>This is multiline @@ -539,22 +767,22 @@ többsoros eszközleíró</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation>Egysoros (mindent kiválaszt)</translation> </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation>Automatikus nagybetűhasználat</translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation>Hiba kijavítása</translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation variants="yes"> <lengthvariant>Csúszkák</lengthvariant> @@ -562,28 +790,28 @@ eszközleíró</translation> </translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>Személyes adatok</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation>Korod:</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>Fényesség:</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>Lejátszó:</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -592,12 +820,16 @@ Seekbar is a special type of Slider used for displaying playback status for mult A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának figyelésére használnak.</translation> </message> <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> <source>Application Menu</source> - <translation>Alkalmazás Menü</translation> + <translation type="obsolete">Alkalmazás Menü</translation> + </message> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> + <source>Application Menu</source> + <translation type="unfinished">Alkalmazás Menü</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation>Az Alkalmazás menü minden nézetből megjeleníthető. <ul><li>Az oldal cím területének érintéséval tehető láthatóvá.</li><li>Az adott nézethez kötődő beállításokat és parancsokat valamint a nézet stílusához kötődő beállításokat tartalmazza.</li><li>Az alkalmazás minden nézetéhez sajátos Alkalmazás Menü kapcsolódhat.</li></ul><b>Irányelvek</b> az Alkalmaźas Menü tartalmához:<ul><li>A Beállítások menü elem az alkalmazás fő nézetéhez kapcsolódó Alkalmazás menüben foglalhon helyet, hacsak nem tartalmaz egy adott nézethez kotődő beállítást</li><li>A Súgó minden Alkalmazás Menüből legyen elérhető</li><li>A Kilépés minden Alkalmazás Menüből legyen elérhető kivéve a főnézet Alkalmazás menüjét.</li></ul></translation> </message> @@ -710,17 +942,17 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig <translation type="obsolete">Japán</translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation>Cím</translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation>Csökkenő sorrendbe rendezés</translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation>Időigényes beállítás</translation> </message> @@ -729,7 +961,7 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig <translation type="obsolete">Testreszabott</translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>Tároló</translation> </message> @@ -742,22 +974,22 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig </translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation>Haladó Csík</translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation>Haladó csíkkal ismert vagy ismeretlen időtartamú folyamatokat lehet követni.</translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation>CoolApp telepítse</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation>szepkep.jpg letöltése</translation> </message> @@ -786,42 +1018,42 @@ A kereső egy olyan csúszka amelyet multimédiás tartalom lejátszásának fig <translation type="obsolete">Rács</translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation>1. Példa</translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation>2. Példa</translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation>Alapértelmezett nézet</translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation>Füles nézet</translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation>Eszköztár</translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation><b>Eszköztár</b> egy tároló amelyik a nézethez szempontjaból fontos parancsokat tartalmaz amelyek kötődnek közvetlenül a nézetben megjelenített grafikus elemekhez. <ul><li>4 Ikon Gombot tartalmazhat (kattints a Menüre, majd az első példáratlmazhat egy szöveges bemeneti mezőt is 2 Ikon Gombbal (kattints a Menüre, majd az második példára)</li> <l</li></ul></translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation>Objektum menü</translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> @@ -830,24 +1062,22 @@ The primary (single short tap) action of the element should not be duplicated in Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megismételni az Objektum Menüben.</translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation>Barátok</translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation>Kedvenc Albumok</translation> </message> <message id="xx_navigationbar_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> <source>Display Modes and Full Screen</source> - <translation>Tájoló Csík</translation> + <translation type="obsolete">Tájoló Csík</translation> </message> <message id="xx_navigationbar_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> <source>Components' display mode:</source> - <translation>Elemek megjeleítési módja:</translation> + <translation type="obsolete">Elemek megjeleítési módja:</translation> </message> <message id="xx_navigationbar_toggle_navigationbar"> <source>Toggle nav. bar visibility</source> @@ -861,39 +1091,32 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <translation type="obsolete">Változtatsd meg az Esc gomb láthatóságát</translation> </message> <message id="xx_navigationbar_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> <source>Navigation Bar</source> - <translation>Tájoló Csík</translation> + <translation type="obsolete">Tájoló Csík</translation> </message> <message id="xx_navigationbar_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> <source>Escape Button</source> - <translation>Escape Gomb</translation> + <translation type="obsolete">Escape Gomb</translation> </message> <message id="xx_navigationbar_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> <source>Home Button</source> - <translation>Főoldal Gomb</translation> + <translation type="obsolete">Főoldal Gomb</translation> </message> <message id="xx_navigationbar_escape_mode_label"> - <location filename="../navigationbarpage.cpp" line="131"/> <source>Escape Button mode:</source> - <translation>Escape Gomb állapota:</translation> + <translation type="obsolete">Escape Gomb állapota:</translation> </message> <message id="xx_navigationbar_auto"> - <location filename="../navigationbarpage.cpp" line="136"/> <source>Auto</source> - <translation>Automatikus</translation> + <translation type="obsolete">Automatikus</translation> </message> <message id="xx_navigationbar_manual_back"> - <location filename="../navigationbarpage.cpp" line="140"/> <source>Manual Back</source> - <translation>Kézi visszaléptetés</translation> + <translation type="obsolete">Kézi visszaléptetés</translation> </message> <message id="xx_navigationbar_close_window"> - <location filename="../navigationbarpage.cpp" line="144"/> <source>Close Window</source> - <translation>Ablak bezárása</translation> + <translation type="obsolete">Ablak bezárása</translation> </message> <message id="xx_navigationbar_escapebutton_mode_label"> <source>Escape Button mode:</source> @@ -911,18 +1134,53 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <source>Hidden</source> <translation type="obsolete">Láthatatlan</translation> </message> + <message id="xx_displaymodes_navbarcombo"> + <location filename="../displaymodespage.cpp" line="59"/> + <source>Navigation Bar</source> + <translation type="unfinished">Tájoló Csík</translation> + </message> + <message id="xx_displaymodes_escapebtncombo"> + <location filename="../displaymodespage.cpp" line="67"/> + <source>Escape Button</source> + <translation type="unfinished">Escape Gomb</translation> + </message> + <message id="xx_displaymodes_homebtncombo"> + <location filename="../displaymodespage.cpp" line="75"/> + <source>Home Button</source> + <translation type="unfinished">Főoldal Gomb</translation> + </message> + <message id="xx_displaymodes_page_title"> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_displaymodes_display_mode"> + <location filename="../displaymodespage.cpp" line="147"/> + <source>Components' display mode:</source> + <translation type="unfinished">Elemek megjeleítési módja:</translation> + </message> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation type="unfinished"></translation> + </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation>Megjelenít</translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation>Automatikusan eltűntet</translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation>Eltűntet</translation> </message> @@ -1090,34 +1348,28 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <translation type="obsolete">Nézetek, Tárolók és Dialógusok</translation> </message> <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> <source>Views and Dialogs</source> - <translation>Nézetek és Dialógusok</translation> + <translation type="obsolete">Nézetek és Dialógusok</translation> </message> <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> <source>Contains and Applets</source> - <translation>Tárolók és Appletek</translation> + <translation type="obsolete">Tárolók és Appletek</translation> </message> <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> <source>Layouts and Visuals</source> - <translation>Szerkezetek és Látható elemek</translation> + <translation type="obsolete">Szerkezetek és Látható elemek</translation> </message> <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> <source>Buttons</source> - <translation>Gombok</translation> + <translation type="obsolete">Gombok</translation> </message> <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> <source>Indicators and Notifications</source> - <translation>Jelzők és Értesítők</translation> + <translation type="obsolete">Jelzők és Értesítők</translation> </message> <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> <source>Lists, Grids and Menus</source> - <translation>Listák, Rácsok és Menük</translation> + <translation type="obsolete">Listák, Rácsok és Menük</translation> </message> <message id="xx_template_page_indicators"> <source>Indicators</source> @@ -1128,9 +1380,8 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <translation type="obsolete">Listák és Rácsok</translation> </message> <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> <source>User input</source> - <translation>Felhasználói bemenet</translation> + <translation type="obsolete">Felhasználói bemenet</translation> </message> <message id="xx_example1 template"> <source>Example 1</source> @@ -1141,7 +1392,7 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <translation type="obsolete">2. Példa</translation> </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation>A felhasználó a kép segítségével külömböző képeket jeleníthet meg. A képek általában passzív elemek, bár szükség esetén reagálhatnak egyszerű érintésszerű felhasználói bemenetetre.</translation> </message> @@ -1154,43 +1405,43 @@ Az elsődleges (egyszeri rövid érintés) kiváltó eseményt nem lehet megism <translation type="obsolete">A felhasználó egy felugró lista meghatározott számú előregyártott / rendszer által meghatározott lehetősége közül választhat egyet. Ezután a lista megjeleníti a kiválasztott lehetőséget. A felugró listából csakis egy lehetőséget lehet kiválasztani.</translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation>Példa Sablon</translation> </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation>Sablon</translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation>Sugallt email cím:</translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource> <translation>A DuiComboBox elem egy gombból és egy felugró listából Nagyon hasonlít a QComboBox-ra, de nem lehet benne szöveget változtatni.</translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation>Kombó</translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation>Sugall egy email címet</translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation>Jelölőnégyzet</translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> @@ -1199,19 +1450,20 @@ Checkbox essentially does the same thing as the Switch button, so please conside A Jelölőnégyzet ugyanúgy működik mint a Kapcsoló, ezért inkább azt használd helyette.</translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> - <translation>Elolvastam és megértettem + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <oldsource>I have read and understood the +instructions.</oldsource> + <translation type="unfinished">Elolvastam és megértettem utasításokat.</translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation>Ikon Gomb</translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> @@ -1220,7 +1472,7 @@ utasításokat.</translation> Ikon Gombokat használnak például az Eszköztárakban.</translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation>Lorem ipsum</translation> </message> @@ -1257,12 +1509,13 @@ sit amet</source> sit amet</translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> - <source>In container main area</source> - <translation>Az alkalmazás testében </translation> + <location filename="../spinnerpage.cpp" line="68"/> + <source>In application main area</source> + <oldsource>In container main area</oldsource> + <translation type="unfinished">Az alkalmazás testében </translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation>A tároló fejlécében</translation> </message> @@ -1271,22 +1524,23 @@ sit amet</translation> <translation type="obsolete">Tárolóban</translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> - <translation>Nézet menüben</translation> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <oldsource>In view menu</oldsource> + <translation type="unfinished">Nézet menüben</translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation>Dialógusban</translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation>Tekerő</translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -1299,41 +1553,40 @@ Tekerőket abban az esetben is lehet használni, ha a végbemenő folyamat időt Nézd meg a menüben a külömböző felhasználási lehetőségeket.</translation> </message> <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> <source>From: John Doe Date: Today Subject: This is funny stuff!</source> - <translation>Kis Jánostól + <translation type="obsolete">Kis Jánostól Dátum: Ma Téma: Egy cseles dolog!</translation> </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> <translation>A tekerő a tartalom betöltődését is jelezheti.</translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation>Online albumok</translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation>A tároló fejlécébe helyezett tekerő a tároló tartalmának frissitését jelzi, miközben a grafikus elemek nincsenek letitlva</translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation>Az alkalmazás menübe helyezett tekerő a teljes nézet frissitésére való várakozást jelzi</translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation>Tekerőt a dialógus fejlécébe is lehet helyezni a tartalom változásának jelzésére</translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation>Válassz internet kapcsolatot</translation> </message> @@ -1342,12 +1595,12 @@ Téma: Egy cseles dolog!</translation> <translation type="obsolete">Kapcsolódási pontok letapogatása</translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation>Kapcsoló</translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> @@ -1357,42 +1610,41 @@ azt sugallva, hogy állapotuk megváltoztatásával nem fog egyéb történni, m A Kapcsolókat bizonyos beállítások megjelenítésére használják.</translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation>Fényszórók</translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation>Automatikus pilóta</translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation>Vontatás</translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation>Reaktor védelem</translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation>Teljesen bizonytalan haladás</translation> </message> <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> <source>Input Feedback</source> - <translation>Visszajelzés</translation> + <translation type="obsolete">Visszajelzés</translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation>Visszajelzés</translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -1404,54 +1656,89 @@ Input feedbacks can be easily configured for different purposes using the themin A visszajelzéseket a témarendszer segítségével lehet beállítani.</translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation>Alapértelmezett</translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation>Külömböző</translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation>Lomha</translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation>Játék</translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation>Szünet</translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation>Csendes</translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation type="unfinished"></translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation>Rács</translation> </message> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation type="unfinished">Fekvő</translation> + </message> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation type="unfinished">Álló</translation> + </message> <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> <source>Video container</source> - <translation>Videó</translation> + <translation type="obsolete">Videó</translation> </message> <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> - <translation>Lejátszáshoz / megállításhoz érintsd meg az indexképet. Hosszabb érintéssel eredeti méretben játsza le a videót.</translation> + <translation type="obsolete">Lejátszáshoz / megállításhoz érintsd meg az indexképet. Hosszabb érintéssel eredeti méretben játsza le a videót.</translation> </message> <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> <source>Gallery</source> - <translation>Galéria</translation> + <translation type="obsolete">Galéria</translation> + </message> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> + <translation type="unfinished"></translation> </message> </context> </TS> diff --git a/demos/widgetsgallery/translations/widgetsgallery_ur.ts b/demos/widgetsgallery/translations/widgetsgallery_ur.ts index 9343b2d7..064bf555 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_ur.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_ur.ts @@ -3,111 +3,146 @@ <TS version="2.0" language="ur_IN"> <context> <name></name> - <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> <source>Application Menu</source> <translation type="unfinished"></translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation type="unfinished"></translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation type="unfinished"></translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -117,147 +152,107 @@ Muwhahaha... [evil laugh]</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation type="unfinished"></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation type="unfinished"></translation> </message> - <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> - <source>Dialogs and Notifications</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> - <source>Dialog examples</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> - <source>Question Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> - <source>Entry Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> - <source>A Long Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> - <source>Stacked Dialogs</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> - <source>System Modal Dialog</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> - <source>Dialog With Progress Indicator</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> - <source>Simple Message Box</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> - <source>Notifications and messages</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> - <source>Event Banner</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> - <source>Information Banner</source> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> <translation type="unfinished"></translation> </message> - <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> - <source>System Information Banner</source> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> <translation type="unfinished"></translation> </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation type="unfinished"></translation> </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation type="unfinished"></translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation type="unfinished"></translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation type="unfinished"></translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation type="unfinished"></translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation type="unfinished"></translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation type="unfinished"></translation> </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation type="unfinished"></translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation type="unfinished"></translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -266,12 +261,12 @@ All Labels can be aligned left, right or center and will be automatically trunca <translation type="unfinished"></translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation type="unfinished"></translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation type="unfinished"></translation> </message> @@ -422,221 +417,347 @@ All Labels can be aligned left, right or center and will be automatically trunca <source>Font test:</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation type="unfinished"></translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>WG Urdu اُردوُ</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymodes_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymodes_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymodes_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymodes_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <oldsource>Display Modes and Full Screen</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_displaymodes_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation type="unfinished"></translation> </message> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation type="unfinished"></translation> + </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation type="unfinished"></translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation type="unfinished"></translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation type="unfinished"></translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <oldsource>The DuiComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation type="unfinished"></translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation type="unfinished"></translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation type="unfinished"></translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation type="unfinished"></translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation type="unfinished"></translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation type="unfinished"></translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation type="unfinished"></translation> </message> - <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> - <source>Layouts and Visuals</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> - <source>Buttons</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> - <source>Views and Dialogs</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> - <source>Contains and Applets</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> - <source>Indicators and Notifications</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> - <source>Lists, Grids and Menus</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> - <source>User input</source> - <translation type="unfinished"></translation> - </message> - <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> - <source>Input Feedback</source> - <translation type="unfinished"></translation> - </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation type="unfinished"></translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <oldsource>This is multiline @@ -644,179 +765,205 @@ tooltip</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation type="unfinished"></translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation type="unfinished"></translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation type="unfinished"></translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation type="unfinished"></translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation type="unfinished"></translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation type="unfinished"></translation> </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation type="unfinished"></translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <oldsource>I have read and understood the +instructions.</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> <translation type="unfinished"></translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation type="unfinished"></translation> </message> @@ -849,32 +996,34 @@ sit amet</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> - <source>In container main area</source> + <location filename="../spinnerpage.cpp" line="68"/> + <source>In application main area</source> + <oldsource>In container main area</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <oldsource>In view menu</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -882,87 +1031,80 @@ Spinners can also be used in situations when duration is known, but available sp See the menu for examples of different use cases.</source> <translation type="unfinished"></translation> </message> - <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> - <source>From: John Doe -Date: Today -Subject: This is funny stuff!</source> - <translation type="unfinished"></translation> - </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation type="unfinished"></translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -972,53 +1114,76 @@ Input feedbacks can be easily configured for different purposes using the themin <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation type="unfinished"></translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation type="unfinished"></translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> - <source>Video container</source> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> - <source>Gallery</source> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> <translation type="unfinished"></translation> </message> </context> diff --git a/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts b/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts index 72480d6b..3ec0706e 100644 --- a/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts +++ b/demos/widgetsgallery/translations/widgetsgallery_zh_CN.ts @@ -3,53 +3,208 @@ <TS version="2.0" language="zh_CN"> <context> <name></name> + <message id="xx_wg_categories_application_view"> + <location filename="../mainpage.cpp" line="86"/> + <source>Application View</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_application_view_view_menu"> + <location filename="../mainpage.cpp" line="88"/> + <source>Application Menu</source> + <translation type="unfinished">应用菜单</translation> + </message> + <message id="xx_wg_application_view_display_modes"> + <location filename="../mainpage.cpp" line="90"/> + <source>Display Modes</source> + <translation type="unfinished">导航条</translation> + </message> + <message id="xx_wg_application_view_toolbar_incl_tab_bar"> + <location filename="../mainpage.cpp" line="92"/> + <source>Toolbar (including Tab Bar)</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_simple_widgets"> + <location filename="../mainpage.cpp" line="96"/> + <source>Simple Widgets</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_simple_widgets_labels"> + <location filename="../mainpage.cpp" line="98"/> + <source>Labels</source> + <translation type="unfinished">标签</translation> + </message> + <message id="xx_wg_simple_widgets_image"> + <location filename="../mainpage.cpp" line="100"/> + <source>Image</source> + <translation type="unfinished">图像</translation> + </message> + <message id="xx_wg_simple_widgets_progress_bar"> + <location filename="../mainpage.cpp" line="102"/> + <source>Progress Bar</source> + <translation type="unfinished">进度条</translation> + </message> + <message id="xx_wg_simple_widgets_container"> + <location filename="../mainpage.cpp" line="104"/> + <source>Container</source> + <translation type="unfinished">包容器</translation> + </message> + <message id="xx_wg_simple_widgets_spinner"> + <location filename="../mainpage.cpp" line="106"/> + <source>Spinner</source> + <translation type="unfinished">旋转进度指示</translation> + </message> + <message id="xx_wg_categories_buttons"> + <location filename="../mainpage.cpp" line="109"/> + <source>Buttons</source> + <translation type="unfinished">按钮</translation> + </message> + <message id="xx_wg_buttons_push_button"> + <location filename="../mainpage.cpp" line="111"/> + <source>Push Button</source> + <translation type="unfinished">按钮</translation> + </message> + <message id="xx_wg_buttons_icon_button"> + <location filename="../mainpage.cpp" line="113"/> + <source>Icon Button</source> + <translation type="unfinished">图标按钮</translation> + </message> + <message id="xx_wg_buttons_switch"> + <location filename="../mainpage.cpp" line="115"/> + <source>Switch</source> + <translation type="unfinished">开关</translation> + </message> + <message id="xx_wg_buttons_checkbox"> + <location filename="../mainpage.cpp" line="117"/> + <source>Checkbox</source> + <translation type="unfinished">核选框</translation> + </message> + <message id="xx_wg_categories_dialogs_and_banners"> + <location filename="../mainpage.cpp" line="120"/> + <source>Dialogs and Banners</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_single_selection_dialog"> + <location filename="../mainpage.cpp" line="122"/> + <source>Single Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_multiple_selection_dialog"> + <location filename="../mainpage.cpp" line="124"/> + <source>Multiple Selection Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_query_dialog"> + <location filename="../mainpage.cpp" line="126"/> + <source>Query Dialog</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_dialogs_and_banners_banner"> + <location filename="../mainpage.cpp" line="128"/> + <source>Banner</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_lists_grids_and_popups"> + <location filename="../mainpage.cpp" line="131"/> + <source>Lists, Grids and Popups</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_list"> + <location filename="../mainpage.cpp" line="133"/> + <source>List</source> + <translation type="unfinished">列表</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_grid"> + <location filename="../mainpage.cpp" line="135"/> + <source>Grid</source> + <translation type="unfinished">网格</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_object_menu"> + <location filename="../mainpage.cpp" line="137"/> + <source>Object Menu</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_combobox"> + <location filename="../mainpage.cpp" line="139"/> + <source>ComboBox</source> + <translation type="unfinished">组合对话框</translation> + </message> + <message id="xx_wg_lists_grids_and_popups_contentitems"> + <location filename="../mainpage.cpp" line="141"/> + <source>ContentItems</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_lists_grids_and_popups_bubble"> + <location filename="../mainpage.cpp" line="143"/> + <source>Speech bubble</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_categories_user_input"> + <location filename="../mainpage.cpp" line="146"/> + <source>User Input</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_text_entries"> + <location filename="../mainpage.cpp" line="148"/> + <source>Text Entries</source> + <translation type="unfinished">输入文字</translation> + </message> + <message id="xx_wg_user_input_slider"> + <location filename="../mainpage.cpp" line="150"/> + <source>Slider</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_user_input_input_feedback"> + <location filename="../mainpage.cpp" line="152"/> + <source>Input Feedback</source> + <translation type="unfinished">输入反馈</translation> + </message> <message id="xx_application_title"> - <location filename="../listpage.cpp" line="187"/> + <location filename="../mainpage.cpp" line="330"/> <source>Widgets Gallery</source> <translation>画廊</translation> </message> <message id="xx_apporientation_auto"> - <location filename="../listpage.cpp" line="456"/> + <location filename="../mainpage.cpp" line="546"/> <source>Automatic</source> <translation>自动</translation> </message> <message id="xx_apporientation_portrait"> - <location filename="../listpage.cpp" line="464"/> + <location filename="../mainpage.cpp" line="554"/> <source>Portrait</source> <translation>竖屏</translation> </message> <message id="xx_apporientation_landscape"> - <location filename="../listpage.cpp" line="472"/> + <location filename="../mainpage.cpp" line="562"/> <source>Landscape</source> <translation>横屏</translation> </message> <message id="xx_apporientation_angle0"> - <location filename="../listpage.cpp" line="480"/> + <location filename="../mainpage.cpp" line="570"/> <source>0 degrees</source> <translation> 0 度</translation> </message> <message id="xx_apporientation_angle90"> - <location filename="../listpage.cpp" line="488"/> + <location filename="../mainpage.cpp" line="578"/> <source>90 degrees clockwise</source> <translation>顺时针旋转90度</translation> </message> <message id="xx_apporientation_angle180"> - <location filename="../listpage.cpp" line="496"/> + <location filename="../mainpage.cpp" line="586"/> <source>180 degrees clockwise</source> <translation>顺时针旋转180度</translation> </message> <message id="xx_apporientation_angle270"> - <location filename="../listpage.cpp" line="504"/> + <location filename="../mainpage.cpp" line="594"/> <source>270 degrees clockwise</source> <translation>顺时针旋转270度</translation> </message> <message id="xx_label_page_title"> - <location filename="../labelpage.cpp" line="119"/> + <location filename="../labelpage.cpp" line="108"/> <source>Labels</source> <translation>标签</translation> </message> <message id="xx_label_page_info_label"> - <location filename="../labelpage.cpp" line="129"/> + <location filename="../labelpage.cpp" line="118"/> <source>Simple Label is used mainly by other components, and it does not support any formatting or interaction. Rich Label supports multiple lines, HTML formatting and highlighting for links. @@ -60,72 +215,107 @@ All Labels can be aligned left, right or center and will be automatically trunca 所有标签都可以左对齐，右对齐和居中，如果文字超过给定的区域将会被自动截断。</translation> </message> <message id="xx_simple_label"> - <location filename="../labelpage.cpp" line="131"/> + <location filename="../labelpage.cpp" line="120"/> <source>Simple Label</source> <translation>简单标签</translation> </message> <message id="xx_rich_label"> - <location filename="../labelpage.cpp" line="134"/> + <location filename="../labelpage.cpp" line="123"/> <source>Rich Label <b>bold</b>, <i>italic</i>, http://www.nokia.com, +358401234567, fors.fagerstrom@email.com</source> <translation>富文本标签<b>粗体</b>,<i>斜体</i>, <a>http://www.nokia.com</a>,+358401234567, fors.fagerstrom@email.com</translation> </message> + <message id="xx_wg_multiple_selection_dialogs_page_question_dialog"> + <location filename="../multipleselectiondialogspage.cpp" line="94"/> + <source>Question Dialog</source> + <translation type="unfinished">询问对话框</translation> + </message> <message id="xx_dialogs_and_notifications_question_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="88"/> + <location filename="../multipleselectiondialogspage.cpp" line="118"/> <source>Question Dialog Title</source> <translation>询问对话框标题</translation> </message> <message id="xx_dialogs_and_notifications_question_dialog_content"> - <location filename="../dialogsandnotificationspage.cpp" line="92"/> + <location filename="../multipleselectiondialogspage.cpp" line="122"/> <source>Lorem ipsum dolor sit amet?</source> <translation type="unfinished"></translation> </message> + <message id="xx_wg_query_dialogs_page_entry_dialog"> + <location filename="../querydialogspage.cpp" line="95"/> + <source>Entry Dialog</source> + <translation type="unfinished">登录对话框</translation> + </message> + <message id="xx_wg_query_dialogs_page_long_dialog"> + <location filename="../querydialogspage.cpp" line="97"/> + <source>Long Dialog</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_entry_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="101"/> + <location filename="../querydialogspage.cpp" line="124"/> <source>Name</source> <translation>姓名</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="113"/> + <location filename="../querydialogspage.cpp" line="134"/> <source>Please enter your name</source> <translation>请输入你的姓名</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="128"/> + <location filename="../querydialogspage.cpp" line="150"/> <source>Select printer</source> <translation>请选择打印机</translation> </message> + <message id="xx_wg_single_selection_dialogs_page_stacked_dialogs"> + <location filename="../singleselectiondialogspage.cpp" line="94"/> + <source>Stacked Dialogs</source> + <translation type="unfinished">对话记录框</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_system_modal_dialog"> + <location filename="../singleselectiondialogspage.cpp" line="96"/> + <source>System Modal Dialog</source> + <translation type="unfinished">模式对话框</translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_dialog_with_progress_indicator"> + <location filename="../singleselectiondialogspage.cpp" line="98"/> + <source>Dialog with Progress Indicator</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_wg_single_selection_dialogs_page_message_box"> + <location filename="../singleselectiondialogspage.cpp" line="100"/> + <source>Message Box</source> + <translation type="unfinished"></translation> + </message> <message id="xx_dialogs_and_notifications_stacked_dialog_button"> - <location filename="../dialogsandnotificationspage.cpp" line="179"/> + <location filename="../singleselectiondialogspage.cpp" line="129"/> <source>Click to spawn a nested dialog</source> <translation>请点按打开下级对话</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="181"/> + <location filename="../singleselectiondialogspage.cpp" line="131"/> <source>Stacked dialogs</source> <translation>对话记录框</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_open_nested_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="194"/> + <location filename="../singleselectiondialogspage.cpp" line="145"/> <source>Click to open a nested message box</source> <translation>请点按打开下级消息框</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_nested_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="196"/> + <location filename="../singleselectiondialogspage.cpp" line="147"/> <source>This is a nested dialog</source> <translation>这是多层对话框</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialog_messagebox_text"> - <location filename="../dialogsandnotificationspage.cpp" line="209"/> + <location filename="../singleselectiondialogspage.cpp" line="160"/> <source>I'm a nested message box</source> <translation>我是多层对话框</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_title"> - <location filename="../dialogsandnotificationspage.cpp" line="219"/> + <location filename="../singleselectiondialogspage.cpp" line="171"/> <source>System Modal Dialog</source> <translation>模式对话框</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog_label"> - <location filename="../dialogsandnotificationspage.cpp" line="225"/> + <location filename="../singleselectiondialogspage.cpp" line="178"/> <source>I'm a window modal dialog. There's no way around me! Muwhahaha... [evil laugh]</source> @@ -134,39 +324,53 @@ Muwhahaha... [evil laugh]</source> 哈哈哈...</translation> </message> <message id="xx_dialogs_and_notifications_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="242"/> + <location filename="../singleselectiondialogspage.cpp" line="197"/> <source>Progress Indicator</source> <translation>进程指示</translation> </message> <message id="xx_dialogs_and_notifications_message_box_text"> - <location filename="../dialogsandnotificationspage.cpp" line="261"/> + <location filename="../singleselectiondialogspage.cpp" line="217"/> <source>Hello World!</source> <translation>你好世界！</translation> </message> + <message id="xx_wg_banners_page_event_banner"> + <location filename="../bannerspage.cpp" line="90"/> + <source>Event Banner</source> + <translation type="unfinished">事件通知</translation> + </message> + <message id="xx_wg_banners_page_information_banner"> + <location filename="../bannerspage.cpp" line="92"/> + <source>Information Banner</source> + <translation type="unfinished">消息通知</translation> + </message> + <message id="xx_wg_banners_page_system_information_banner"> + <location filename="../bannerspage.cpp" line="94"/> + <source>System Information Banner</source> + <translation type="unfinished">系统消息通知</translation> + </message> <message id="xx_dialogs_and_notifications_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="271"/> + <location filename="../bannerspage.cpp" line="121"/> <source><b>Ida Taipale</b><br/>Have you seen my dog?</source> <translation><b>lda Taipale</b><br/>你看见我的狗了吗?</translation> </message> <message id="xx_dialogs_and_notifications_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="284"/> + <location filename="../bannerspage.cpp" line="134"/> <source><b>Battery is running low</b></source> <translation><b>电池容量低</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="296"/> + <location filename="../bannerspage.cpp" line="145"/> <source><b>Incoming call</b></source> <translation><b>来电</b></translation> </message> <message id="xx_dialogs_and_notifications_system_information_banner_accept"> - <location filename="../dialogsandnotificationspage.cpp" line="298"/> + <location filename="../bannerspage.cpp" line="147"/> <source>Accept</source> <translation>接听</translation> </message> <message id="xx_dialogs_and_notifications_title"> - <location filename="../dialogsandnotificationspage.cpp" line="365"/> <source>Dialogs and Notifications</source> - <translation variants="yes"> + <translation type="obsolete" variants="yes"> <lengthvariant>对话框和通知</lengthvariant> <lengthvariant>对话框和通知</lengthvariant> <lengthvariant>对话框 & 通知</lengthvariant> @@ -175,76 +379,64 @@ Muwhahaha... [evil laugh]</source> </translation> </message> <message id="xx_dialogs_and_notifications_label_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="369"/> <source>Dialog examples</source> - <translation>对话框</translation> + <translation type="obsolete">对话框</translation> </message> <message id="xx_dialogs_and_notifications_query_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="371"/> <source>Question Dialog</source> - <translation>询问对话框</translation> + <translation type="obsolete">询问对话框</translation> </message> <message id="xx_dialogs_and_notifications_entry_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="373"/> <source>Entry Dialog</source> - <translation>登录对话框</translation> + <translation type="obsolete">登录对话框</translation> </message> <message id="xx_dialogs_and_notifications_long_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="375"/> <source>A Long Dialog</source> - <translation>长对话框</translation> + <translation type="obsolete">长对话框</translation> </message> <message id="xx_dialogs_and_notifications_stacked_dialogs"> - <location filename="../dialogsandnotificationspage.cpp" line="378"/> <source>Stacked Dialogs</source> - <translation>对话记录框</translation> + <translation type="obsolete">对话记录框</translation> </message> <message id="xx_dialogs_and_notifications_system_modal_dialog"> - <location filename="../dialogsandnotificationspage.cpp" line="381"/> <source>System Modal Dialog</source> - <translation>模式对话框</translation> + <translation type="obsolete">模式对话框</translation> </message> <message id="xx_dialogs_and_notifications_dialog_with_progress_indicator"> - <location filename="../dialogsandnotificationspage.cpp" line="384"/> <source>Dialog With Progress Indicator</source> - <translation>进程条对话框 </translation> + <translation type="obsolete">进程条对话框 </translation> </message> <message id="xx_dialogs_and_notifications_label_messagebox"> <source> DuiMessageBox examples</source> <translation type="obsolete">消息对话框例子</translation> </message> <message id="xx_dialogs_and_notifications_messagebox"> - <location filename="../dialogsandnotificationspage.cpp" line="389"/> <source>Simple Message Box</source> - <translation>简单消息对话框</translation> + <translation type="obsolete">简单消息对话框</translation> </message> <message id="xx_dialogs_and_notifications_label_notifications"> - <location filename="../dialogsandnotificationspage.cpp" line="387"/> <source>Notifications and messages</source> - <translation>通知</translation> + <translation type="obsolete">通知</translation> </message> <message id="xx_dialogs_and_notifications_label_event_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="391"/> <source>Event Banner</source> - <translation>事件通知</translation> + <translation type="obsolete">事件通知</translation> </message> <message id="xx_dialogs_and_notifications_label_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="393"/> <source>Information Banner</source> - <translation>消息通知</translation> + <translation type="obsolete">消息通知</translation> </message> <message id="xx_dialogs_and_notifications_label_system_information_banner"> - <location filename="../dialogsandnotificationspage.cpp" line="395"/> <source>System Information Banner</source> - <translation>系统消息通知</translation> + <translation type="obsolete">系统消息通知</translation> </message> <message id="xx_Image"> - <location filename="../imagepage.cpp" line="123"/> + <location filename="../imagepage.cpp" line="131"/> <source>Image</source> <translation>图像</translation> </message> <message id="xx_Image properties"> - <location filename="../imagepage.cpp" line="127"/> + <location filename="../imagepage.cpp" line="135"/> <source>Image properties</source> <translation>图像属性</translation> </message> @@ -253,7 +445,7 @@ Muwhahaha... [evil laugh]</source> <translation type="obsolete">动画</translation> </message> <message id="xx_image_page_info"> - <location filename="../imagepage.cpp" line="152"/> + <location filename="../imagepage.cpp" line="160"/> <source>Image allows the placement of images onto the UI. Images are generally non-interactive elements. Various single and multiple touch interactions can be added to an Image component if desired. As an example, pinch gesture can be used in this page to zoom the image.</source> <translation>用于在界面上放置图像，通常图像不是可交互控件，根据需求可加入单点和多点触控。</translation> </message> @@ -266,164 +458,199 @@ Muwhahaha... [evil laugh]</source> <translation type="obsolete">停止</translation> </message> <message id="xx_image_operations"> - <location filename="../imagepage.cpp" line="145"/> + <location filename="../imagepage.cpp" line="153"/> <source>Image operations</source> <translation>图像操作</translation> </message> <message id="xx_Zoom"> - <location filename="../imagepage.cpp" line="133"/> + <location filename="../imagepage.cpp" line="141"/> <source>Zoom</source> <translation>缩放</translation> </message> <message id="xx_Transparency"> - <location filename="../imagepage.cpp" line="135"/> + <location filename="../imagepage.cpp" line="143"/> <source>Transparency</source> <translation>透明度</translation> </message> <message id="xx_Crop"> - <location filename="../imagepage.cpp" line="137"/> + <location filename="../imagepage.cpp" line="145"/> <source>Crop</source> <translation>裁剪</translation> </message> + <message id="xx_listpage_list_remove"> + <location filename="../mlistpage.cpp" line="547"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_listpage_list_edit"> + <location filename="../mlistpage.cpp" line="553"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> <message id="xx_listpage_title"> - <location filename="../mlistpage.cpp" line="423"/> + <location filename="../mlistpage.cpp" line="573"/> <source>List</source> <translation>列表</translation> </message> <message id="xx_textentry_title"> - <location filename="../textentrypage.cpp" line="490"/> + <location filename="../textentrypage.cpp" line="582"/> <source>Text Entries</source> <translation>输入文字</translation> </message> <message id="xx_tooltip_entry8"> - <location filename="../textentrypage.cpp" line="500"/> + <location filename="../textentrypage.cpp" line="592"/> <source>Provides email address suggestions</source> <translation>提供邮件地址提示</translation> </message> <message id="xx_textentry_free_text"> - <location filename="../textentrypage.cpp" line="506"/> + <location filename="../textentrypage.cpp" line="598"/> <source>Free text:</source> <translation>任意文字:</translation> </message> <message id="xx_textentry_free_text_masked"> - <location filename="../textentrypage.cpp" line="508"/> + <location filename="../textentrypage.cpp" line="600"/> <source>Free text(masked):</source> <translation>密码:</translation> </message> <message id="xx_textentry_number_text"> - <location filename="../textentrypage.cpp" line="510"/> + <location filename="../textentrypage.cpp" line="602"/> <source>Number text:</source> <translation>数字:</translation> </message> <message id="xx_textentry_phone_number"> - <location filename="../textentrypage.cpp" line="512"/> + <location filename="../textentrypage.cpp" line="604"/> <source>Phone number:</source> <translation>电话:</translation> </message> <message id="xx_textentry_email_text"> - <location filename="../textentrypage.cpp" line="514"/> + <location filename="../textentrypage.cpp" line="606"/> <source>Email text:</source> <translation>电子邮件:</translation> </message> + <message id="xx_textentry_richtext_text"> + <location filename="../textentrypage.cpp" line="616"/> + <source>Rich Text:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_noecho"> - <location filename="../textentrypage.cpp" line="525"/> + <location filename="../textentrypage.cpp" line="619"/> <source>No Echo mode:</source> <translation>无回响模式</translation> </message> <message id="xx_textentry_echoonedit"> - <location filename="../textentrypage.cpp" line="528"/> + <location filename="../textentrypage.cpp" line="622"/> <source>Echo on edit:</source> <translation>编辑回响</translation> </message> <message id="xx_textentry_direct_input_mode"> - <location filename="../textentrypage.cpp" line="531"/> + <location filename="../textentrypage.cpp" line="625"/> <source>Direct Input Mode:</source> <translation>直接输入模式:</translation> </message> <message id="xx_textentry_click_here"> - <location filename="../textentrypage.cpp" line="144"/> - <location filename="../textentrypage.cpp" line="166"/> + <location filename="../textentrypage.cpp" line="147"/> + <location filename="../textentrypage.cpp" line="169"/> <source>Click here</source> <translation>点击这儿</translation> </message> <message id="xx_textentry_press_any_key"> - <location filename="../textentrypage.cpp" line="157"/> + <location filename="../textentrypage.cpp" line="160"/> <source>Press any key</source> <translation>按任意键</translation> </message> <message id="xx_textentry_keypress"> - <location filename="../textentrypage.cpp" line="183"/> + <location filename="../textentrypage.cpp" line="186"/> <source><i>Key press</i> key:</source> <translation><i>Key press</i> key:</translation> </message> <message id="xx_textentry_text"> - <location filename="../textentrypage.cpp" line="186"/> - <location filename="../textentrypage.cpp" line="200"/> + <location filename="../textentrypage.cpp" line="189"/> + <location filename="../textentrypage.cpp" line="203"/> <source>text:</source> <translation>text:</translation> </message> <message id="xx_textentry_keyrelease"> - <location filename="../textentrypage.cpp" line="197"/> + <location filename="../textentrypage.cpp" line="200"/> <source><i>Key release</i> key:</source> <translation><i>Key release</i> key:</translation> </message> + <message id="xx_tooltip_customtoolbar1"> + <location filename="../textentrypage.cpp" line="519"/> + <source>Example custom toolbar 1</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_tooltip_customtoolbar2"> + <location filename="../textentrypage.cpp" line="532"/> + <source>Example custom toolbar 2</source> + <translation type="unfinished"></translation> + </message> <message id="xx_textentry_url_text"> - <location filename="../textentrypage.cpp" line="516"/> + <location filename="../textentrypage.cpp" line="608"/> <source>Url text:</source> <translation>网址:</translation> </message> <message id="xx_textentry_multiline"> - <location filename="../textentrypage.cpp" line="518"/> + <location filename="../textentrypage.cpp" line="610"/> <source>Multiline:</source> <translation>多行输入:</translation> </message> <message id="xx_tooltip_entry0"> - <location filename="../textentrypage.cpp" line="494"/> + <location filename="../textentrypage.cpp" line="586"/> <source>Enter text here</source> <translation>在这里输入文字</translation> </message> <message id="xx_tooltip_entry1"> - <location filename="../textentrypage.cpp" line="497"/> + <location filename="../textentrypage.cpp" line="589"/> <source>This tooltip is quite long and will be clipped on the display</source> <translation>这个提示太长显示是会被截短</translation> </message> <message id="xx_textentry_completion_text"> - <location filename="../textentrypage.cpp" line="522"/> + <location filename="../textentrypage.cpp" line="614"/> <source>Email suggestion text:</source> <translation>邮件提示文字：</translation> </message> + <message id="xx_textentry_custom_toolbar1"> + <location filename="../textentrypage.cpp" line="628"/> + <source>Custom ToolBar 1:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_textentry_custom_toolbar2"> + <location filename="../textentrypage.cpp" line="630"/> + <source>Custom ToolBar 2:</source> + <translation type="unfinished"></translation> + </message> <message id="xx_auto_true_entry0"> - <location filename="../textentrypage.cpp" line="564"/> + <location filename="../textentrypage.cpp" line="663"/> <source>Auto Capitalisation is active</source> <translation>自动大写转换已激活</translation> </message> <message id="xx_auto_false_entry0"> - <location filename="../textentrypage.cpp" line="567"/> + <location filename="../textentrypage.cpp" line="666"/> <source>No Auto Capitalisation</source> <translation>自动大写转换关闭</translation> </message> <message id="xx_tooltip_entry6"> - <location filename="../textentrypage.cpp" line="503"/> + <location filename="../textentrypage.cpp" line="595"/> <source>This is a multiline text entry</source> <translation>这是多行提示</translation> </message> <message id="xx_textentry_singleselectall"> - <location filename="../textentrypage.cpp" line="520"/> + <location filename="../textentrypage.cpp" line="612"/> <source>Singleline (selectall):</source> <translation>单行 (全选)</translation> </message> <message id="xx_auto_capitalisation"> - <location filename="../textentrypage.cpp" line="534"/> + <location filename="../textentrypage.cpp" line="633"/> <source>Auto capitalisation</source> <translation>自动大写转换</translation> </message> <message id="xx_error_correction"> - <location filename="../textentrypage.cpp" line="536"/> + <location filename="../textentrypage.cpp" line="635"/> <source>Error correction</source> <translation>错误校正</translation> </message> <message id="xx_slider_page_title"> - <location filename="../sliderpage.cpp" line="169"/> + <location filename="../sliderpage.cpp" line="168"/> <source>Sliders</source> <translation variants="yes"> <lengthvariant>滑动条</lengthvariant> @@ -431,28 +658,28 @@ Muwhahaha... [evil laugh]</source> </translation> </message> <message id="xx_slider_personal_data_label"> - <location filename="../sliderpage.cpp" line="180"/> + <location filename="../sliderpage.cpp" line="179"/> <source>Personal data</source> <translation>个人信息</translation> </message> <message id="xx_slider_age_label"> - <location filename="../sliderpage.cpp" line="184"/> + <location filename="../sliderpage.cpp" line="183"/> <source>Please select your age:!! Please select your age:!! Please select your age:!! Age:</source> <oldsource>Please select your age:</oldsource> <translation>您的年龄：</translation> </message> <message id="xx_slider_brightness_label"> - <location filename="../sliderpage.cpp" line="217"/> + <location filename="../sliderpage.cpp" line="216"/> <source>Brightness:</source> <translation>亮度:</translation> </message> <message id="xx_slider_player_label"> - <location filename="../sliderpage.cpp" line="197"/> + <location filename="../sliderpage.cpp" line="196"/> <source>Player:</source> <translation>播放器:</translation> </message> <message id="xx_slider_page_info_label"> - <location filename="../sliderpage.cpp" line="177"/> + <location filename="../sliderpage.cpp" line="176"/> <source>Slider is used for continuous set of values, among which user can choose one value. Seekbar is a special type of Slider used for displaying playback status for multimedia content.</source> @@ -460,12 +687,16 @@ Seekbar is a special type of Slider used for displaying playback status for mult 播放条是一种特殊的滑动条用于在多媒体内容中控制播放，后退等信息。</translation> </message> <message id="xx_viewmenu_page_title"> - <location filename="../applicationmenupage.cpp" line="60"/> <source>Application Menu</source> - <translation>应用菜单</translation> + <translation type="obsolete">应用菜单</translation> + </message> + <message id="xx_applicationmenu_page_title"> + <location filename="../applicationmenupage.cpp" line="62"/> + <source>Application Menu</source> + <translation type="unfinished">应用菜单</translation> </message> <message id="xx_applicationmenu_page_info"> - <location filename="../applicationmenupage.cpp" line="75"/> + <location filename="../applicationmenupage.cpp" line="77"/> <source>Application Menu is a menu element available to any view. <ul><li>It can be opened by tapping on the menu title area.</li><li>It contains commands and view settings for the view in question and an optional area for style commands.</li><li>Each view of the application can have different menu contents.</li></ul><b>Guidelines</b> for mandatory menu items: <ul><li>Settings should be on the main View of the application, unless the settings are specific to a sub-View</li><li>Help should be available in each View </li><li>Exit task should be present in all Views except for the main View of the application.</li></ul></source> <translation>菜单可用于任何视图。<ul><li>可通过单击标题区域打开</li><li>菜单包括命令，设图设置 和可选的定制命令。</li><li>应用的不同视图会有不同的菜单内容。</li></ul><b>指导</b>菜单组件的强制性要求<ul><li>设置应该出现在主视图菜单，除非该设置单独应用于子视图。</li><li>每个视图菜单上都应该有帮助</li><li>退出选项应该提供于除主视图菜单之外的所有视图菜单上</li></ul></translation> </message> @@ -522,52 +753,52 @@ Seekbar is a special type of Slider used for displaying playback status for mult <translation type="obsolete">日本</translation> </message> <message id="xx_combobox_page_info"> - <location filename="../comboboxpage.cpp" line="120"/> + <location filename="../comboboxpage.cpp" line="121"/> <source>The MComboBox widget is a combined button and popup list. It is very similar to QComboBox, but does not allow editing the text.</source> <translation>选择对话框是按钮和弹出列表的组合。它非常类似于QComboBox, 但不允许编辑文本。</translation> </message> <message id="xx_popup_generic_title"> - <location filename="../comboboxpage.cpp" line="112"/> + <location filename="../comboboxpage.cpp" line="113"/> <source>Title</source> <translation>标题</translation> </message> <message id="xx_combobox_title"> - <location filename="../comboboxpage.cpp" line="108"/> + <location filename="../comboboxpage.cpp" line="109"/> <source>ComboBox</source> <translation>组合对话框</translation> </message> <message id="xx_popup_sort_descending_order"> - <location filename="../comboboxpage.cpp" line="114"/> + <location filename="../comboboxpage.cpp" line="115"/> <source>Sort - DescendingOrder</source> <translation>排序 — 降序</translation> </message> <message id="xx_popup_time_consuming"> - <location filename="../comboboxpage.cpp" line="116"/> + <location filename="../comboboxpage.cpp" line="117"/> <source>Time-consuming setting</source> <translation type="unfinished"></translation> </message> <message id="xx_container_page_title"> - <location filename="../containerpage.cpp" line="65"/> + <location filename="../containerpage.cpp" line="64"/> <source>Container</source> <translation>包容器</translation> </message> <message id="xx_progressbar_page_title"> - <location filename="../progressbarpage.cpp" line="80"/> + <location filename="../progressbarpage.cpp" line="78"/> <source>Progress Bar</source> <translation>进度条</translation> </message> <message id="xx_progressbar_page_info_label"> - <location filename="../progressbarpage.cpp" line="85"/> + <location filename="../progressbarpage.cpp" line="83"/> <source>A Progress Bar can indicate an ongoing process with either known or unknown durations.</source> <translation>进度条可以指示已知的或未知的正在进行的进度。</translation> </message> <message id="xx_progressindicator_unknown_duration_bar"> - <location filename="../progressbarpage.cpp" line="89"/> + <location filename="../progressbarpage.cpp" line="87"/> <source>Installing CoolApp</source> <translation>正在安装 CoolApp</translation> </message> <message id="xx_progressindicator_known_duration_bar"> - <location filename="../progressbarpage.cpp" line="87"/> + <location filename="../progressbarpage.cpp" line="85"/> <source>Downloading nicepic.jpg</source> <translation>正在下载 nicepic.jpg</translation> </message> @@ -576,94 +807,105 @@ Seekbar is a special type of Slider used for displaying playback status for mult <translation type="obsolete">网格</translation> </message> <message id="xx_toolbar_page_example1"> - <location filename="../toolbarpage.cpp" line="168"/> + <location filename="../toolbarpage.cpp" line="176"/> <source>Example 1</source> <translation>例子1</translation> </message> <message id="xx_toolbar_page_example2"> - <location filename="../toolbarpage.cpp" line="174"/> + <location filename="../toolbarpage.cpp" line="182"/> <source>Example 2</source> <translation>例子2</translation> </message> <message id="xx_toolbar_page_defaultview"> - <location filename="../toolbarpage.cpp" line="180"/> + <location filename="../toolbarpage.cpp" line="188"/> <source>Default View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_tabview"> - <location filename="../toolbarpage.cpp" line="186"/> + <location filename="../toolbarpage.cpp" line="194"/> <source>Tab View</source> <translation type="unfinished"></translation> </message> <message id="xx_toolbar_page_title"> - <location filename="../toolbarpage.cpp" line="208"/> + <location filename="../toolbarpage.cpp" line="216"/> <source>ToolBar</source> <translation>工具条</translation> </message> <message id="xx_toolbar_page_info"> - <location filename="../toolbarpage.cpp" line="215"/> + <location filename="../toolbarpage.cpp" line="223"/> <source><b>Toolbar</b> acts as a container for actions. Depending upon the view attached, it either acts as a tab bar or is a container for buttons and text input field. <ul><li>Click Menu to explore the example</li></ul></source> <translation type="unfinished">工具条包括很多</translation> </message> <message id="xx_objectmenu_page_title"> - <location filename="../objectmenupage.cpp" line="155"/> + <location filename="../objectmenupage.cpp" line="154"/> <source>Object menu</source> <translation>弹出菜单</translation> </message> <message id="xx_objectmenu_page_info_label"> - <location filename="../objectmenupage.cpp" line="167"/> + <location filename="../objectmenupage.cpp" line="166"/> <source>Object Menu is a popup menu of commands opened by long tapping an element. It is used for providing shortcuts to functions related to that particular element. The primary (single short tap) action of the element should not be duplicated in the Object Menu.</source> <translation>长按某个界面元件，会显示弹出菜单，给出该元件相关的操作捷径。</translation> </message> <message id="xx_objectmenu_page_container_friends"> - <location filename="../objectmenupage.cpp" line="170"/> + <location filename="../objectmenupage.cpp" line="169"/> <source>Friends</source> <translation>朋友</translation> </message> <message id="xx_objectmenu_page_container_albums"> - <location filename="../objectmenupage.cpp" line="172"/> + <location filename="../objectmenupage.cpp" line="171"/> <source>Favorite Albums</source> <translation>喜爱的相册</translation> </message> <message id="xx_displaymodes_navbarcombo"> - <location filename="../navigationbarpage.cpp" line="60"/> + <location filename="../displaymodespage.cpp" line="59"/> <source>Navigation Bar</source> <translation>导航条</translation> </message> <message id="xx_displaymodes_escapebtncombo"> - <location filename="../navigationbarpage.cpp" line="68"/> + <location filename="../displaymodespage.cpp" line="67"/> <source>Escape Button</source> <translation>退出按钮</translation> </message> <message id="xx_displaymodes_homebtncombo"> - <location filename="../navigationbarpage.cpp" line="76"/> + <location filename="../displaymodespage.cpp" line="75"/> <source>Home Button</source> <translation>返回主界面按钮</translation> </message> <message id="xx_displaymodes_page_title"> - <location filename="../navigationbarpage.cpp" line="125"/> - <source>Display Modes and Full Screen</source> - <translation>导航条</translation> + <location filename="../displaymodespage.cpp" line="143"/> + <source>Display Modes</source> + <oldsource>Display Modes and Full Screen</oldsource> + <translation type="unfinished">导航条</translation> </message> <message id="xx_displaymodes_display_mode"> - <location filename="../navigationbarpage.cpp" line="129"/> + <location filename="../displaymodespage.cpp" line="147"/> <source>Components' display mode:</source> <translation>器件显示模式:</translation> </message> + <message id="xx_displaymodes_window_state"> + <location filename="../displaymodespage.cpp" line="150"/> + <source>Window state:</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_displaymodes_full_screen"> + <location filename="../displaymodespage.cpp" line="153"/> + <source>Full Screen</source> + <translation type="unfinished"></translation> + </message> <message id="xx_displaymode_show"> - <location filename="../navigationbarpage.cpp" line="162"/> + <location filename="../displaymodespage.cpp" line="166"/> <source>Show</source> <translation>显示</translation> </message> <message id="xx_displaymode_autohide"> - <location filename="../navigationbarpage.cpp" line="164"/> + <location filename="../displaymodespage.cpp" line="168"/> <source>Auto Hide</source> <translation>自动隐藏</translation> </message> <message id="xx_displaymode_hide"> - <location filename="../navigationbarpage.cpp" line="166"/> + <location filename="../displaymodespage.cpp" line="170"/> <source>Hide</source> <translation>隐藏</translation> </message> @@ -842,62 +1084,54 @@ The primary (single short tap) action of the element should not be duplicated in <translation type="obsolete">默认</translation> </message> <message id="xx_template_page_layouts_visuals"> - <location filename="../templatepage.cpp" line="51"/> <source>Layouts and Visuals</source> - <translation>布局和效果</translation> + <translation type="obsolete">布局和效果</translation> </message> <message id="xx_template_page_buttons"> - <location filename="../templatepage.cpp" line="53"/> <source>Buttons</source> - <translation>按钮</translation> + <translation type="obsolete">按钮</translation> </message> <message id="xx_template_page_views_dialogs"> - <location filename="../templatepage.cpp" line="47"/> <source>Views and Dialogs</source> - <translation>视图和对话框</translation> + <translation type="obsolete">视图和对话框</translation> </message> <message id="xx_template_page_contains_applets"> - <location filename="../templatepage.cpp" line="49"/> <source>Contains and Applets</source> - <translation>包容器和小程序</translation> + <translation type="obsolete">包容器和小程序</translation> </message> <message id="xx_template_page_indicators_notifications"> - <location filename="../templatepage.cpp" line="55"/> <source>Indicators and Notifications</source> - <translation>指示和提示</translation> + <translation type="obsolete">指示和提示</translation> </message> <message id="xx_template_page_lists_grids_menus"> - <location filename="../templatepage.cpp" line="57"/> <source>Lists, Grids and Menus</source> - <translation>列表，网格和菜单</translation> + <translation type="obsolete">列表，网格和菜单</translation> </message> <message id="xx_template_page_user_input"> - <location filename="../templatepage.cpp" line="59"/> <source>User input</source> - <translation>用户输入</translation> + <translation type="obsolete">用户输入</translation> </message> <message id="xx_template_page_input_feedback"> - <location filename="../templatepage.cpp" line="61"/> <source>Input Feedback</source> - <translation>输入反馈</translation> + <translation type="obsolete">输入反馈</translation> </message> <message id="xx_template_page_title"> - <location filename="../templatepage.cpp" line="119"/> + <location filename="../templatepage.cpp" line="101"/> <source>Template</source> <translation type="unfinished"></translation> </message> <message id="xx_sample template"> - <location filename="../templatepage.cpp" line="125"/> + <location filename="../templatepage.cpp" line="107"/> <source>Sample template</source> <translation type="unfinished"></translation> </message> <message id="xx_checkbox_page_title"> - <location filename="../checkboxpage.cpp" line="76"/> + <location filename="../checkboxpage.cpp" line="80"/> <source>Checkbox</source> <translation>核选框</translation> </message> <message id="xx_checkbox_page_info_label"> - <location filename="../checkboxpage.cpp" line="85"/> + <location filename="../checkboxpage.cpp" line="89"/> <source>The Checkbox is a variant of Button that allows users to set the state of variable or setting which has two values, On and Off. Checkbox essentially does the same thing as the Switch button, so please consider using a Switch instead.</source> @@ -905,18 +1139,19 @@ Checkbox essentially does the same thing as the Switch button, so please conside 复选框实质上和开关按钮具有相同的功能，所以可考虑用开关按钮。</translation> </message> <message id="xx_checkbox_page_checkbox_label"> - <location filename="../checkboxpage.cpp" line="88"/> - <source>I have read and understood the -instructions.</source> - <translation>我已经读过并理解了指示。</translation> + <location filename="../checkboxpage.cpp" line="92"/> + <source>I have read and understood the instructions.</source> + <oldsource>I have read and understood the +instructions.</oldsource> + <translation type="unfinished">我已经读过并理解了指示。</translation> </message> <message id="xx_icon_button_page_title"> - <location filename="../iconbuttonpage.cpp" line="82"/> + <location filename="../iconbuttonpage.cpp" line="81"/> <source>Icon Button</source> <translation>图标按钮</translation> </message> <message id="xx_icon_button_page_info_label"> - <location filename="../iconbuttonpage.cpp" line="90"/> + <location filename="../iconbuttonpage.cpp" line="89"/> <source>Icon Buttons have an icon and can have a text label. Icon button differs from push button by its visual presentation: it does not have button-style edges like a Push Button does. Icon Buttons are used in e.g. Toolbars.</source> @@ -924,7 +1159,7 @@ instructions.</source> 图标按钮可以在工具条使用。</translation> </message> <message id="xx_icon_button_page_icon_button2"> - <location filename="../iconbuttonpage.cpp" line="92"/> + <location filename="../iconbuttonpage.cpp" line="91"/> <source>Lorem ipsum</source> <translation type="unfinished"></translation> </message> @@ -957,32 +1192,34 @@ sit amet</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_application_main_area"> - <location filename="../spinnerpage.cpp" line="66"/> - <source>In container main area</source> + <location filename="../spinnerpage.cpp" line="68"/> + <source>In application main area</source> + <oldsource>In container main area</oldsource> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_header"> - <location filename="../spinnerpage.cpp" line="72"/> + <location filename="../spinnerpage.cpp" line="74"/> <source>In container header</source> <translation>在包容器标题区</translation> </message> <message id="xx_spinner_page_menu"> - <location filename="../spinnerpage.cpp" line="78"/> - <source>In view menu</source> - <translation>在菜单中</translation> + <location filename="../spinnerpage.cpp" line="80"/> + <source>In application menu</source> + <oldsource>In view menu</oldsource> + <translation type="unfinished">在菜单中</translation> </message> <message id="xx_spinner_page_dialog"> - <location filename="../spinnerpage.cpp" line="84"/> + <location filename="../spinnerpage.cpp" line="86"/> <source>In dialog</source> <translation>在对话框</translation> </message> <message id="xx_spinner_page_title"> - <location filename="../spinnerpage.cpp" line="97"/> + <location filename="../spinnerpage.cpp" line="99"/> <source>Spinner</source> <translation>旋转进度指示</translation> </message> <message id="xx_spinner_page_info_label"> - <location filename="../spinnerpage.cpp" line="106"/> + <location filename="../spinnerpage.cpp" line="108"/> <source>Spinner is used to indicate that a progress is ongoing and the duration is unknown. Spinners can also be used in situations when duration is known, but available space on screen does not permit using a Progress bar. @@ -996,51 +1233,50 @@ See the menu for examples of different use cases.</source> </translation> </message> <message id="xx_spinner_page_email_header"> - <location filename="../spinnerpage.cpp" line="116"/> <source>From: John Doe Date: Today Subject: This is funny stuff!</source> - <translation>发自：John Doe + <translation type="obsolete">发自：John Doe 日期：今天 主题：这是个有趣的资料!</translation> </message> <message id="xx_spinner_page_application_area_description"> - <location filename="../spinnerpage.cpp" line="129"/> + <location filename="../spinnerpage.cpp" line="118"/> <source>Spinner can be used while content is loading.</source> <translation type="unfinished"></translation> </message> <message id="xx_spinner_page_container_title"> - <location filename="../spinnerpage.cpp" line="142"/> + <location filename="../spinnerpage.cpp" line="151"/> <source>Online albums</source> <translation>在线相册</translation> </message> <message id="xx_spinner_page_container_header_description"> - <location filename="../spinnerpage.cpp" line="151"/> + <location filename="../spinnerpage.cpp" line="160"/> <source>Spinner can be used in container header to indicate that the items inside the container are being updated, but visible items can be interacted with.</source> <translation>旋转进度指示在容器的标题上显示，表示该容器内容正在被更新，已经显示的内容可以启动。</translation> </message> <message id="xx_spinner_page_application_menu_description"> - <location filename="../spinnerpage.cpp" line="195"/> + <location filename="../spinnerpage.cpp" line="204"/> <source>Spinner in the application menu area indicates that the whole view is pending for update.</source> <translation>旋转进度指示在应用菜单中使用，表示整个界面在等待更新。</translation> </message> <message id="xx_spinner_page_dialog_header_description"> - <location filename="../spinnerpage.cpp" line="209"/> + <location filename="../spinnerpage.cpp" line="218"/> <source>Spinner can be placed in dialog header to indicate changing content.</source> <translation>旋转进度指示在对话标题使用，表示内容正在更新。</translation> </message> <message id="xx_spinner_page_dialog_header"> - <location filename="../spinnerpage.cpp" line="230"/> + <location filename="../spinnerpage.cpp" line="239"/> <source>Select Internet connection</source> <translation>选择互联网连接</translation> </message> <message id="xx_switch_page_title"> - <location filename="../switchpage.cpp" line="128"/> + <location filename="../switchpage.cpp" line="127"/> <source>Switch</source> <translation>开关</translation> </message> <message id="xx_switch_page_info_label"> - <location filename="../switchpage.cpp" line="138"/> + <location filename="../switchpage.cpp" line="137"/> <source>A Switch button differs from both a push button and an icon button visually. It looks like a switch, communicating that pressing this button will not go to another view or will not perform any other actions except to toggle the state of the button. Switches are used to indicate e.g. settings values</source> @@ -1048,37 +1284,37 @@ Switches are used to indicate e.g. settings values</source> 开关可被用于指示设置的值。</translation> </message> <message id="xx_switch_page_switch1"> - <location filename="../switchpage.cpp" line="141"/> + <location filename="../switchpage.cpp" line="140"/> <source>Headlights</source> <translation>高亮</translation> </message> <message id="xx_switch_page_switch2"> - <location filename="../switchpage.cpp" line="143"/> + <location filename="../switchpage.cpp" line="142"/> <source>Autopilot</source> <translation>自动指示</translation> </message> <message id="xx_switch_page_switch3"> - <location filename="../switchpage.cpp" line="145"/> + <location filename="../switchpage.cpp" line="144"/> <source>Warp Drive</source> <translation>偏度</translation> </message> <message id="xx_switch_page_switch4"> - <location filename="../switchpage.cpp" line="147"/> + <location filename="../switchpage.cpp" line="146"/> <source>Reactor Shields</source> <translation>响应屏蔽</translation> </message> <message id="xx_switch_page_switch5"> - <location filename="../switchpage.cpp" line="149"/> + <location filename="../switchpage.cpp" line="148"/> <source>Infinite Improbability Drive</source> <translation>无限非可能性驱动</translation> </message> <message id="xx_input_feedback_page_title"> - <location filename="../feedbackpage.cpp" line="90"/> + <location filename="../feedbackpage.cpp" line="89"/> <source>Input Feedback</source> <translation>输入反馈</translation> </message> <message id="xx_input_feedback_page_info_label"> - <location filename="../feedbackpage.cpp" line="100"/> + <location filename="../feedbackpage.cpp" line="99"/> <source>This page contains buttons with custom input feedbacks. Any MWidget can have input feedback for press and release events. Input feedback can be a sound effect and/or a haptic effect (piezo, vibra) depending on the product. Input feedbacks can be easily configured for different purposes using the theming system.</source> @@ -1087,53 +1323,76 @@ Input feedbacks can be easily configured for different purposes using the themin </translation> </message> <message id="xx_input_feedback_page_button1"> - <location filename="../feedbackpage.cpp" line="102"/> + <location filename="../feedbackpage.cpp" line="101"/> <source>Default</source> <translation>缺省</translation> </message> <message id="xx_input_feedback_page_button2"> - <location filename="../feedbackpage.cpp" line="104"/> + <location filename="../feedbackpage.cpp" line="103"/> <source>Different</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button3"> - <location filename="../feedbackpage.cpp" line="106"/> + <location filename="../feedbackpage.cpp" line="105"/> <source>Sluggish</source> <translation type="unfinished"></translation> </message> <message id="xx_input_feedback_page_button4"> - <location filename="../feedbackpage.cpp" line="108"/> + <location filename="../feedbackpage.cpp" line="107"/> <source>Babytoy</source> <translation>婴儿玩具</translation> </message> <message id="xx_input_feedback_page_button5"> - <location filename="../feedbackpage.cpp" line="110"/> + <location filename="../feedbackpage.cpp" line="109"/> <source>Space</source> <translation>空间</translation> </message> <message id="xx_input_feedback_page_button6"> - <location filename="../feedbackpage.cpp" line="112"/> + <location filename="../feedbackpage.cpp" line="111"/> <source>Silent</source> <translation>静音</translation> </message> + <message id="xx_gridpage_configuration"> + <location filename="../mgridpage.cpp" line="193"/> + <source>Configuration</source> + <translation type="unfinished"></translation> + </message> <message id="xx_gridpage_title"> - <location filename="../mgridpage.cpp" line="96"/> + <location filename="../mgridpage.cpp" line="204"/> <source>Grid page</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_title"> - <location filename="../videocontainerpage.cpp" line="372"/> - <source>Video container</source> + <message id="xx_gridpage_set_columns"> + <location filename="../mgridpage.cpp" line="290"/> + <source>Set columns</source> + <translation type="unfinished"></translation> + </message> + <message id="xx_gridpage_landscape"> + <location filename="../mgridpage.cpp" line="316"/> + <source>Landscape</source> + <translation type="unfinished">横屏</translation> + </message> + <message id="xx_gridpage_portrait"> + <location filename="../mgridpage.cpp" line="321"/> + <source>Portrait</source> + <translation type="unfinished">竖屏</translation> + </message> + <message id="xx_bubblepage_title"> + <location filename="../bubblepage.cpp" line="143"/> + <source>Speech Bubble</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_page_info_label"> - <location filename="../videocontainerpage.cpp" line="377"/> - <source>Tap video thumbnail to play/pause it. Tap and hold thumbnail to open video in it's native size.</source> + <message id="xx_wg_bubblepage_linkactivated"> + <location filename="../bubblepage.cpp" line="156"/> + <source>Link activated</source> <translation type="unfinished"></translation> </message> - <message id="xx_video_container_header_title"> - <location filename="../videocontainerpage.cpp" line="380"/> - <source>Gallery</source> + <message id="xx_content_items_subtitle"> + <location filename="../contentitemspage.cpp" line="63"/> + <location filename="../contentitemspage.cpp" line="71"/> + <location filename="../contentitemspage.cpp" line="81"/> + <location filename="../contentitemspage.cpp" line="90"/> + <source>Subtitle</source> <translation type="unfinished"></translation> </message> </context> diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro index ac7b0ff8..5c24bd77 100644 --- a/demos/widgetsgallery/widgetsgallery.pro +++ b/demos/widgetsgallery/widgetsgallery.pro @@ -9,11 +9,11 @@ INCLUDEPATH += . \ $$MSRC/corelib QMAKE_LIBDIR += $$MLIB -win32|macx { - macx { +win32|macx { + macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework meegotouchcore \ - -framework meegotouchviews + -framework meegotouchviews } win32:LIBS += -lmeegotouchcore0 \ -lmeegotouchviews0 @@ -38,13 +38,12 @@ contains(DEFINES, HAVE_DBUS) { } SOURCES += main.cpp \ templatepage.cpp \ - listpage.cpp \ + mainpage.cpp \ labelpage.cpp \ pushbuttonpage.cpp \ feedbackpage.cpp \ iconbuttonpage.cpp \ switchpage.cpp \ - dialogsandnotificationspage.cpp \ imagepage.cpp \ applicationmenupage.cpp \ toolbarpage.cpp \ @@ -72,16 +71,24 @@ SOURCES += main.cpp \ gridimagewidget.cpp \ itemdetailpage.cpp \ gridvideowidget.cpp \ - swaphook.cpp + swaphook.cpp \ + maincategorypage.cpp \ + contentitemspage.cpp \ + bannerspage.cpp \ + querydialogspage.cpp \ + multipleselectiondialogspage.cpp \ + singleselectiondialogspage.cpp \ + phonebookcell.cpp \ + bubblepage.cpp \ + bubblelistmodel.cpp \ HEADERS += templatepage.h \ - listpage.h \ + mainpage.h \ labelpage.h \ pushbuttonpage.h \ feedbackpage.h \ iconbuttonpage.h \ switchpage.h \ - dialogsandnotificationspage.h \ imagepage.h \ applicationmenupage.h \ toolbarpage.h \ @@ -109,7 +116,16 @@ HEADERS += templatepage.h \ gridimagewidget.h \ itemdetailpage.h \ gridvideowidget.h \ - swaphook.h + swaphook.h \ + maincategorypage.h \ + contentitemspage.h \ + bannerspage.h \ + querydialogspage.h \ + multipleselectiondialogspage.h \ + singleselectiondialogspage.h \ + phonebookcell.h \ + bubblepage.h \ + bubblelistmodel.h \ # theme include(theme/theme.pri) |