Skip to content

Commit

Permalink
Merge pull request #709 from eclipse/CHE-351
Browse files Browse the repository at this point in the history
CHE-351. Move Preferences from Help menu to Profile menu
  • Loading branch information
RomanNikitenko committed Mar 15, 2016
2 parents b2c83b8 + 31a5fd5 commit 7940ca0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -508,16 +508,17 @@ public void initialize() {
DefaultActionGroup profileGroup = (DefaultActionGroup) actionManager.getAction(IdeActions.GROUP_PROFILE);
actionManager.registerAction("redirectToDashboardProjectsAction", redirectToDashboardProjectsAction);
actionManager.registerAction("redirectToDashboardWorkspacesAction", redirectToDashboardWorkspacesAction);
actionManager.registerAction("showPreferences", showPreferencesAction);
profileGroup.add(redirectToDashboardProjectsAction);
profileGroup.add(redirectToDashboardWorkspacesAction);

profileGroup.addSeparator();
profileGroup.add(showPreferencesAction);

// Compose Help menu
DefaultActionGroup helpGroup = (DefaultActionGroup) actionManager.getAction(IdeActions.GROUP_HELP);
helpGroup.addSeparator();

actionManager.registerAction("showPreferences", showPreferencesAction);
helpGroup.add(showPreferencesAction);

actionManager.registerAction("setupProjectAction", settingsAction);
helpGroup.add(settingsAction);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ importProject.message.failure = Failed to import project {0}
importProject.message.startWithWhiteSpace = The url can not start with a whitespace.
importProject.message.urlInvalid = The URL provided for the project to import is invalid.
importProject.message.unableGetSshKey = Unable get private ssh key. \
You can create a new SSH key pair in Help->Preferences->SSH->Git.
You can create a new SSH key pair in Profile->Preferences->SSH->Git.
importProject.importer.info = Importer Information
importProject.project.info = Project Information
importProject.name.prompt = Define the name of your project...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ button.pull=Pull

############MESSAGES################
messages.unableGetSshKey = Failed to get private ssh key. \
You can create a new SSH key pair in Help->Preferences->SSH->Git.
You can create a new SSH key pair in Profile->Preferences->SSH->Git.
messages.warningTitle = Warning
messages.index_empty=Index is empty
messages.add_success=Git index updated
Expand All @@ -50,7 +50,7 @@ messages.branch_delete_failed=Failed to delete branch
messages.branch_rename_failed=Failed to rename branch
messages.commit_failed=Failed to commit
messages.committer_identity_info_empty=Git user name and (or) email was not set. \
You can set this information in Help -> Preferences -> Git -> Committer.
You can set this information in Profile -> Preferences -> Git -> Committer.
messages.diff.failed=Failed to get diff
messages.log_failed=Failed to load commits history
messages.init_commit_was_not_performed=Initial commit is required to perform this operation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ authorization.dialog.title = Authorization
authorization.dialog.text = {0} requests authorization through OAuth2 protocol
authorization.generateKeyLabel = generate ssh key and upload it on GitHub
authorization.message.unableCreateSshKey = Unable create private ssh key. \
You can create a new SSH key pair in Help->Preferences->SSH->Git.
You can create a new SSH key pair in Profile->Preferences->SSH->Git.
authorization.message.keyUploadSuccess = Ssh key uploaded
############### SamplesListGrid ###############
samplesListGrid.column.name=Project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ ssh.connect.info=You can connect your SSH client to ''{0}'' with:\
\n\nNOTES:\
\n1. You can login with user / password, but it is not recommended.\
\n2. Use an SSH key pair to securely authenticate.\
\n3. You can generate new SSH key pairs at `Help -> Preferences -> SSH -> Machine`\
\n3. You can generate new SSH key pairs at `Profile -> Preferences -> SSH -> Machine`\
\n4. Or, you can upload your own public key.\
\n5. You must restart your workspace for the keys to take affect.\
\n6. You can verify your key by opening a terminal and viewing `/home/user/.ssh/authorized_keys`\
Expand Down

0 comments on commit 7940ca0

Please sign in to comment.