Apple changes, fixes issue 2514

launcher/unix/DMDirc.sh

@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-LAUNCHERVERSION="10"
+LAUNCHERVERSION="11"
 
 params=""
 
@@ -450,7 +450,7 @@ if [ -e "${jar}" ]; then
 		APPLEOPTS="${APPLEOPTS} -Djava.library.path=${jarDir}"
 		#APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.growbox.intrudes=false"
 		#APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.live-resize=true"
-		#APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.apple.menu.about.name=DMDirc"
+		APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.apple.menu.about.name=DMDirc"
 		#APPLEOPTS="${APPLEOPTS} -Dapple.awt.showGrowBox=true"
 		#APPLEOPTS="${APPLEOPTS} -Dapple.laf.useScreenMenuBar=true"
 	fi;

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -217,20 +217,15 @@ public final class Apple implements InvocationHandler, ActionListener {
 		if (!isApple()) { return; }
 		
 		// Set some Apple OS X related stuff from http://tinyurl.com/6xwuld
-		final String aaText = System.getProperty("swing.aatext").equalsIgnoreCase("true") ? "on" : "off";
-		
-		if (IdentityManager.getGlobalConfig().getOptionBool("ui", "antialias")) {
-			System.setProperty("apple.awt.antialiasing", "on");
-		} else {
-			System.setProperty("apple.awt.antialiasing", "off");
-		}
-		
+		final String aaText = IdentityManager.getGlobalConfig().getOptionBool("ui", "antialias") ? "on" : "off";
+
+		System.setProperty("apple.awt.antialiasing", aaText);
 		System.setProperty("apple.awt.textantialiasing", aaText);
 		System.setProperty("apple.awt.showGrowBox", "true");
+		System.setProperty("com.apple.mrj.application.apple.menu.about.name", "DMDirc");
 		System.setProperty("apple.laf.useScreenMenuBar", "true");
 		System.setProperty("com.apple.mrj.application.growbox.intrudes", "false");
 		System.setProperty("com.apple.mrj.application.live-resize", "true");
-		System.setProperty("com.apple.mrj.application.apple.menu.about.name", "DMDirc");
 	}
 	
 	/**