Cleanup setting-related things

- Add palette command to open settings - Use `edit_settings` command to show settings in two-pane view - Remove mention of Sublime Text 2 from readme
SublimeText · Mar 23, 2020 · cb6639a · cb6639a
1 parent 3189d1d
commit cb6639a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 73 deletions.
diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -6,5 +6,14 @@
 	{
 		"caption": "Trailing Spaces: Delete Trailing Spaces",
 		"command": "delete_trailing_spaces"
-	}
+	},
+	{
+		"caption": "Preferences: Trailing Spaces Settings",
+		"command": "edit_settings",
+		"args": {
+			"base_file": "${packages}/TrailingSpaces/trailing_spaces.sublime-settings",
+			"default": "// Settings in here override those in \"TrailingSpaces/trailing_spaces.sublime-settings\"\n\n{\n\t$0\n}\n",
+		},
+	},
+
 ]
diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -42,78 +42,21 @@
                         "children":
                         [
                             {
-                                "command": "open_file",
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/TrailingSpaces/README.md",
-                                    "platform": "Windows"
+                                    "base_file": "${packages}/TrailingSpaces/trailing_spaces.sublime-settings",
+                                    "default": "// Settings in here override those in \"TrailingSpaces/trailing_spaces.sublime-settings\"\n\n{\n\t$0\n}\n",
                                 },
-                                "caption": "Help"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TrailingSpaces/README.md",
-                                    "platform": "OSX"
-                                },
-                                "caption": "Help"
+                                "caption": "Settings"
                             },
+                            { "caption": "-" },
                             {
                                 "command": "open_file",
                                 "args": {
                                     "file": "${packages}/TrailingSpaces/README.md",
-                                    "platform": "Linux"
                                 },
                                 "caption": "Help"
                             },
-                            { "caption": "-" },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TrailingSpaces/trailing_spaces.sublime-settings",
-                                    "platform": "Windows"
-                                },
-                                "caption": "Settings - Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TrailingSpaces/trailing_spaces.sublime-settings",
-                                    "platform": "OSX"
-                                },
-                                "caption": "Settings - Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TrailingSpaces/trailing_spaces.sublime-settings",
-                                    "platform": "Linux"
-                                },
-                                "caption": "Settings - Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/User/trailing_spaces.sublime-settings",
-                                    "platform": "Windows"
-                                },
-                                "caption": "Settings - User"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/User/trailing_spaces.sublime-settings",
-                                    "platform": "OSX"
-                                },
-                                "caption": "Settings - User"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/User/trailing_spaces.sublime-settings",
-                                    "platform": "Linux"
-                                },
-                                "caption": "Settings - User"
-                            }
                         ]
                     }
                 ]

diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 Trailing Spaces
 ===============
 
-A [Sublime Text 2](http://www.sublimetext.com/2) and
-[3](http://www.sublimetext.com/3) plugin that allows you to…
+A [Sublime Text](http://www.sublimetext.com) plugin that allows you to…
 
 **highlight trailing spaces and delete them in a flash!**
 
@@ -115,9 +114,8 @@ Options
 
 Several options are available to customize the plugin's behavior. Those
 settings are stored in a configuration file, as JSON. You must use a specific
-file: Go to "Preferences / Package Settings / Trailing Spaces / Settings
-\- User" to add you custom settings. You can look at the default values in
-"Settings - Default", in the same menu.
+file: Go to "Preferences / Package Settings / Trailing Spaces / Settings" to
+add you custom settings.
 
 A few of them are also accessible through the "Edit / Trailing Spaces" menu.
 Sometimes, editing a setting will require a fresh Sublime Text to be applied
@@ -322,7 +320,7 @@ Trailing Spaces is designed to be a drop-in replacement of the limited
 *Trim Whitespace On Save* built-in feature. ST is indeed able to delete
 trailing spaces upon saving files, and maybe that's all you need!
 
-In order to enable this behavior, edit "Preferences / Settings - User"
+In order to enable this behavior, edit "Preferences / Settings"
 to add the following:
 
 ``` js

diff --git a/trailing_spaces.sublime-settings b/trailing_spaces.sublime-settings
@@ -1,9 +1,5 @@
 // Trailing Spaces' default settings.
 //
-// In order to tweak the settings, you should NOT edit this file, but instead
-// the user-specific, empty-by-default version under "Preferences / Package
-// Settings / Trailing Spaces / Settings - User".
-//
 // See Trailing Spaces' README for detailed instructions.
 {
     // By default, Trailing Spaces is "live". It means the trailing spaces