aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--benchmarks/mt_mbutton/mt_mbutton.cpp34
-rw-r--r--benchmarks/mt_mtoolbar/mt_mtoolbar.cpp4
-rw-r--r--benchmarks/pt_mbutton/pt_mbutton.cpp52
-rw-r--r--benchmarks/pt_micontestcase/pt_micontestcase.cpp4
-rw-r--r--benchmarks/pt_mslider/pt_mslider.cpp6
-rw-r--r--demos/widgetsgallery/applets/galleryapplet/gallery.cpp2
-rw-r--r--doc/src/appletdevelopment.dox2
-rw-r--r--mthemedaemon/benchmark/common.cpp8
-rw-r--r--src/corelib/widgets/mcombobox.h2
-rw-r--r--src/corelib/widgets/minfobanner.h2
-rw-r--r--src/corelib/widgets/mtoolbar.h4
-rw-r--r--src/extensions/mashup/mashup/mmashupcanvas.h2
-rw-r--r--src/views/mtexteditview.cpp2
-rw-r--r--tests/ut_mbutton/ut_mbutton.cpp2
-rw-r--r--tests/ut_mbuttonview/ut_mbuttonview.cpp16
-rw-r--r--tests/ut_mcombobox/ut_mcombobox.cpp2
-rw-r--r--tests/ut_mcontainer/ut_mcontainer.cpp8
-rw-r--r--tests/ut_minfobanner/ut_minfobanner.cpp4
-rw-r--r--tests/ut_mnavigationbar/ut_mnavigationbar.cpp2
-rw-r--r--tests/ut_mpopuplist/ut_mpopuplist.cpp2
20 files changed, 80 insertions, 80 deletions
diff --git a/benchmarks/mt_mbutton/mt_mbutton.cpp b/benchmarks/mt_mbutton/mt_mbutton.cpp
index 24e23faa..206b0729 100644
--- a/benchmarks/mt_mbutton/mt_mbutton.cpp
+++ b/benchmarks/mt_mbutton/mt_mbutton.cpp
@@ -46,8 +46,8 @@ void Mt_MButton::initTestCase()
warmupButton = new MButton();
warmupButton->setText("text");
- warmupButton->setIconID("Icon-home");
- warmupButton->setToggledIconID("Icon-close");
+ warmupButton->setIconID("icon-m-framework-home");
+ warmupButton->setToggledIconID("icon-m-framework-close");
warmupButton->setGeometry(QRectF(0, 0, W, H));
@@ -96,10 +96,10 @@ void Mt_MButton::memoryMButtonView_data()
QTest::newRow("Empty") << W << H << "MButtonView" << "" << "" << "";
QTest::newRow("Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
- QTest::newRow("Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
- QTest::newRow("Text&Icon") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("Toggle") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("Toggle&Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("Text&Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("Toggle") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("Toggle&Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
}
void Mt_MButton::memoryMButtonDefaultView()
@@ -120,10 +120,10 @@ void Mt_MButton::memoryMButtonDefaultView_data()
QTest::newRow("Empty") << W << H << "MButtonDefaultView" << "" << "" << "";
QTest::newRow("Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
- QTest::newRow("Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
- QTest::newRow("Text&Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("Toggle") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("Toggle&Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("Text&Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("Toggle") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("Toggle&Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
}
void Mt_MButton::memoryMButtonIconView()
@@ -144,25 +144,25 @@ void Mt_MButton::memoryMButtonIconView_data()
QTest::newRow("Empty") << W << H << "MButtonIconView" << "" << "" << "";
QTest::newRow("Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
- QTest::newRow("Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
- QTest::newRow("Text&Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("Toggle") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("Toggle&Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("Text&Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("Toggle") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("Toggle&Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
}
void Mt_MButton::memoryMButtonViewTimeline()
{
- memoryBenchmark(W, H, "MButtonView", "Icon-home", "Icon-close", "ButtonText");
+ memoryBenchmark(W, H, "MButtonView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
}
void Mt_MButton::memoryMButtonViewDefaultViewTimeline()
{
- memoryBenchmark(W, H, "MButtonDefaultView", "Icon-home", "Icon-close", "ButtonText");
+ memoryBenchmark(W, H, "MButtonDefaultView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
}
void Mt_MButton::memoryMButtonViewIconViewTimeline()
{
- memoryBenchmark(W, H, "MButtonIconView", "Icon-home", "Icon-close", "ButtonText");
+ memoryBenchmark(W, H, "MButtonIconView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
}
void Mt_MButton::memoryBenchmark(qint32 width, qint32 height, const QString &view, const QString &icon1, const QString &icon2, const QString &text)
diff --git a/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp b/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
index 0fc3d358..0b1b0476 100644
--- a/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
+++ b/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
@@ -47,7 +47,7 @@ void Mt_MToolBar::initTestCase()
QCoreApplication::processEvents();
}
for (int i = 0; i < 1; ++i)
- toolbar->addAction(new MAction("Icon-music", "Action " + QString::number(i), this));
+ toolbar->addAction(new MAction("icon-l-music", "Action " + QString::number(i), this));
toolbar->paint(&painter, NULL);
delete toolbar;
}
@@ -63,7 +63,7 @@ void Mt_MToolBar::memoryBenchmark_data()
QTest::addColumn<qint32>("height");
QTest::addColumn<QString>("icon");
- QTest::newRow("300x60") << 300 << 60 << "Icon-music";
+ QTest::newRow("300x60") << 300 << 60 << "icon-l-music";
}
void Mt_MToolBar::memoryBenchmark()
diff --git a/benchmarks/pt_mbutton/pt_mbutton.cpp b/benchmarks/pt_mbutton/pt_mbutton.cpp
index 6fc6e8b8..e3327287 100644
--- a/benchmarks/pt_mbutton/pt_mbutton.cpp
+++ b/benchmarks/pt_mbutton/pt_mbutton.cpp
@@ -45,8 +45,8 @@ void Pt_MButton::initTestCase()
QPainter painter(&pixmap);
MButton warmupButton;
warmupButton.setText("text");
- warmupButton.setIconID("Icon-home");
- warmupButton.setToggledIconID("Icon-close");
+ warmupButton.setIconID("icon-m-framework-home");
+ warmupButton.setToggledIconID("icon-m-framework-close");
warmupButton.setGeometry(QRectF(0, 0, W, H));
while (MTheme::hasPendingRequests()) {
usleep(10000);
@@ -83,24 +83,24 @@ void Pt_MButton::paintPerformance_data()
QTest::newRow("250x100 MButtonView") << W << H << "MButtonView" << "" << "" << "";
QTest::newRow("250x100 MButtonView Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
QTest::newRow("250x100 MButtonDefaultView") << W << H << "MButtonDefaultView" << "" << "" << "";
QTest::newRow("250x100 MButtonDefaultView Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
QTest::newRow("250x100 MButtonIconView") << W << H << "MButtonIconView" << "" << "" << "";
QTest::newRow("250x100 MButtonIconView Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
}
void Pt_MButton::paintPerformance()
@@ -183,24 +183,24 @@ void Pt_MButton::toggledPaintPerformance_data()
QTest::newRow("250x100 MButtonView") << W << H << "MButtonView" << "" << "" << "";
QTest::newRow("250x100 MButtonView Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
QTest::newRow("250x100 MButtonDefaultView") << W << H << "MButtonDefaultView" << "" << "" << "";
QTest::newRow("250x100 MButtonDefaultView Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
QTest::newRow("250x100 MButtonIconView") << W << H << "MButtonIconView" << "" << "" << "";
QTest::newRow("250x100 MButtonIconView Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
- QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
- QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
- QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+ QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+ QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+ QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+ QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
}
void Pt_MButton::toggledPaintPerformance()
diff --git a/benchmarks/pt_micontestcase/pt_micontestcase.cpp b/benchmarks/pt_micontestcase/pt_micontestcase.cpp
index 60608edc..da593277 100644
--- a/benchmarks/pt_micontestcase/pt_micontestcase.cpp
+++ b/benchmarks/pt_micontestcase/pt_micontestcase.cpp
@@ -75,13 +75,13 @@ void Pt_MButton::init()
views[ this->currentViewIndex ] = new MButtonView(m_subject);
m_subject->setView(views[ this->currentViewIndex ]); // transfers ownership to controller
- m_subject->setIconID("Icon-mute");
+ m_subject->setIconID("icon-m-telephony-ongoing-muted");
views[ this->currentViewIndex ]->updateStyle();
views[ this->currentViewIndex ]->styleUpdated();
// if this is paced above 'updateStyle()', then get a core dump; if above setView(), then no icon
- //m_subject->setIconID("Icon-mute");
+ //m_subject->setIconID("icon-m-telephony-ongoing-muted");
qDebug() << "ICONID" << m_subject->iconID();
sleep(1);
diff --git a/benchmarks/pt_mslider/pt_mslider.cpp b/benchmarks/pt_mslider/pt_mslider.cpp
index 565f824e..ea4a50a3 100644
--- a/benchmarks/pt_mslider/pt_mslider.cpp
+++ b/benchmarks/pt_mslider/pt_mslider.cpp
@@ -58,9 +58,9 @@ void Pt_MSlider::createController()
{
this->m_subject = new MSlider();
- this->m_subject->setMinLabelIconID("Icon-contacts");
- this->m_subject->setMaxLabelIconID("Icon-browser");
- this->m_subject->setHandleLabelIconID("Icon-music");
+ this->m_subject->setMinLabelIconID("icon-l-contacts");
+ this->m_subject->setMaxLabelIconID("icon-l-browser");
+ this->m_subject->setHandleLabelIconID("icon-l-music");
this->m_subject->setMaxLabel("Max");
this->m_subject->setHandleLabel("Thumb");
this->m_subject->setMinLabelVisible(true);
diff --git a/demos/widgetsgallery/applets/galleryapplet/gallery.cpp b/demos/widgetsgallery/applets/galleryapplet/gallery.cpp
index abfa1148..27db7cf6 100644
--- a/demos/widgetsgallery/applets/galleryapplet/gallery.cpp
+++ b/demos/widgetsgallery/applets/galleryapplet/gallery.cpp
@@ -81,7 +81,7 @@ Gallery::Gallery(const MAppletMetaData &metadata, MDataStore &instanceData, MDat
GalleryModel *model = new GalleryModel();
m_grid->setItemModel(model);
- setIcon(QString("Icon-pictures"));
+ setIcon(QString("icon-l-gallery"));
setTitle(QString("Gallery"));
setView(new GalleryView(this));
}
diff --git a/doc/src/appletdevelopment.dox b/doc/src/appletdevelopment.dox
index 6eed6c5f..d0491215 100644
--- a/doc/src/appletdevelopment.dox
+++ b/doc/src/appletdevelopment.dox
@@ -99,7 +99,7 @@ Following is an example of applet metadata specification:
[Desktop Entry]
Type=X-MeeGoApplet
Name=ExampleApplet
-Icon=Icon-music
+Icon=icon-l-music
Exec=duiappletrunner
[X-MeeGoApplet]
diff --git a/mthemedaemon/benchmark/common.cpp b/mthemedaemon/benchmark/common.cpp
index 9b0caf7e..e667c684 100644
--- a/mthemedaemon/benchmark/common.cpp
+++ b/mthemedaemon/benchmark/common.cpp
@@ -11,10 +11,10 @@ QList<QPair<QString,QSize> > Common::getPixmapsToRequest() {
QList<QPair<QString,QSize> > pixmapsToRequest;
pixmapsToRequest << QPair<QString,QSize>("icon-m-list", QSize(30, 30))
<< QPair<QString,QSize>("icon-m-grid", QSize(30, 30))
- << QPair<QString,QSize>("Icon-pictures", QSize(0, 0))
- << QPair<QString,QSize>("Icon-video", QSize(30, 30))
- << QPair<QString,QSize>("Icon-new-SMS", QSize(30, 30))
- << QPair<QString,QSize>("Icon-contacts", QSize(30, 30))
+ << QPair<QString,QSize>("icon-l-gallery", QSize(0, 0))
+ << QPair<QString,QSize>("icon-l-video", QSize(30, 30))
+ << QPair<QString,QSize>("icon-m-toolbar-send-sms", QSize(30, 30))
+ << QPair<QString,QSize>("icon-l-contacts", QSize(30, 30))
<< QPair<QString,QSize>("duilist-singlecolumn-center-background", QSize(0, 0))
<< QPair<QString,QSize>("duislider-background-received", QSize(0, 0))
<< QPair<QString,QSize>("duilist-singlerow-center-background-pressed", QSize(0, 0))
diff --git a/src/corelib/widgets/mcombobox.h b/src/corelib/widgets/mcombobox.h
index 06fbca4f..caec1607 100644
--- a/src/corelib/widgets/mcombobox.h
+++ b/src/corelib/widgets/mcombobox.h
@@ -61,7 +61,7 @@ class MComboBoxPrivate;
\code
MComboBox *combobox = new MComboBox();
combobox->setTitle("Select an item");
- combobox->setIconID("Icon-pictures");
+ combobox->setIconID("icon-l-gallery");
QStringList stringList;
stringList << "Item 1" << "Item 2";
diff --git a/src/corelib/widgets/minfobanner.h b/src/corelib/widgets/minfobanner.h
index 20c37af5..d7226746 100644
--- a/src/corelib/widgets/minfobanner.h
+++ b/src/corelib/widgets/minfobanner.h
@@ -47,7 +47,7 @@ class MInfoBannerPrivate;
infoBanner->setBodyText(
//% "<b>Ida Taipale</b><br/>Have you seen my dog?"
qtTrId("xx_dialogs_and_notifications_event_banner"));
- infoBanner->setIconID("Icon-new-SMS");
+ infoBanner->setIconID("icon-m-toolbar-send-sms");
connect(infoBanner, SIGNAL(clicked()), this, SLOT(openMessageBox()));
infoBanner->appear(MSceneWindow::DestroyWhenDone);
QTimer::singleShot(3000, infoBanner, SLOT(disappear()));
diff --git a/src/corelib/widgets/mtoolbar.h b/src/corelib/widgets/mtoolbar.h
index f0c0e410..1efa800e 100644
--- a/src/corelib/widgets/mtoolbar.h
+++ b/src/corelib/widgets/mtoolbar.h
@@ -45,7 +45,7 @@ class MToolBarPrivate;
to a toolbar.
\code
MToolBar* toolbar = new MToolBar();
- MAction * iconAction = new MAction("Icon-pictures","Pictures", this);
+ MAction * iconAction = new MAction("icon-l-gallery","Pictures", this);
iconAction->setLocation(MAction::ToolBarLocation);
toolbar->addAction(iconAction);
MTextEdit *entry = new MTextEdit();
@@ -65,7 +65,7 @@ class MToolBarPrivate;
Following demonstates how to add a tab action to the toolbar:
\code
MToolBar* toolbar = new MToolBar();
- MAction *action = new MAction("Icon-pictures", NULL, this);
+ MAction *action = new MAction("icon-l-gallery", NULL, this);
action->setLocation(MAction::ToolbarLocation);
action->setCheckable(true);
action->setChecked(true);
diff --git a/src/extensions/mashup/mashup/mmashupcanvas.h b/src/extensions/mashup/mashup/mmashupcanvas.h
index a4a1275d..9649ac9f 100644
--- a/src/extensions/mashup/mashup/mmashupcanvas.h
+++ b/src/extensions/mashup/mashup/mmashupcanvas.h
@@ -57,7 +57,7 @@ class MMashupCanvasPrivate;
* [Desktop Entry]
* Type=MApplet
* Name=ExampleApplet
- * Icon=Icon-music
+ * Icon=icon-l-music
* Exec=mappletrunner
*
* [M]
diff --git a/src/views/mtexteditview.cpp b/src/views/mtexteditview.cpp
index 8869bcb7..3f08fea7 100644
--- a/src/views/mtexteditview.cpp
+++ b/src/views/mtexteditview.cpp
@@ -55,7 +55,7 @@ namespace
const QChar DefaultMaskCharacter('*');
// Default icon name for informational banner about failed paste
- const char *const DefaultPasteBannerIcon = "Icon-close";
+ const char *const DefaultPasteBannerIcon = "icon-m-framework-close";
// How long notification will stay visible
const int NotificationDuration = 3000;
diff --git a/tests/ut_mbutton/ut_mbutton.cpp b/tests/ut_mbutton/ut_mbutton.cpp
index 8b070605..a220248f 100644
--- a/tests/ut_mbutton/ut_mbutton.cpp
+++ b/tests/ut_mbutton/ut_mbutton.cpp
@@ -61,7 +61,7 @@ void Ut_MButton::testConstructionAndDestruction()
QCOMPARE(m_tmp->text(), ButtonText);
delete m_tmp;
- QString IconId("Icon-home");
+ QString IconId("icon-m-framework-home");
m_tmp = new MButton(IconId, ButtonText);
QCOMPARE(m_tmp->text(), ButtonText);
QCOMPARE(m_tmp->iconID(), IconId);
diff --git a/tests/ut_mbuttonview/ut_mbuttonview.cpp b/tests/ut_mbuttonview/ut_mbuttonview.cpp
index 8cfb92e3..0b56e1c1 100644
--- a/tests/ut_mbuttonview/ut_mbuttonview.cpp
+++ b/tests/ut_mbuttonview/ut_mbuttonview.cpp
@@ -123,10 +123,10 @@ void Ut_MButtonView::testDrawIcon_data()
QTest::addColumn<bool>("checkable");
- QTest::newRow("testDrawIcon1") << (int)Qt::AlignLeft << "Icon-close" << "Icon-close" << QSize(16, 16) << false;
- QTest::newRow("testDrawIcon2") << (int)Qt::AlignRight << "Icon-close" << "Icon-close" << QSize(32, 32) << true;
- QTest::newRow("testDrawIcon3") << (int)Qt::AlignBottom << "Icon-close" << "Icon-close" << QSize(64, 64) << false;
- QTest::newRow("testDrawIcon4") << (int)Qt::AlignTop << "Icon-close" << "Icon-close" << QSize(128, 128) << true;
+ QTest::newRow("testDrawIcon1") << (int)Qt::AlignLeft << "icon-m-framework-close" << "icon-m-framework-close" << QSize(16, 16) << false;
+ QTest::newRow("testDrawIcon2") << (int)Qt::AlignRight << "icon-m-framework-close" << "icon-m-framework-close" << QSize(32, 32) << true;
+ QTest::newRow("testDrawIcon3") << (int)Qt::AlignBottom << "icon-m-framework-close" << "icon-m-framework-close" << QSize(64, 64) << false;
+ QTest::newRow("testDrawIcon4") << (int)Qt::AlignTop << "icon-m-framework-close" << "icon-m-framework-close" << QSize(128, 128) << true;
}
void Ut_MButtonView::testDrawIcon()
@@ -174,10 +174,10 @@ void Ut_MButtonView::testDrawIconText_data()
QTest::addColumn<QString>("toggledIcon");
QTest::addColumn<QSize>("iconSize");
- QTest::newRow("testDrawIcon1") << (int)Qt::AlignLeft << "Icon-close" << "Icon-close" << QSize(16, 16);
- QTest::newRow("testDrawIcon2") << (int)Qt::AlignRight << "Icon-close" << "Icon-close" << QSize(32, 32);
- QTest::newRow("testDrawIcon3") << (int)Qt::AlignBottom << "Icon-close" << "Icon-close" << QSize(64, 64);
- QTest::newRow("testDrawIcon4") << (int)Qt::AlignTop << "Icon-close" << "Icon-close" << QSize(128, 128);
+ QTest::newRow("testDrawIcon1") << (int)Qt::AlignLeft << "icon-m-framework-close" << "icon-m-framework-close" << QSize(16, 16);
+ QTest::newRow("testDrawIcon2") << (int)Qt::AlignRight << "icon-m-framework-close" << "icon-m-framework-close" << QSize(32, 32);
+ QTest::newRow("testDrawIcon3") << (int)Qt::AlignBottom << "icon-m-framework-close" << "icon-m-framework-close" << QSize(64, 64);
+ QTest::newRow("testDrawIcon4") << (int)Qt::AlignTop << "icon-m-framework-close" << "icon-m-framework-close" << QSize(128, 128);
}
void Ut_MButtonView::testDrawIconText()
diff --git a/tests/ut_mcombobox/ut_mcombobox.cpp b/tests/ut_mcombobox/ut_mcombobox.cpp
index dd779da7..5b840c70 100644
--- a/tests/ut_mcombobox/ut_mcombobox.cpp
+++ b/tests/ut_mcombobox/ut_mcombobox.cpp
@@ -208,7 +208,7 @@ void Ut_MComboBox::testIconVisibility()
QCOMPARE(viewPrivate->button->layoutGrid->policy(), viewPrivate->button->_basicSubtitlePolicy);
QCOMPARE(viewPrivate->button->titleWidget()->text(), QString("Title"));
- m_combobox->setIconID("Icon-music");
+ m_combobox->setIconID("icon-l-music");
view->updateData(QList<const char *>() << MComboBoxModel::IconID);
QCOMPARE(viewPrivate->button->layoutGrid->policy(), viewPrivate->button->_iconSubtitlePolicy);
QCOMPARE(viewPrivate->button->iconWidget()->image(), QString("Icon-music"));
diff --git a/tests/ut_mcontainer/ut_mcontainer.cpp b/tests/ut_mcontainer/ut_mcontainer.cpp
index b60150d3..98638a22 100644
--- a/tests/ut_mcontainer/ut_mcontainer.cpp
+++ b/tests/ut_mcontainer/ut_mcontainer.cpp
@@ -187,17 +187,17 @@ void Ut_MContainer::setTitleWithHeaderInvisible()
void Ut_MContainer::setIconIDWithHeaderVisible()
{
m_subject->setHeaderVisible(true);
- m_subject->setIconID("Icon-close");
+ m_subject->setIconID("icon-m-framework-close");
- QCOMPARE(m_subject->iconID(), QString("Icon-close"));
+ QCOMPARE(m_subject->iconID(), QString("icon-m-framework-close"));
}
void Ut_MContainer::setIconIDWithHeaderInvisible()
{
m_subject->setHeaderVisible(false);
- m_subject->setIconID("Icon-close");
+ m_subject->setIconID("icon-m-framework-close");
- QCOMPARE(m_subject->iconID(), QString("Icon-close"));
+ QCOMPARE(m_subject->iconID(), QString("icon-m-framework-close"));
}
void Ut_MContainer::setTextWithHeaderVisible()
diff --git a/tests/ut_minfobanner/ut_minfobanner.cpp b/tests/ut_minfobanner/ut_minfobanner.cpp
index ef76f5ba..3f8e4ae7 100644
--- a/tests/ut_minfobanner/ut_minfobanner.cpp
+++ b/tests/ut_minfobanner/ut_minfobanner.cpp
@@ -65,7 +65,7 @@ void Ut_MInfoBanner::testCreation_data()
QTest::newRow("info") << MInfoBanner::Information
<< MTheme::ViewType(MInfoBanner::informationType)
- << QString("Icon-close")
+ << QString("icon-m-framework-close")
<< QString("<font color=\"white\">Battery is running low</font>")
<< QString("");
@@ -73,7 +73,7 @@ void Ut_MInfoBanner::testCreation_data()
<< MTheme::ViewType(MInfoBanner::eventType)
<< QString("ebf7db7b6ab73c6cba8fc87da2d1fdcf")
<< QString("<font color=\"white\" size=\"3\">Ida Taipale</font><br/><font color=\"white\" size=\"2\">Have you seen my dog?</font>")
- << QString("Icon-new-SMS");
+ << QString("icon-m-toolbar-send-sms");
QTest::newRow("invalid") << (MInfoBanner::BannerType)10
<< MTheme::ViewType(MInfoBanner::eventType)
diff --git a/tests/ut_mnavigationbar/ut_mnavigationbar.cpp b/tests/ut_mnavigationbar/ut_mnavigationbar.cpp
index ab648c28..36898872 100644
--- a/tests/ut_mnavigationbar/ut_mnavigationbar.cpp
+++ b/tests/ut_mnavigationbar/ut_mnavigationbar.cpp
@@ -73,7 +73,7 @@ void Ut_MNavigationBar::testToolbar()
void Ut_MNavigationBar::testViewMenuIconID()
{
- QString iconID("Icon-back");
+ QString iconID("icon-m-framework-back");
// this is the default value from model
QCOMPARE(subject->viewMenuIconID(), QString(""));
diff --git a/tests/ut_mpopuplist/ut_mpopuplist.cpp b/tests/ut_mpopuplist/ut_mpopuplist.cpp
index 2a373822..3863ad9a 100644
--- a/tests/ut_mpopuplist/ut_mpopuplist.cpp
+++ b/tests/ut_mpopuplist/ut_mpopuplist.cpp
@@ -144,7 +144,7 @@ void Ut_MPopupList::testSetItemIconID()
QCOMPARE(item->imageWidget()->image(), QString());
// Add icon to previously set item
- itemModel->setData(itemModel->index(0, 0), "Icon-music", Qt::DecorationRole);
+ itemModel->setData(itemModel->index(0, 0), "icon-l-music", Qt::DecorationRole);
view->updateCell(itemModel->index(0,0), item);
QCOMPARE(item->imageWidget()->image(), QString("Icon-music"));
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 22:52:58 +0000