From 948fa3a91c4eb3ac98415487cb1373ca1e751545 Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Tue, 9 Jul 2013 10:23:49 -0700
Subject: [PATCH] Fix naming errors

---
 src/packages/settings-view/keymaps/settings.cson            | 2 +-
 .../lib/{settings-panel.coffee => general-panel.coffee}     | 4 ++--
 src/packages/settings-view/lib/settings-view.coffee         | 5 ++---
 src/packages/settings-view/package.cson                     | 2 +-
 src/packages/settings-view/spec/settings-panel-spec.coffee  | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename src/packages/settings-view/lib/{settings-panel.coffee => general-panel.coffee} (97%)

diff --git a/src/packages/settings-view/keymaps/settings.cson b/src/packages/settings-view/keymaps/settings.cson
index f43a593e5..840d4821e 100644
--- a/src/packages/settings-view/keymaps/settings.cson
+++ b/src/packages/settings-view/keymaps/settings.cson
@@ -1,2 +1,2 @@
 'body':
-  'meta-,': 'settings:toggle'
+  'meta-,': 'settings-view:toggle'
diff --git a/src/packages/settings-view/lib/settings-panel.coffee b/src/packages/settings-view/lib/general-panel.coffee
similarity index 97%
rename from src/packages/settings-view/lib/settings-panel.coffee
rename to src/packages/settings-view/lib/general-panel.coffee
index 40c9fff55..44209f84e 100644
--- a/src/packages/settings-view/lib/settings-panel.coffee
+++ b/src/packages/settings-view/lib/general-panel.coffee
@@ -10,9 +10,9 @@ Editor = require 'editor'
 ###
 
 module.exports =
-class SettingsPanel extends View
+class GeneralPanel extends View
   @content: ->
-    @form id: 'settings-panel', class: 'form-horizontal', =>
+    @form id: 'general-panel', class: 'form-horizontal', =>
       @div outlet: "loadingElement", class: 'alert alert-info loading-area', "Loading settings"
 
   initialize: ->
diff --git a/src/packages/settings-view/lib/settings-view.coffee b/src/packages/settings-view/lib/settings-view.coffee
index 393150829..bf2135883 100644
--- a/src/packages/settings-view/lib/settings-view.coffee
+++ b/src/packages/settings-view/lib/settings-view.coffee
@@ -3,7 +3,7 @@ ScrollView = require 'scroll-view'
 $ = require 'jquery'
 _ = require 'underscore'
 Pane = require 'pane'
-SettingsPanel = require './settings-panel'
+GeneralPanel = require './general-panel'
 ThemePanel = require './theme-panel'
 PackagePanel = require './package-panel'
 Project = require 'project'
@@ -40,14 +40,13 @@ class SettingsView extends ScrollView
   initialize: (activePanelName) ->
     super
     @panelsByName = {}
-    document.title = "Atom Configuration"
     @on 'click', '#panels-menu li a', (e) =>
       @showPanel($(e.target).closest('li').attr('name'))
 
     @on 'click', '#open-dot-atom', ->
       atom.open(config.configDirPath)
 
-    @addPanel('Settings', new SettingsPanel)
+    @addPanel('General', new GeneralPanel)
     @addPanel('Themes', new ThemePanel)
     @addPanel('Packages', new PackagePanel)
     @showPanel(activePanelName) if activePanelName
diff --git a/src/packages/settings-view/package.cson b/src/packages/settings-view/package.cson
index 66921a864..6d0cfc8c5 100644
--- a/src/packages/settings-view/package.cson
+++ b/src/packages/settings-view/package.cson
@@ -1,3 +1,3 @@
-'main': './lib/settings'
+'main': './lib/settings-view'
 'deferredDeserializers': ['SettingsView']
 'description': 'GUI pane for Atom settings'
diff --git a/src/packages/settings-view/spec/settings-panel-spec.coffee b/src/packages/settings-view/spec/settings-panel-spec.coffee
index 1a1c76a40..bfb578a90 100644
--- a/src/packages/settings-view/spec/settings-panel-spec.coffee
+++ b/src/packages/settings-view/spec/settings-panel-spec.coffee
@@ -1,7 +1,7 @@
-SettingsPanel = require '../lib/settings-panel'
+GeneralPanel = require '../lib/general-panel'
 Editor = require 'editor'
 
-describe "SettingsPanel", ->
+describe "GeneralPanel", ->
   panel = null
 
   getValueForId = (id) ->
@@ -27,7 +27,7 @@ describe "SettingsPanel", ->
     config.set('foo.boolean', true)
     config.set('foo.string', 'hey')
 
-    panel = new SettingsPanel()
+    panel = new GeneralPanel()
     spyOn(panel, "showSettings").andCallThrough()
     window.advanceClock(10000)
     waitsFor ->