Changeset 103

Timestamp:

23/06/08 14:44:24 (4 months ago)

Author:

altglass

Message:

Bugfix: SubBitmap? dimension checking in editing dialog
Layout: Window editing dialog got new layout, Pressing return/enter in resources & window editing dialogs triggers the OK button
Main Interface: Cross platform native feel improvement - espc. for Mac OS X

Files:

• trunk/src/vlcskineditor/Main.java (modified) (10 diffs)
• trunk/src/vlcskineditor/Window.java (modified) (3 diffs)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/Font.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (3 diffs)

trunk/src/vlcskineditor/Main.java

@@ -125 +125 @@
-    mbar = new JMenuBar();
-    
+    //For cross-platform feel (CTRL on Win & Linux, APPLE/COMMAND on Mac OS)
+    int mask = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+    
-    m_file = new JMenu("File");
-    m_file.setMnemonic("F".charAt(0));
@@ -130 +133 @@
-    m_file_new.setIcon(new_icon);
-    m_file_new.setMnemonic("N".charAt(0));
-"ctrl N"
+'N',mask
-    m_file_new.addActionListener(this);
-    m_file_open = new JMenuItem("Open");
-    m_file_open.setIcon(open_icon);
-    m_file_open.setMnemonic('O');
-"ctrl O"
+'O',mask
-    m_file_open.addActionListener(this);    
-    m_file_save = new JMenuItem("Save");
-    m_file_save.setIcon(save_icon);
-    m_file_save.setMnemonic('S');
-"ctrl S"
+'S',mask
-    m_file_save.addActionListener(this);
-    m_file_test = new JMenuItem("Test skin in VLC...");
-    m_file_test.setMnemonic('T');
-"ctrl shift t"
+'T',mask+InputEvent.SHIFT_DOWN_MASK
-    m_file_test.addActionListener(this);    
-    m_file_vlt = new JMenuItem("Export as VLT...");
-    m_file_vlt.setMnemonic('V');
-"ctrl shift v"
+'V',mask+InputEvent.SHIFT_DOWN_MASK
-    m_file_vlt.addActionListener(this);
-    m_file_png = new JMenuItem("Save current preview as image");
@@ -154 +157 @@
-    m_file_png.addActionListener(this);
-    m_file_png.setEnabled(false);
-
-
-
-
-
+
+
+
+
+
+
+
-    
-    m_file.add(m_file_new);
@@ -176 +181 @@
-    m_edit_undo.setIcon(edit_undo_icon);
-    m_edit_undo.setMnemonic('U');
-"ctrl Z"
+'Z',mask
-    m_edit_undo.addActionListener(this);
-    m_edit_redo = new JMenuItem("Redo");
-    m_edit_redo.setIcon(edit_redo_icon);
-    m_edit_redo.setMnemonic('R');    
-"ctrl Y"
+'Y',mask
-    m_edit_redo.addActionListener(this);
-    m_edit_theme = new JMenuItem("Theme settings");
-    m_edit_theme.setIcon(edit_icon);
-    m_edit_theme.setMnemonic('I');
-"ctrl I"
+'I',mask
-    m_edit_theme.addActionListener(this);
-    m_edit_global = new JMenuItem("Global variables");
-    m_edit_global.setMnemonic('G');
-"ctrl G"
+'G',mask
-    m_edit_global.addActionListener(this);
-    m_edit_up = new JMenuItem("Move selected item up");
-"ctrl UP"
+KeyEvent.VK_UP,mask
-    m_edit_up.addActionListener(this);
-    m_edit_down = new JMenuItem("Move selected item down");
-"ctrl DOWN"
+KeyEvent.VK_DOWN,mask
-    m_edit_down.addActionListener(this);
-    m_edit_left = new JMenuItem("Move selected item left");
-"ctrl LEFT"
+KeyEvent.VK_LEFT,mask
-    m_edit_left.addActionListener(this);
-    m_edit_right = new JMenuItem("Move selected item right");
-"ctrl RIGHT"
+KeyEvent.VK_RIGHT,mask
-    m_edit_right.addActionListener(this);
-    
@@ -564 +569 @@
-      }
-      catch (Exception e) {
+        System.err.println("Could not read VLC installation directory from Registry. VLC might not be properly installed.");
-        e.printStackTrace();
-      }  
@@ -610 +616 @@
-    opening = true;
-    String[] exts = { "xml","vlt" };
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -1499 +1527 @@
-      pvwin.selectItem(s.getItem(selected_item));
-    }
-
-
-
+
-  public void windowClosing(WindowEvent e) {
-    if(!saved) {
@@ -1530 +1556 @@
-    }
-  }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public void windowOpened(WindowEvent e) {}  
-  public void mouseClicked(MouseEvent e) {
@@ -1598 +1640 @@
-        return null;
-      }
-
+  
-  /**
-   * Creates a new instance of Main and thus launches the editor
@@ -1611 +1653 @@
-    }
-    JFrame.setDefaultLookAndFeelDecorated(true);
+    System.setProperty("apple.laf.useScreenMenuBar", "true");
+    System.setProperty("com.apple.mrj.application.apple.menu.about.name", "VLC Skin Editor");
-    new Main(args);      
-  }

trunk/src/vlcskineditor/Window.java

@@ -153 +153 @@
-      playondrop_tf.setToolTipText("Indicates whether a dropped file is played directly (true) or only enqueued (false). This attribute has no effect if dragdrop is set to \"false\".");
-      ok_btn = new JButton("OK");
-
-
+
-      cancel_btn = new JButton("Cancel");
-
-
+
-      help_btn = new JButton("Help");
-
-
+
+
+
+
+
+
+
+
-      
-      JPanel general = new JPanel(null);
-      general.add(id_l);
-      general.add(id_tf);
-
-
+
-      general.add(x_l);
-      general.add(x_tf);
-
-
+
-      general.add(y_l);
-      general.add(y_tf);
-
-
+
-      general.add(visible_l);
-      general.add(visible_tf);
-
-
+
-      general.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "General Attributes"));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      frame.add(general);
-      
@@ -188 +216 @@
-      options.add(dragdrop_l);
-      options.add(dragdrop_tf);
-
-
+
-      options.add(playondrop_l);
-      options.add(playondrop_tf);
-
-
+
-      options.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Drag and drop options"));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      frame.add(options);
-      
@@ -203 +243 @@
-      frame.add(cancel_btn);
-      frame.add(help_btn);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -353 +353 @@
-      frame.pack();
-      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/resources/Font.java

@@ -255 +255 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -221 +221 @@
-      bounds.setLayout(bounds_layout);
-      bounds_layout.putConstraint(SpringLayout.NORTH, x_l, 5, SpringLayout.NORTH, bounds);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.WEST, x_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, x_tf, 0, SpringLayout.NORTH, x_l);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.NORTH, y_l, 10, SpringLayout.SOUTH, x_l);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.WEST, y_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, y_tf, 0, SpringLayout.NORTH, y_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, y_tf, 0, SpringLayout.EAST, x_tf);
+      
-      bounds_layout.putConstraint(SpringLayout.NORTH, width_l, 10, SpringLayout.SOUTH, y_l);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.WEST, width_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, width_tf, 0, SpringLayout.NORTH, width_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, width_tf, 0, SpringLayout.EAST, x_tf);
+      
-      bounds_layout.putConstraint(SpringLayout.NORTH, height_l, 10, SpringLayout.SOUTH, width_l);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.WEST, height_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, height_tf, 0, SpringLayout.NORTH, height_l);
-
+
+
-      bounds_layout.putConstraint(SpringLayout.SOUTH, bounds, 10, SpringLayout.SOUTH, height_l);
-      frame.add(bounds);
@@ -299 +307 @@
-      
-      frame.pack();      
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    
@@ -335 +345 @@
-        return;
-      }
-height_tf.getText())>parent.image.getHeight
+width_tf.getText())>parent.image.getWidth
-        JOptionPane.showMessageDialog(frame,"Specified dimensions are outside the parent bitmap!","Dimension not valid",JOptionPane.INFORMATION_MESSAGE);
-        return;