← Back to branch summary

~ubuntu-branches/ubuntu/natty/unity-2d/natty-updates

« back to all changes in this revision

Viewing changes to launcher/UnityApplications/place.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert, Oliver Grawert, Aurélien Gâteau
  • Date: 2011-04-08 16:03:10 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110408160310-yth7qb9kbgabkqk0
Tags: 3.8.2-0ubuntu1
https://launchpad.net/bugs/632526
https://launchpad.net/bugs/669926
https://launchpad.net/bugs/708479
https://launchpad.net/bugs/718686
https://launchpad.net/bugs/727483
https://launchpad.net/bugs/731449
https://launchpad.net/bugs/736097
https://launchpad.net/bugs/744999
https://launchpad.net/bugs/745077
https://launchpad.net/bugs/745237
https://launchpad.net/bugs/746693
https://launchpad.net/bugs/747836
https://launchpad.net/bugs/750753
https://launchpad.net/bugs/670608
https://launchpad.net/bugs/683084
https://launchpad.net/bugs/714646
https://launchpad.net/bugs/717744
https://launchpad.net/bugs/729002
https://launchpad.net/bugs/745758
https://launchpad.net/bugs/751284
https://launchpad.net/bugs/751325
https://launchpad.net/bugs/697816
https://launchpad.net/bugs/729478
https://launchpad.net/bugs/750244
https://launchpad.net/bugs/752948
https://launchpad.net/bugs/751425
[ Oliver Grawert ]
* New upstream bugfix release
 - (LP: #632526)  Dash elipsizes file and application names too soon, making them
   unreadable
 - (LP: #669926) [launcher] Web favorites support
 - (LP: #708479) Dash view should use "Prefferred Applications" icons where
   appropriate
 - (LP: #718686) [dash] Group of results sometimes badly positioned
 - (LP: #727483) unity-2d-panel crashed with SIGSEGV in g_return_if_fail_warning()
 - (LP: #731449) [launcher] Dragging a tile at the top of the launcher while
   autoscrolling makes autoscroll wrong afterwards
 - (LP: #736097) [dash] home screen misses icons for applications that are not
   installed
 - (LP: #744999) [launcher] launchers are truncated when too many items to fit
   onscreen
 - (LP: #745077) [spread] clicking launcher with open windows not working correctly
   across workspaces
 - (LP: #745237) [dash] search field default string not translated
 - (LP: #746693) [launcher] .places messages not i18nized
 - (LP: #747836) [dash] Banshee no longer works from the dash home page in 3.8.2
 - (LP: #750753) [dash] showing/hiding places causing graphical corruption
 - (LP: #670608) [dash] Home screen customization should be easy
 - (LP: #683084) Global menu doesn't work well with more than one screen
 - (LP: #714646) [launcher] icons jagged edges during animation
 - (LP: #717744) [panel] inactive menus are clickable
 - (LP: #729002) First four items in Dash begin "Find" "Find" "Find" "Find"
 - (LP: #745758) [spread] super+s should toggle the workspace switcher
 - (LP: #751284) [launcher] Escaping of title broken with webfavorites
 - (LP: #751325) [panel] circle of friends button icon needs to be updated to match
   Unity's
 - (LP: #697816) [launcher] if an urgent window is available then the spread should
   not be activated
 - (LP: #729478) [launcher] Clicking middle mouse button should launch another
   instance of application
 - (LP: #750244) [launcher] Newly installed lenses don’t appear
 - (LP: #752948) Home's "Shortcuts" not i18n/l10n

[ Aurélien Gâteau ]
* Include .mo files in unity-2d package (LP: #751425)

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/UnityApplications/place.cpp
20
20
#include "launcherapplication.h"
21
21
#include "place.h"
22
22
 
 
23
// libunity-2d
 
24
#include <unity2dtr.h>
 
25
 
23
26
#include <QStringList>
24
27
#include <QDebug>
25
28
#include <QDBusPendingReply>
85
88
        m_dbusName = m_file->value("Place/DBusName").toString();
86
89
        m_dbusObjectPath = m_file->value("Place/dbusObjectPath").toString();
87
90
 
 
91
        QString gettextDomain = m_file->value("Desktop Entry/X-Ubuntu-Gettext-Domain").toString();
 
92
 
88
93
        QStringList entries = m_file->childGroups().filter("Entry:");
89
94
        QStringList::const_iterator iter;
90
95
        uint i = 0;
95
100
            m_file->beginGroup(*iter);
96
101
            entry->setDbusName(m_dbusName);
97
102
            entry->setDbusObjectPath(m_file->value("DBusObjectPath").toString());
98
 
            // FIXME: extract localized name
99
 
            entry->setName(m_file->value("Name").toString());
 
103
            entry->setName(u2dTr(m_file->value("Name").toString().toUtf8().constData(),
 
104
                                 gettextDomain.toUtf8().constData()));
100
105
            entry->setIcon(m_file->value("Icon").toString());
101
 
            entry->setSearchHint(m_file->value("SearchHint").toString());
 
106
            entry->setSearchHint(u2dTr(m_file->value("SearchHint").toString().toUtf8().constData(),
 
107
                                 gettextDomain.toUtf8().constData()));
102
108
            if (!m_file->contains("ShowEntry")) {
103
109
                entry->setShowEntry(true);
104
110
            } else {
109
115
            connect(entry, SIGNAL(positionChanged(uint)),
110
116
                    SLOT(onEntryPositionChanged(uint)));
111
117
            m_static_entries[entry->dbusObjectPath()] = entry;
 
118
            int index = m_entries.size();
 
119
            beginInsertRows(QModelIndex(), index, index);
112
120
            m_entries.append(entry);
 
121
            endInsertRows();
113
122
        }
114
123
 
115
124
        /* Monitor the corresponding D-Bus place service */