[tiled] r689 - in branches/0.6: . src/tiled/mapeditor src/tiled/mapeditor/dialogs

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-07-15 12:44:21 -0500 (Sat, 15 Jul 2006)
New Revision: 689

Modified:
   branches/0.6/CHANGES
   branches/0.6/src/tiled/mapeditor/MapEditor.java
   branches/0.6/src/tiled/mapeditor/dialogs/TileDialog.java
Log:
* Fixed the add-tile button being disabled in the case of empty tilesets
* Prepared for 0.6.1 release


Modified: branches/0.6/CHANGES
===================================================================
--- branches/0.6/CHANGES	2006-07-08 11:55:38 UTC (rev 688)
+++ branches/0.6/CHANGES	2006-07-15 17:44:21 UTC (rev 689)
@@ -1,10 +1,11 @@
-0.6.1 - Unreleased
+0.6.1 - July 15th, 2006
 
 * Fixed failing to default to map format by extention when plugins are loaded
 * Fixed active marquee not being reset on loading a map
 * Fixed layer duplicates to not share layer properties with the original
 * Fixed width of tile button changing between selecting a tile and no tile
 * Fixed creation of one-tile gaps between tilesets on saving (Christian Henz)
+* Fixed the add-tile button being disabled in the case of empty tilesets
 
 0.6.0 - June 23rd, 2006
 

Modified: branches/0.6/src/tiled/mapeditor/MapEditor.java
===================================================================
--- branches/0.6/src/tiled/mapeditor/MapEditor.java	2006-07-08 11:55:38 UTC (rev 688)
+++ branches/0.6/src/tiled/mapeditor/MapEditor.java	2006-07-15 17:44:21 UTC (rev 689)
@@ -74,7 +74,7 @@
     private Cursor curMarquee;
 
     /** Current release version. */
-    public static final String version = "0.6.0";
+    public static final String version = "0.6.1";
 
     private Map currentMap;
     private MapView mapView;

Modified: branches/0.6/src/tiled/mapeditor/dialogs/TileDialog.java
===================================================================
--- branches/0.6/src/tiled/mapeditor/dialogs/TileDialog.java	2006-07-08 11:55:38 UTC (rev 688)
+++ branches/0.6/src/tiled/mapeditor/dialogs/TileDialog.java	2006-07-15 17:44:21 UTC (rev 689)
@@ -227,7 +227,7 @@
         // Create actionlisteners
         okButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
-            	tileset.setName(tilesetNameEntry.getText());
+                tileset.setName(tilesetNameEntry.getText());
                 dispose();
             }
         });
@@ -324,9 +324,9 @@
 
         Enumeration ids = tileset.getImageIds();
         while(ids.hasMoreElements()) {
-        	Image img = tileset.getImageById(Integer.parseInt((String) ids.nextElement()));
-        	if(img != null)
-        		listData.add(img);
+            Image img = tileset.getImageById(Integer.parseInt((String) ids.nextElement()));
+            if (img != null)
+                listData.add(img);
         }
 
         imageList.setListData(listData);
@@ -362,13 +362,13 @@
         boolean tileSelected = currentTile != null;
         boolean atLeastOneSharedImage = tileset.getTotalImages() >= 1;
 
-        newTileButton.setEnabled(atLeastOneSharedImage && !tilebmp);
+        newTileButton.setEnabled(!tilebmp);
         deleteTileButton.setEnabled(!tilebmp && tileSelected);
         changeImageButton.setEnabled(atLeastOneSharedImage && !tilebmp
             && tileSelected);
         duplicateTileButton.setEnabled(!tilebmp && tileSelected);
         //animationButton.setEnabled(!tilebmp && tileSelected &&
-        //		currentTile instanceof AnimatedTile);
+        //        currentTile instanceof AnimatedTile);
         tileProperties.setEnabled(tileSelected);
         createTileButton.setEnabled(!tilebmp);
     }
@@ -456,12 +456,12 @@
         }
         */
         else if (source == createTileButton) {
-        	Image img = (Image)imageList.getSelectedValue();
-        	Tile n = new Tile(tileset);
+            Image img = (Image)imageList.getSelectedValue();
+            Tile n = new Tile(tileset);
 
-        	n.setImage(tileset.getIdByImage(img));
-        	tileset.addNewTile(n);
-        	queryTiles();
+            n.setImage(tileset.getIdByImage(img));
+            tileset.addNewTile(n);
+            queryTiles();
             // Select the last (cloned) tile
             tileList.setSelectedIndex(tileset.size() - 1);
             tileList.ensureIndexIsVisible(tileset.size() - 1);