Revision: 3504
Author: lucboudreau
Date: Thu May 6 09:31:10 2010
Log: Redesigned help menu.
http://code.google.com/p/power-architect/source/detail?r=3504
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
/trunk/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Wed Apr 21 09:00:48 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu May 6 09:31:10 2010
@@ -133,6 +133,7 @@
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
import ca.sqlpower.swingui.SPSUtils;
+import ca.sqlpower.swingui.action.OpenUrlAction;
import ca.sqlpower.swingui.enterprise.client.SPServerInfoManagerPanel;
/**
@@ -888,13 +889,22 @@
JMenu helpMenu = new
JMenu(Messages.getString("ArchitectFrame.helpMenu")); //$NON-NLS-1$
helpMenu.setMnemonic('h');
+
if (!context.isMacOSX()) {
helpMenu.add(aboutAction);
+ helpMenu.add(checkForUpdateAction);
helpMenu.addSeparator();
}
+
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_GS_URL,
Messages.getString("ArchitectFrame.gettingStartedAction")));
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_DEMO_URL,
Messages.getString("ArchitectFrame.tutorialsAction")));
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_FAQ_URL,
Messages.getString("ArchitectFrame.faqAction")));
helpMenu.add(SPSUtils.forumAction);
helpMenu.addSeparator();
- helpMenu.add(checkForUpdateAction);
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_UPGRADE_URL,
Messages.getString("ArchitectFrame.upgradeAction")));
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_PS_URL,
Messages.getString("ArchitectFrame.premiumSupportAction")));
+ helpMenu.add(new OpenUrlAction(SPSUtils.ARCHITECT_UG_URL,
Messages.getString("ArchitectFrame.userGuideAction")));
+
menuBar.add(helpMenu);
return menuBar;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Mon May 3 16:11:03 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Thu May 6 09:31:10 2010
@@ -69,6 +69,7 @@
import ca.sqlpower.architect.profile.ProfileManagerImpl;
import ca.sqlpower.architect.swingui.action.AboutAction;
import ca.sqlpower.architect.swingui.action.AddDataSourceAction;
+import ca.sqlpower.architect.swingui.action.CheckForUpdateAction;
import ca.sqlpower.architect.swingui.action.NewDataSourceAction;
import ca.sqlpower.architect.swingui.action.OpenProjectAction;
import ca.sqlpower.architect.swingui.action.PreferencesAction;
@@ -448,7 +449,7 @@
// The main registration method. Takes quitAction,
prefsAction, aboutAction.
Class[] defArgs = { Action.class, Action.class,
Action.class };
Method registerMethod =
osxAdapter.getDeclaredMethod("registerMacOSXApplication", defArgs);
//$NON-NLS-1$
- Object[] args = { exitAction, prefAction, aboutAction };
+ Object[] args = { exitAction, prefAction, aboutAction, new
CheckForUpdateAction(this) };
registerMethod.invoke(osxAdapter, args);
// The enable prefs method. Takes a boolean.
=======================================
---
/trunk/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
Mon May 3 09:45:01 2010
+++
/trunk/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
Thu May 6 09:31:10 2010
@@ -38,6 +38,12 @@
ArchitectFrame.playPenToolbarToolTip=PlayPen Toolbar
ArchitectFrame.architectLaunchFailureMessage=Could not launch the SQL
Power Architect
ArchitectFrame.playPenToolbarName=PlayPen Toolbar
+ArchitectFrame.gettingStartedAction=Getting Started
+ArchitectFrame.tutorialsAction=Tutorials
+ArchitectFrame.faqAction=Frequently Asked Questions
+ArchitectFrame.upgradeAction=Upgrade to Enterprise Edition
+ArchitectFrame.premiumSupportAction=Premium Support
+ArchitectFrame.userGuideAction=User Guide
ArchitectSwingSessionContextImpl.defaultNewProjectName=New Project
ArchitectSwingSessionContextImpl.projectLoadingDialogTitle=Loading...
ArchitectSwingSessionImpl.cancelOption=Cancel
