[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.java

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/12/22 08:36:17

Modified files:
        gzz/modules/pp : PPMouseEvents.java PPView2.java 

Log message:
        Added swing depency and photo adding.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.1 
gzz/gzz/modules/pp/PPMouseEvents.java:1.2
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.1   Fri Dec 20 13:23:57 2002
+++ gzz/gzz/modules/pp/PPMouseEvents.java       Sun Dec 22 08:36:17 2002
@@ -14,6 +14,12 @@
 
 import java.awt.event.*;
 
+// begin liita kuva
+import java.io.*;
+import javax.swing.JFileChooser;
+// end liita kuva
+
+
 /** Event handling, event objects.. 
  */
 public class PPMouseEvents {
@@ -43,6 +49,7 @@
        
        // Buttons
        EventHandling.i().assign("Add new paper", new NewPaper() );
+       EventHandling.i().assign("Add photo to paper", new AddPhoto() );
        EventHandling.i().assign("Delete paper", new DeletePaper() );
 
        // Shortcut papers
@@ -87,6 +94,39 @@
            AbstractUpdateManager.chg();
        }
     }
+
+    public class AddPhoto implements EventHandling.EventMouseObj {
+       public void event(MouseEvent ev, EventHandling.MousePressState p_state,
+                         Object[] obs) {
+           try {
+               pa("Add photo!");
+
+               JFileChooser fc = new JFileChooser();
+                int returnVal = fc.showOpenDialog(null);
+
+                if (returnVal == JFileChooser.APPROVE_OPTION) {
+                    File file = fc.getSelectedFile();
+                    //this is where a real application would open the file.
+                    pa("Opening: IMG:" + file.getPath() );
+
+                   Cell c = context.getAccursed();
+                   // XXX no checks!!
+                   c = 
space.getCell(ppactions.newNote(c.h(ppv.d.contains).getId(),
+                                                       (int)ppv.panx, 
(int)ppv.pany,
+                                                       "IMG:" + file.getPath()
+                                                       )
+                                     );
+                } else {
+                    pa("Open command cancelled by user.");
+                }
+
+               //ppactions.newPaper();
+           } catch (Exception e) { pa(e.getMessage()); }
+           AbstractUpdateManager.chg();
+       }
+    }
+
+
 
     public class DeletePaper implements EventHandling.EventMouseObj {
        public void event(MouseEvent ev, EventHandling.MousePressState p_state,
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.28 
gzz/gzz/modules/pp/PPView2.java:1.29
--- gzz/gzz/modules/pp/PPView2.java:1.28        Fri Dec 20 13:23:57 2002
+++ gzz/gzz/modules/pp/PPView2.java     Sun Dec 22 08:36:17 2002
@@ -418,28 +418,57 @@
            // the left panel
            // ==============
 
+           float scale = style.getScaleByHeight(40);
+
            // put the "New paper" -text
            TextVob new_paper_button = new TextVob(style, "Uusi paperi");
-           float scale = style.getScaleByHeight(40);
            float width = new_paper_button.getWidth(scale);
-           int new_paper_button_frame = vs.orthoBoxCS(0, 
"new_paper_button_frame", 0, 0, 0, 1, 1,
-                                  width, new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale));
-           int new_paper_button_cs = vs.scaleCS(new_paper_button_frame, 
"new_paper_button_cs",
-                     new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale),
-                     new_paper_button.getHeight(scale) + 
new_paper_button.getDepth(scale));
+           int new_paper_button_frame =
+               vs.orthoBoxCS(0, "new_paper_button_frame", 0,  0,0,  1,1,
+                             width, new_paper_button.getHeight(scale) +
+                             new_paper_button.getDepth(scale));
+           int new_paper_button_cs =
+               vs.scaleCS(new_paper_button_frame, "new_paper_button_cs",
+                          new_paper_button.getHeight(scale) +
+                            new_paper_button.getDepth(scale),
+                          new_paper_button.getHeight(scale) +
+                            new_paper_button.getDepth(scale));
            vs.activate(new_paper_button_frame);
            vs.map.put(new_paper_button, new_paper_button_cs);
            ev_handler.onClick(new_paper_button_frame, "Add new paper");
 
+
+           // put the "Add photo" -text
+           TextVob add_photo_button = new TextVob(style, "Liita kuva");
+           width = add_photo_button.getWidth(scale);
+           int add_photo_button_frame =
+               vs.orthoBoxCS(0, "add_photo_button_frame", 0, 300,0, 1,1,
+                             width, add_photo_button.getHeight(scale) + 
+                             add_photo_button.getDepth(scale));
+           int add_photo_button_cs = 
+               vs.scaleCS(add_photo_button_frame, "add_photo_button_cs",
+                          add_photo_button.getHeight(scale) + 
+                          add_photo_button.getDepth(scale),
+                          add_photo_button.getHeight(scale) + 
+                          add_photo_button.getDepth(scale));
+           vs.activate(add_photo_button_frame);
+           vs.map.put(add_photo_button, add_photo_button_cs);
+           ev_handler.onClick(add_photo_button_frame, "Add photo to paper");
+
+
            // put the "Delete paper" -text
            TextVob delete_paper_button = new TextVob(style, "Tuhoa paperi");
-           float scale2 = style.getScaleByHeight(40);
-           float width2 = delete_paper_button.getWidth(scale);
-           int delete_paper_button_frame = vs.orthoBoxCS(0, 
"delete_paper_button_frame", 0, 300, 0, 1, 1,
-                                  width2, 
delete_paper_button.getHeight(scale2) + delete_paper_button.getDepth(scale));
-           int delete_paper_button_cs = vs.scaleCS(delete_paper_button_frame, 
"delete_paper_button_cs",
-                     delete_paper_button.getHeight(scale) + 
delete_paper_button.getDepth(scale),
-                     delete_paper_button.getHeight(scale) + 
delete_paper_button.getDepth(scale));
+           width = delete_paper_button.getWidth(scale);
+           int delete_paper_button_frame =
+               vs.orthoBoxCS(0, "delete_paper_button_frame", 0, 600,0, 1,1,
+                             width, delete_paper_button.getHeight(scale) +
+                             delete_paper_button.getDepth(scale));
+           int delete_paper_button_cs =
+               vs.scaleCS(delete_paper_button_frame, "delete_paper_button_cs",
+                          delete_paper_button.getHeight(scale) +
+                          delete_paper_button.getDepth(scale),
+                          delete_paper_button.getHeight(scale) +
+                          delete_paper_button.getDepth(scale));
            vs.activate(delete_paper_button_frame);
            vs.map.put(delete_paper_button, delete_paper_button_cs);
            ev_handler.onClick(delete_paper_button_frame, "Delete paper");