Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 04:15:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify friends window

Browse source
This commit is contained in:
Atlante45 2015-09-24 19:21:04 +02:00
parent 77a7814854
commit 7da55747f5
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/src/Application.cpp
View file

@ -326,7 +326,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
_dependencyManagerIsSetup(setupEssentials(argc, argv)), _dependencyManagerIsSetup(setupEssentials(argc, argv)),
_window(new MainWindow(desktop())), _window(new MainWindow(desktop())),
_toolWindow(NULL), _toolWindow(NULL),
_friendsWindow(NULL),
_undoStackScriptingInterface(&_undoStack), _undoStackScriptingInterface(&_undoStack),
_frameCount(0), _frameCount(0),
_fps(60.0f), _fps(60.0f),
@ -4625,21 +4624,20 @@ void Application::activeChanged(Qt::ApplicationState state) {
} }
} }
void Application::showFriendsWindow() { void Application::showFriendsWindow() {
const QString FRIENDS_WINDOW_OBJECT_NAME = "FriendsWindow";
const QString FRIENDS_WINDOW_TITLE = "Add/Remove Friends"; const QString FRIENDS_WINDOW_TITLE = "Add/Remove Friends";
const QString FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends"; const QString FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends";
const int FRIENDS_WINDOW_WIDTH = 290; const int FRIENDS_WINDOW_WIDTH = 290;
const int FRIENDS_WINDOW_HEIGHT = 500; const int FRIENDS_WINDOW_HEIGHT = 500;
if (!_friendsWindow) { auto webWindowClass = _window->findChildren<WebWindowClass>(FRIENDS_WINDOW_OBJECT_NAME);
_friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH, if (webWindowClass.empty()) {
FRIENDS_WINDOW_HEIGHT, false); auto friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH,
connect(_friendsWindow, &WebWindowClass::closed, this, &Application::friendsWindowClosed); FRIENDS_WINDOW_HEIGHT, false);
friendsWindow->setParent(_window);
friendsWindow->setObjectName(FRIENDS_WINDOW_OBJECT_NAME);
connect(friendsWindow, &WebWindowClass::closed, &WebWindowClass::deleteLater);
friendsWindow->setVisible(true);
} }
_friendsWindow->setVisible(true);
}
void Application::friendsWindowClosed() {
delete _friendsWindow;
_friendsWindow = NULL;
} }
void Application::postLambdaEvent(std::function<void()> f) { void Application::postLambdaEvent(std::function<void()> f) {

2
interface/src/Application.h
View file

@ -393,7 +393,6 @@ public slots:
void saveScripts(); void saveScripts();
void showFriendsWindow(); void showFriendsWindow();
void friendsWindowClosed();
void packageModel(); void packageModel();
@ -506,7 +505,6 @@ private:
MainWindow* _window; MainWindow* _window;
ToolWindow* _toolWindow; ToolWindow* _toolWindow;
WebWindowClass* _friendsWindow;
QUndoStack _undoStack; QUndoStack _undoStack;
UndoStackScriptingInterface _undoStackScriptingInterface; UndoStackScriptingInterface _undoStackScriptingInterface;