← Back to branch summary

~mzanetti/unity8/spread-blur

« back to all changes in this revision

Viewing changes to tests/mocks/Unity/Application/ApplicationInfo.cpp

  • Committer: Bileto Bot
  • Author(s): Michael Zanetti
  • Date: 2016-10-24 11:34:08 UTC
  • mfrom: (2400.6.204 unity8-unified-spread)
  • Revision ID: ci-train-bot@canonical.com-20161024113408-7ul8ivww68dqm74v
Merge all Stages into one single codebase. Apply new spread visuals.

This deletes PhoneStage, TabletStage and DesktopStage, and merges all of the functionality into Stage. Also the spread visuals have been updated by design to work with all usage modes. (LP: #1489517, #1603914, #1635800)

Approved by: Lukáš Tinkl

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Unity/Application/ApplicationInfo.cpp
79
79
{
80
80
    if (state() == ApplicationInfo::Stopped) { return; }
81
81
 
82
 
    QString surfaceName = name();
 
82
    QString surfaceName = name() + "s window title";
83
83
    if (m_surfaceList->count() > 0) {
84
84
        surfaceName.append(QString(" %1").arg(m_surfaceList->count()+1));
85
85
    }
138
138
 
139
139
void ApplicationInfo::setIconId(const QString &iconId)
140
140
{
141
 
    setIcon(QString("../../graphics/applicationIcons/%2@18.png")
 
141
    setIcon(QString(sourceDirectory() +  "/tests/graphics/applicationIcons/%2@18.png")
142
142
            .arg(iconId));
143
143
}
144
144