[Jsxe-cvs] SF.net SVN: jsxe: [907] trunk/jsxe
Status: Inactive
Brought to you by:
ian_lewis
Menu
▾
▴
[Jsxe-cvs] SF.net SVN: jsxe: [907] trunk/jsxe
|
From: <ian...@us...> - 2006-06-06 21:53:30
|
Revision: 907 Author: ian_lewis Date: 2006-06-06 14:53:19 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/jsxe/?rev=907&view=rev Log Message: ----------- Added a new document options dialog to handle settings on a per document basis. Updated the Global options dialog so that it doesn't include the per document options anymore. Modified Paths: -------------- trunk/jsxe/Changelog trunk/jsxe/messages/messages.en trunk/jsxe/src/net/sourceforge/jsxe/action/ToolsOptionsAction.java trunk/jsxe/src/net/sourceforge/jsxe/gui/DirtyFilesDialog.java trunk/jsxe/src/net/sourceforge/jsxe/gui/EnhancedDialog.java trunk/jsxe/src/net/sourceforge/jsxe/gui/GlobalOptionsDialog.java trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java trunk/jsxe/src/net/sourceforge/jsxe/properties Modified: trunk/jsxe/Changelog =================================================================== --- trunk/jsxe/Changelog 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/Changelog 2006-06-06 21:53:19 UTC (rev 907) @@ -1,3 +1,13 @@ +06/06/2006 Ian Lewis <Ian...@me...> + + * Added a new Document Options Dialog which handles settings on a per + document basis. + * Updated the Global Options so that they don't include the per document + options anymore. + * Updated the DirtyFilesDialog so that it selects the first entry by + default. + * Updated EnhancedDialogs to be resizable by default. + 05/31/2006 Ian Lewis <Ian...@me...> * All plugins now implement EBListener and are added to the EditBus Modified: trunk/jsxe/messages/messages.en =================================================================== --- trunk/jsxe/messages/messages.en 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/messages/messages.en 2006-06-06 21:53:19 UTC (rev 907) @@ -63,7 +63,11 @@ Global.Options.network-cache=Ask first, then cache remote files Global.Options.network-always=Always download without asking Global.Options.network=DTD and schema downloading: +#}}} + +#{{{ Document Options Document.Options.Title=XML Document Options +Document.Options.Message=This dialog changes settings for the current\n document only. To change settings on an\n editor-wide basis, see the\n Tools->Global Options dialog box. Document.Options.Line.Separator=Line Separator: Document.Options.Encoding=Encoding: Document.Options.Encoding.ToolTip=The encoding that jsXe uses to write the file. @@ -99,7 +103,8 @@ File.Exit=Exit #}}} -Tools.Options=Options... +Tools.Options=Global Options... +Tools.Document.Options=Document Options... Tools.Plugin=Plugin Manager... Tools.ValidationErrors=Validation Errors... Plugin.Manager.Title=Plugin Manager Modified: trunk/jsxe/src/net/sourceforge/jsxe/action/ToolsOptionsAction.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/action/ToolsOptionsAction.java 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/action/ToolsOptionsAction.java 2006-06-06 21:53:19 UTC (rev 907) @@ -64,7 +64,7 @@ public ToolsOptionsAction(TabbedView parent) { //putValue(Action.NAME, "Options..."); putValue(Action.NAME, Messages.getMessage("Tools.Options")); - putValue(Action.MNEMONIC_KEY, new Integer(KeyStroke.getKeyStroke("O").getKeyCode())); + putValue(Action.MNEMONIC_KEY, new Integer(KeyStroke.getKeyStroke("G").getKeyCode())); view = parent; }//}}} Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/DirtyFilesDialog.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/gui/DirtyFilesDialog.java 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/gui/DirtyFilesDialog.java 2006-06-06 21:53:19 UTC (rev 907) @@ -196,7 +196,7 @@ buttons.add(selectAllJButton); saveSelectedJButton.setText(Messages.getMessage("DirtyFilesDialog.Button.SaveSelected.Title")); - saveSelectedJButton .addActionListener(new ActionListener() { + saveSelectedJButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { saveSelectedJButtonActionPerformed(); } Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/EnhancedDialog.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/gui/EnhancedDialog.java 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/gui/EnhancedDialog.java 2006-06-06 21:53:19 UTC (rev 907) @@ -157,8 +157,21 @@ jsXe.setIntegerProperty(name + ".height",bounds.height); } //}}} - public abstract void ok(); - public abstract void cancel(); + //{{{ ok() + /** + * The method that is called when enter is pressed when viewing the dialog. + * In options dialogs this would corresponding to when the OK button is + * pressed. + */ + public abstract void ok();//}}} + + //{{{ cancel() + /** + * The method that is called when escape is pressed when viewing the dialog. + * In options dialogs this would corresponding to when the Cancel button is + * pressed. + */ + public abstract void cancel();//}}} //{{{ Private members Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/GlobalOptionsDialog.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/gui/GlobalOptionsDialog.java 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/gui/GlobalOptionsDialog.java 2006-06-06 21:53:19 UTC (rev 907) @@ -78,10 +78,6 @@ } } - pane = buffer.getOptionsPanel(); - if (pane != null) { - addOptionPane(pane); - } addOptionGroup(m_defaultGroup, rootGroup); return paneTreeModel; Modified: trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/gui/TabbedView.java 2006-06-06 21:53:19 UTC (rev 907) @@ -442,6 +442,7 @@ set.addAction("close-file", new FileCloseAction(this)); set.addAction("close-all", new FileCloseAllAction(this)); set.addAction("exit", new FileExitAction(this)); + set.addAction("document-options", new DocumentOptionsAction(this)); set.addAction("general-options", new ToolsOptionsAction(this)); set.addAction("plugin-manager", new ToolsPluginManagerAction(this)); set.addAction("about-jsxe", new jsxeAboutDialog(this)); @@ -528,6 +529,8 @@ //{{{ Create Tools Menu m_toolsMenu = new JMenu(Messages.getMessage("Tools.Menu")); m_toolsMenu.setMnemonic('T'); + menuItem = new JMenuItem(jsXe.getAction("document-options")); + m_toolsMenu.add(menuItem); menuItem = new JMenuItem(jsXe.getAction("general-options")); m_toolsMenu.add(menuItem); menuItem = new JMenuItem(jsXe.getAction("plugin-manager")); Modified: trunk/jsxe/src/net/sourceforge/jsxe/properties =================================================================== --- trunk/jsxe/src/net/sourceforge/jsxe/properties 2006-06-06 19:57:21 UTC (rev 906) +++ trunk/jsxe/src/net/sourceforge/jsxe/properties 2006-06-06 21:53:19 UTC (rev 907) @@ -13,26 +13,31 @@ xml.cache=true #{{{ Plugin Manager Default Dimensions -pluginmgr.x=100 -pluginmgr.y=100 +#pluginmgr.x=100 +#pluginmgr.y=100 pluginmgr.height=300 pluginmgr.width=400 #}}} #{{{ Dirty Files Dialog Default Dimensions -dirtyfiles.x=100 -dirtyfiles.y=100 +#dirtyfiles.x=100 +#dirtyfiles.y=100 dirtyfiles.height=300 dirtyfiles.width=500 #}}} #{{{ Activity Log default dimensions -activitylog.x=100 -activitylog.y=100 -activitylog.height=300 -activitylog.width=300 +#activitylog.x=100 +#activitylog.y=100 +activitylog.height=400 +activitylog.width=500 #}}} +#{{{ Document Options Dialog default dimensions +Document.Options.width=300 +Document.Options.height=400 +#}}} + #{{{ Metal control and menu font metal.primary.font=Dialog metal.primary.fontsize=12 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
