From 9f56d2f6f6f5779b471c4b7465b779770b59a0ce Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 2 Mar 2017 12:30:36 +1300
Subject: [PATCH] Make tablet general settings dialog naming more consistent
 with desktop

---
 .../qml/hifi/dialogs/GeneralPreferencesDialog.qml        | 2 +-
 ...tGeneralSettings.qml => TabletGeneralPreferences.qml} | 9 +++------
 scripts/system/generalSettings.js                        | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename interface/resources/qml/hifi/tablet/{TabletGeneralSettings.qml => TabletGeneralPreferences.qml} (85%)

diff --git a/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml b/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
index 9be1c30e55..44cae95696 100644
--- a/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
@@ -1,5 +1,5 @@
 //
-//  PreferencesDialog.qml
+//  GeneralPreferencesDialog.qml
 //
 //  Created by Bradley Austin Davis on 24 Jan 2016
 //  Copyright 2015 High Fidelity, Inc.
diff --git a/interface/resources/qml/hifi/tablet/TabletGeneralSettings.qml b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
similarity index 85%
rename from interface/resources/qml/hifi/tablet/TabletGeneralSettings.qml
rename to interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
index b445e6a463..dcfd48746d 100644
--- a/interface/resources/qml/hifi/tablet/TabletGeneralSettings.qml
+++ b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
@@ -1,9 +1,8 @@
 //
-//  TabletGeneralSettings.qml
-//  scripts/system/
+//  TabletGeneralPreferences.qml
 //
 //  Created by Dante Ruiz on 9 Feb 2017
-//  Copyright 2016 High Fidelity, Inc.
+//  Copyright 2017 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -34,11 +33,9 @@ StackView {
     
     TabletPreferencesDialog {
         id: root
-        objectName: "GeneralPreferencesDialog"
+        objectName: "TabletGeneralPreferences"
         width: parent.width
         height: parent.height
         showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect"]
-        
     }
-
 }
diff --git a/scripts/system/generalSettings.js b/scripts/system/generalSettings.js
index 0a9fc823ae..7d97f13757 100644
--- a/scripts/system/generalSettings.js
+++ b/scripts/system/generalSettings.js
@@ -18,7 +18,7 @@
     var buttonName = "Settings";
     var toolBar = null;
     var tablet = null;
-    var settings = "TabletGeneralSettings.qml"
+    var settings = "TabletGeneralPreferences.qml"
     function onClicked(){
         if (tablet) {
             tablet.loadQMLSource(settings);