New properties framework

AUTHORS

@@ -362,6 +362,12 @@ Icons from the Elementary icon theme (GPLv3)
 * src/tiled/images/32/dialog-error.png
 * src/tiled/images/32/dialog-warning.png
 
+Icons from the GNOME project (CC0 1.0 Universal)
+* src/tiled/resources/images/scalable/text-bold-symbolic.svg
+* src/tiled/resources/images/scalable/text-italic-symbolic.svg
+* src/tiled/resources/images/scalable/text-underline-symbolic.svg
+* src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg
+
 
 Tilesets:
 

src/libtiled/imagelayer.cpp

@@ -104,8 +104,7 @@ ImageLayer *ImageLayer::initializeClone(ImageLayer *clone) const
     clone->mImageSource = mImageSource;
     clone->mTransparentColor = mTransparentColor;
     clone->mImage = mImage;
-    clone->mRepeatX = mRepeatX;
-    clone->mRepeatY = mRepeatY;
+    clone->mRepetition = mRepetition;
 
     return clone;
 }

src/libtiled/imagelayer.h

@@ -46,6 +46,19 @@ namespace Tiled {
 class TILEDSHARED_EXPORT ImageLayer : public Layer
 {
 public:
+    enum Repetition {
+        /**
+         * Makes the image repeat along the X axis.
+         */
+        RepeatX = 0x1,
+
+        /**
+         * Makes the image repeat along the Y axis.
+         */
+        RepeatY = 0x2,
+    };
+    Q_DECLARE_FLAGS(RepetitionFlags, Repetition)
+
     ImageLayer(const QString &name, int x, int y);
     ~ImageLayer() override;
 
@@ -114,25 +127,13 @@ class TILEDSHARED_EXPORT ImageLayer : public Layer
      */
     bool isEmpty() const override;
 
-    /**
-     * Returns true if the image of this layer repeats along the X axis.
-     */
-    bool repeatX() const { return mRepeatX; }
-
-    /**
-     * Returns true if the image of this layer repeats along the Y axis.
-     */
-    bool repeatY() const { return mRepeatY; }
-
-    /**
-     * Sets whether the image of this layer repeats along the X axis.
-     */
-    void setRepeatX(bool repeatX) { mRepeatX = repeatX; }
+    bool repeatX() const { return mRepetition & RepeatX; }
+    bool repeatY() const { return mRepetition & RepeatY; }
+    RepetitionFlags repetition() const { return mRepetition; }
 
-    /**
-     * Sets whether the image of this layer repeats along the Y axis.
-     */
-    void setRepeatY(bool repeatY) { mRepeatY = repeatY; }
+    void setRepeatX(bool repeatX) { mRepetition.setFlag(RepeatX, repeatX); }
+    void setRepeatY(bool repeatY) { mRepetition.setFlag(RepeatY, repeatY); }
+    void setRepetition(RepetitionFlags repetition) { mRepetition = repetition; }
 
     ImageLayer *clone() const override;
 
@@ -143,8 +144,10 @@ class TILEDSHARED_EXPORT ImageLayer : public Layer
     QUrl mImageSource;
     QColor mTransparentColor;
     QPixmap mImage;
-    bool mRepeatX = false;
-    bool mRepeatY = false;
+    RepetitionFlags mRepetition;
 };
 
 } // namespace Tiled
+
+Q_DECLARE_METATYPE(Tiled::ImageLayer::RepetitionFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Tiled::ImageLayer::RepetitionFlags)

src/libtiled/map.h

@@ -791,3 +791,5 @@ Q_DECLARE_METATYPE(Tiled::Map*)
 Q_DECLARE_METATYPE(Tiled::Map::Orientation)
 Q_DECLARE_METATYPE(Tiled::Map::LayerDataFormat)
 Q_DECLARE_METATYPE(Tiled::Map::RenderOrder)
+Q_DECLARE_METATYPE(Tiled::Map::StaggerAxis)
+Q_DECLARE_METATYPE(Tiled::Map::StaggerIndex)

src/libtiled/objectgroup.h

@@ -238,3 +238,4 @@ TILEDSHARED_EXPORT ObjectGroup::DrawOrder drawOrderFromString(const QString &);
 } // namespace Tiled
 
 Q_DECLARE_METATYPE(Tiled::ObjectGroup*)
+Q_DECLARE_METATYPE(Tiled::ObjectGroup::DrawOrder)

src/libtiled/tileset.h

@@ -739,5 +739,9 @@ inline void Tileset::setTransformationFlags(TransformationFlags flags)
 
 Q_DECLARE_METATYPE(Tiled::Tileset*)
 Q_DECLARE_METATYPE(Tiled::SharedTileset)
+Q_DECLARE_METATYPE(Tiled::Tileset::Orientation)
+Q_DECLARE_METATYPE(Tiled::Tileset::TileRenderSize)
+Q_DECLARE_METATYPE(Tiled::Tileset::FillMode)
+Q_DECLARE_METATYPE(Tiled::Tileset::TransformationFlags)
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Tiled::Tileset::TransformationFlags)

src/libtiled/wangset.h

@@ -424,5 +424,6 @@ TILEDSHARED_EXPORT WangSet::Type wangSetTypeFromString(const QString &);
 
 } // namespace Tiled
 
-Q_DECLARE_METATYPE(Tiled::WangSet*)
 Q_DECLARE_METATYPE(Tiled::WangId)
+Q_DECLARE_METATYPE(Tiled::WangSet*)
+Q_DECLARE_METATYPE(Tiled::WangSet::Type)

src/tiled/changeevents.h

@@ -61,6 +61,7 @@ class ChangeEvent
         WangSetRemoved,
         WangSetChanged,
         WangColorAboutToBeRemoved,
+        WangColorChanged,
     } type;
 
 protected:
@@ -164,7 +165,7 @@ class TileLayerChangeEvent : public LayerChangeEvent
 class ImageLayerChangeEvent : public LayerChangeEvent
 {
 public:
-    enum TileLayerProperty {
+    enum ImageLayerProperty {
         TransparentColorProperty    = 1 << 7,
         ImageSourceProperty         = 1 << 8,
         RepeatProperty              = 1 << 9,
@@ -277,17 +278,20 @@ class WangSetChangeEvent : public ChangeEvent
 {
 public:
     enum WangSetProperty {
-        TypeProperty            = 1 << 0,
+        NameProperty,
+        TypeProperty,
+        ImageProperty,
+        ColorCountProperty,
     };
 
-    WangSetChangeEvent(WangSet *wangSet, int properties)
+    WangSetChangeEvent(WangSet *wangSet, WangSetProperty property)
         : ChangeEvent(WangSetChanged)
         , wangSet(wangSet)
-        , properties(properties)
+        , property(property)
     {}
 
     WangSet *wangSet;
-    int properties;
+    WangSetProperty property;
 };
 
 class WangColorEvent : public ChangeEvent
@@ -303,4 +307,24 @@ class WangColorEvent : public ChangeEvent
     int color;
 };
 
+class WangColorChangeEvent : public ChangeEvent
+{
+public:
+    enum WangColorProperty {
+        NameProperty,
+        ColorProperty,
+        ImageProperty,
+        ProbabilityProperty,
+    };
+
+    WangColorChangeEvent(WangColor *wangColor, WangColorProperty property)
+        : ChangeEvent(WangColorChanged)
+        , wangColor(wangColor)
+        , property(property)
+    {}
+
+    WangColor *wangColor;
+    WangColorProperty property;
+};
+
 } // namespace Tiled

src/tiled/changeproperties.cpp

@@ -34,7 +34,7 @@ ChangeClassName::ChangeClassName(Document *document,
                                  QUndoCommand *parent)
     : ChangeValue(document, objects, className, parent)
 {
-    setText(QCoreApplication::translate("Undo Commands", "Change Type"));
+    setText(QCoreApplication::translate("Undo Commands", "Change Class"));
 }
 
 void ChangeClassName::undo()

src/tiled/colorbutton.cpp

@@ -40,7 +40,7 @@ ColorButton::ColorButton(QWidget *parent)
 
 void ColorButton::setColor(const QColor &color)
 {
-    if (mColor == color || !color.isValid())
+    if (mColor == color)
         return;
 
     mColor = color;
@@ -75,7 +75,9 @@ void ColorButton::pickColor()
 
 void ColorButton::updateIcon()
 {
+    // todo: fix gray icon in disabled state (consider using opacity, and not using an icon at all)
     setIcon(Utils::colorIcon(mColor, iconSize()));
+    setText(mColor.isValid() ? QString() : tr("Unset"));
 }
 
 #include "moc_colorbutton.cpp"

src/tiled/document.cpp

@@ -145,6 +145,7 @@ void Document::setCurrentObject(Object *object, Document *owningDocument)
 
     emit currentObjectSet(object);
     emit currentObjectChanged(object);
+    emit currentObjectsChanged();
 }
 
 /**

src/tiled/document.h

@@ -139,6 +139,7 @@ class Document : public QObject,
 
     void currentObjectSet(Object *object);
     void currentObjectChanged(Object *object);
+    void currentObjectsChanged();
 
     /**
      * Makes the Properties window visible and take focus.

src/tiled/fileedit.cpp

@@ -45,7 +45,7 @@ FileEdit::FileEdit(QWidget *parent)
     mOkTextColor = mLineEdit->palette().color(QPalette::Active, QPalette::Text);
 
     QToolButton *button = new QToolButton(this);
-    button->setText(QLatin1String("..."));
+    button->setText(QStringLiteral("…"));
     button->setAutoRaise(true);
     button->setToolTip(tr("Choose"));
     layout->addWidget(mLineEdit);

src/tiled/layerdock.cpp

@@ -29,7 +29,6 @@
 #include "map.h"
 #include "mapdocument.h"
 #include "mapdocumentactionhandler.h"
-#include "objectgroup.h"
 #include "reversingproxymodel.h"
 #include "utils.h"
 #include "iconcheckdelegate.h"
@@ -39,10 +38,8 @@
 #include <QBoxLayout>
 #include <QContextMenuEvent>
 #include <QHeaderView>
-#include <QLabel>
 #include <QMenu>
 #include <QScopedValueRollback>
-#include <QSlider>
 #include <QStyledItemDelegate>
 #include <QToolBar>
 #include <QUndoStack>
@@ -54,8 +51,6 @@ using namespace Tiled;
 
 LayerDock::LayerDock(QWidget *parent):
     QDockWidget(parent),
-    mOpacityLabel(new QLabel),
-    mOpacitySlider(new QSlider(Qt::Horizontal)),
     mLayerView(new LayerView)
 {
     setObjectName(QLatin1String("layerDock"));
@@ -64,13 +59,6 @@ LayerDock::LayerDock(QWidget *parent):
     QVBoxLayout *layout = new QVBoxLayout(widget);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    QHBoxLayout *opacityLayout = new QHBoxLayout;
-    mOpacitySlider->setRange(0, 100);
-    mOpacitySlider->setEnabled(false);
-    opacityLayout->addWidget(mOpacityLabel);
-    opacityLayout->addWidget(mOpacitySlider);
-    mOpacityLabel->setBuddy(mOpacitySlider);
-
     MapDocumentActionHandler *handler = MapDocumentActionHandler::instance();
 
     QMenu *newLayerMenu = handler->createNewLayerMenu(this);
@@ -99,20 +87,12 @@ LayerDock::LayerDock(QWidget *parent):
     buttonContainer->addWidget(spacerWidget);
     buttonContainer->addAction(ActionManager::action("HighlightCurrentLayer"));
 
-    QVBoxLayout *listAndToolBar = new QVBoxLayout;
-    listAndToolBar->setSpacing(0);
-    listAndToolBar->addWidget(mLayerView);
-    listAndToolBar->addWidget(buttonContainer);
-
-    layout->addLayout(opacityLayout);
-    layout->addLayout(listAndToolBar);
+    layout->setSpacing(0);
+    layout->addWidget(mLayerView);
+    layout->addWidget(buttonContainer);
 
     setWidget(widget);
     retranslateUi();
-
-    connect(mOpacitySlider, &QAbstractSlider::valueChanged,
-            this, &LayerDock::sliderValueChanged);
-    updateOpacitySlider();
 }
 
 void LayerDock::setMapDocument(MapDocument *mapDocument)
@@ -126,10 +106,6 @@ void LayerDock::setMapDocument(MapDocument *mapDocument)
     mMapDocument = mapDocument;
 
     if (mMapDocument) {
-        connect(mMapDocument, &MapDocument::changed,
-                this, &LayerDock::documentChanged);
-        connect(mMapDocument, &MapDocument::currentLayerChanged,
-                this, &LayerDock::updateOpacitySlider);
         connect(mMapDocument, &MapDocument::editLayerNameRequested,
                 this, &LayerDock::editLayerName);
     }
@@ -145,8 +121,6 @@ void LayerDock::setMapDocument(MapDocument *mapDocument)
         mLayerView->header()->resizeSection(1, iconSectionWidth);
         mLayerView->header()->resizeSection(2, iconSectionWidth);
     }
-
-    updateOpacitySlider();
 }
 
 void LayerDock::changeEvent(QEvent *e)
@@ -162,40 +136,6 @@ void LayerDock::changeEvent(QEvent *e)
     }
 }
 
-void LayerDock::updateOpacitySlider()
-{
-    const bool enabled = mMapDocument &&
-                         mMapDocument->currentLayer() != nullptr;
-
-    mOpacitySlider->setEnabled(enabled);
-    mOpacityLabel->setEnabled(enabled);
-
-    QScopedValueRollback<bool> updating(mUpdatingSlider, true);
-    if (enabled) {
-        qreal opacity = mMapDocument->currentLayer()->opacity();
-        mOpacitySlider->setValue(qRound(opacity * 100));
-    } else {
-        mOpacitySlider->setValue(100);
-    }
-}
-
-void LayerDock::documentChanged(const ChangeEvent &change)
-{
-    switch (change.type) {
-    case ChangeEvent::LayerChanged: {
-        auto &layerChange = static_cast<const LayerChangeEvent&>(change);
-
-        // Don't update the slider when we're the ones changing the layer opacity
-        if ((layerChange.properties & LayerChangeEvent::OpacityProperty) && !mChangingLayerOpacity)
-            if (layerChange.layer == mMapDocument->currentLayer())
-                updateOpacitySlider();
-        break;
-    }
-    default:
-        break;
-    }
-}
-
 void LayerDock::editLayerName()
 {
     if (!isVisible())
@@ -208,33 +148,9 @@ void LayerDock::editLayerName()
     mLayerView->editLayerModelIndex(layerModel->index(currentLayer));
 }
 
-void LayerDock::sliderValueChanged(int opacity)
-{
-    if (!mMapDocument)
-        return;
-
-    // When the slider changes value just because we're updating it, it
-    // shouldn't try to set the layer opacity.
-    if (mUpdatingSlider)
-        return;
-
-    const auto layer = mMapDocument->currentLayer();
-    if (!layer)
-        return;
-
-    if (static_cast<int>(layer->opacity() * 100) != opacity) {
-        LayerModel *layerModel = mMapDocument->layerModel();
-        QScopedValueRollback<bool> updating(mChangingLayerOpacity, true);
-        layerModel->setData(layerModel->index(layer),
-                            qreal(opacity) / 100,
-                            LayerModel::OpacityRole);
-    }
-}
-
 void LayerDock::retranslateUi()
 {
     setWindowTitle(tr("Layers"));
-    mOpacityLabel->setText(tr("Opacity:"));
     mNewLayerButton->setToolTip(tr("New Layer"));
 }