Add Menu::goToUrl

Ryan Huffman committed 12 years ago

Commit ff51b221 parent 05708492 files · +32 −27Browse files

Showing the changes to interface/src/Menu.cpp (1 of 2 files). Show all

Unified · Split

     int dialogReturn = gotoDialog.exec();
     if (dialogReturn == QDialog::Accepted && !gotoDialog.textValue().isEmpty()) {
         QString desiredDestination = gotoDialog.textValue();
+        if (!goToURL(desiredDestination)) {;
+            goTo(desiredDestination);
+        }
+    }
+    sendFakeEnterEvent();
+}
-        if (desiredDestination.startsWith(CUSTOM_URL_SCHEME + "//")) {
+bool Menu::goToURL(QString location) {
-            QStringList urlParts = desiredDestination.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts);
+    if (location.startsWith(CUSTOM_URL_SCHEME + "//")) {
+        QStringList urlParts = location.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts);
-            if (urlParts.count() > 1) {
+        if (urlParts.count() > 1) {
-                // if url has 2 or more parts, the first one is domain name
+            // if url has 2 or more parts, the first one is domain name
-                QString domain = urlParts[0];
+            QString domain = urlParts[0];
-                // second part is either a destination coordinate or
+            // second part is either a destination coordinate or
-                // a place name
+            // a place name
-                QString destination = urlParts[1];
+            QString destination = urlParts[1];
-                // any third part is an avatar orientation.
+            // any third part is an avatar orientation.
-                QString orientation = urlParts.count() > 2 ? urlParts[2] : QString();
+            QString orientation = urlParts.count() > 2 ? urlParts[2] : QString();
-                goToDomain(domain);
+            goToDomain(domain);
-                // goto either @user, #place, or x-xx,y-yy,z-zz
-                // style co-ordinate.
-                goTo(destination);
-                if (!orientation.isEmpty()) {
+            // goto either @user, #place, or x-xx,y-yy,z-zz
-                    // location orientation
+            // style co-ordinate.
-                    goToOrientation(orientation);
+            goTo(destination);
-                }
-            } else if (urlParts.count() == 1) {
-                // location coordinates or place name
-                QString destination = urlParts[0];
-                goTo(destination);
-            }
-        } else {
+            if (!orientation.isEmpty()) {
-            goToUser(gotoDialog.textValue());
+                // location orientation
+                goToOrientation(orientation);
+            }
+        } else if (urlParts.count() == 1) {
+            // location coordinates or place name
+            QString destination = urlParts[0];
+            goTo(destination);
         }
+        return true;
     }
-    sendFakeEnterEvent();
+    return false;
 }
 void Menu::goToUser(const QString& user) {