[SCM] sweethome3d - Interior 2D design application with 3D preview branch, master, updated. debian/3.7+dfsg-2-6-ga2f1d47

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit bfede46e99988281d47fa3c13654e81f35459d4c
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Mar 23 00:00:14 2013 +0100

    Refresh patches.

diff --git a/debian/patches/01noMacOSX b/debian/patches/01noMacOSX
index 68654f4..4cc8bf6 100644
--- a/debian/patches/01noMacOSX
+++ b/debian/patches/01noMacOSX
@@ -4,7 +4,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
 +++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
-@@ -29,7 +29,7 @@ import java.util.Timer;
+@@ -32,7 +32,7 @@ import java.util.Timer;
  import java.util.TimerTask;
  import java.util.UUID;
  
@@ -13,7 +13,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.model.Home;
  
  /**
-@@ -216,9 +216,10 @@ public class OperatingSystem {
+@@ -347,9 +347,10 @@ public class OperatingSystem {
     */
    public static File getDefaultApplicationFolder() throws IOException {
      File userApplicationFolder; 
@@ -26,7 +26,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
        // If user Application Data directory doesn't exist, use user home
        if (!userApplicationFolder.exists()) {
-@@ -239,10 +240,10 @@ public class OperatingSystem {
+@@ -370,10 +371,10 @@ public class OperatingSystem {
     * This class requires some classes of <code>com.apple.eio</code> package  
     * to compile.
     */
@@ -41,7 +41,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  }
 --- a/src/com/eteks/sweethome3d/SweetHome3D.java
 +++ b/src/com/eteks/sweethome3d/SweetHome3D.java
-@@ -401,7 +401,6 @@ public class SweetHome3D extends HomeApp
+@@ -452,7 +452,6 @@ public class SweetHome3D extends HomeApp
      }
      if (OperatingSystem.isMacOSX()) {
        // Bind to application menu at last
diff --git a/debian/patches/03novideo b/debian/patches/03novideo
index b65bef2..4138efd 100644
--- a/debian/patches/03novideo
+++ b/debian/patches/03novideo
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-@@ -184,8 +184,8 @@ public interface ViewFactory {
+@@ -196,8 +196,8 @@ public interface ViewFactory {
    /**
     * Returns a new view able to compute a 3D video of a home. 
     */
@@ -27,7 +27,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
    }
 --- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
 +++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
-@@ -56,7 +56,6 @@ import com.eteks.sweethome3d.viewcontrol
+@@ -58,7 +58,6 @@ import com.eteks.sweethome3d.viewcontrol
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskController;
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskView;
  import com.eteks.sweethome3d.viewcontroller.UserPreferencesController;
@@ -35,7 +35,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.viewcontroller.View;
  import com.eteks.sweethome3d.viewcontroller.ViewFactory;
  import com.eteks.sweethome3d.viewcontroller.WallController;
-@@ -280,11 +279,11 @@ public class SwingViewFactory implements
+@@ -298,11 +297,11 @@ public class SwingViewFactory implements
    /**
     * Returns a new view able to create 3D videos of the given home. 
     */
@@ -62,9 +62,9 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      <!-- Copy resources excepted furniture, textures and help files -->
 --- a/src/com/eteks/sweethome3d/swing/package.properties
 +++ b/src/com/eteks/sweethome3d/swing/package.properties
-@@ -1046,8 +1046,8 @@ HomePane.CREATE_PHOTO.MnemonicKey=H
- # Note to translators: do not copy the following key in localized file
- HomePane.CREATE_PHOTO.SmallIcon=resources/icons/tango/camera-photo.png
+@@ -1048,8 +1048,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW
+ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.ShortDescription=Create photos at stored points of view
+ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.MnemonicKey=C
  
 -HomePane.CREATE_VIDEO.Name=Create video...
 -HomePane.CREATE_VIDEO.ShortDescription=Create a 3D video
@@ -75,7 +75,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  HomePane.CREATE_VIDEO.SmallIcon=resources/icons/tango/camera-video.png
 --- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
-@@ -288,7 +288,7 @@ public class HomeController implements C
+@@ -315,7 +315,7 @@ public class HomeController implements C
      homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
      homeView.setEnabled(HomeView.ActionType.MODIFY_3D_ATTRIBUTES, true);
      homeView.setEnabled(HomeView.ActionType.CREATE_PHOTO, true);

-- 
sweethome3d - Interior 2D design application with 3D preview