← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sweethome3d/utopic

« back to all changes in this revision

Viewing changes to debian/patches/03novideo

  • Committer: Package Import Robot
  • Author(s): Gabriele Giacone
  • Date: 2012-11-21 00:41:38 UTC
  • Revision ID: package-import@ubuntu.com-20121121004138-zr3l8v909ckvnoia
Tags: 3.7+dfsg-2
http://bugs.debian.org/695528
https://launchpad.net/bugs/996714
* Fix home path added to application folder property (Closes: #695528).
* Make video feature removal more explicit (LP: #996714).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03novideo
3
3
 
4
4
--- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
5
5
+++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
6
 
@@ -184,8 +184,8 @@
 
6
@@ -184,8 +184,8 @@ public interface ViewFactory {
7
7
   /**
8
8
    * Returns a new view able to compute a 3D video of a home. 
9
9
    */
16
16
    * Returns a new view that displays Sweet Home 3D help.
17
17
--- a/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
18
18
+++ b/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
19
 
@@ -99,7 +99,7 @@
 
19
@@ -99,7 +99,7 @@ public class VideoController implements
20
20
   public DialogView getView() {
21
21
     // Create view lazily only once it's needed
22
22
     if (this.videoView == null) {
27
27
   }
28
28
--- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
29
29
+++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
30
 
@@ -56,7 +56,6 @@
 
30
@@ -56,7 +56,6 @@ import com.eteks.sweethome3d.viewcontrol
31
31
 import com.eteks.sweethome3d.viewcontroller.ThreadedTaskController;
32
32
 import com.eteks.sweethome3d.viewcontroller.ThreadedTaskView;
33
33
 import com.eteks.sweethome3d.viewcontroller.UserPreferencesController;
35
35
 import com.eteks.sweethome3d.viewcontroller.View;
36
36
 import com.eteks.sweethome3d.viewcontroller.ViewFactory;
37
37
 import com.eteks.sweethome3d.viewcontroller.WallController;
38
 
@@ -280,11 +279,11 @@
 
38
@@ -280,11 +279,11 @@ public class SwingViewFactory implements
39
39
   /**
40
40
    * Returns a new view able to create 3D videos of the given home. 
41
41
    */
51
51
    * Returns a new view that displays Sweet Home 3D help.
52
52
--- a/build.xml
53
53
+++ b/build.xml
54
 
@@ -51,6 +51,8 @@
 
54
@@ -54,6 +54,8 @@
55
55
         <pathelement location="libtest/jnlp.jar"/>
56
56
       </classpath>
57
57
        <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
60
60
     </javac>
61
61
     
62
62
     <!-- Copy resources excepted furniture, textures and help files -->
63
 
--- a/src/com/eteks/sweethome3d/swing/HomePane.java
64
 
+++ b/src/com/eteks/sweethome3d/swing/HomePane.java
65
 
@@ -460,7 +460,7 @@
66
 
           homeController3D, "displaySelectedLevel");
67
 
       createAction(ActionType.MODIFY_3D_ATTRIBUTES, preferences, homeController3D, "modifyAttributes");
68
 
       createAction(ActionType.CREATE_PHOTO, preferences, controller, "createPhoto");
69
 
-      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
70
 
+//      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
71
 
       createAction(ActionType.EXPORT_TO_OBJ, preferences, controller, "exportToOBJ");
72
 
     }
73
 
     
74
 
@@ -995,7 +995,7 @@
75
 
     addActionToMenu(ActionType.MODIFY_3D_ATTRIBUTES, preview3DMenu);
76
 
     preview3DMenu.addSeparator();
77
 
     addActionToMenu(ActionType.CREATE_PHOTO, preview3DMenu);
78
 
-    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
79
 
+//    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
80
 
     preview3DMenu.addSeparator();
81
 
     addActionToMenu(ActionType.EXPORT_TO_OBJ, preview3DMenu);
82
 
     
83
 
@@ -1840,7 +1840,7 @@
84
 
     addActionToToolBar(ActionType.ZOOM_OUT, toolBar);
85
 
     toolBar.addSeparator();
86
 
     addActionToToolBar(ActionType.CREATE_PHOTO, toolBar);
87
 
-    addActionToToolBar(ActionType.CREATE_VIDEO, toolBar);
88
 
+//    addActionToToolBar(ActionType.CREATE_VIDEO, toolBar);
89
 
     toolBar.addSeparator();
90
 
     
91
 
     // Add plugin actions buttons
92
 
@@ -2508,7 +2508,7 @@
93
 
       addActionToPopupMenu(ActionType.MODIFY_3D_ATTRIBUTES, view3DPopup);
94
 
       view3DPopup.addSeparator();
95
 
       addActionToPopupMenu(ActionType.CREATE_PHOTO, view3DPopup);
96
 
-      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
97
 
+//      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
98
 
       view3DPopup.addSeparator();
99
 
       addActionToPopupMenu(ActionType.EXPORT_TO_OBJ, view3DPopup);
100
 
       SwingTools.hideDisabledMenuItems(view3DPopup);
 
63
--- a/src/com/eteks/sweethome3d/swing/package.properties
 
64
+++ b/src/com/eteks/sweethome3d/swing/package.properties
 
65
@@ -1046,8 +1046,8 @@ HomePane.CREATE_PHOTO.MnemonicKey=H
 
66
 # Note to translators: do not copy the following key in localized file
 
67
 HomePane.CREATE_PHOTO.SmallIcon=resources/icons/tango/camera-photo.png
 
68
 
 
69
-HomePane.CREATE_VIDEO.Name=Create video...
 
70
-HomePane.CREATE_VIDEO.ShortDescription=Create a 3D video
 
71
+HomePane.CREATE_VIDEO.Name=Create video... (See README.Debian file)
 
72
+HomePane.CREATE_VIDEO.ShortDescription=Create a 3D video (See README.Debian file)
 
73
 HomePane.CREATE_VIDEO.MnemonicKey=O
 
74
 # Note to translators: do not copy the following key in localized file
 
75
 HomePane.CREATE_VIDEO.SmallIcon=resources/icons/tango/camera-video.png
 
76
--- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
 
77
+++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
 
78
@@ -288,7 +288,7 @@ public class HomeController implements C
 
79
     homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
 
80
     homeView.setEnabled(HomeView.ActionType.MODIFY_3D_ATTRIBUTES, true);
 
81
     homeView.setEnabled(HomeView.ActionType.CREATE_PHOTO, true);
 
82
-    homeView.setEnabled(HomeView.ActionType.CREATE_VIDEO, true);
 
83
+    homeView.setEnabled(HomeView.ActionType.CREATE_VIDEO, false);
 
84
     homeView.setEnabled(HomeView.ActionType.EXPORT_TO_OBJ, true);
 
85
     homeView.setEnabled(HomeView.ActionType.HELP, true);
 
86
     homeView.setEnabled(HomeView.ActionType.ABOUT, true);