From 5b1971907c2a6cf438975a0698fc9a25f94ec182 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 28 Jan 2016 21:20:43 -0800
Subject: [PATCH] Move bookmarks to QML only dialogs

---
 interface/src/Bookmarks.cpp | 44 +++++++++++++++----------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index 896a50acca..0a885493e3 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -20,12 +20,14 @@
 
 #include <AddressManager.h>
 #include <Application.h>
+#include <OffscreenUi.h>
 
 #include "MainWindow.h"
 #include "Menu.h"
 #include "InterfaceLogging.h"
 
 #include "Bookmarks.h"
+#include <QtQuick/QQuickWindow>
 
 Bookmarks::Bookmarks() {
     _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + BOOKMARKS_FILENAME;
@@ -104,18 +106,13 @@ void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
 }
 
 void Bookmarks::bookmarkLocation() {
-    QInputDialog bookmarkLocationDialog(qApp->getWindow());
-    bookmarkLocationDialog.setWindowTitle("Bookmark Location");
-    bookmarkLocationDialog.setLabelText("Name:");
-    bookmarkLocationDialog.setInputMode(QInputDialog::TextInput);
-    bookmarkLocationDialog.resize(400, 200);
-    
-    if (bookmarkLocationDialog.exec() == QDialog::Rejected) {
+    bool ok = false;
+    auto bookmarkName = OffscreenUi::getText(nullptr, "Bookmark Location", "Name:", QLineEdit::Normal, QString(), &ok);
+    if (!ok) {
         return;
     }
     
-    QString bookmarkName = bookmarkLocationDialog.textValue().trimmed();
-    bookmarkName = bookmarkName.replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
+    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
     if (bookmarkName.length() == 0) {
         return;
     }
@@ -125,13 +122,14 @@ void Bookmarks::bookmarkLocation() {
     
     Menu* menubar = Menu::getInstance();
     if (contains(bookmarkName)) {
-        QMessageBox duplicateBookmarkMessage;
-        duplicateBookmarkMessage.setIcon(QMessageBox::Warning);
-        duplicateBookmarkMessage.setText("The bookmark name you entered already exists in your list.");
-        duplicateBookmarkMessage.setInformativeText("Would you like to overwrite it?");
-        duplicateBookmarkMessage.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        duplicateBookmarkMessage.setDefaultButton(QMessageBox::Yes);
-        if (duplicateBookmarkMessage.exec() == QMessageBox::No) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        auto duplicateBookmarkMessage = offscreenUi->createMessageBox(QMessageBox::Warning, "Duplicate Bookmark",
+            "The bookmark name you entered already exists in your list.",
+            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        duplicateBookmarkMessage->setProperty("informativeText", "Would you like to overwrite it?");
+
+        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
+        if (result != QMessageBox::Yes) {
             return;
         }
         removeLocationFromMenu(menubar, bookmarkName);
@@ -157,19 +155,13 @@ void Bookmarks::deleteBookmark() {
         bookmarkList.append(menuItems[i]->text());
     }
     
-    QInputDialog deleteBookmarkDialog(qApp->getWindow());
-    deleteBookmarkDialog.setWindowTitle("Delete Bookmark");
-    deleteBookmarkDialog.setLabelText("Select the bookmark to delete");
-    deleteBookmarkDialog.resize(400, 400);
-    deleteBookmarkDialog.setOption(QInputDialog::UseListViewForComboBoxItems);
-    deleteBookmarkDialog.setComboBoxItems(bookmarkList);
-    deleteBookmarkDialog.setOkButtonText("Delete");
-    
-    if (deleteBookmarkDialog.exec() == QDialog::Rejected) {
+    bool ok = false;
+    auto bookmarkName = OffscreenUi::getItem(nullptr, "Delete Bookmark", "Select the bookmark to delete", bookmarkList, 0, false, &ok);
+    if (!ok) {
         return;
     }
     
-    QString bookmarkName = deleteBookmarkDialog.textValue().trimmed();
+    bookmarkName = bookmarkName.trimmed();
     if (bookmarkName.length() == 0) {
         return;
     }