From: <sc...@us...> - 2009-04-18 09:08:54
|
Revision: 14950 http://jedit.svn.sourceforge.net/jedit/?rev=14950&view=rev Author: scarlac Date: 2009-04-18 09:08:51 +0000 (Sat, 18 Apr 2009) Log Message: ----------- added short and long description to props file Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props Added Paths: ----------- plugins/MacOSX/trunk/description.html Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2009-04-17 03:15:30 UTC (rev 14949) +++ plugins/MacOSX/trunk/MacOSX.props 2009-04-18 09:08:51 UTC (rev 14950) @@ -2,13 +2,16 @@ #plugin.macosx.MacOSXPlugin.option-pane=MacOSXPlugin #plugin.macosx.MacOSXPlugin.menu.code=new MacOSXPlugin(); + # # Plugin info # plugin.macosx.MacOSXPlugin.name=Mac OS X Support -plugin.macosx.MacOSXPlugin.author=Seph M. Soliman +plugin.macosx.MacOSXPlugin.author=Seph Soliman plugin.macosx.MacOSXPlugin.version=1.1 plugin.macosx.MacOSXPlugin.docs=MacOSX.html +plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. +plugin.macosx.MacOSXPlugin.longdescription=description.html # # Dependencies @@ -22,13 +25,8 @@ # # Options dialog # -#options.MacOSXPlugin.code=new macos.MacOSOptionPane(); -#options.MacOSXPlugin.label=Mac OS Settings -#options.MacOSXPlugin.menubar.label=Enable Mac OS X style menubar -#options.MacOSXPlugin.preserve.label=Preserve existing file/creator codes on save -#options.MacOSXPlugin.scripts.label=Script folder search depth: -#options.MacOSXPlugin.useSelection.label=Use system highlight colour for Text Area -#options.MacOSXPlugin.setTypeCreator.label=Save the file type/creator on save +#options.MacOSXPlugin.code=new macos.MacOSXOptionPane(); +#options.MacOSXPlugin.label=Mac OS X Settings # # Error dialogs Added: plugins/MacOSX/trunk/description.html =================================================================== --- plugins/MacOSX/trunk/description.html (rev 0) +++ plugins/MacOSX/trunk/description.html 2009-04-18 09:08:51 UTC (rev 14950) @@ -0,0 +1,9 @@ +The Mac OS X Support plugin provides features that are specific to Mac OS X +but not supported out-of-the-box by jEdit. + +Features include: +* Drag-and-drop support from Finder +* Preferences through conventional CMD+comma and application menu +* Reveal in finder by CMD/CTRL-clicking in the title bar +* Correct mapping of CMD key in all input fields for better copy-paste functionality + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2011-09-17 01:17:14
|
Revision: 19963 http://jedit.svn.sourceforge.net/jedit/?rev=19963&view=rev Author: Vampire0 Date: 2011-09-17 01:17:08 +0000 (Sat, 17 Sep 2011) Log Message: ----------- cleaning up the MacOSX build file and making the MacOSX plugin buildable on any platform Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/build.xml plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/OSXAdapter.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2011-09-16 21:05:06 UTC (rev 19962) +++ plugins/MacOSX/trunk/MacOSX.props 2011-09-17 01:17:08 UTC (rev 19963) @@ -9,7 +9,7 @@ plugin.macosx.MacOSXPlugin.name=Mac OS X Support plugin.macosx.MacOSXPlugin.author=Seph Soliman plugin.macosx.MacOSXPlugin.version=1.1 -plugin.macosx.MacOSXPlugin.docs=MacOSX.html +plugin.macosx.MacOSXPlugin.docs=docs/MacOSX.html plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. plugin.macosx.MacOSXPlugin.longdescription=description.html Modified: plugins/MacOSX/trunk/build.xml =================================================================== --- plugins/MacOSX/trunk/build.xml 2011-09-16 21:05:06 UTC (rev 19962) +++ plugins/MacOSX/trunk/build.xml 2011-09-17 01:17:08 UTC (rev 19963) @@ -1,78 +1,23 @@ <?xml version="1.0"?> +<project name="MacOSX" + default="build"> + <description> + This is an ant build.xml file for building the MacOSX plugin for jEdit. + </description> -<!-- - This is a build.xml file for building the MacOSX plugin. - The 'dist' target compiles the plugin and creates the JAR file. ---> - -<project name="MacOSX" default="dist" basedir="."> - <!-- properties --> <property file="build.properties"/> <property file="../build.properties"/> - <property name="build.support" value="../build-support" /> + <property name="jedit.install.dir" + location="../../build" /> + <property name="docs-proc.target" + value="none" /> + + <property name="build.support" + value="../../../build-support" /> <import file="${build.support}/plugin-build.xml" /> - <property name="src.dir" value="."/> - <property name="build.dir" value="build"/> - <property name="install.dir" value=".."/> - <property name="jar.name" value="${ant.project.name}.jar"/> - <property name="docs.dir" value="docs"/> - - <!-- define the class path --> - <path id="project.class.path"> - <pathelement location="${jedit.install.dir}/jedit.jar"/> - <pathelement location="${src.dir}"/> - </path> - - <target name="init"> - <mkdir dir="${build.dir}"/> - </target> - <target name="compile" depends="init"> - <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="on" includeJavaRuntime="yes"> - <classpath refid="project.class.path"/> - </javac> - </target> - - <target name="dist" depends="compile"> - - <!-- create installation directory --> - <mkdir dir="${install.dir}"/> - - <!-- create jar file --> - <jar jarfile="${install.dir}/${jar.name}"> - - <!-- add compiled classes to jar --> - <fileset dir="${build.dir}"/> - - <!-- add any required files from the source directory (not java files) --> - <fileset dir="${src.dir}"> - <include name="actions.xml"/> - <include name="**/*.props"/> - <include name="**/*.html"/> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - </fileset> - - <!-- add any documentation --> - <fileset dir="${docs.dir}"> - <include name="**/*.xml"/> - <include name="**/*.props"/> - <include name="**/*.html"/> - <include name="**/*.gif"/> - <include name="**/*.jpg"/> - <include name="**/*.png"/> - </fileset> - - </jar> - </target> - - <!-- cleans build directory --> - <target name="clean"> - <delete dir="${build.dir}"/> - <delete> - <fileset dir="." includes="**/*~" defaultexcludes="no"/> - </delete> - </target> - + <selector id="packageFiles"> + <filename name="docs/MacOSX.html" /> + </selector> </project> Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2011-09-16 21:05:06 UTC (rev 19962) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2011-09-17 01:17:08 UTC (rev 19963) @@ -23,8 +23,6 @@ package macosx; //{{{ Imports -import macosx.*; - import javax.swing.*; import java.util.regex.Pattern; import java.io.File; @@ -34,6 +32,7 @@ import org.gjt.sp.jedit.gui.*; import org.gjt.sp.jedit.msg.*; import org.gjt.sp.util.Log; +import org.gjt.sp.util.StandardUtilities; //}}} public class MacOSXPlugin extends EBPlugin @@ -252,7 +251,7 @@ return false; } - if (MiscUtilities.compareStrings(System.getProperty("mrj.version"),mrjversion,false) < 0) + if (StandardUtilities.compareStrings(System.getProperty("mrj.version"),mrjversion,false) < 0) { SwingUtilities.invokeLater( new Runnable() { public void run() { GUIUtilities.error(null,"MacOSXPlugin.dialog.mrjversion",new Object[] {mrjversion}); Modified: plugins/MacOSX/trunk/macosx/OSXAdapter.java =================================================================== --- plugins/MacOSX/trunk/macosx/OSXAdapter.java 2011-09-16 21:05:06 UTC (rev 19962) +++ plugins/MacOSX/trunk/macosx/OSXAdapter.java 2011-09-17 01:17:08 UTC (rev 19963) @@ -23,8 +23,6 @@ package macosx; //{{{ Imports -import com.apple.eawt.*; -import com.apple.eio.*; import java.util.*; import java.io.File; import java.awt.event.*; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2011-09-17 01:33:15
|
Revision: 19966 http://jedit.svn.sourceforge.net/jedit/?rev=19966&view=rev Author: Vampire0 Date: 2011-09-17 01:33:09 +0000 (Sat, 17 Sep 2011) Log Message: ----------- correct dependencies and raise version Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/build.xml Property Changed: ---------------- plugins/MacOSX/trunk/ Property changes on: plugins/MacOSX/trunk ___________________________________________________________________ Added: svn:ignore + build Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2011-09-17 01:17:38 UTC (rev 19965) +++ plugins/MacOSX/trunk/MacOSX.props 2011-09-17 01:33:09 UTC (rev 19966) @@ -8,7 +8,7 @@ # plugin.macosx.MacOSXPlugin.name=Mac OS X Support plugin.macosx.MacOSXPlugin.author=Seph Soliman -plugin.macosx.MacOSXPlugin.version=1.1 +plugin.macosx.MacOSXPlugin.version=1.2 plugin.macosx.MacOSXPlugin.docs=docs/MacOSX.html plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. plugin.macosx.MacOSXPlugin.longdescription=description.html @@ -16,7 +16,7 @@ # # Dependencies # -plugin.macosx.MacOSXPlugin.depend.0=jedit 04.03.16.00 +plugin.macosx.MacOSXPlugin.depend.0=jedit 04.04.99.02 plugin.macosx.MacOSXPlugin.depend.1=jdk 1.5.0 MacOSXPlugin.depend.os.name=Mac OS X Modified: plugins/MacOSX/trunk/build.xml =================================================================== --- plugins/MacOSX/trunk/build.xml 2011-09-17 01:17:38 UTC (rev 19965) +++ plugins/MacOSX/trunk/build.xml 2011-09-17 01:33:09 UTC (rev 19966) @@ -8,13 +8,9 @@ <property file="build.properties"/> <property file="../build.properties"/> - <property name="jedit.install.dir" - location="../../build" /> <property name="docs-proc.target" value="none" /> - <property name="build.support" - value="../../../build-support" /> <import file="${build.support}/plugin-build.xml" /> <selector id="packageFiles"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-12-09 01:48:49
|
Revision: 20583 http://jedit.svn.sourceforge.net/jedit/?rev=20583&view=rev Author: evanpw Date: 2011-12-09 01:48:42 +0000 (Fri, 09 Dec 2011) Log Message: ----------- Added an option pane for quartz rendering, alternative keyboard dispatcher, and disabling option key shortcuts Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/macosx/MacOSXPlugin.java Added Paths: ----------- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2011-12-08 21:26:00 UTC (rev 20582) +++ plugins/MacOSX/trunk/MacOSX.props 2011-12-09 01:48:42 UTC (rev 20583) @@ -1,5 +1,5 @@ plugin.macosx.MacOSXPlugin.activate=startup -#plugin.macosx.MacOSXPlugin.option-pane=MacOSXPlugin +plugin.macosx.MacOSXPlugin.option-pane=MacOSXPlugin #plugin.macosx.MacOSXPlugin.menu.code=new MacOSXPlugin(); @@ -25,8 +25,12 @@ # # Options dialog # -#options.MacOSXPlugin.code=new macos.MacOSXOptionPane(); -#options.MacOSXPlugin.label=Mac OS X Settings +options.MacOSXPlugin.code=new macosx.MacOSXPluginOptionPane(); +options.MacOSXPlugin.label=Mac OS X Settings +options.MacOSXPlugin.experimental=Experimental options +options.MacOSXPlugin.useQuartz=Use OS X native Quartz renderer (restart required) +options.MacOSXPlugin.altDispatcher=Use alternative keyboard dispatcher (may help with buggy international keyboards) +options.MacOSXPlugin.disableOption=Disable option-key shortcuts # # Error dialogs @@ -40,3 +44,9 @@ compiler.source=1.5 compiler.target=1.5 +# +# Plugin options +# +plugin.MacOSXPlugin.altDispatcher=false +plugin.MacOSXPlugin.disableOption=false + Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2011-12-08 21:26:00 UTC (rev 20582) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2011-12-09 01:48:42 UTC (rev 20583) @@ -91,6 +91,10 @@ }; ThreadUtilities.runInDispatchThread(setup); + + // Set global keyboard options from local properties + Debug.ALTERNATIVE_DISPATCHER = jEdit.getBooleanProperty("plugin.MacOSXPlugin.altDispatcher"); + Debug.ALT_KEY_PRESSED_DISABLED = jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); } } //}}} @@ -266,6 +270,42 @@ } } } + + public static void setAlternativeDispatcher(boolean state) + { + jEdit.setBooleanProperty("plugin.MacOSXPlugin.altDispatcher", state); + Debug.ALTERNATIVE_DISPATCHER = state; + } + + public static boolean getAlternativeDispatcher() + { + // This is a public variable, so it can be changed at any time + boolean state = Debug.ALTERNATIVE_DISPATCHER; + if (jEdit.getBooleanProperty("plugin.MacOSXPlugin.altDispatcher") != state) + { + jEdit.setBooleanProperty("plugin.MacOSXPlugin.altDispatcher", state); + } + + return state; + } + + public static void setDisableOption(boolean state) + { + jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); + Debug.ALT_KEY_PRESSED_DISABLED = state; + } + + public static boolean getDisableOption() + { + // This is a public variable, so it can be changed at any time + boolean state = Debug.ALT_KEY_PRESSED_DISABLED; + if (jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption") != state) + { + jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); + } + + return state; + } //{{{ osok() method private boolean osok() Added: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java (rev 0) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2011-12-09 01:48:42 UTC (rev 20583) @@ -0,0 +1,106 @@ +/* + * MacOSXPluginOptionPane.java - Option pane for MacOSXPlugin + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package macosx; + +//{{{ Imports +import java.io.IOException; +import java.io.File; +import java.io.FileOutputStream; +import javax.swing.JCheckBox; +import org.gjt.sp.jedit.jEdit; +import org.gjt.sp.jedit.AbstractOptionPane; +import org.gjt.sp.util.IOUtilities; +import org.gjt.sp.util.Log; +//}}} + +public class MacOSXPluginOptionPane extends AbstractOptionPane +{ + public MacOSXPluginOptionPane() + { + super("macosx"); + } + + //{{{ _init() method + @Override + protected void _init() + { + String settingsDirectory = jEdit.getSettingsDirectory(); + useQuartz = new JCheckBox(jEdit.getProperty("options.MacOSXPlugin.useQuartz")); + useQuartz.setSelected(!new File(settingsDirectory, "noquartz").exists()); + addComponent(useQuartz); + + addSeparator("options.MacOSXPlugin.experimental"); + + altDispatcher = new JCheckBox(jEdit.getProperty( + "options.MacOSXPlugin.altDispatcher")); + altDispatcher.setSelected(MacOSXPlugin.getAlternativeDispatcher()); + addComponent(altDispatcher); + + disableOption = new JCheckBox(jEdit.getProperty( + "options.MacOSXPlugin.disableOption")); + disableOption.setSelected(MacOSXPlugin.getDisableOption()); + addComponent(disableOption); + } //}}} + + //{{{ _save() method + protected void _save() + { + setFileFlag("noquartz", !useQuartz.isSelected()); + MacOSXPlugin.setAlternativeDispatcher(altDispatcher.isSelected()); + MacOSXPlugin.setDisableOption(disableOption.isSelected()); + } //}}} + + //{{{ setFileFlag() method + private void setFileFlag(String fileName, boolean present) + { + String settingsDirectory = jEdit.getSettingsDirectory(); + if(settingsDirectory != null) + { + File file = new File(settingsDirectory, fileName); + if (!present) + { + file.delete(); + } + else + { + FileOutputStream out = null; + try + { + out = new FileOutputStream(file); + out.write('\n'); + out.close(); + } + catch(IOException io) + { + Log.log(Log.ERROR,this,io); + } + finally + { + IOUtilities.closeQuietly(out); + } + } + } + } //}}} + + private JCheckBox useQuartz; + private JCheckBox altDispatcher; + private JCheckBox disableOption; +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2011-12-09 02:54:39
|
Revision: 20587 http://jedit.svn.sourceforge.net/jedit/?rev=20587&view=rev Author: evanpw Date: 2011-12-09 02:54:33 +0000 (Fri, 09 Dec 2011) Log Message: ----------- Added an option to use ordinary accelerator labels on screen menu bar rather than ugly drawn-in shortcut labels Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2011-12-09 02:53:21 UTC (rev 20586) +++ plugins/MacOSX/trunk/MacOSX.props 2011-12-09 02:54:33 UTC (rev 20587) @@ -28,6 +28,7 @@ options.MacOSXPlugin.code=new macosx.MacOSXPluginOptionPane(); options.MacOSXPlugin.label=Mac OS X Settings options.MacOSXPlugin.experimental=Experimental options +option.MacOSXPlugin.multiShortcut=Draw multi-key shortcuts on screen menu bar? options.MacOSXPlugin.useQuartz=Use OS X native Quartz renderer (restart required) options.MacOSXPlugin.altDispatcher=Use alternative keyboard dispatcher (may help with buggy international keyboards) options.MacOSXPlugin.disableOption=Disable option-key shortcuts Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2011-12-09 02:53:21 UTC (rev 20586) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2011-12-09 02:54:33 UTC (rev 20587) @@ -46,6 +46,10 @@ useQuartz.setSelected(!new File(settingsDirectory, "noquartz").exists()); addComponent(useQuartz); + multiShortcut = new JCheckBox(jEdit.getProperty("option.MacOSXPlugin.multiShortcut")); + multiShortcut.setSelected(jEdit.getBooleanProperty("menu.multiShortcut", false)); + addComponent(multiShortcut); + addSeparator("options.MacOSXPlugin.experimental"); altDispatcher = new JCheckBox(jEdit.getProperty( @@ -63,6 +67,7 @@ protected void _save() { setFileFlag("noquartz", !useQuartz.isSelected()); + jEdit.setBooleanProperty("menu.multiShortcut", multiShortcut.isSelected()); MacOSXPlugin.setAlternativeDispatcher(altDispatcher.isSelected()); MacOSXPlugin.setDisableOption(disableOption.isSelected()); } //}}} @@ -102,5 +107,6 @@ private JCheckBox useQuartz; private JCheckBox altDispatcher; private JCheckBox disableOption; + private JCheckBox multiShortcut; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-18 18:57:03
|
Revision: 23180 http://jedit.svn.sourceforge.net/jedit/?rev=23180&view=rev Author: ezust Date: 2013-09-18 18:56:56 +0000 (Wed, 18 Sep 2013) Log Message: ----------- updates for JDK 1.7 Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-18 18:56:56 UTC (rev 23180) @@ -8,7 +8,7 @@ # plugin.macosx.MacOSXPlugin.name=Mac OS X Support plugin.macosx.MacOSXPlugin.author=Seph Soliman -plugin.macosx.MacOSXPlugin.version=1.2 +plugin.macosx.MacOSXPlugin.version=1.3 plugin.macosx.MacOSXPlugin.docs=docs/MacOSX.html plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. plugin.macosx.MacOSXPlugin.longdescription=description.html @@ -16,8 +16,8 @@ # # Dependencies # -plugin.macosx.MacOSXPlugin.depend.0=jedit 04.04.99.02 -plugin.macosx.MacOSXPlugin.depend.1=jdk 1.5.0 +plugin.macosx.MacOSXPlugin.depend.0=jedit 05.02.01.00 +plugin.macosx.MacOSXPlugin.depend.1=jdk 1.7 MacOSXPlugin.depend.os.name=Mac OS X MacOSXPlugin.depend.mrj.version=99 Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-18 18:56:56 UTC (rev 23180) @@ -297,19 +297,12 @@ public static void setDisableOption(boolean state) { jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); - Debug.ALT_KEY_PRESSED_DISABLED = state; } public static boolean getDisableOption() { // This is a public variable, so it can be changed at any time - boolean state = Debug.ALT_KEY_PRESSED_DISABLED; - if (jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption") != state) - { - jEdit.setBooleanProperty("plugin.MacOSXPlugin.disableOption", state); - } - - return state; + return jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); } public void enableFullScreenMode(View view) Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-17 21:46:33 UTC (rev 23179) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-18 18:56:56 UTC (rev 23180) @@ -34,7 +34,7 @@ { public MacOSXPluginOptionPane() { - super("macosx"); + super("MacOSXPlugin"); } //{{{ _init() method @@ -55,7 +55,7 @@ altDispatcher = new JCheckBox(jEdit.getProperty( "options.MacOSXPlugin.altDispatcher")); altDispatcher.setSelected(MacOSXPlugin.getAlternativeDispatcher()); - addComponent(altDispatcher); + // addComponent(altDispatcher); disableOption = new JCheckBox(jEdit.getProperty( "options.MacOSXPlugin.disableOption")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-18 19:51:26
|
Revision: 23184 http://jedit.svn.sourceforge.net/jedit/?rev=23184&view=rev Author: ezust Date: 2013-09-18 19:51:19 +0000 (Wed, 18 Sep 2013) Log Message: ----------- Get rid of alternative key dispatcher references from macosx plugin. Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/docs/MacOSX.html plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-18 19:17:46 UTC (rev 23183) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-18 19:51:19 UTC (rev 23184) @@ -1,8 +1,6 @@ plugin.macosx.MacOSXPlugin.activate=startup plugin.macosx.MacOSXPlugin.option-pane=MacOSXPlugin -#plugin.macosx.MacOSXPlugin.menu.code=new MacOSXPlugin(); - # # Plugin info # Modified: plugins/MacOSX/trunk/docs/MacOSX.html =================================================================== --- plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-18 19:17:46 UTC (rev 23183) +++ plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-18 19:51:19 UTC (rev 23184) @@ -21,6 +21,9 @@ </table> <h3>Provides Mac OS X specific features, such as:</h3> <ul> + <li>The Mac OSX Plugin offers an option to disable the default alt-key behavior + that inserts international characters instead of performing like a modifier key. + </li> <li>jEdit exits cleanly when using Command-Q or "Quit" from the "File" menu.</li> <li>Files created or associated with jEdit can now be opened from the Finder, @@ -30,11 +33,11 @@ Options.</li> <li>"About jEdit..." in the application menu can be used to access the About Dialog.</li> - <li>You can show the current in the finder by CMD+Clicking in the titlebar.</li> + <li>You can show the current buffer in the finder by CMD+Clicking in the titlebar.</li> </ul> <h3>Supported Java version:</h3> <ul> - <li>You will need at least Java 1.5. Switching to Java 1.6 is strongly recommeded.</li> + <li>You will need at least Java 1.7. </li> </ul> <p> </p> </body> Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-18 19:17:46 UTC (rev 23183) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-18 19:51:19 UTC (rev 23184) @@ -94,8 +94,7 @@ ThreadUtilities.runInDispatchThread(setup); - // Set global keyboard options from local properties - Debug.ALTERNATIVE_DISPATCHER = jEdit.getBooleanProperty("plugin.MacOSXPlugin.altDispatcher"); + // Set global keyboard options from local properties Debug.ALT_KEY_PRESSED_DISABLED = jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); } } //}}} @@ -276,24 +275,7 @@ } } - public static void setAlternativeDispatcher(boolean state) - { - jEdit.setBooleanProperty("plugin.MacOSXPlugin.altDispatcher", state); - Debug.ALTERNATIVE_DISPATCHER = state; - } - public static boolean getAlternativeDispatcher() - { - // This is a public variable, so it can be changed at any time - boolean state = Debug.ALTERNATIVE_DISPATCHER; - if (jEdit.getBooleanProperty("plugin.MacOSXPlugin.altDispatcher") != state) - { - jEdit.setBooleanProperty("plugin.MacOSXPlugin.altDispatcher", state); - } - - return state; - } - public static void setDisableOption(boolean state) { Debug.ALT_KEY_PRESSED_DISABLED = state; Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-18 19:17:46 UTC (rev 23183) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-18 19:51:19 UTC (rev 23184) @@ -50,13 +50,8 @@ multiShortcut.setSelected(jEdit.getBooleanProperty("menu.multiShortcut", false)); addComponent(multiShortcut); - addSeparator("options.MacOSXPlugin.experimental"); - - altDispatcher = new JCheckBox(jEdit.getProperty( - "options.MacOSXPlugin.altDispatcher")); - altDispatcher.setSelected(MacOSXPlugin.getAlternativeDispatcher()); - // addComponent(altDispatcher); - + // addSeparator("options.MacOSXPlugin.experimental"); + disableOption = new JCheckBox(jEdit.getProperty( "options.MacOSXPlugin.disableOption")); disableOption.setSelected(MacOSXPlugin.getDisableOption()); @@ -68,7 +63,6 @@ { setFileFlag("noquartz", !useQuartz.isSelected()); jEdit.setBooleanProperty("menu.multiShortcut", multiShortcut.isSelected()); - MacOSXPlugin.setAlternativeDispatcher(altDispatcher.isSelected()); MacOSXPlugin.setDisableOption(disableOption.isSelected()); } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-19 15:20:48
|
Revision: 23188 http://jedit.svn.sourceforge.net/jedit/?rev=23188&view=rev Author: ezust Date: 2013-09-19 15:20:41 +0000 (Thu, 19 Sep 2013) Log Message: ----------- New option to swap ctrl and alt keys. Modified Paths: -------------- plugins/MacOSX/trunk/CHANGES.txt plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/docs/MacOSX.html plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/CHANGES.txt =================================================================== --- plugins/MacOSX/trunk/CHANGES.txt 2013-09-18 21:55:25 UTC (rev 23187) +++ plugins/MacOSX/trunk/CHANGES.txt 2013-09-19 15:20:41 UTC (rev 23188) @@ -3,6 +3,7 @@ - Updates for Java 7 and jEdit 5.2 - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs. - Fixed #1542027. +- New option to swap ctrl and alt keys. Max OS X Plugin 1.1 - CTRL is now mapped to the CMD button so CMD+C and CMD+V will work correctly in *all* windows. Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-18 21:55:25 UTC (rev 23187) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-19 15:20:41 UTC (rev 23188) @@ -30,7 +30,7 @@ options.MacOSXPlugin.useQuartz=Use OS X native Quartz renderer (restart required) options.MacOSXPlugin.altDispatcher=Use alternative keyboard dispatcher (may help with buggy international keyboards) options.MacOSXPlugin.disableOption=Disable option-key shortcuts - +options.MacOSXPlugin.ctrlAltSwapped=Swap Ctrl and Alt keys (for Linux-like modifiers) # # Error dialogs # Modified: plugins/MacOSX/trunk/docs/MacOSX.html =================================================================== --- plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-18 21:55:25 UTC (rev 23187) +++ plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-19 15:20:41 UTC (rev 23188) @@ -21,9 +21,10 @@ </table> <h3>Provides Mac OS X specific features, such as:</h3> <ul> - <li>The Mac OSX Plugin offers an option to disable the default alt-key behavior + <li>The Mac OSX Plugin offers a checkbox option to disable the default alt-key behavior that inserts international characters instead of performing like a modifier key. </li> + <li> Another checkbox option lets you swap ctrl and alt modifier keys. </li> <li>jEdit exits cleanly when using Command-Q or "Quit" from the "File" menu.</li> <li>Files created or associated with jEdit can now be opened from the Finder, Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-18 21:55:25 UTC (rev 23187) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-19 15:20:41 UTC (rev 23188) @@ -23,6 +23,8 @@ package macosx; //{{{ Imports +import java.awt.event.InputEvent; + import javax.swing.*; import java.util.regex.Pattern; import java.io.File; @@ -30,6 +32,7 @@ import java.lang.reflect.*; import org.gjt.sp.jedit.*; +import org.gjt.sp.jedit.gui.KeyEventTranslator; import org.gjt.sp.jedit.options.*; import org.gjt.sp.jedit.gui.*; import org.gjt.sp.jedit.msg.*; @@ -96,6 +99,11 @@ // Set global keyboard options from local properties Debug.ALT_KEY_PRESSED_DISABLED = jEdit.getBooleanProperty("plugin.MacOSXPlugin.disableOption"); + + + // swap ctrl-alt keys if desired: + boolean toSwap = isCtrlAltSwapped(); + setCtrlAltSwapped(toSwap); } } //}}} @@ -275,7 +283,26 @@ } } + // {{{ swap Ctrl-Alt key + public static boolean isCtrlAltSwapped() + { + return jEdit.getBooleanProperty("plugin.MacOSXPlugin.ctrlAltSwapped"); + } + public static void setCtrlAltSwapped(boolean isSwapped) + { + jEdit.setBooleanProperty("plugin.MacOSXPlugin.ctrlAltSwapped", isSwapped); + if (isSwapped) + KeyEventTranslator.setModifierMapping(InputEvent.CTRL_MASK, + InputEvent.META_MASK, InputEvent.ALT_MASK, + InputEvent.SHIFT_MASK); + else + KeyEventTranslator.setModifierMapping(InputEvent.META_MASK, /* == C+ */ + InputEvent.CTRL_MASK, /* == A+ */ + InputEvent.ALT_MASK, /* == M+ */ + InputEvent.SHIFT_MASK /* == S+ */); + } // }}} + public static void setDisableOption(boolean state) { Debug.ALT_KEY_PRESSED_DISABLED = state; Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-18 21:55:25 UTC (rev 23187) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-19 15:20:41 UTC (rev 23188) @@ -32,6 +32,11 @@ public class MacOSXPluginOptionPane extends AbstractOptionPane { + private JCheckBox useQuartz; + private JCheckBox ctrlAltSwapped; + private JCheckBox disableOption; + private JCheckBox multiShortcut; + public MacOSXPluginOptionPane() { super("MacOSXPlugin"); @@ -56,14 +61,22 @@ "options.MacOSXPlugin.disableOption")); disableOption.setSelected(MacOSXPlugin.getDisableOption()); addComponent(disableOption); + + ctrlAltSwapped = new JCheckBox(jEdit.getProperty( + "options.MacOSXPlugin.ctrlAltSwapped")); + ctrlAltSwapped.setSelected(MacOSXPlugin.isCtrlAltSwapped()); + addComponent(ctrlAltSwapped); + } //}}} //{{{ _save() method protected void _save() { + setFileFlag("noquartz", !useQuartz.isSelected()); jEdit.setBooleanProperty("menu.multiShortcut", multiShortcut.isSelected()); MacOSXPlugin.setDisableOption(disableOption.isSelected()); + MacOSXPlugin.setCtrlAltSwapped(ctrlAltSwapped.isSelected()); } //}}} //{{{ setFileFlag() method @@ -98,9 +111,5 @@ } } //}}} - private JCheckBox useQuartz; - private JCheckBox altDispatcher; - private JCheckBox disableOption; - private JCheckBox multiShortcut; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-19 16:26:13
|
Revision: 23190 http://jedit.svn.sourceforge.net/jedit/?rev=23190&view=rev Author: ezust Date: 2013-09-19 16:26:06 +0000 (Thu, 19 Sep 2013) Log Message: ----------- Updated docs and props. Modified Paths: -------------- plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/docs/MacOSX.html Property Changed: ---------------- plugins/MacOSX/trunk/docs/MacOSX.html Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-19 15:26:49 UTC (rev 23189) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-19 16:26:06 UTC (rev 23190) @@ -5,7 +5,7 @@ # Plugin info # plugin.macosx.MacOSXPlugin.name=Mac OS X Support -plugin.macosx.MacOSXPlugin.author=Seph Soliman +plugin.macosx.MacOSXPlugin.author=Seph Soliman, Alan Ezust plugin.macosx.MacOSXPlugin.version=1.3 plugin.macosx.MacOSXPlugin.docs=docs/MacOSX.html plugin.macosx.MacOSXPlugin.description=Provides better MacOS X integration through features such as better CMD-key mapping, drag-and-drop from Finder and more. Modified: plugins/MacOSX/trunk/docs/MacOSX.html =================================================================== --- plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-19 15:26:49 UTC (rev 23189) +++ plugins/MacOSX/trunk/docs/MacOSX.html 2013-09-19 16:26:06 UTC (rev 23190) @@ -14,9 +14,9 @@ > <tr width="100%"> <td valign="TOP"><strong><font size="+2">Mac OS X Plugin</font></strong></td> - <td valign="TOP" align="RIGHT"><font size="-1"> <strong>Version 1.0 (Sep. - 1, 2008)</strong> <br> - By Seph M. Soliman <sc...@us...> </font></td> + <td valign="TOP" align="RIGHT"><font size="-1"> <strong>Version 1.3 ($DATE$)</strong> + <br> Seph M. Soliman, Alan Ezust </font> + </td> </tr> </table> <h3>Provides Mac OS X specific features, such as:</h3> Property changes on: plugins/MacOSX/trunk/docs/MacOSX.html ___________________________________________________________________ Added: svn:attrs + DATE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-19 22:09:33
|
Revision: 23196 http://jedit.svn.sourceforge.net/jedit/?rev=23196&view=rev Author: ezust Date: 2013-09-19 22:09:26 +0000 (Thu, 19 Sep 2013) Log Message: ----------- Use combined options instead of global options. Modified Paths: -------------- plugins/MacOSX/trunk/CHANGES.txt plugins/MacOSX/trunk/macosx/MacOSXPlugin.java plugins/MacOSX/trunk/macosx/OSXAdapter.java Modified: plugins/MacOSX/trunk/CHANGES.txt =================================================================== --- plugins/MacOSX/trunk/CHANGES.txt 2013-09-19 17:42:51 UTC (rev 23195) +++ plugins/MacOSX/trunk/CHANGES.txt 2013-09-19 22:09:26 UTC (rev 23196) @@ -4,6 +4,7 @@ - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs. - Fixed #1542027. - New option to swap ctrl and alt keys. +- Show combined options from the Apple Preferences action. Max OS X Plugin 1.1 - CTRL is now mapped to the CMD button so CMD+C and CMD+V will work correctly in *all* windows. Modified: plugins/MacOSX/trunk/macosx/MacOSXPlugin.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-19 17:42:51 UTC (rev 23195) +++ plugins/MacOSX/trunk/macosx/MacOSXPlugin.java 2013-09-19 22:09:26 UTC (rev 23196) @@ -33,12 +33,12 @@ import org.gjt.sp.jedit.*; import org.gjt.sp.jedit.gui.KeyEventTranslator; -import org.gjt.sp.jedit.options.*; import org.gjt.sp.jedit.gui.*; import org.gjt.sp.jedit.msg.*; import org.gjt.sp.util.Log; import org.gjt.sp.util.StandardUtilities; import org.gjt.sp.util.ThreadUtilities; +import org.jedit.options.CombinedOptions; //}}} public class MacOSXPlugin extends EBPlugin @@ -122,7 +122,7 @@ public void handlePreferences() { - new GlobalOptions(jEdit.getActiveView()); + new CombinedOptions(jEdit.getActiveView()); } // General info dialog; fed to the OSXAdapter as the method to call when Modified: plugins/MacOSX/trunk/macosx/OSXAdapter.java =================================================================== --- plugins/MacOSX/trunk/macosx/OSXAdapter.java 2013-09-19 17:42:51 UTC (rev 23195) +++ plugins/MacOSX/trunk/macosx/OSXAdapter.java 2013-09-19 22:09:26 UTC (rev 23196) @@ -34,7 +34,6 @@ import org.gjt.sp.jedit.browser.*; import org.gjt.sp.jedit.gui.*; import org.gjt.sp.jedit.msg.*; -import org.gjt.sp.jedit.options.GlobalOptions; import org.gjt.sp.util.Log; //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-09-23 23:12:19
|
Revision: 23208 http://jedit.svn.sourceforge.net/jedit/?rev=23208&view=rev Author: ezust Date: 2013-09-23 23:12:13 +0000 (Mon, 23 Sep 2013) Log Message: ----------- Remove useQuartz option since it is always on in java7 Modified Paths: -------------- plugins/MacOSX/trunk/CHANGES.txt plugins/MacOSX/trunk/MacOSX.props plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java Modified: plugins/MacOSX/trunk/CHANGES.txt =================================================================== --- plugins/MacOSX/trunk/CHANGES.txt 2013-09-23 23:06:01 UTC (rev 23207) +++ plugins/MacOSX/trunk/CHANGES.txt 2013-09-23 23:12:13 UTC (rev 23208) @@ -1,4 +1,3 @@ - Mac OS X Plugin 1.3 [Alan Ezust] - Updates for Java 7 and jEdit 5.2 - Got rid of alternative dispatcher stuff which was workaround for Java 5 bugs. Modified: plugins/MacOSX/trunk/MacOSX.props =================================================================== --- plugins/MacOSX/trunk/MacOSX.props 2013-09-23 23:06:01 UTC (rev 23207) +++ plugins/MacOSX/trunk/MacOSX.props 2013-09-23 23:12:13 UTC (rev 23208) @@ -27,7 +27,6 @@ options.MacOSXPlugin.label=Mac OS X Settings options.MacOSXPlugin.experimental=Experimental options option.MacOSXPlugin.multiShortcut=Draw multi-key shortcuts on screen menu bar -options.MacOSXPlugin.useQuartz=Use OS X native Quartz renderer (restart required) options.MacOSXPlugin.disableOption=Disable international option-key shortcuts options.MacOSXPlugin.ctrlAltSwapped=Swap Ctrl and Alt keys (for Linux-like modifiers) # Modified: plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java =================================================================== --- plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-23 23:06:01 UTC (rev 23207) +++ plugins/MacOSX/trunk/macosx/MacOSXPluginOptionPane.java 2013-09-23 23:12:13 UTC (rev 23208) @@ -35,7 +35,7 @@ @SuppressWarnings("serial") public class MacOSXPluginOptionPane extends AbstractOptionPane { - private JCheckBox useQuartz; + private JCheckBox ctrlAltSwapped; private JCheckBox disableOption; private JCheckBox multiShortcut; @@ -50,9 +50,6 @@ protected void _init() { String settingsDirectory = jEdit.getSettingsDirectory(); - useQuartz = new JCheckBox(jEdit.getProperty("options.MacOSXPlugin.useQuartz")); - useQuartz.setSelected(!new File(settingsDirectory, "noquartz").exists()); - addComponent(useQuartz); multiShortcut = new JCheckBox(jEdit.getProperty("option.MacOSXPlugin.multiShortcut")); multiShortcut.setSelected(jEdit.getBooleanProperty("menu.multiShortcut", false)); @@ -74,9 +71,7 @@ //{{{ _save() method protected void _save() - { - - setFileFlag("noquartz", !useQuartz.isSelected()); + { jEdit.setBooleanProperty("menu.multiShortcut", multiShortcut.isSelected()); MacOSXPlugin.setDisableOption(disableOption.isSelected()); MacOSXPlugin.setCtrlAltSwapped(ctrlAltSwapped.isSelected()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |