merged all CM into 1 #3423

Merged
merged 9 commits into from Jun 23, 2015

Conversation

Projects
None yet
2 participants
@Akarshit
Member

Akarshit commented Jun 23, 2015

  • A new class ContributionTab contains the stuff that is visible in a tab.
  • ContributionManagerDialog contains the tabbedPane which has ContributionTabs
  • ContribtionListing object is present in every ContributionTab object but it will be removed later to include a single object in ContributionManagerDialog so we can get rid of synchronization issues.
  • Added shortcuts to the tabs like Alt+1, Alt+2 on linux and windows etc.

waiting for @alignedleft to give this PR a go then @benfry can review and merge it.

merged this with the latest and tried to minimize the changes.

@@ -410,36 +404,35 @@ public void actionPerformed(ActionEvent actionEvent) {
public void keyPressed(KeyEvent e) {
//System.out.println(e);
KeyStroke wc = Toolkit.WINDOW_CLOSE_KEYSTROKE;
- if ((e.getKeyCode() == KeyEvent.VK_ESCAPE) ||
- (KeyStroke.getKeyStrokeForEvent(e).equals(wc))) {
+ if ((e.getKeyCode() == KeyEvent.VK_ESCAPE)

This comment has been minimized.

@benfry

benfry Jun 23, 2015

Member

That was the correct formatting before you changed it:
https://github.com/processing/processing/wiki/Style-Guidelines
Please read the guidelines.

@benfry

benfry Jun 23, 2015

Member

That was the correct formatting before you changed it:
https://github.com/processing/processing/wiki/Style-Guidelines
Please read the guidelines.

This comment has been minimized.

@Akarshit

Akarshit Jun 23, 2015

Member

@benfry i am using formatter.xml from processing isn't it supposed to take care of all this stuff ?

Edit: I read that the formatter was incomplete i think i will open a issue for it as it could really decrease a lot of effort with auto formatting :)

@Akarshit

Akarshit Jun 23, 2015

Member

@benfry i am using formatter.xml from processing isn't it supposed to take care of all this stuff ?

Edit: I read that the formatter was incomplete i think i will open a issue for it as it could really decrease a lot of effort with auto formatting :)

This comment has been minimized.

@benfry

benfry Jun 23, 2015

Member

Some of the changes will still be subjective so a formatter isn't going to fix everything.

@benfry

benfry Jun 23, 2015

Member

Some of the changes will still be subjective so a formatter isn't going to fix everything.

- List<Library> libraries =

This comment has been minimized.

@benfry

benfry Jun 23, 2015

Member

This formatting was correct; do not change it.

@benfry

benfry Jun 23, 2015

Member

This formatting was correct; do not change it.

+ pane.add(statusRestartPane, BorderLayout.SOUTH);
+
+
+// status = new StatusPanel();

This comment has been minimized.

@benfry

benfry Jun 23, 2015

Member

For the future, just use /* and */ to remove large sections like this.

@benfry

benfry Jun 23, 2015

Member

For the future, just use /* and */ to remove large sections like this.

benfry added a commit that referenced this pull request Jun 23, 2015

@benfry benfry merged commit ce34f5f into processing:master Jun 23, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment