Refactored how preview keeps up with model changes.

2016-05-29 22:35:17 -04:00
parent f447aed034
commit cabb71db70
9 changed files with 107 additions and 39 deletions
@@ -104,6 +104,8 @@ void LabelModel::restore( const LabelModel *savedModel )
 	emit nameChanged();
 	emit sizeChanged();
 	emit mergeChanged();
+	emit mergeSourceChanged();
+	emit mergeSelectionChanged();
 }


@@ -293,9 +295,11 @@ void LabelModel::setMerge( merge::Merge* merge )
 		mMerge = merge;

 		connect( mMerge, SIGNAL(sourceChanged()), this, SLOT(onMergeSourceChanged()) );
+		connect( mMerge, SIGNAL(selectionChanged()), this, SLOT(onMergeSelectionChanged()) );

 		setModified();
 		
+		emit changed();
 		emit mergeChanged();
 		emit mergeSourceChanged();
 	}
@@ -431,6 +435,16 @@ void LabelModel::onMergeSourceChanged()
 }


+///
+/// Merge Selection Changed Slot
+///
+void LabelModel::onMergeSelectionChanged()
+{
+	emit changed();
+	emit mergeSelectionChanged();
+}
+
+
 ///
 /// Select Object
 ///