History

added notifications (faked user name for now), along with switch to avatar entities

David Kelly committed 9 years ago

Commit 76657a61 parent 0edcdde4 files · +32 −5Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+9−1
@@ -235,6 +235,14 @@ void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& hr · 234 unmodified lines
235 qApp->shareSnapshot(path, href);235 qApp->shareSnapshot(path, href);
236}236}
237 237
238void WindowScriptingInterface::makeConnection(bool success, const QString& userNameOrError) {
239 if (success) {
240 emit connectionAdded(userNameOrError);
241 } else {
242 emit connectionError(userNameOrError);
243 }
244}
245
238bool WindowScriptingInterface::isPhysicsEnabled() {246bool WindowScriptingInterface::isPhysicsEnabled() {
239 return qApp->isPhysicsEnabled();247 return qApp->isPhysicsEnabled();
240}248}
@@ -255,7 +263,7 @@ int WindowScriptingInterface::openMessageBox(QString title, QString text, int bu · 14 unmodified lines
255}263}
256 264
257int WindowScriptingInterface::createMessageBox(QString title, QString text, int buttons, int defaultButton) {265int WindowScriptingInterface::createMessageBox(QString title, QString text, int buttons, int defaultButton) {
258 auto messageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, title, text, 266 auto messageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, title, text,
259 static_cast<QFlags<QMessageBox::StandardButton>>(buttons), static_cast<QMessageBox::StandardButton>(defaultButton));267 static_cast<QFlags<QMessageBox::StandardButton>>(buttons), static_cast<QMessageBox::StandardButton>(defaultButton));
260 connect(messageBox, SIGNAL(selected(int)), this, SLOT(onMessageBoxSelected(int)));268 connect(messageBox, SIGNAL(selected(int)), this, SLOT(onMessageBoxSelected(int)));
261 269