[sweethome3d] 02/05: Merge tag 'upstream/4.2+dfsg'
Gabriele Giacone
gg0-guest at alioth.debian.org
Wed Nov 6 00:16:15 UTC 2013
This is an automated email from the git hooks/post-receive script.
gg0-guest pushed a commit to branch master
in repository sweethome3d.
commit fb758bb1573717d30165082c9a021d23ba22096e
Merge: 8c2d261 d194215
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Tue Nov 5 12:28:28 2013 +0100
Merge tag 'upstream/4.2+dfsg'
Upstream version 4.2+dfsg
.classpath | 2 +-
.settings/org.eclipse.jdt.core.prefs | 30 +-
.settings/org.eclipse.jdt.ui.prefs | 3 +-
ChangeLog | 52 +
README.TXT | 6 +-
THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT | 2 +-
build.xml | 257 +-
deploy/SweetHome3D.jnlp | 48 +-
deploy/SweetHome3DApplet.html | 6 +-
deploy/SweetHome3DApplet.jnlp | 74 +
deploy/SweetHome3DViewer.html | 11 +-
deploy/SweetHome3DViewer.jnlp | 73 +
install/linux/SweetHome3D | 2 +-
install/macosx/Sweet Home 3D/Contents/Info.plist | 8 +-
.../Contents/Resources/SweetHome3D.icns | Bin 53647 -> 265083 bytes
.../Contents/Resources/SweetHome3DDocument.icns | Bin 44895 -> 40381 bytes
install/windows/installerInnoSetup.iss | 10 +-
install/windows/installerLaunch4j.xml | 10 +-
install/windows/signedInstallerInnoSetup.iss | 10 +-
src/com/eteks/sweethome3d/HomeFramePane.java | 108 +-
src/com/eteks/sweethome3d/MacOSXConfiguration.java | 219 +-
src/com/eteks/sweethome3d/SweetHome3D.java | 28 +-
.../eteks/sweethome3d/SweetHome3DBootstrap.java | 71 +-
.../SweetHome3DJavaWebStartBootstrap.java | 74 -
.../sweethome3d/applet/AppletApplication.java | 11 +-
.../sweethome3d/applet/AppletUserPreferences.java | 116 +-
.../sweethome3d/applet/SweetHome3DApplet.java | 20 +-
.../sweethome3d/applet/SweetHome3DViewer.java | 3 +-
.../eteks/sweethome3d/applet/package.properties | 2 +-
.../io/ContributedFurnitureCatalog.properties | 25 +
.../io/ContributedFurnitureCatalog_bg.properties | 25 +
.../io/ContributedFurnitureCatalog_cs.properties | 25 +
.../io/ContributedFurnitureCatalog_de.properties | 25 +
.../io/ContributedFurnitureCatalog_el.properties | 25 +
.../io/ContributedFurnitureCatalog_es.properties | 25 +
.../io/ContributedFurnitureCatalog_fr.properties | 28 +
.../io/ContributedFurnitureCatalog_hu.properties | 25 +
.../io/ContributedFurnitureCatalog_it.properties | 25 +
.../io/ContributedFurnitureCatalog_ja.properties | 25 +
.../io/ContributedFurnitureCatalog_pl.properties | 25 +
.../io/ContributedFurnitureCatalog_pt.properties | 25 +
.../io/ContributedFurnitureCatalog_ru.properties | 25 +
.../io/ContributedFurnitureCatalog_sv.properties | 25 +
.../io/ContributedFurnitureCatalog_vi.properties | 25 +
.../ContributedFurnitureCatalog_zh_CN.properties | 25 +
.../sweethome3d/io/DefaultFurnitureCatalog.java | 17 +-
.../io/DefaultFurnitureCatalog.properties | 160 +-
.../io/DefaultFurnitureCatalog_bg.properties | 87 +-
.../io/DefaultFurnitureCatalog_cs.properties | 87 +-
.../io/DefaultFurnitureCatalog_de.properties | 87 +-
.../io/DefaultFurnitureCatalog_el.properties | 87 +-
.../io/DefaultFurnitureCatalog_es.properties | 93 +-
.../io/DefaultFurnitureCatalog_fr.properties | 87 +-
.../io/DefaultFurnitureCatalog_hu.properties | 87 +-
.../io/DefaultFurnitureCatalog_it.properties | 87 +-
.../io/DefaultFurnitureCatalog_ja.properties | 87 +-
.../io/DefaultFurnitureCatalog_pl.properties | 87 +-
.../io/DefaultFurnitureCatalog_pt.properties | 87 +-
.../io/DefaultFurnitureCatalog_ru.properties | 87 +-
.../io/DefaultFurnitureCatalog_sv.properties | 87 +-
.../io/DefaultFurnitureCatalog_vi.properties | 87 +-
.../io/DefaultFurnitureCatalog_zh_CN.properties | 89 +-
.../sweethome3d/io/DefaultHomeOutputStream.java | 26 +-
.../io/resources/fixedTriangleWindow85x85.obj | 146 +
.../io/resources/fixedTriangleWindow85x85.png | Bin 0 -> 4524 bytes
.../sweethome3d/io/resources/halfRoundWindow.obj | 507 +++
.../sweethome3d/io/resources/halfRoundWindow.png | Bin 0 -> 6896 bytes
.../sweethome3d/io/resources/roundDoorFrame.obj | 435 +++
.../sweethome3d/io/resources/roundDoorFrame.png | Bin 0 -> 3382 bytes
.../eteks/sweethome3d/io/resources/roundWindow.obj | 978 +++++
.../eteks/sweethome3d/io/resources/roundWindow.png | Bin 0 -> 7814 bytes
.../eteks/sweethome3d/io/resources/roundedDoor.obj | 4046 ++++++++++++++++++++
.../eteks/sweethome3d/io/resources/roundedDoor.png | Bin 0 -> 2314 bytes
src/com/eteks/sweethome3d/j3d/Ground3D.java | 111 +-
.../sweethome3d/j3d/HomePieceOfFurniture3D.java | 27 +-
src/com/eteks/sweethome3d/j3d/ModelManager.java | 313 +-
src/com/eteks/sweethome3d/j3d/Object3DBranch.java | 138 +
src/com/eteks/sweethome3d/j3d/PhotoRenderer.java | 68 +-
src/com/eteks/sweethome3d/j3d/Room3D.java | 428 +--
src/com/eteks/sweethome3d/j3d/TextureManager.java | 17 +
src/com/eteks/sweethome3d/j3d/Wall3D.java | 464 ++-
.../sweethome3d/model/CatalogDoorOrWindow.java | 57 +
.../sweethome3d/model/CatalogPieceOfFurniture.java | 114 +-
src/com/eteks/sweethome3d/model/DoorOrWindow.java | 12 +-
src/com/eteks/sweethome3d/model/Home.java | 9 +-
.../eteks/sweethome3d/model/HomeDoorOrWindow.java | 23 +
.../sweethome3d/model/HomeFurnitureGroup.java | 27 +-
.../sweethome3d/model/HomePieceOfFurniture.java | 35 +-
.../eteks/sweethome3d/model/PieceOfFurniture.java | 12 +
src/com/eteks/sweethome3d/package.properties | 2 +-
.../sweethome3d/resources/frameIcon128x128.png | Bin 0 -> 7023 bytes
.../sweethome3d/swing/AutoCompleteTextField.java | 12 +-
.../swing/BackgroundImageWizardStepsPanel.java | 277 +-
src/com/eteks/sweethome3d/swing/ColorButton.java | 47 +-
.../sweethome3d/swing/FileContentManager.java | 100 +-
.../swing/FurnitureCatalogListPanel.java | 67 +-
.../eteks/sweethome3d/swing/HomeComponent3D.java | 32 +-
src/com/eteks/sweethome3d/swing/HomePane.java | 88 +-
.../swing/ImportedFurnitureWizardStepsPanel.java | 52 +-
.../swing/ImportedTextureWizardStepsPanel.java | 50 +-
.../sweethome3d/swing/ModelPreviewComponent.java | 35 +-
src/com/eteks/sweethome3d/swing/PhotoPanel.java | 3 +-
src/com/eteks/sweethome3d/swing/PhotosPanel.java | 4 +-
src/com/eteks/sweethome3d/swing/PlanComponent.java | 13 +-
.../sweethome3d/swing/ScaledImageComponent.java | 87 +-
src/com/eteks/sweethome3d/swing/SwingTools.java | 68 +-
.../eteks/sweethome3d/swing/ThreadedTaskPanel.java | 37 +-
src/com/eteks/sweethome3d/swing/VideoPanel.java | 39 +-
.../sweethome3d/swing/VisualTransferHandler.java | 6 +-
src/com/eteks/sweethome3d/swing/package.properties | 8 +-
.../eteks/sweethome3d/swing/package_fr.properties | 8 +-
.../eteks/sweethome3d/swing/package_pt.properties | 6 +-
.../sweethome3d/swing/resources/aboutIcon.png | Bin 19964 -> 20749 bytes
.../eteks/sweethome3d/tools/OperatingSystem.java | 26 +-
.../sweethome3d/viewcontroller/HomeController.java | 10 +
.../viewcontroller/HomeController3D.java | 2 +-
.../viewcontroller/HomeFurnitureController.java | 7 +-
.../viewcontroller/PhotosController.java | 2 +-
.../sweethome3d/viewcontroller/WallController.java | 2 +-
.../resources/help/de/images/addingFurniture.png | Bin 16649 -> 10954 bytes
.../resources/help/de/images/drawingWalls.png | Bin 7176 -> 6703 bytes
.../resources/help/en/editingPreferences.html | 2 +-
.../resources/help/en/images/addingFurniture.png | Bin 16177 -> 10600 bytes
.../resources/help/en/images/drawingWalls.png | Bin 8588 -> 7380 bytes
.../resources/help/es/images/addingFurniture.png | Bin 16476 -> 10803 bytes
.../resources/help/es/images/drawingWalls.png | Bin 7329 -> 6899 bytes
.../resources/help/fr/editingPreferences.html | 2 +-
.../resources/help/fr/images/addingFurniture.png | Bin 16098 -> 10914 bytes
.../resources/help/fr/images/drawingWalls.png | Bin 7205 -> 6504 bytes
.../resources/help/fr/savingHome.html | 2 +-
.../resources/help/helpLargerFont.css | 121 +
.../resources/help/images/applicationIcon.png | Bin 19544 -> 20749 bytes
.../resources/help/it/images/addingFurniture.png | Bin 15584 -> 10532 bytes
.../resources/help/it/images/drawingWalls.png | Bin 7290 -> 6700 bytes
.../resources/help/ja/addingFurniture.html | 2 +-
.../resources/help/ja/addingTexts.html | 2 +-
.../resources/help/ja/creatingHome.html | 2 +-
.../resources/help/ja/drawingDimensions.html | 2 +-
.../resources/help/ja/drawingRooms.html | 2 +-
.../resources/help/ja/drawingWalls.html | 2 +-
.../resources/help/ja/editing3DView.html | 2 +-
.../resources/help/ja/editingDimensions.html | 2 +-
.../resources/help/ja/editingFurniture.html | 2 +-
.../resources/help/ja/editingPreferences.html | 2 +-
.../resources/help/ja/editingRooms.html | 2 +-
.../resources/help/ja/editingWalls.html | 2 +-
.../resources/help/ja/importingBackground.html | 2 +-
.../resources/help/ja/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/ja/index.html | 2 +-
.../resources/help/ja/printingHome.html | 2 +-
.../resources/help/ja/savingHome.html | 2 +-
.../viewcontroller/resources/help/ja/tips.html | 2 +-
.../resources/help/ja/tocCreating.html | 2 +-
.../resources/help/ja/tocEditing.html | 2 +-
.../resources/help/ja/tocImporting.html | 2 +-
.../viewcontroller/resources/help/ja/tocStart.html | 2 +-
.../viewcontroller/resources/help/ja/ui.html | 2 +-
.../resources/help/pt/images/addingFurniture.png | Bin 15461 -> 10328 bytes
.../resources/help/pt/images/drawingWalls.png | Bin 7249 -> 6797 bytes
.../resources/help/zh_CN/addingFurniture.html | 2 +-
.../resources/help/zh_CN/addingTexts.html | 2 +-
.../resources/help/zh_CN/creatingHome.html | 2 +-
.../resources/help/zh_CN/drawingDimensions.html | 2 +-
.../resources/help/zh_CN/drawingRooms.html | 2 +-
.../resources/help/zh_CN/drawingWalls.html | 2 +-
.../resources/help/zh_CN/editing3DView.html | 2 +-
.../resources/help/zh_CN/editingDimensions.html | 2 +-
.../resources/help/zh_CN/editingFurniture.html | 2 +-
.../resources/help/zh_CN/editingPreferences.html | 2 +-
.../resources/help/zh_CN/editingRooms.html | 2 +-
.../resources/help/zh_CN/editingWalls.html | 2 +-
.../resources/help/zh_CN/importingBackground.html | 2 +-
.../resources/help/zh_CN/importingFurniture.html | 2 +-
.../viewcontroller/resources/help/zh_CN/index.html | 2 +-
.../resources/help/zh_CN/printingHome.html | 2 +-
.../resources/help/zh_CN/savingHome.html | 2 +-
.../viewcontroller/resources/help/zh_CN/tips.html | 2 +-
.../resources/help/zh_CN/tocCreating.html | 2 +-
.../resources/help/zh_CN/tocEditing.html | 2 +-
.../resources/help/zh_CN/tocImporting.html | 2 +-
.../resources/help/zh_CN/tocStart.html | 2 +-
.../viewcontroller/resources/help/zh_CN/ui.html | 2 +-
test/com/eteks/sweethome3d/junit/LevelTest.java | 21 +-
.../com/eteks/sweethome3d/junit/OBJWriterTest.java | 2 +-
.../eteks/sweethome3d/junit/resources/home1.sh3d | Bin 21769 -> 157778 bytes
185 files changed, 11184 insertions(+), 1290 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git
More information about the pkg-java-commits
mailing list