Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [588] trunk/magicmapclient
|
From: <fle...@us...> - 2007-03-01 19:02:45
|
Revision: 588
http://svn.sourceforge.net/magicmap/?rev=588&view=rev
Author: flederohr
Date: 2007-03-01 11:02:36 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
moved graphics in seperate folder
fixing issue of resourceloading
deleted unused graphics
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
Added Paths:
-----------
trunk/magicmapclient/res/magicmapGraphics/
trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
Removed Paths:
-------------
trunk/magicmapclient/res/MagicMap.png
trunk/magicmapclient/res/MagicMapLogo.gif
trunk/magicmapclient/res/magicmap-splash.png
trunk/magicmapclient/res/magicmap_header.png
Deleted: trunk/magicmapclient/res/MagicMap.png
===================================================================
(Binary files differ)
Deleted: trunk/magicmapclient/res/MagicMapLogo.gif
===================================================================
(Binary files differ)
Deleted: trunk/magicmapclient/res/magicmap-splash.png
===================================================================
(Binary files differ)
Added: trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/res/magicmapGraphics/MagicMap.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
===================================================================
(Binary files differ)
Property changes on: trunk/magicmapclient/res/magicmapGraphics/magicmap-splash.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/magicmapclient/res/magicmap_header.png
===================================================================
(Binary files differ)
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/core/MagicMapApplication.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -7,13 +7,13 @@
import java.awt.Toolkit;
import java.util.Locale;
-import javax.swing.ImageIcon;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JWindow;
import net.sf.magicmap.client.controller.Controller;
import net.sf.magicmap.client.gui.MainGUI;
+import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.utils.Settings;
import net.sf.magicmap.client.utils.Version;
@@ -30,7 +30,7 @@
JWindow splashScreen = new JWindow();
- JLabel splashLabel = new JLabel(new ImageIcon(MagicMapApplication.class.getClassLoader().getResource("magicmap-splash.png"))) {
+ JLabel splashLabel = new JLabel(GUIBuilder.getToolIcon("magicmap-splash.png", "magicmapGraphics")) {
private static final long serialVersionUID = 5735447445835224982L;
@@ -56,14 +56,14 @@
GUIUtils.setPlasticLookAndFeel();
GUIUtils.setLocale(Locale.getDefault());
-
+
JFrame frame = MainGUI.getInstance().getMainFrame();
GUIUtils.locateOnScreen(frame);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
// plugins laden.
Controller.getInstance().initializePlugins();
-
+
splashScreen.setVisible(false);
splashScreen.dispose();
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/MainFrame.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -5,16 +5,13 @@
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.HeadlessException;
-import java.awt.Image;
import java.awt.event.ActionEvent;
-import java.awt.image.VolatileImage;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.rmi.RemoteException;
import javax.swing.AbstractAction;
-import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
@@ -58,50 +55,50 @@
import com.brunchboy.util.swing.relativelayout.RelativeLayout;
import com.jgoodies.uif_lite.component.UIFSplitPane;
-public class MainFrame extends JFrame
-implements
-ServerConnectCallback,
-ServerDisconnectCallback,
-CreateNewMapCallback,
-MapNamesCallback,
-LoadMapDialogListener {
+public class MainFrame extends JFrame
+ implements
+ ServerConnectCallback,
+ ServerDisconnectCallback,
+ CreateNewMapCallback,
+ MapNamesCallback,
+ LoadMapDialogListener {
/**
* serial version id
*/
- private static final long serialVersionUID = -3842976532877305041L;
- private JMenuBar menuBar;
- private JToolBar toolBar;
- private StatusPanel statusBar;
- private MapPanel mapPanel;
- private OutlineView outlineView;
- private ConsoleView consoleView;
- private MapView mapView;
- private MeasurementView measurementView;
- private ViewTabPanel bottomRightTabPanel;
- private RelativeLayout layout;
- private AbstractAction connectAction;
- private AbstractAction setProxyAction;
- private AbstractAction disconnectAction;
- private AbstractAction newMapAction;
- private AbstractAction loadMapAction;
- private AbstractAction exitAction;
- private AbstractAction aboutAction;
- private AbstractAction onlineHelp;
- private MagicAction invisibleAction;
- private MagicAction simpleView;
- private MagicAction normalView;
- private MagicAction expertView;
- private MagicAction userDefinedView;
- private static final int numberOfdataInvocationRateAction = 10;
- private MagicAction[] dataInvocationRateAction;
-
+ private static final long serialVersionUID = -3842976532877305041L;
+ private JMenuBar menuBar;
+ private JToolBar toolBar;
+ private StatusPanel statusBar;
+ private MapPanel mapPanel;
+ private OutlineView outlineView;
+ private ConsoleView consoleView;
+ private MapView mapView;
+ private MeasurementView measurementView;
+ private ViewTabPanel bottomRightTabPanel;
+ private RelativeLayout layout;
+ private AbstractAction connectAction;
+ private AbstractAction setProxyAction;
+ private AbstractAction disconnectAction;
+ private AbstractAction newMapAction;
+ private AbstractAction loadMapAction;
+ private AbstractAction exitAction;
+ private AbstractAction aboutAction;
+ private AbstractAction onlineHelp;
+ private MagicAction invisibleAction;
+ private MagicAction simpleView;
+ private MagicAction normalView;
+ private MagicAction expertView;
+ private MagicAction userDefinedView;
+ private static final int numberOfdataInvocationRateAction = 10;
+ private MagicAction[] dataInvocationRateAction;
+
public MainFrame() throws HeadlessException {
super();
// Aktionen erstellen
buildActions();
-
+
// Layout vorbereiten
this.layout = new RelativeLayout();
Container pane = this.getContentPane();
@@ -110,7 +107,7 @@
// Hauptfenstereigenschaften setzen
this.setSize(new Dimension(1024, 768));
this.setTitle("MagicMap - Version " + Version.getVersion());
- this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMap.png")).getImage());
+ this.setIconImage(GUIBuilder.getToolIcon("MagicMap.png", "magicmapGraphics").getImage());
//Menu erstellen
this.menuBar = new JMenuBar();
@@ -166,7 +163,7 @@
AttributeType.BOTTOM, GUIConstants.DIVIDER_SIZE));
}
-
+
/**
* Build the main panel
* @return the main panel
@@ -191,7 +188,7 @@
pane2.setDividerLocation(1.0);
return pane;
}
-
+
/**
* Build the file menu
* @return the file menu
@@ -292,7 +289,7 @@
.getInstance().getNodeModel(), "measurementView");
this.mapPanel = new MapPanel("mapPanel");
this.mapPanel.setMapView(this.mapView);
- }
+ }
/**
* Add buttons to main toolbar
@@ -314,7 +311,7 @@
// bar.addSeparator();
}
-
+
/* (non-Javadoc)
* @see net.sf.magicmap.client.interfaces.ServerConnectCallback#connected(long)
*/
@@ -439,7 +436,6 @@
Controller.getInstance().connect(this);
}
-
/**
* Action builder for the action of the GUI
*
@@ -613,7 +609,6 @@
}
};
-
this.simpleView = new MagicAction("simpleview") {
/**
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java 2007-03-01 18:25:55 UTC (rev 587)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java 2007-03-01 19:02:36 UTC (rev 588)
@@ -7,13 +7,13 @@
import java.awt.event.ActionListener;
import java.io.IOException;
-import javax.swing.ImageIcon;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import net.sf.magicmap.client.gui.utils.GUIBuilder;
import net.sf.magicmap.client.gui.utils.GUIUtils;
import net.sf.magicmap.client.utils.Version;
@@ -37,7 +37,7 @@
private AboutDialog(Frame owner) {
super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about")));
- JLabel splashLabel = new JLabel(new ImageIcon("magicmap-splash.png")) {
+ JLabel splashLabel = new JLabel(GUIBuilder.getToolIcon("magicmap-splash.png", "magicmapGraphics")) {
private static final long serialVersionUID = 5735447445835224982L;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|