Merge branch 'release/1.1'

Doc/Examples/Tome Example Code Generation Project/CSharpEventClasses.texport

@@ -10,6 +10,7 @@
         <Mapping TomeType="Reference" ExportedType="string"/>
         <Mapping TomeType="String" ExportedType="string"/>
     </TypeMap>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Code Generation Project/CSharpEventDeserializer.texport

@@ -10,6 +10,7 @@
         <Mapping TomeType="Reference" ExportedType="String"/>
         <Mapping TomeType="String" ExportedType="String"/>
     </TypeMap>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Code Generation Project/CSharpEventSerializer.texport

@@ -10,6 +10,7 @@
         <Mapping TomeType="Reference" ExportedType="string"/>
         <Mapping TomeType="String" ExportedType="string"/>
     </TypeMap>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Code Generation Project/CSharpEventTypes.texport

@@ -10,6 +10,7 @@
         <Mapping TomeType="Reference" ExportedType="string"/>
         <Mapping TomeType="String" ExportedType="string"/>
     </TypeMap>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export CSV.texport

@@ -3,6 +3,7 @@
     <Name>Data (CSV)</Name>
     <FileExtension>.csv</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export HTML.texport

@@ -3,6 +3,7 @@
     <Name>Data (HTML)</Name>
     <FileExtension>.html</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export INI.texport

@@ -3,6 +3,7 @@
     <Name>Data (INI)</Name>
     <FileExtension>.ini</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export JSON.texport

@@ -3,6 +3,7 @@
     <Name>Data (JSON)</Name>
     <FileExtension>.json</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export Slash Framework XML.texport

@@ -19,6 +19,7 @@
         <Mapping TomeType="ShortString" ExportedType="System.String"/>
         <Mapping TomeType="String" ExportedType="System.String"/>
     </TypeMap>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export StarCraft II XML.texport

@@ -3,6 +3,7 @@
     <Name>Data (StarCraft II XML)</Name>
     <FileExtension>.xml</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Export YAML.texport

@@ -3,6 +3,7 @@
     <Name>Data (YAML)</Name>
     <FileExtension>.yaml</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Data Import CSV.timport

@@ -3,10 +3,13 @@
     <Name>Units (CSV)</Name>
     <SourceType>CSV</SourceType>
     <IdColumn>ID</IdColumn>
+    <DisplayNameColumn></DisplayNameColumn>
+    <EditorIconFieldIdColumn></EditorIconFieldIdColumn>
     <RootRecordId>Unit</RootRecordId>
     <ColumnMap>
         <Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
     </ColumnMap>
+    <StringReplacementMap/>
     <IgnoredIds>
         <Id>COMMENT</Id>
     </IgnoredIds>

Doc/Examples/Tome Example Data Project/Data Import GoogleSheets.timport

@@ -3,12 +3,15 @@
     <Name>Units (Google Sheets)</Name>
     <SourceType>GoogleSheets</SourceType>
     <IdColumn>ID</IdColumn>
+    <DisplayNameColumn></DisplayNameColumn>
+    <EditorIconFieldIdColumn></EditorIconFieldIdColumn>
     <RootRecordId>Unit</RootRecordId>
     <ColumnMap>
         <Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
         <Mapping ColumnName="Attack Range" FieldId="AttackRange"/>
         <Mapping ColumnName="Damage Type" FieldId="DamageType"/>
     </ColumnMap>
+    <StringReplacementMap/>
     <IgnoredIds>
         <Id>COMMENT</Id>
     </IgnoredIds>

Doc/Examples/Tome Example Data Project/Data Import XLSX.timport

@@ -3,10 +3,13 @@
     <Name>Units (XLSX)</Name>
     <SourceType>XLSX</SourceType>
     <IdColumn>ID</IdColumn>
+    <DisplayNameColumn></DisplayNameColumn>
+    <EditorIconFieldIdColumn></EditorIconFieldIdColumn>
     <RootRecordId>Unit</RootRecordId>
     <ColumnMap>
         <Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
     </ColumnMap>
+    <StringReplacementMap/>
     <IgnoredIds>
         <Id>COMMENT</Id>
     </IgnoredIds>

Doc/Examples/Tome Example Data Project/Localization Export CSV.texport

@@ -3,6 +3,7 @@
     <Name>Localization (CSV)</Name>
     <FileExtension>.csv</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Doc/Examples/Tome Example Data Project/Localization Export XLIFF.texport

@@ -3,6 +3,7 @@
     <Name>Localization (XLIFF 1.2)</Name>
     <FileExtension>.xlf</FileExtension>
     <TypeMap/>
+    <StringReplacementMap/>
     <IgnoredRecords/>
     <IgnoredFields/>
 </Template>

Project/Tome.pro

@@ -13,8 +13,8 @@ TEMPLATE = app
 
 # Expose application version in Windows property window and in application code.
 # http://www.openguru.com/2009/11/qt-best-way-to-set-application-version.html
-VERSION = 1.0
-VERSION_NAME = Phoenix
+VERSION = 1.1
+VERSION_NAME = Griffin
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 DEFINES += APP_VERSION_NAME=\\\"$$VERSION_NAME\\\"
 

Source/Tome/Core/mainwindow.cpp

@@ -898,55 +898,101 @@ void MainWindow::on_actionDuplicate_Record_triggered()
         this->duplicateRecordWindow = new DuplicateRecordWindow(this);
     }
 
-    const QVariant& recordId = this->recordTreeWidget->getSelectedRecordId();
-    const QVariantList recordIds = this->controller->getRecordsController().getRecordIds();
-
-    if (recordId.isNull())
-    {
-        return;
-    }
+    // Get selected record id.
+    const QVariantList& selectedRecordIds = this->recordTreeWidget->getSelectedRecordIds();
+    const QVariantList existingRecordIds = this->controller->getRecordsController().getRecordIds();
 
     // Check record id type.
     RecordIdType::RecordIdType recordIdType = this->controller->getProjectController().getProjectRecordIdType();
+
+    // Get new record id.
     DuplicateRecordCommand* command;
 
-    if (recordIdType == RecordIdType::String)
+    if (selectedRecordIds.count() <= 0)
     {
-        // Disallow all existing record ids.
-        this->duplicateRecordWindow->setRecordId(recordId.toString());
+        return;
+    }
+    else if (selectedRecordIds.count() == 1)
+    {
+        const QVariant& recordId = selectedRecordIds.first();
+
+        if (recordIdType == RecordIdType::String)
+        {
+            // Disallow all existing record ids.
+            this->duplicateRecordWindow->setRecordId(recordId.toString());
+
+            QStringList recordStringIds;
+            for (QVariant v : existingRecordIds)
+            {
+                recordStringIds << v.toString();
+            }
+
+            this->duplicateRecordWindow->setDisallowedRecordIds(recordStringIds);
+
+            // Show window.
+            int result = this->duplicateRecordWindow->exec();
 
-        QStringList recordStringIds;
-        for (QVariant v : recordIds)
+            if (result != QDialog::Accepted)
+            {
+                return;
+            }
+
+            const QString& newRecordId = this->duplicateRecordWindow->getRecordId();
+
+
+            command = new DuplicateRecordCommand(this->controller->getRecordsController(),
+                                                                         recordId,
+                                                                         newRecordId);
+        }
+        else
         {
-            recordStringIds << v.toString();
+            command = new DuplicateRecordCommand(this->controller->getRecordsController(),
+                                                                         recordId,
+                                                                         QVariant());
         }
 
-        this->duplicateRecordWindow->setDisallowedRecordIds(recordStringIds);
+        // Update model.
+        this->controller->getUndoController().doCommand(command);
+    }
+    else
+    {
+        const QString& question = tr("Are you sure you want to duplicate %1 records? Tome will automatically assign IDs for them.")
+                                  .arg(selectedRecordIds.count());
 
-        // Show window.
-        int result = this->duplicateRecordWindow->exec();
+        int answer = QMessageBox::question(
+                    this,
+                    tr("Duplicate Records"),
+                    question,
+                    QMessageBox::Yes,
+                    QMessageBox::No);
 
-        if (result != QDialog::Accepted)
+        if (answer != QMessageBox::Yes)
         {
             return;
         }
 
-        const QString& newRecordId = this->duplicateRecordWindow->getRecordId();
+        for (auto recordId : selectedRecordIds)
+        {
+            if (recordIdType == RecordIdType::String)
+            {
+                const QString& newRecordId = QString("%1New").arg(recordId.toString());
 
 
-        command = new DuplicateRecordCommand(this->controller->getRecordsController(),
-                                                                     recordId,
-                                                                     newRecordId);
-    }
-    else
-    {
-        command = new DuplicateRecordCommand(this->controller->getRecordsController(),
-                                                                     recordId,
-                                                                     QVariant());
-    }
+                command = new DuplicateRecordCommand(this->controller->getRecordsController(),
+                                                                             recordId,
+                                                                             newRecordId);
+            }
+            else
+            {
+                command = new DuplicateRecordCommand(this->controller->getRecordsController(),
+                                                                             recordId,
+                                                                             QVariant());
+            }
 
-    // Update model.
-    this->controller->getUndoController().doCommand(command);
+            // Update model.
+            this->controller->getUndoController().doCommand(command);
+        }
+    }
 }
 
 void MainWindow::on_actionRevert_Record_triggered()
@@ -1327,16 +1373,14 @@ void MainWindow::revertFieldValue()
     QVariant recordId = this->recordTreeWidget->getSelectedRecordId();
 
     // Get field to revert.
-    QModelIndexList selectedIndexes = this->recordFieldTableWidget->selectionModel()->selectedRows(0);
+    auto selectedItems = this->recordFieldTableWidget->selectedItems();
 
-    if (selectedIndexes.empty())
+    if (selectedItems.empty())
     {
         return;
     }
 
-    const RecordFieldValueMap fieldValues =
-            this->controller->getRecordsController().getRecordFieldValues(recordId);
-    const QString fieldId = fieldValues.keys()[selectedIndexes.first().row()];
+    const QString fieldId = selectedItems.first()->data(Qt::UserRole).toString();
 
     // Get inherited field value.
     QVariant valueToRevertTo = this->controller->getRecordsController().getInheritedFieldValue(recordId, fieldId);
@@ -1694,8 +1738,6 @@ void MainWindow::onRecordUpdated(const QVariant& oldId,
                                  const QString& newDisplayName,
                                  const QString& newEditorIconFieldId)
 {
-    Q_UNUSED(oldDisplayName)
-
     // Update view.
     this->recordTreeWidget->updateRecord(oldId, oldDisplayName, oldEditorIconFieldId, newId, newDisplayName, newEditorIconFieldId);
     this->refreshRecordTable();

Source/Tome/Features/Export/Controller/exportcontroller.cpp

@@ -345,6 +345,14 @@ void ExportController::exportRecords(const RecordExportTemplate& exportTemplate,
                     }
                 }
 
+                // Apply string replacement.
+                for (auto itStringReplacementMap = exportTemplate.stringReplacementMap.cbegin();
+                     itStringReplacementMap != exportTemplate.stringReplacementMap.cend();
+                     ++itStringReplacementMap)
+                {
+                    fieldValueText = fieldValueText.replace(itStringReplacementMap.key(), itStringReplacementMap.value());
+                }
+
                 // Store for later use.
                 fieldValueTexts[fieldId] = fieldValueText;
             }

Source/Tome/Features/Export/Controller/exporttemplateserializer.cpp

@@ -22,6 +22,9 @@ const QString ExportTemplateSerializer::ElementIgnoredFields = "IgnoredFields";
 const QString ExportTemplateSerializer::ElementIgnoredRecords = "IgnoredRecords";
 const QString ExportTemplateSerializer::ElementMapping = "Mapping";
 const QString ExportTemplateSerializer::ElementName = "Name";
+const QString ExportTemplateSerializer::ElementReplaceWith = "ReplaceWith";
+const QString ExportTemplateSerializer::ElementString = "String";
+const QString ExportTemplateSerializer::ElementStringReplacementMap = "StringReplacementMap";
 const QString ExportTemplateSerializer::ElementTemplate = "Template";
 const QString ExportTemplateSerializer::ElementTypeMap = "TypeMap";
 
@@ -91,6 +94,21 @@ void ExportTemplateSerializer::serialize(QIODevice& device, const RecordExportTe
             }
             writer.writeEndElement();
 
+            // Write string replacement map.
+            writer.writeStartElement(ElementStringReplacementMap);
+            {
+                for (auto itStringReplacementMap = exportTemplate.stringReplacementMap.cbegin();
+                     itStringReplacementMap != exportTemplate.stringReplacementMap.cend();
+                     ++itStringReplacementMap)
+                {
+                    writer.writeStartElement(ElementMapping);
+                    writer.writeTextElement(ElementString, itStringReplacementMap.key());
+                    writer.writeTextElement(ElementReplaceWith, itStringReplacementMap.value());
+                    writer.writeEndElement();
+                }
+            }
+            writer.writeEndElement();
+
             // Write ignore lists.
             writer.writeStartElement(ElementIgnoredRecords);
             {
@@ -163,6 +181,26 @@ void ExportTemplateSerializer::deserialize(QIODevice& device, RecordExportTempla
             }
             reader.readEndElement();
 
+            // Read string replacement map.
+            if (reader.isAtElement(ElementStringReplacementMap))
+            {
+                reader.readStartElement(ElementStringReplacementMap);
+                {
+                    while (reader.isAtElement(ElementMapping))
+                    {
+                        reader.readStartElement(ElementMapping);
+                        {
+                            QString stringReplacementKey = reader.readTextElement(ElementString);
+                            QString stringReplacementValue = reader.readTextElement(ElementReplaceWith);
+
+                            exportTemplate.stringReplacementMap.insert(stringReplacementKey, stringReplacementValue);
+                        }
+                        reader.readEndElement();
+                    }
+                }
+                reader.readEndElement();
+            }
+
             // Read ignore lists.
             reader.readStartElement(ElementIgnoredRecords);
             {