Browse Source

Enabled editing for every layer, not only the first one...

Max Nuding 12 years ago
parent
commit
095c02f4c4
3 changed files with 32 additions and 15 deletions
  1. 6
    6
      Cube Control/frame.java
  2. 24
    7
      Cube Control/layerEditFrame.java
  3. 2
    2
      Cube Control/makefile

+ 6
- 6
Cube Control/frame.java View File

@@ -515,27 +515,27 @@ public class frame extends JFrame implements ListSelectionListener {
515 515
   }
516 516
 
517 517
   public void editC_ActionPerformed(ActionEvent evt) {
518
-    layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker);
518
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker);
519 519
   }
520 520
 
521 521
   public void editD_ActionPerformed(ActionEvent evt) {
522
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(3));
522
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 3, worker);
523 523
   }
524 524
 
525 525
   public void editE_ActionPerformed(ActionEvent evt) {
526
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(4));
526
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 4, worker);
527 527
   }
528 528
 
529 529
   public void editF_ActionPerformed(ActionEvent evt) {
530
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(5));
530
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 5, worker);
531 531
   }
532 532
 
533 533
   public void editG_ActionPerformed(ActionEvent evt) {
534
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(6));
534
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 6, worker);
535 535
   }
536 536
 
537 537
   public void editH_ActionPerformed(ActionEvent evt) {
538
-    // layerEditFrame layerFrame1 = new layerEditFrame(worker.getLayer(7));
538
+     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 7, worker);
539 539
   }
540 540
 
541 541
   public void frameUp_ActionPerformed(ActionEvent evt) {

+ 24
- 7
Cube Control/layerEditFrame.java View File

@@ -1,15 +1,32 @@
1
+/*
2
+* layerEditFrame.java
3
+*
4
+*
5
+* Copyright 2011 Thomas Buck <xythobuz@me.com>
6
+* Copyright 2011 Max Nuding <max.nuding@gmail.com>
7
+* Copyright 2011 Felix Bäder <baeder.felix@gmail.com>
8
+*
9
+* This file is part of LED-Cube.
10
+*
11
+* LED-Cube is free software: you can redistribute it and/or modify
12
+* it under the terms of the GNU General Public License as published by
13
+* the Free Software Foundation, either version 3 of the License, or
14
+* (at your option) any later version.
15
+*
16
+* LED-Cube is distributed in the hope that it will be useful,
17
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
18
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19
+* GNU General Public License for more details.
20
+*
21
+* You should have received a copy of the GNU General Public License
22
+* along with LED-Cube. If not, see <http://www.gnu.org/licenses/>.
23
+*/
24
+
1 25
 import java.awt.*;
2 26
 import java.awt.event.*;
3 27
 import javax.swing.*;
4 28
 import javax.swing.event.*;
5 29
 
6
-/**
7
-*
8
-* Beschreibung
9
-*
10
-* @version 1.0 vom 11/16/2011
11
-* @author
12
-*/
13 30
 
14 31
 public class layerEditFrame extends JFrame {
15 32
   // Anfang Attribute

+ 2
- 2
Cube Control/makefile View File

@@ -1,7 +1,7 @@
1 1
 JAVAC = javac
2 2
 CC = gcc
3
-TARGET = unix
4
-#TARGET = win
3
+#TARGET = unix
4
+TARGET = win
5 5
 
6 6
 JAVAFILES = cubeWorker.java layerEditFrame.java frame.java
7 7
 

Loading…
Cancel
Save