Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use edit_settings to open settings #155

Merged
merged 4 commits into from
Dec 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Default (Linux).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
{ "keys": ["ctrl+k", "right"], "command": "travel_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "down"], "command": "travel_to_pane", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "left"], "command": "travel_to_pane", "args": {"direction": "left"} },

{ "keys": ["ctrl+k", "shift+up"], "command": "carry_file_to_pane", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "shift+right"], "command": "carry_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "shift+down"], "command": "carry_file_to_pane", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "shift+left"], "command": "carry_file_to_pane", "args": {"direction": "left"} },

{ "keys": ["ctrl+k", "alt+up"], "command": "clone_file_to_pane", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "alt+right"], "command": "clone_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "alt+down"], "command": "clone_file_to_pane", "args": {"direction": "down"} },
Expand All @@ -29,12 +29,12 @@
{ "keys": ["ctrl+k", "ctrl+shift+left"], "command": "destroy_pane", "args": {"direction": "left"} },
// You can also destroy the current pane by binding the following command:
// { "keys": [], "command": "destroy_pane", "args": {"direction": "self"} },

{ "keys": ["ctrl+k", "ctrl+alt+up"], "command": "create_pane_with_file", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "ctrl+alt+right"], "command": "create_pane_with_file", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "ctrl+alt+down"], "command": "create_pane_with_file", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "ctrl+alt+left"], "command": "create_pane_with_file", "args": {"direction": "left"} },


// You can pull a file from another pane by binding the following command:
// { "keys": [], "command": "pull_file_from_pane", "args": { "direction": ""} }
Expand Down
6 changes: 3 additions & 3 deletions Default (OSX).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{ "keys": ["super+k", "shift+right"], "command": "carry_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["super+k", "shift+down"], "command": "carry_file_to_pane", "args": {"direction": "down"} },
{ "keys": ["super+k", "shift+left"], "command": "carry_file_to_pane", "args": {"direction": "left"} },

{ "keys": ["super+k", "alt+up"], "command": "clone_file_to_pane", "args": {"direction": "up"} },
{ "keys": ["super+k", "alt+right"], "command": "clone_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["super+k", "alt+down"], "command": "clone_file_to_pane", "args": {"direction": "down"} },
Expand All @@ -29,12 +29,12 @@
{ "keys": ["super+k", "super+shift+left"], "command": "destroy_pane", "args": {"direction": "left"} },
// You can also destroy the current pane by binding the following command:
// { "keys": [], "command": "destroy_pane", "args": {"direction": "self"} },

{ "keys": ["super+k", "super+alt+up"], "command": "create_pane_with_file", "args": {"direction": "up"} },
{ "keys": ["super+k", "super+alt+right"], "command": "create_pane_with_file", "args": {"direction": "right"} },
{ "keys": ["super+k", "super+alt+down"], "command": "create_pane_with_file", "args": {"direction": "down"} },
{ "keys": ["super+k", "super+alt+left"], "command": "create_pane_with_file", "args": {"direction": "left"} },


// You can pull a file from another pane by binding the following command:
// { "keys": [], "command": "pull_file_from_pane", "args": { "direction": ""} }
Expand Down
8 changes: 4 additions & 4 deletions Default (Windows).sublime-keymap
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
{ "keys": ["ctrl+k", "right"], "command": "travel_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "down"], "command": "travel_to_pane", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "left"], "command": "travel_to_pane", "args": {"direction": "left"} },

{ "keys": ["ctrl+k", "shift+up"], "command": "carry_file_to_pane", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "shift+right"], "command": "carry_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "shift+down"], "command": "carry_file_to_pane", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "shift+left"], "command": "carry_file_to_pane", "args": {"direction": "left"} },

{ "keys": ["ctrl+k", "alt+up"], "command": "clone_file_to_pane", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "alt+right"], "command": "clone_file_to_pane", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "alt+down"], "command": "clone_file_to_pane", "args": {"direction": "down"} },
Expand All @@ -29,12 +29,12 @@
{ "keys": ["ctrl+k", "ctrl+shift+left"], "command": "destroy_pane", "args": {"direction": "left"} },
// You can also destroy the current pane by binding the following command:
// { "keys": [], "command": "destroy_pane", "args": {"direction": "self"} },

{ "keys": ["ctrl+k", "ctrl+alt+up"], "command": "create_pane_with_file", "args": {"direction": "up"} },
{ "keys": ["ctrl+k", "ctrl+alt+right"], "command": "create_pane_with_file", "args": {"direction": "right"} },
{ "keys": ["ctrl+k", "ctrl+alt+down"], "command": "create_pane_with_file", "args": {"direction": "down"} },
{ "keys": ["ctrl+k", "ctrl+alt+left"], "command": "create_pane_with_file", "args": {"direction": "left"} },


// You can pull a file from another pane by binding the following command:
// { "keys": [], "command": "pull_file_from_pane", "args": { "direction": ""} }
Expand Down
44 changes: 12 additions & 32 deletions Main.sublime-menu
Original file line number Diff line number Diff line change
Expand Up @@ -132,55 +132,35 @@
"caption": "Origami",
"children":
[
// README
{
"caption": "README",
"command": "open_file",
"caption": "Settings",
"command": "edit_settings",
"args": {
"file": "${packages}/Origami/Origami.sublime-settings"
"base_file": "${packages}/Origami/Origami.sublime-settings",
"default": "// Settings in here override those in \"Origami/Origami.sublime-settings\"\n{\n\t$0\n}\n"
}
},
{ "caption": "-" },

// Settings - Default
{
"caption": "Settings – Default",
"command": "open_file",
"caption": "Key Bindings",
"command": "edit_settings",
"args": {
"file": "${packages}/Origami/Origami.sublime-settings"
}
},
// Settings - User
{
"caption": "Settings – User",
"command": "open_file",
"args": {
"file": "${packages}/User/Origami.sublime-settings"
"base_file": "${packages}/Origami/Default ($platform).sublime-keymap",
"user_file": "${packages}/User/Default (${platform}).sublime-keymap",
"default": "[\n\t$0\n]\n",
}
},
{ "caption": "-" },

// Key Bindings - Default
{
"caption": "Key Bindings – Default",
"command": "open_file",
"args": {
"file": "${packages}/Origami/Default ($platform).sublime-keymap"
}
},
// Key Bindings - User
{
"caption": "Key Bindings – User",
"caption": "README",
"command": "open_file",
"args": {
"file": "${packages}/User/Default ($platform).sublime-keymap"
"file": "${packages}/Origami/README.markdown"
}
},
{ "caption": "-" }
]
}
]
}
]
}
]
]
19 changes: 18 additions & 1 deletion Origami.sublime-commands
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,22 @@

{ "command": "toggle_zoom_pane", "args": {"fraction": 0.9}, "caption": "Origami: Zoom/Unzoom Current Pane (Toggle Zoom)" },
{ "command": "zoom_pane", "args": {"fraction": 0.9}, "caption": "Origami: Zoom Current Pane" },
{ "command": "unzoom_pane", "args": {}, "caption": "Origami: Unzoom Current Pane" }
{ "command": "unzoom_pane", "args": {}, "caption": "Origami: Unzoom Current Pane" },

{
"caption": "Preferences: Origami Settings",
"command": "edit_settings",
"args": {
"base_file": "${packages}/Origami/Origami.sublime-settings",
"default": "// Settings in here override those in \"Origami/Origami.sublime-settings\"\n{\n\t$0\n}\n"}
},
{
"caption": "Preferences: Origami Key Bindings",
"command": "edit_settings",
"args": {
"base_file": "${packages}/Origami/Default ($platform).sublime-keymap",
"user_file": "${packages}/User/Default ($platform).sublime-keymap",
"default": "[\n\t$0\n]\n",
}
}
]