summaryrefslogtreecommitdiff
path: root/src/plugins/bookmarks
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-01-27 19:03:20 +0100
committercon <qtc-committer@nokia.com>2010-01-27 19:05:19 +0100
commit58a248cb9d877935a966f226381a08d934b628b0 (patch)
tree3d6910a5182c713093d97add8727ec6cd200b533 /src/plugins/bookmarks
parenta47cfaa01be1e9079e388bf48bb4f0f6b3f13ae0 (diff)
downloadqt-creator-58a248cb9d877935a966f226381a08d934b628b0.tar.gz
Navigation widgets need separate id and display name.
Such that the layout of the left hand sidebar can be restored even if the display language is changed.
Diffstat (limited to 'src/plugins/bookmarks')
-rw-r--r--src/plugins/bookmarks/bookmarkmanager.cpp9
-rw-r--r--src/plugins/bookmarks/bookmarkmanager.h7
2 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 71507d4d6d..0d2ea2f45e 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -774,12 +774,17 @@ BookmarkViewFactory::BookmarkViewFactory(BookmarkManager *bm)
}
-QString BookmarkViewFactory::displayName()
+QString BookmarkViewFactory::displayName() const
{
return BookmarkView::tr("Bookmarks");
}
-QKeySequence BookmarkViewFactory::activationSequence()
+QString BookmarkViewFactory::id() const
+{
+ return QLatin1String("Bookmarks");
+}
+
+QKeySequence BookmarkViewFactory::activationSequence() const
{
return QKeySequence(Qt::ALT + Qt::Key_M);
}
diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h
index 02c3036833..843bfe0033 100644
--- a/src/plugins/bookmarks/bookmarkmanager.h
+++ b/src/plugins/bookmarks/bookmarkmanager.h
@@ -169,9 +169,10 @@ class BookmarkViewFactory : public Core::INavigationWidgetFactory
{
public:
BookmarkViewFactory(BookmarkManager *bm);
- virtual QString displayName();
- virtual QKeySequence activationSequence();
- virtual Core::NavigationView createWidget();
+ QString displayName() const;
+ QString id() const;
+ QKeySequence activationSequence() const;
+ Core::NavigationView createWidget();
private:
BookmarkManager *m_manager;
};