Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 03:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement "go home" action

Browse source
This commit is contained in:
David Rowe 2016-04-27 11:24:19 +12:00
parent f74be226c8
commit 5e00a1ef49
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Bookmarks.cpp
View file

@ -29,6 +29,10 @@
#include "Bookmarks.h" #include "Bookmarks.h"
#include <QtQuick/QQuickWindow> #include <QtQuick/QQuickWindow>
const QString Bookmarks::HOME_BOOKMARK = "Home";
Bookmarks::Bookmarks() { Bookmarks::Bookmarks() {
_bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + BOOKMARKS_FILENAME; _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + BOOKMARKS_FILENAME;
readFromFile(); readFromFile();
@ -60,6 +64,10 @@ bool Bookmarks::contains(const QString& name) const {
return _bookmarks.contains(name); return _bookmarks.contains(name);
} }
QString Bookmarks::addressForBookmark(const QString& name) const {
return _bookmarks.value(name).toString();
}
void Bookmarks::readFromFile() { void Bookmarks::readFromFile() {
QFile loadFile(_bookmarksFilename); QFile loadFile(_bookmarksFilename);
@ -150,7 +158,7 @@ void Bookmarks::bookmarkLocation() {
void Bookmarks::setHomeLocation() { void Bookmarks::setHomeLocation() {
Menu* menubar = Menu::getInstance(); Menu* menubar = Menu::getInstance();
QString bookmarkName = "Home"; QString bookmarkName = HOME_BOOKMARK;
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
QString bookmarkAddress = addressManager->currentAddress().toString(); QString bookmarkAddress = addressManager->currentAddress().toString();

4
interface/src/Bookmarks.h
View file

@ -29,6 +29,10 @@ public:
void setupMenus(Menu* menubar, MenuWrapper* menu); void setupMenus(Menu* menubar, MenuWrapper* menu);
QString addressForBookmark(const QString& name) const;
static const QString HOME_BOOKMARK;
private slots: private slots:
void bookmarkLocation(); void bookmarkLocation();
void setHomeLocation(); void setHomeLocation();

8
interface/src/ui/AddressBarDialog.cpp
View file

@ -10,6 +10,7 @@
// //
#include "AddressBarDialog.h" #include "AddressBarDialog.h"
#include "Application.h"
#include <QMessageBox> #include <QMessageBox>
@ -52,7 +53,12 @@ void AddressBarDialog::loadAddress(const QString& address) {
void AddressBarDialog::loadHome() { void AddressBarDialog::loadHome() {
qDebug() << "Called LoadHome"; qDebug() << "Called LoadHome";
// TODO QString homeLocation = qApp->getBookmarks()->addressForBookmark(Bookmarks::HOME_BOOKMARK);
const QString DEFAULT_HOME_LOCATION = "localhost";
if (homeLocation == "") {
homeLocation = DEFAULT_HOME_LOCATION;
}
DependencyManager::get<AddressManager>()->handleLookupString(homeLocation);
} }
void AddressBarDialog::loadBack() { void AddressBarDialog::loadBack() {