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.

Sign up for GitHub

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

CHE-351. Move Preferences from Help menu to Profile menu #709

Merged
merged 1 commit into from
Mar 15, 2016
Merged

CHE-351. Move Preferences from Help menu to Profile menu #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ...che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...e-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions .../src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ain/resources/org/eclipse/che/ide/ext/github/client/GitHubLocalizationConstant.properties
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...urces/org/eclipse/che/ide/extension/machine/client/MachineLocalizationConstant.properties
View file
Open in desktop
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