|
Line
Link Here
|
| 0 |
-- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java |
0 |
++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java |
|
Lines 33-39
import java.util.Timer;
Link Here
|
| 33 |
import java.util.TimerTask; |
33 |
import java.util.TimerTask; |
| 34 |
import java.util.UUID; |
34 |
import java.util.UUID; |
| 35 |
|
35 |
|
| 36 |
import com.apple.eio.FileManager; |
36 |
//import com.apple.eio.FileManager; |
| 37 |
import com.eteks.sweethome3d.model.Home; |
37 |
import com.eteks.sweethome3d.model.Home; |
| 38 |
|
38 |
|
| 39 |
/** |
39 |
/** |
|
Lines 410-418
public class OperatingSystem {
Link Here
|
| 410 |
*/ |
410 |
*/ |
| 411 |
public static File getDefaultApplicationFolder() throws IOException { |
411 |
public static File getDefaultApplicationFolder() throws IOException { |
| 412 |
File userApplicationFolder; |
412 |
File userApplicationFolder; |
| 413 |
if (isMacOSX()) { |
413 |
/* if (isMacOSX()) { |
| 414 |
userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder()); |
414 |
userApplicationFolder = new File(MacOSXFileManager.getApplicationSupportFolder()); |
| 415 |
} else if (isWindows()) { |
415 |
} else if (isWindows()) { */ |
|
|
416 |
if (isWindows()) { |
| 416 |
userApplicationFolder = new File(System.getProperty("user.home"), "Application Data"); |
417 |
userApplicationFolder = new File(System.getProperty("user.home"), "Application Data"); |
| 417 |
// If user Application Data directory doesn't exist, use user home |
418 |
// If user Application Data directory doesn't exist, use user home |
| 418 |
if (!userApplicationFolder.exists()) { |
419 |
if (!userApplicationFolder.exists()) { |
|
Lines 433-442
public class OperatingSystem {
Link Here
|
| 433 |
* This class requires some classes of <code>com.apple.eio</code> package |
434 |
* This class requires some classes of <code>com.apple.eio</code> package |
| 434 |
* to compile. |
435 |
* to compile. |
| 435 |
*/ |
436 |
*/ |
| 436 |
private static class MacOSXFileManager { |
437 |
/* private static class MacOSXFileManager { |
| 437 |
public static String getApplicationSupportFolder() throws IOException { |
438 |
public static String getApplicationSupportFolder() throws IOException { |
| 438 |
// Find application support folder (0x61737570) for user domain (-32763) |
439 |
// Find application support folder (0x61737570) for user domain (-32763) |
| 439 |
return FileManager.findFolder((short)-32763, 0x61737570); |
440 |
return FileManager.findFolder((short)-32763, 0x61737570); |
| 440 |
} |
441 |
} |
| 441 |
} |
442 |
} */ |
| 442 |
} |
443 |
} |
| 443 |
-- a/src/com/eteks/sweethome3d/SweetHome3D.java |
444 |
++ b/src/com/eteks/sweethome3d/SweetHome3D.java |
|
Lines 466-472
public class SweetHome3D extends HomeApp
Link Here
|
| 466 |
} |
466 |
} |
| 467 |
if (OperatingSystem.isMacOSX()) { |
467 |
if (OperatingSystem.isMacOSX()) { |
| 468 |
// Bind to application menu at last |
468 |
// Bind to application menu at last |
| 469 |
MacOSXConfiguration.bindToApplicationMenu(this); |
|
|
| 470 |
} |
469 |
} |
| 471 |
|
470 |
|
| 472 |
// Run everything else in Event Dispatch Thread |
471 |
// Run everything else in Event Dispatch Thread |
| 473 |
-- a/src/com/eteks/sweethome3d/HomeFramePane.java |
472 |
++ b/src/com/eteks/sweethome3d/HomeFramePane.java |
|
Lines 123-129
public class HomeFramePane extends JRoot
Link Here
|
| 123 |
homeFrame.setIconImage(frameImages.get(0)); |
123 |
homeFrame.setIconImage(frameImages.get(0)); |
| 124 |
} |
124 |
} |
| 125 |
if (OperatingSystem.isMacOSXLionOrSuperior()) { |
125 |
if (OperatingSystem.isMacOSXLionOrSuperior()) { |
| 126 |
MacOSXConfiguration.installToolBar(this); |
126 |
// MacOSXConfiguration.installToolBar(this); |
| 127 |
} |
127 |
} |
| 128 |
updateFrameTitle(homeFrame, this.home, this.application); |
128 |
updateFrameTitle(homeFrame, this.home, this.application); |
| 129 |
// Change component orientation |
129 |
// Change component orientation |
| 130 |
-- a/build.xml |
130 |
++ b/build.xml |
|
Lines 32-37
Link Here
|
| 32 |
<!-- The current version of Sweet Home 3D --> |
32 |
<!-- The current version of Sweet Home 3D --> |
| 33 |
<property name="version" value="4.3"/> |
33 |
<property name="version" value="4.3"/> |
| 34 |
|
34 |
|
|
|
35 |
<delete verbose="true" file="src/com/eteks/sweethome3d/MacOSXConfiguration.java"/> |
| 36 |
|
| 35 |
<target name="build" |
37 |
<target name="build" |
| 36 |
description="Builds build/SweetHome3D.jar with all its classes"> |
38 |
description="Builds build/SweetHome3D.jar with all its classes"> |
| 37 |
<!-- Compile Sweet Home 3D --> |
39 |
<!-- Compile Sweet Home 3D --> |
