Skip to content

Commit

Permalink
Merge branch 'release/0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
npruehs committed Dec 29, 2016
2 parents fd10499 + bbc5ae2 commit f474567
Show file tree
Hide file tree
Showing 268 changed files with 5,461 additions and 827 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportAsTable="true" ExportLeafs="true">
<Name>CSV</Name>
<Name>Data (CSV)</Name>
<FileExtension>.csv</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Unit;Acceleration;Allowed Targets;Armor Type;Attack Damage;Attack Range;Cooldown;Damage Type;Health;Health Regeneration;Invulnerable;Mana;Mana Regeneration;Mass;Movement Speed;Name;Projectile;Rotation Speed;Sight Radius;Sprite;Sprite Color
Unit;Acceleration;Allowed Targets;Armor Type;Attack Damage;Attack Range;Cooldown;Damage Type;Health;Health Regeneration;Invulnerable;Mana;Mana Regeneration;Mass;Movement Speed;Name;Projectile;Projectile Base;Resource Costs;Rotation Speed;Sight Radius;Sprite;Sprite Color
$RECORDS$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportAsTable="true" ExportLeafs="true">
<Name>HTML</Name>
<Name>Data (HTML)</Name>
<FileExtension>.html</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
<th>Movement Speed</th>
<th>Name</th>
<th>Projectile</th>
<th>Projectile base</th>
<th>Resource Costs</th>
<th>Rotation Speed</th>
<th>Sight Radius</th>
<th>Sprite</th>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<td>
$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$
</td>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true">
<Name>INI</Name>
<Name>Data (INI)</Name>
<FileExtension>.ini</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$FIELD_ID$=$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true">
<Name>JSON</Name>
<Name>Data (JSON)</Name>
<FileExtension>.json</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"$FIELD_ID$": "$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true">
<Name>Slash XML</Name>
<Name>Data (Slash Framework XML)</Name>
<FileExtension>.blueprints.xml</FileExtension>
<TypeMap>
<Mapping TomeType="Armor Type" ExportedType="FantasyGame.Data.ArmorType"/>
Expand All @@ -9,8 +9,14 @@
<Mapping TomeType="Damage Type" ExportedType="FantasyGame.Data.DamageType"/>
<Mapping TomeType="Integer" ExportedType="System.Int32"/>
<Mapping TomeType="Movement Type" ExportedType="FantasyGame.Data.MovementType"/>
<Mapping TomeType="Movement Types" ExportedType="FantasyGame.Data.MovementType"/>
<Mapping TomeType="NonNegativeInteger" ExportedType="System.Int32"/>
<Mapping TomeType="NonNegativeReal" ExportedType="System.Single"/>
<Mapping TomeType="ProjectileReference" ExportedType="System.String"/>
<Mapping TomeType="Real" ExportedType="System.Single"/>
<Mapping TomeType="Reference" ExportedType="System.String"/>
<Mapping TomeType="Resource" ExportedType="FantasyGame.Data.ResourceType"/>
<Mapping TomeType="ShortString" ExportedType="System.String"/>
<Mapping TomeType="String" ExportedType="System.String"/>
</TypeMap>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Attribute keyType="System.String" valueType="Slash.Serialization.Xml.SerializableDictionary`2[[$KEY_TYPE$, $VALUE_TYPE$]]">
<Key>$FIELD_ID$</Key>
<Value>
<SerializableDictionary>
$FIELD_VALUE$
</SerializableDictionary>
</Value>
</Attribute>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<item>
<key>$FIELD_KEY$</key>
<value>$FIELD_VALUE$</value>
</item>
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<Attribute keyType="System.String" valueType="$FIELD_TYPE$">
<Key>$FIELD_ID$</Key>
<Value>
$FIELD_VALUE$
</Value>
<Value>$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$</Value>
</Attribute>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true">
<Name>StarCraft II XML</Name>
<Name>Data (StarCraft II XML)</Name>
<FileExtension>.xml</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<$FIELD_ID$ value="$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$"/>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true">
<Name>YAML</Name>
<Name>Data (YAML)</Name>
<FileExtension>.yaml</FileExtension>
<TypeMap/>
<IgnoredRecords/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- $FIELD_ID$: $RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$
14 changes: 14 additions & 0 deletions Doc/Examples/Tome Example Data Project/Data Import CSV.timport
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="1">
<Name>Units (CSV)</Name>
<SourceType>CSV</SourceType>
<IdColumn>ID</IdColumn>
<RootRecordId>Unit</RootRecordId>
<ColumnMap>
<Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
</ColumnMap>
<IgnoredIds>
<Id>COMMENT</Id>
</IgnoredIds>
<Parameters/>
</Template>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="1">
<Name>Units (Google Sheets)</Name>
<SourceType>GoogleSheets</SourceType>
<IdColumn>ID</IdColumn>
<RootRecordId>Unit</RootRecordId>
<ColumnMap>
<Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
</ColumnMap>
<IgnoredIds>
<Id>COMMENT</Id>
</IgnoredIds>
<Parameters/>
</Template>
16 changes: 16 additions & 0 deletions Doc/Examples/Tome Example Data Project/Data Import XLSX.timport
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="1">
<Name>Units (XLSX)</Name>
<SourceType>XLSX</SourceType>
<IdColumn>ID</IdColumn>
<RootRecordId>Unit</RootRecordId>
<ColumnMap>
<Mapping ColumnName="Attack Damage" FieldId="AttackDamage"/>
</ColumnMap>
<IgnoredIds>
<Id>COMMENT</Id>
</IgnoredIds>
<Parameters>
<Parameter Key="Sheet" Value="Sheet1"/>
</Parameters>
</Template>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ID;Health;Attack Damage
Archer;50;5
COMMENT;;
Ogre;110;19
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true" ExportLocalizedFieldsOnly="true">
<Name>Localization (CSV)</Name>
<FileExtension>.csv</FileExtension>
<TypeMap/>
<IgnoredRecords/>
<IgnoredFields/>
</Template>
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ID;Source Language;Target Language
$RECORDS$
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$RECORD_FIELDS$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$;$FIELD_VALUE$;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Template Version="2" ExportLeafs="true" ExportLocalizedFieldsOnly="true">
<Name>Localization (XLIFF 1.2)</Name>
<FileExtension>.xlf</FileExtension>
<TypeMap/>
<IgnoredRecords/>
<IgnoredFields/>
</Template>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<xliff version='1.2' xmlns='urn:oasis:names:tc:xliff:document:1.2'>
<file original='Tome Example Data Project' source-language='en' target-language='de' datatype='plaintext'>
<body>
$RECORDS$
</body>
</file>
</xliff>
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$RECORD_FIELDS$
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<trans-unit id='$RECORD_ROOT$.$RECORD_ID$.$FIELD_ID$'>
<source>$FIELD_VALUE$</source>
<target></target>
</trans-unit>
1 change: 0 additions & 1 deletion Doc/Examples/Tome Example Data Project/Slash XML.texportmi

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<TomeProject Version="4">
<TomeProject Version="5">
<Name>Tome Example Data Project</Name>
<Locale>en_US</Locale>
<Components>
Expand All @@ -12,15 +12,22 @@
<Path>Tome Example Data Project.tdata</Path>
</Records>
<RecordExportTemplates>
<Path>CSV.texport</Path>
<Path>HTML.texport</Path>
<Path>INI.texport</Path>
<Path>JSON.texport</Path>
<Path>Slash XML.texport</Path>
<Path>StarCraft II XML.texport</Path>
<Path>YAML.texport</Path>
<Path>Data Export CSV.texport</Path>
<Path>Data Export HTML.texport</Path>
<Path>Data Export INI.texport</Path>
<Path>Data Export JSON.texport</Path>
<Path>Data Export Slash Framework XML.texport</Path>
<Path>Data Export StarCraft II XML.texport</Path>
<Path>Data Export YAML.texport</Path>
<Path>Localization Export CSV.texport</Path>
<Path>Localization Export XLIFF.texport</Path>
</RecordExportTemplates>
<Types>
<Path>Tome Example Data Project.ttypes</Path>
</Types>
<RecordImportTemplates>
<Path>Data Import CSV.timport</Path>
<Path>Data Import GoogleSheets.timport</Path>
<Path>Data Import XLSX.timport</Path>
</RecordImportTemplates>
</TomeProject>
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<FundamentalFacet Key="BaseType" Value="String"/>
</FundamentalFacets>
<ConstrainingFacets>
<ConstrainingFacet Key="Localized" Value="true"/>
<ConstrainingFacet Key="MaxLength" Value="64"/>
</ConstrainingFacets>
</Type>
Expand Down
Binary file modified Doc/Manual/Images/CustomTypes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/Manual/Images/ProjectOverview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/Manual/Images/ReadOnlyRecords.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Doc/Manual/Images/WindowOverview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Media/Icons/NavigateBackwards_6270.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Media/Icons/NavigateForward_6271.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Media/Icons/Redo_16x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Media/Icons/Undo_16x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 73 additions & 5 deletions Project/Tome.pro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
#-------------------------------------------------

QT += core gui
QT += core gui network sql

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

Expand All @@ -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 = 0.7
VERSION_NAME = Manticore
VERSION = 0.8
VERSION_NAME = Pegasus
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += APP_VERSION_NAME=\\\"$$VERSION_NAME\\\"

Expand Down Expand Up @@ -118,7 +118,40 @@ SOURCES += ../Source/Tome/main.cpp \
../Source/Tome/Features/Diagnostics/Controller/filemessagehandler.cpp \
../Source/Tome/Features/Diagnostics/View/outputdockwidget.cpp \
../Source/Tome/Features/Types/View/derivedtypewindow.cpp \
../Source/Tome/Features/Integrity/Controller/typefacetviolatedtask.cpp
../Source/Tome/Features/Integrity/Controller/typefacetviolatedtask.cpp \
../Source/Tome/Features/Records/Controller/Commands/updaterecordfieldvaluecommand.cpp \
../Source/Tome/Features/Undo/Controller/undocontroller.cpp \
../Source/Tome/Features/Components/Controller/Commands/addcomponentcommand.cpp \
../Source/Tome/Features/Components/Controller/Commands/removecomponentcommand.cpp \
../Source/Tome/Features/Fields/Controller/Commands/addfielddefinitioncommand.cpp \
../Source/Tome/Features/Fields/Controller/Commands/removefielddefinitioncommand.cpp \
../Source/Tome/Features/Fields/Controller/Commands/updatefielddefinitioncommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/addderivedtypecommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/addenumerationcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/addlistcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/addmapcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/removederivedtypecommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/removeenumerationcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/removelistcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/removemapcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/updatederivedtypecommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/updateenumerationcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/updatelistcommand.cpp \
../Source/Tome/Features/Types/Controller/Commands/updatemapcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/addrecordcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/updaterecordcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/duplicaterecordcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/revertrecordcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/reparentrecordcommand.cpp \
../Source/Tome/Features/Records/Controller/Commands/removerecordcommand.cpp \
../Source/Tome/Features/Import/Model/recordtableimporttemplate.cpp \
../Source/Tome/Features/Import/Controller/importcontroller.cpp \
../Source/Tome/Features/Import/Controller/recorddatasource.cpp \
../Source/Tome/Features/Import/Controller/csvrecorddatasource.cpp \
../Source/Tome/Features/Import/Controller/xlsxrecorddatasource.cpp \
../Source/Tome/Features/Import/Controller/googlesheetsrecorddatasource.cpp \
../Source/Tome/Features/Import/Controller/importtemplateserializer.cpp \
../Source/Tome/Features/Facets/Controller/localizedstringfacet.cpp

HEADERS += ../Source/Tome/Core/mainwindow.h \
../Source/Tome/Features/Types/Model/builtintype.h \
Expand Down Expand Up @@ -227,7 +260,42 @@ HEADERS += ../Source/Tome/Core/mainwindow.h \
../Source/Tome/Features/Diagnostics/Controller/filemessagehandler.h \
../Source/Tome/Features/Diagnostics/View/outputdockwidget.h \
../Source/Tome/Features/Types/View/derivedtypewindow.h \
../Source/Tome/Features/Integrity/Controller/typefacetviolatedtask.h
../Source/Tome/Features/Integrity/Controller/typefacetviolatedtask.h \
../Source/Tome/Features/Records/Controller/Commands/updaterecordfieldvaluecommand.h \
../Source/Tome/Features/Undo/Controller/undocontroller.h \
../Source/Tome/Features/Components/Controller/Commands/addcomponentcommand.h \
../Source/Tome/Features/Components/Controller/Commands/removecomponentcommand.h \
../Source/Tome/Features/Fields/Controller/Commands/addfielddefinitioncommand.h \
../Source/Tome/Features/Fields/Controller/Commands/removefielddefinitioncommand.h \
../Source/Tome/Features/Fields/Controller/Commands/updatefielddefinitioncommand.h \
../Source/Tome/Features/Types/Controller/Commands/addderivedtypecommand.h \
../Source/Tome/Features/Types/Controller/Commands/addenumerationcommand.h \
../Source/Tome/Features/Types/Controller/Commands/addlistcommand.h \
../Source/Tome/Features/Types/Controller/Commands/addmapcommand.h \
../Source/Tome/Features/Types/Controller/Commands/removederivedtypecommand.h \
../Source/Tome/Features/Types/Controller/Commands/removeenumerationcommand.h \
../Source/Tome/Features/Types/Controller/Commands/removelistcommand.h \
../Source/Tome/Features/Types/Controller/Commands/removemapcommand.h \
../Source/Tome/Features/Types/Controller/Commands/updatederivedtypecommand.h \
../Source/Tome/Features/Types/Controller/Commands/updateenumerationcommand.h \
../Source/Tome/Features/Types/Controller/Commands/updatelistcommand.h \
../Source/Tome/Features/Types/Controller/Commands/updatemapcommand.h \
../Source/Tome/Features/Records/Controller/Commands/addrecordcommand.h \
../Source/Tome/Features/Records/Controller/Commands/updaterecordcommand.h \
../Source/Tome/Features/Records/Controller/Commands/duplicaterecordcommand.h \
../Source/Tome/Features/Records/Controller/Commands/revertrecordcommand.h \
../Source/Tome/Features/Records/Controller/Commands/reparentrecordcommand.h \
../Source/Tome/Features/Records/Controller/Commands/removerecordcommand.h \
../Source/Tome/Features/Import/Model/recordtableimporttemplate.h \
../Source/Tome/Features/Import/Model/tabletype.h \
../Source/Tome/Features/Import/Model/recordtableimporttemplatelist.h \
../Source/Tome/Features/Import/Controller/importcontroller.h \
../Source/Tome/Features/Import/Controller/recorddatasource.h \
../Source/Tome/Features/Import/Controller/csvrecorddatasource.h \
../Source/Tome/Features/Import/Controller/xlsxrecorddatasource.h \
../Source/Tome/Features/Import/Controller/googlesheetsrecorddatasource.h \
../Source/Tome/Features/Import/Controller/importtemplateserializer.h \
../Source/Tome/Features/Facets/Controller/localizedstringfacet.h

FORMS += ../Source/Tome/Core/mainwindow.ui \
../Source/Tome/Features/Help/View/aboutwindow.ui \
Expand Down
4 changes: 4 additions & 0 deletions Project/tome.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,9 @@
<file>../Media/Icons/lock_16xLG.png</file>
<file>../Media/Icons/Find_5650.png</file>
<file>../Media/Icons/Output_16xLG.png</file>
<file>../Media/Icons/Redo_16x.png</file>
<file>../Media/Icons/Undo_16x.png</file>
<file>../Media/Icons/NavigateBackwards_6270.png</file>
<file>../Media/Icons/NavigateForward_6271.png</file>
</qresource>
</RCC>
Loading

0 comments on commit f474567

Please sign in to comment.