From 07e6b766b564307f6d261d9bed8d0a27cc01c7b1 Mon Sep 17 00:00:00 2001
From: Triplelexx <mojolexx@gmail.com>
Date: Sun, 26 Mar 2017 23:10:50 +0100
Subject: [PATCH] rename FILENAME constants

---
 .../qml/dialogs/preferences/AvatarPreference.qml     | 12 ++++++++----
 interface/src/AvatarBookmarks.cpp                    |  2 +-
 interface/src/AvatarBookmarks.h                      |  2 +-
 interface/src/LocationBookmarks.cpp                  |  2 +-
 interface/src/LocationBookmarks.h                    |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index 9a2d9f3edb..c176370717 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -61,22 +61,26 @@ Preference {
 
         TextField {
             id: dataTextField
+            label: root.label
             placeholderText: root.placeholderText
             text: preference.value
-            label: root.label
+            colorScheme: dataTextField.acceptableInput ? hifi.colorSchemes.dark : hifi.colorSchemes.light
+            validator: RegExpValidator {
+                regExp: /.*\.(?:fst).*\?*/ig
+            }
             anchors {
                 left: parent.left
                 right: parent.right
                 bottom: bookmarkAvatarButton.top
                 bottomMargin: hifi.dimensions.contentSpacing.y
             }
-            colorScheme: hifi.colorSchemes.dark
         }
 
         QueuedButton {
             id: bookmarkAvatarButton
             text: "Bookmark Avatar"
             width: 140
+            visible: dataTextField.acceptableInput
             anchors {
                 left: parent.left
                 bottom: parent.bottom
@@ -90,9 +94,9 @@ Preference {
             text: "Browse Avatars"
             width: 140
             anchors {
-                left: bookmarkAvatarButton.right
+                left: dataTextField.acceptableInput ? bookmarkAvatarButton.right : parent.left
                 bottom: parent.bottom
-                leftMargin: hifi.dimensions.contentSpacing.x
+                leftMargin: dataTextField.acceptableInput ? hifi.dimensions.contentSpacing.x : 0
             }
             onClicked: {
                 // Load dialog via OffscreenUi so that JavaScript EventBridge is available.
diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index 69559cc5c9..b45a262093 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -26,7 +26,7 @@
 #include <QtQuick/QQuickWindow>
 
 AvatarBookmarks::AvatarBookmarks() {
-    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AvatarBookmarks_FILENAME;
+    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AVATARBOOKMARKS_FILENAME;
     readFromFile();
 }
 
diff --git a/interface/src/AvatarBookmarks.h b/interface/src/AvatarBookmarks.h
index 78f2930106..958e0e891c 100644
--- a/interface/src/AvatarBookmarks.h
+++ b/interface/src/AvatarBookmarks.h
@@ -29,7 +29,7 @@ protected:
     void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
 
 private:
-    const QString AvatarBookmarks_FILENAME = "avatarbookmarks.json";
+    const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json";
 
 private slots:
     void changeToBookmarkedAvatar();
diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp
index 7b39ed2926..f9719db18d 100644
--- a/interface/src/LocationBookmarks.cpp
+++ b/interface/src/LocationBookmarks.cpp
@@ -27,7 +27,7 @@
 const QString LocationBookmarks::HOME_BOOKMARK = "Home";
 
 LocationBookmarks::LocationBookmarks() {
-    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + LocationBookmarks_FILENAME;
+    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + LOCATIONBOOKMARKS_FILENAME;
     readFromFile();
 }
 
diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h
index d1eeb87329..b762a0be9d 100644
--- a/interface/src/LocationBookmarks.h
+++ b/interface/src/LocationBookmarks.h
@@ -30,7 +30,7 @@ protected:
     void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
 
 private:
-    const QString LocationBookmarks_FILENAME = "bookmarks.json";
+    const QString LOCATIONBOOKMARKS_FILENAME = "bookmarks.json";
 
 private slots:
     void setHomeLocation();