Finished fleshing out MergeView for now.

2016-05-14 13:25:24 -04:00
parent efb4e56e74
commit 73b7475cbc
7 changed files with 111 additions and 34 deletions
@@ -60,6 +60,8 @@ private slots:
 	void onMergeSourceChanged();
 	void onMergeSelectionChanged();

+	void onFormatComboActivated();
+	void onLocationButtonClicked();
 	void onSelectAllButtonClicked();
 	void onUnselectAllButtonClicked();
 	void onCellChanged( int iRow, int iCol );
@@ -79,13 +81,16 @@ private:
 private:
 	QStringList  mMergeFormatNames;
 	
-	LabelModel*  mModel;
+	LabelModel*    mModel;
 	UndoRedoModel* mUndoRedoModel;

 	QStringList mKeys;
 	QString     mPrimaryKey;

+	QString mCwd;
+
 	bool mBlock;
+	int  mOldFormatComboIndex;

 };