Changeset 20

Timestamp:

07/04/07 04:41:05 (5 years ago)

Author:

ciro

Message:

Added PlaybackCanvas? to display the "Now Playing" event.
Added images to the repository (NOTE: they are crap so far :> it just needed something fast)

Location:

mymrc/trunk/Java-client/src

Files:

• images (added)
• images/mymrc.png (added)
• images/playback_bwd.png (added)
• images/playback_fwd.png (added)
• images/playback_next.png (added)
• images/playback_play.png (added)
• images/playback_prev.png (added)
• images/playback_stop.png (added)
• org/myMRC/control/Controller.java (modified) (13 diffs)
• org/myMRC/events/Content.java (modified) (3 diffs)
• org/myMRC/events/Opcode.java (modified) (1 diff)
• org/myMRC/myMRC.java (modified) (1 diff)
• org/myMRC/net/RequestTable.java (modified) (1 diff)
• org/myMRC/parser/FormParser.java (modified) (2 diffs)

mymrc/trunk/Java-client/src/org/myMRC/control/Controller.java

@@ -29 +29 @@
     private ListScreen list;
     private FormScreen form;
+    private PlaybackCanvas canvas;
     private Display display;
     private CommunicationController communicator;
@@ -35 +36 @@
     private ListParser listParser;
     private FormParser formParser;
+    private CanvasParser canvasParser;
     
     
@@ -82 +84 @@
         form         = new FormScreen();
         list         = new ListScreen();
+        canvas       = new PlaybackCanvas();
         display      = Display.getDisplay(myMRC);
         communicator = CommunicationController.getInstance();
@@ -88 +91 @@
         listParser   = new ListParser(list);
         formParser   = new FormParser(form);
+        canvasParser = new CanvasParser(canvas);
     }
     
@@ -106 +110 @@
         display.setCurrent(list);
     }
-        
+     
+    /**
+     * Sets the internal stored Canvas object to the display.
+     */
+    private void setCanvasScreen() {
+        canvas.generateMenu();
+        display.setCurrent(canvas);
+    }
+    
+    /**
+     * Sets an arbitrary screen element to the display.
+     * @param screen Displayable object to display.
+     */
     public void setScreen(Displayable screen) {
         display.setCurrent(screen);
@@ -135 +151 @@
                 formParser.parse();
                 setFormScreen();
+                break;
+                
+            case Opcode.IOP_PARSECANVAS:
+                canvas.clear();
+                System.out.println("set canvas parser input: " + data);
+                canvasParser.setInput(data.getBytes());
+                canvasParser.parse();
+                setCanvasScreen();
                 break;
                 
@@ -191 +215 @@
                 
             case Opcode.IOP_CONNECT:
-                // connect
                 /*
                  * We have to use a separate thread to start the
@@ -202 +225 @@
                     communicator.send(Opcode.OP_HELLO, null);
                 }
-                //this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
                 break;
                 
             case Opcode.IOP_DISCONNECT_CONF:
-                // disconnect confirmation
-                //alert.setTitle("Disconnect?");
                 alert.setString("Do you really want to disconnect?");
                 display.setCurrent(alert);
@@ -218 +238 @@
                 
             case Opcode.IOP_DISCONNECT:
-                // disconnect
-                System.out.println("handling IOP_DISCONNECT");
                 communicator.destroy();
                 this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START_DISCONNECTED);
@@ -225 +243 @@
                 
             case Opcode.IOP_ABOUT_DIALOG:
-                // about
-                System.out.println("processing internal event \"About\"");
                 this.handle(Opcode.IOP_PARSEFORM, Content.CONT_ABOUT);
                 break;
                 
             case Opcode.IOP_SETTINGS:
-                // settings
                 this.handle(Opcode.IOP_PARSEFORM, Content.CONT_SETTINGS);
                 break;
                 
             case Opcode.IOP_SETTINGS_SAVE:
-                // save settings
                 config.writeSettings(form);
                 try {
@@ -242 +256 @@
                 } catch (IOException ioe) {
                     ioe.printStackTrace();
-                    //alert.setTitle("Saving settings failed!");
                     alert.setTimeout(alert.FOREVER);
                     alert.setString("Error while saving settings:\n" + ioe.getMessage());
@@ -248 +261 @@
                     break;
                 }
-                //alert.setTitle("Settings saved");
                 alert.setString("Your settings have been saved successfully");
                 display.setCurrent(alert);
-                //this.processInternalEvent(900, null);
-                break;
-                
-            case Opcode.IOP_INT_EXIT_CONF: // exit confirmation
-                //alert.setTitle("Exit?");
+                break;
+                
+            case Opcode.IOP_INT_EXIT_CONF:
                 alert.setString("Do you really want to quit?");
                 display.setCurrent(alert);
@@ -261 +271 @@
                 
             case Opcode.IOP_INT_EXIT:
-                // exit (the real one)
                 if (communicator.isAlive()) {
-                    communicator.destroy(); // FIXME does it work?
+                    communicator.destroy(); // FIXME: does it work?
                 }
                 Controller.killEmAll();

mymrc/trunk/Java-client/src/org/myMRC/events/Content.java

@@ -23 +23 @@
     public static final String CONT_START = 
             "<form label=\"myMRC 0.1\">" + 
-            //"   <image file=\"mymrc.png\"/>" +
-            "   <string label=\"hallo :)\"/>" +
+            "   <image file=\"mymrc.png\"/>" +
             "   <string label=\"Not Connected\"/>" +
             "   <command label=\"Connect\" opcode=\"0" + Opcode.IOP_CONNECT + "\"/>" +
@@ -35 +34 @@
     public static final String CONT_START_DISCONNECTED =
             "<form label=\"myMRC 0.1\">" + 
-            //"   <image file=\"mymrc.png\"/>" +
-            "   <string label=\"hallo :)\"/>" +
+            "   <image file=\"mymrc.png\"/>" +
             "   <string label=\"Connection lost!\"/>" +
             "   <command label=\"Connect\" opcode=\"0" + Opcode.IOP_CONNECT + "\"/>" +
@@ -47 +45 @@
     public static final String CONT_START_CONNECTED = 
             "<form label=\"myMRC 0.1\">" + 
-            //"   <image file=\"mymrc.png\"/>" +
-            "   <string label=\"hallo :)\"/>" +
+            "   <image file=\"mymrc.png\"/>" +
             "   <string label=\"OH OH! this is deprecated, it shouldn't be displayed\"/>" +
             "   <command label=\"Continue\" opcode=\"0000\"/>" +

mymrc/trunk/Java-client/src/org/myMRC/events/Opcode.java

@@ -37 +37 @@
     public static final String OP_PARSELIST         = "0910";
     public static final int   IOP_PARSELIST         =   910;
-    public static final String OP_PARSRFORM         = "0911";
+    public static final String OP_PARSEFORM         = "0911";
     public static final int   IOP_PARSEFORM         =   911;
+    public static final String OP_PARSECANVAS       = "0912";
+    public static final int   IOP_PARSECANVAS       =   912;
     public static final int   IOP_SETTINGS          =   920;
     public static final int   IOP_SETTINGS_SAVE     =   921;

mymrc/trunk/Java-client/src/org/myMRC/myMRC.java

@@ -42 +42 @@
         
         Controller.createInstance(this);
-        Controller.getInstance().handle(Opcode.IOP_PARSEFORM, Content.CONT_START);                
+        Controller.getInstance().handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
     }
         

mymrc/trunk/Java-client/src/org/myMRC/net/RequestTable.java

@@ -13 +13 @@
  * When a message is sent to the server that awaits a reply from it, this
  * table is used to store the requests.
+ *
+ * NOTE: this is legacy code! It is NOT used at the moment.
  *
  * @author Sven Gregori

mymrc/trunk/Java-client/src/org/myMRC/parser/FormParser.java

@@ -25 +25 @@
     private final int DEFAULT_TEXTFIELD_SIZE = 20;
     private final int DEFAULT_SELECT_TYPE = ChoiceGroup.EXCLUSIVE;
+    private final String IMAGE_PATH = "/images/";
 
     /**
@@ -107 +108 @@
                 
             } else if (parser.getName().equalsIgnoreCase("image")) {
-                String label = parser.getAttributeValue(null, "label");
+                String label   = parser.getAttributeValue(null, "label");
                 String imgFile = parser.getAttributeValue(null, "file");
-                String altTxt = parser.getAttributeValue(null, "alt");
-                Image img = Util.createImage(imgFile);
+                String altTxt  = parser.getAttributeValue(null, "alt");
+                Image  img     = Image.createImage(IMAGE_PATH + imgFile);
                 form.append(new ImageItem(label, img, Item.LAYOUT_CENTER, altTxt));