Added the Objects dock and per-MapObject visibility.

src/libtiled/map.cpp

@@ -31,6 +31,7 @@
 #include "map.h"
 
 #include "layer.h"
+#include "objectgroup.h"
 #include "tile.h"
 #include "tilelayer.h"
 #include "tileset.h"
@@ -82,6 +83,32 @@ int Map::layerCount(Layer::Type type) const
     return count;
 }
 
+QList<Layer*> Map::layers(Layer::Type type) const
+{
+    QList<Layer*> layers;
+    foreach (Layer *layer, mLayers)
+        if (layer->type() == type)
+            layers.append(layer);
+    return layers;
+}
+
+QList<ObjectGroup*> Map::objectGroups() const
+{
+    QList<ObjectGroup*> layers;
+    foreach (Layer *layer, mLayers)
+        if (ObjectGroup *og = layer->asObjectGroup())
+            layers.append(og);
+    return layers;
+}
+
+QList<TileLayer*> Map::tileLayers() const
+{
+    QList<TileLayer*> layers;
+    foreach (Layer *layer, mLayers)
+        if (TileLayer *tl = layer->asTileLayer())
+            layers.append(tl);
+    return layers;
+}
 void Map::addLayer(Layer *layer)
 {
     adoptLayer(layer);

src/libtiled/map.h

@@ -175,6 +175,10 @@ class TILEDSHARED_EXPORT Map : public Object
      */
     const QList<Layer*> &layers() const { return mLayers; }
 
+    QList<Layer*> layers(Layer::Type type) const;
+    QList<ObjectGroup*> objectGroups() const;
+    QList<TileLayer*> tileLayers() const;
+
     /**
      * Adds a layer to this map.
      */

src/libtiled/mapobject.cpp

@@ -35,7 +35,8 @@ MapObject::MapObject():
     mSize(0, 0),
     mShape(Rectangle),
     mTile(0),
-    mObjectGroup(0)
+    mObjectGroup(0),
+    mVisible(true)
 {
 }
 
@@ -48,7 +49,8 @@ MapObject::MapObject(const QString &name, const QString &type,
     mSize(size),
     mShape(Rectangle),
     mTile(0),
-    mObjectGroup(0)
+    mObjectGroup(0),
+    mVisible(true)
 {
 }
 

src/libtiled/mapobject.h

@@ -228,6 +228,9 @@ class TILEDSHARED_EXPORT MapObject : public Object
      */
     MapObject *clone() const;
 
+    bool isVisible() const { return mVisible; }
+    void setVisible(bool visible) { mVisible = visible; }
+
 private:
     QString mName;
     QString mType;
@@ -237,6 +240,7 @@ class TILEDSHARED_EXPORT MapObject : public Object
     Shape mShape;
     Tile *mTile;
     ObjectGroup *mObjectGroup;
+    bool mVisible;
 };
 
 } // namespace Tiled

src/tiled/addremovemapobject.cpp

@@ -23,6 +23,7 @@
 #include "mapdocument.h"
 #include "mapobject.h"
 #include "objectgroup.h"
+#include "mapobjectmodel.h"
 
 #include <QCoreApplication>
 
@@ -51,19 +52,13 @@ AddRemoveMapObject::~AddRemoveMapObject()
 
 void AddRemoveMapObject::addObject()
 {
-    if (mIndex == -1)
-        mObjectGroup->addObject(mMapObject);
-    else
-        mObjectGroup->insertObject(mIndex, mMapObject);
-
-    mMapDocument->emitObjectAdded(mMapObject);
+    mMapDocument->mapObjectModel()->insertObject(mObjectGroup, mIndex, mMapObject);
     mOwnsObject = false;
 }
 
 void AddRemoveMapObject::removeObject()
 {
-    mIndex = mObjectGroup->removeObject(mMapObject);
-    mMapDocument->emitObjectRemoved(mMapObject);
+    mIndex = mMapDocument->mapObjectModel()->removeObject(mObjectGroup, mMapObject);
     mOwnsObject = true;
 }
 

src/tiled/changemapobject.cpp

@@ -22,6 +22,7 @@
 
 #include "mapdocument.h"
 #include "mapobject.h"
+#include "mapobjectmodel.h"
 
 #include <QCoreApplication>
 
@@ -56,9 +57,8 @@ void ChangeMapObject::swap()
     const QString name = mMapObject->name();
     const QString type = mMapObject->type();
 
-    mMapObject->setName(mName);
-    mMapObject->setType(mType);
-    mMapDocument->emitObjectChanged(mMapObject);
+    mMapDocument->mapObjectModel()->setObjectName(mMapObject, mName);
+    mMapDocument->mapObjectModel()->setObjectType(mMapObject, mType);
 
     mName = name;
     mType = type;

src/tiled/changeobjectgroupproperties.cpp

@@ -23,6 +23,7 @@
 
 #include "mapdocument.h"
 #include "objectgroup.h"
+#include "mapobjectmodel.h"
 
 #include <QCoreApplication>
 
@@ -46,11 +47,12 @@ ChangeObjectGroupProperties::ChangeObjectGroupProperties(
 void ChangeObjectGroupProperties::redo()
 {
     mObjectGroup->setColor(mRedoColor);
-    mMapDocument->emitObjectsChanged(mObjectGroup->objects());
+    mMapDocument->mapObjectModel()->emitObjectsChanged(mObjectGroup->objects());
+
 }
 
 void ChangeObjectGroupProperties::undo()
 {
     mObjectGroup->setColor(mUndoColor);
-    mMapDocument->emitObjectsChanged(mObjectGroup->objects());
+    mMapDocument->mapObjectModel()->emitObjectsChanged(mObjectGroup->objects());
 }

src/tiled/changepolygon.cpp

@@ -22,6 +22,7 @@
 
 #include "mapdocument.h"
 #include "mapobject.h"
+#include "mapobjectmodel.h"
 
 #include <QCoreApplication>
 
@@ -41,12 +42,10 @@ ChangePolygon::ChangePolygon(MapDocument *mapDocument,
 
 void ChangePolygon::undo()
 {
-    mMapObject->setPolygon(mOldPolygon);
-    mMapDocument->emitObjectChanged(mMapObject);
+    mMapDocument->mapObjectModel()->setObjectPolygon(mMapObject, mOldPolygon);
 }
 
 void ChangePolygon::redo()
 {
-    mMapObject->setPolygon(mNewPolygon);
-    mMapDocument->emitObjectChanged(mMapObject);
+    mMapDocument->mapObjectModel()->setObjectPolygon(mMapObject, mNewPolygon);
 }

src/tiled/mainwindow.cpp

@@ -74,6 +74,7 @@
 #include "utils.h"
 #include "zoomable.h"
 #include "commandbutton.h"
+#include "objectsdock.h"
 
 #ifdef Q_WS_MAC
 #include "macsupport.h"
@@ -105,6 +106,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags)
     , mMapDocument(0)
     , mActionHandler(new MapDocumentActionHandler(this))
     , mLayerDock(new LayerDock(this))
+    , mObjectsDock(new ObjectsDock())
     , mTilesetDock(new TilesetDock(this))
     , mCurrentLayerLabel(new QLabel)
     , mZoomable(0)
@@ -161,6 +163,8 @@ MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags)
     addDockWidget(Qt::RightDockWidgetArea, mLayerDock);
     addDockWidget(Qt::RightDockWidgetArea, undoDock);
     tabifyDockWidget(undoDock, mLayerDock);
+    addDockWidget(Qt::RightDockWidgetArea, mObjectsDock);
+    tabifyDockWidget(mLayerDock, mObjectsDock);
     addDockWidget(Qt::RightDockWidgetArea, mTilesetDock);
 
     statusBar()->addPermanentWidget(mZoomComboBox);
@@ -365,6 +369,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags)
     mUi->menuView->addAction(mTilesetDock->toggleViewAction());
     mUi->menuView->addAction(mLayerDock->toggleViewAction());
     mUi->menuView->addAction(undoDock->toggleViewAction());
+    mUi->menuView->addAction(mObjectsDock->toggleViewAction());
 
     connect(mClipboardManager, SIGNAL(hasMapChanged()), SLOT(updateActions()));
 
@@ -1440,6 +1445,7 @@ void MainWindow::mapDocumentChanged(MapDocument *mapDocument)
 
     mActionHandler->setMapDocument(mMapDocument);
     mLayerDock->setMapDocument(mMapDocument);
+    mObjectsDock->setMapDocument(mMapDocument);
     mTilesetDock->setMapDocument(mMapDocument);
     AutomappingManager::instance()->setMapDocument(mMapDocument);
     QuickStampManager::instance()->setMapDocument(mMapDocument);

src/tiled/mainwindow.h

@@ -55,6 +55,7 @@ class BucketFillTool;
 class TilesetDock;
 class MapView;
 class CommandButton;
+class ObjectsDock;
 class Zoomable;
 
 /**
@@ -202,6 +203,7 @@ public slots:
     MapDocument *mMapDocument;
     MapDocumentActionHandler *mActionHandler;
     LayerDock *mLayerDock;
+    ObjectsDock *mObjectsDock;
     TilesetDock *mTilesetDock;
     QLabel *mCurrentLayerLabel;
     Zoomable *mZoomable;

src/tiled/mapdocument.cpp

@@ -29,6 +29,7 @@
 #include "imagelayer.h"
 #include "isometricrenderer.h"
 #include "layermodel.h"
+#include "mapobjectmodel.h"
 #include "map.h"
 #include "mapobject.h"
 #include "movelayer.h"
@@ -56,6 +57,7 @@ MapDocument::MapDocument(Map *map, const QString &fileName):
     mFileName(fileName),
     mMap(map),
     mLayerModel(new LayerModel(this)),
+    mMapObjectModel(new MapObjectModel(this)),
     mUndoStack(new QUndoStack(this))
 {
     switch (map->orientation()) {
@@ -80,6 +82,11 @@ MapDocument::MapDocument(Map *map, const QString &fileName):
     connect(mLayerModel, SIGNAL(layerRemoved(int)), SLOT(onLayerRemoved(int)));
     connect(mLayerModel, SIGNAL(layerChanged(int)), SIGNAL(layerChanged(int)));
 
+    mMapObjectModel->setMapDocument(this);
+    connect(mMapObjectModel, SIGNAL(objectsAdded(QList<MapObject*>)), SLOT(onObjectsAdded(QList<MapObject*>)));
+    connect(mMapObjectModel, SIGNAL(objectsChanged(QList<MapObject*>)), SLOT(onObjectsChanged(QList<MapObject*>)));
+    connect(mMapObjectModel, SIGNAL(objectsAboutToBeRemoved(QList<MapObject*>)), SLOT(onObjectsAboutToBeRemoved(QList<MapObject*>)));
+    connect(mMapObjectModel, SIGNAL(objectsRemoved(QList<MapObject*>)), SLOT(onObjectsRemoved(QList<MapObject*>)));
     connect(mUndoStack, SIGNAL(cleanChanged(bool)), SIGNAL(modifiedChanged()));
 
     // Register tileset references
@@ -476,6 +483,11 @@ void MapDocument::emitObjectsAdded(const QList<MapObject*> &objects)
     emit objectsAdded(objects);
 }
 
+void MapDocument::emitObjectsAboutToBeRemoved(const QList<MapObject*> &objects)
+{
+    emit objectsAboutToBeRemoved(objects);
+}
+
 /**
  * Emits the objects removed signal with the specified list of objects.
  * This will cause the scene to remove the related items.
@@ -499,6 +511,26 @@ void MapDocument::emitObjectsChanged(const QList<MapObject*> &objects)
     emit objectsChanged(objects);
 }
 
+void MapDocument::onObjectsAdded(const QList<MapObject*> &objects)
+{
+    emitObjectsAdded(objects);
+}
+
+void MapDocument::onObjectsChanged(const QList<MapObject*> &objects)
+{
+    emitObjectsChanged(objects);
+}
+
+void MapDocument::onObjectsAboutToBeRemoved(const QList<MapObject*> &objects)
+{
+    emitObjectsAboutToBeRemoved(objects);
+}
+
+void MapDocument::onObjectsRemoved(const QList<MapObject*> &objects)
+{
+    emitObjectsRemoved(objects);
+}
+
 void MapDocument::onLayerAdded(int index)
 {
     emit layerAdded(index);
@@ -513,6 +545,7 @@ void MapDocument::onLayerAboutToBeRemoved(int index)
     // Deselect any objects on this layer when necessary
     if (ObjectGroup *og = dynamic_cast<ObjectGroup*>(mMap->layerAt(index)))
         deselectObjects(og->objects());
+    emit layerAboutToBeRemoved(index);
 }
 
 void MapDocument::onLayerRemoved(int index)

src/tiled/mapdocument.h

@@ -46,6 +46,7 @@ namespace Internal {
 
 class LayerModel;
 class TileSelectionModel;
+class MapObjectModel;
 
 /**
  * Represents an editable map. The purpose of this class is to make sure that
@@ -155,6 +156,8 @@ class MapDocument : public QObject
      */
     LayerModel *layerModel() const { return mLayerModel; }
 
+    MapObjectModel *mapObjectModel() const { return mMapObjectModel; }
+
     /**
      * Returns the map renderer.
      */
@@ -217,6 +220,7 @@ class MapDocument : public QObject
     void emitRegionEdited(const QRegion &region, Layer *layer);
 
     void emitObjectsAdded(const QList<MapObject*> &objects);
+    void emitObjectsAboutToBeRemoved(const QList<MapObject*> &objects);
     void emitObjectsRemoved(const QList<MapObject*> &objects);
     void emitObjectsChanged(const QList<MapObject*> &objects);
 
@@ -257,6 +261,8 @@ class MapDocument : public QObject
     void mapChanged();
 
     void layerAdded(int index);
+    void layerAboutToBeRemoved(int index);
+    void layerRenamed(int index);
     void layerRemoved(int index);
     void layerChanged(int index);
 
@@ -291,10 +297,16 @@ class MapDocument : public QObject
     void tilesetNameChanged(Tileset *tileset);
 
     void objectsAdded(const QList<MapObject*> &objects);
+    void objectsAboutToBeRemoved(const QList<MapObject*> &objects);
     void objectsRemoved(const QList<MapObject*> &objects);
     void objectsChanged(const QList<MapObject*> &objects);
 
 private slots:
+    void onObjectsAdded(const QList<MapObject*> &objects);
+    void onObjectsChanged(const QList<MapObject*> &objects);
+    void onObjectsAboutToBeRemoved(const QList<MapObject*> &objects);
+    void onObjectsRemoved(const QList<MapObject*> &objects);
+
     void onLayerAdded(int index);
     void onLayerAboutToBeRemoved(int index);
     void onLayerRemoved(int index);
@@ -309,6 +321,7 @@ private slots:
     QList<MapObject*> mSelectedObjects;
     MapRenderer *mRenderer;
     int mCurrentLayerIndex;
+    MapObjectModel *mMapObjectModel;
     QUndoStack *mUndoStack;
 };
 

src/tiled/mapobjectitem.cpp

@@ -226,6 +226,8 @@ void MapObjectItem::syncWithMapObject()
     }
 
     mSyncing = false;
+
+    setVisible(mObject->isVisible());
 }
 
 void MapObjectItem::setEditable(bool editable)