Merge branch 'master' into esxSelector

apps/opencs/model/tools/birthsigncheck.cpp

@@ -19,7 +19,12 @@ int CSMTools::BirthsignCheckStage::setup()
 
 void CSMTools::BirthsignCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::BirthSign& birthsign = mBirthsigns.getRecord (stage).get();
+    const CSMWorld::Record<ESM::BirthSign>& record = mBirthsigns.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::BirthSign& birthsign = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Birthsign, birthsign.mId);
 

apps/opencs/model/tools/classcheck.cpp

@@ -20,7 +20,12 @@ int CSMTools::ClassCheckStage::setup()
 
 void CSMTools::ClassCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Class& class_= mClasses.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Class>& record = mClasses.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Class& class_ = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Class, class_.mId);
 

apps/opencs/model/tools/factioncheck.cpp

@@ -20,7 +20,12 @@ int CSMTools::FactionCheckStage::setup()
 
 void CSMTools::FactionCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Faction& faction = mFactions.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Faction>& record = mFactions.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Faction& faction = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Faction, faction.mId);
 

apps/opencs/model/tools/racecheck.cpp

@@ -9,7 +9,12 @@
 
 void CSMTools::RaceCheckStage::performPerRecord (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Race& race = mRaces.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Race& race = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Race, race.mId);
 

apps/opencs/model/tools/regioncheck.cpp

@@ -19,7 +19,12 @@ int CSMTools::RegionCheckStage::setup()
 
 void CSMTools::RegionCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Region& region = mRegions.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Region>& record = mRegions.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Region& region = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Region, region.mId);
 

apps/opencs/model/tools/skillcheck.cpp

@@ -18,7 +18,12 @@ int CSMTools::SkillCheckStage::setup()
 
 void CSMTools::SkillCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Skill& skill = mSkills.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Skill>& record = mSkills.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Skill& skill = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Skill, skill.mId);
 

apps/opencs/model/tools/soundcheck.cpp

@@ -18,7 +18,12 @@ int CSMTools::SoundCheckStage::setup()
 
 void CSMTools::SoundCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Sound& sound = mSounds.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Sound>& record = mSounds.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Sound& sound = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Sound, sound.mId);
 

apps/opencs/model/tools/spellcheck.cpp

@@ -19,7 +19,12 @@ int CSMTools::SpellCheckStage::setup()
 
 void CSMTools::SpellCheckStage::perform (int stage, std::vector<std::string>& messages)
 {
-    const ESM::Spell& spell = mSpells.getRecord (stage).get();
+    const CSMWorld::Record<ESM::Spell>& record = mSpells.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    const ESM::Spell& spell = record.get();
 
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Spell, spell.mId);
 

apps/opencs/model/world/universalid.cpp

@@ -43,18 +43,18 @@ namespace
 
     static const TypeData sIdArg[] =
     {
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", 0 },
-        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", 0 },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable", ":./globvar.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Gmst, "Game Setting", ":./GMST.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Skill, "Skill", ":./skill.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class", ":./class.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction", ":./faction.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race", ":./race.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound", ":./sound.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Script, "Script", ":./script.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Region, "Region", ":./land.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Birthsign, "Birthsign", ":./birthsign.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Spell, "Spell", ":./spell.png" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Cell, "Cell", ":./cell.png" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Referenceable, "Referenceables", 0 },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Activator, "Activator", ":./activator.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Potion, "Potion", ":./potion.png" },
@@ -80,7 +80,7 @@ namespace
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Static, "Static", ":./static.png" },
         { CSMWorld::UniversalId::Class_RefRecord, CSMWorld::UniversalId::Type_Weapon, "Weapon", ":./weapon.png" },
         { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Reference, "Reference", 0 },
-        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Filter, "Filter", 0 },
+        { CSMWorld::UniversalId::Class_SubRecord, CSMWorld::UniversalId::Type_Filter, "Filter", ":./filter.png" },
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
     };
 

credits.txt

@@ -62,6 +62,7 @@ Roman Proskuryakov (humbug)
 Sandy Carter (bwrsandman)
 Sebastian Wick (swick)
 Sergey Shambir
+sir_herrbatka
 Sylvain Thesnieres (Garvek)
 Tom Mason (wheybags)
 Torben Leif Carrington (TorbenC)

files/opencs/resources.qrc

@@ -1,30 +1,61 @@
 <RCC>
     <qresource prefix="/">
         <file>opencs.png</file>
-        <file>added.png</file>
-        <file>modified.png</file>
-        <file>removed.png</file>
-        <file>base.png</file>
         <file>activator.png</file>
-        <file>apparatus.png</file>
-        <file>armor.png</file>
-        <file>book.png</file>
-        <file>clothing.png</file>
-        <file>container.png</file>
-        <file>creature.png</file>
-        <file>door.png</file>
-        <file>ingredient.png</file>
-        <file>leveled-creature.png</file>
-        <file>leveled-item.png</file>
-        <file>light.png</file>
-        <file>lockpick.png</file>
-        <file>miscellaneous.png</file>
-        <file>npc.png</file>
-        <file>potion.png</file>
-        <file>probe.png</file>
-        <file>repair.png</file>
-        <file>static.png</file>
-        <file>weapon.png</file>
+	<file>added.png</file>
+	<file>apparatus.png</file>
+	<file>armor.png</file>
+	<file>attribute.png</file>
+	<file>base.png</file>
+	<file>birthsign.png</file>
+	<file>body-part.png</file>
+	<file>book.png</file>
+	<file>cell.png</file>
+	<file>class.png</file>
+	<file>clothing.png</file>
+	<file>container.png</file>
+	<file>creature.png</file>
+	<file>dialogoue-info.png</file>
+	<file>dialogoue-journal.png</file>
+	<file>dialogoue-regular.png</file>
+	<file>dialogue-greeting.png</file>
+	<file>dialogue-persuasion.png</file>
+	<file>dialogue-speech.png</file>
+	<file>door.png</file>
+	<file>enchantment.png</file>
+	<file>faction.png</file>
+	<file>filter.png</file>
+	<file>globvar.png</file>
+	<file>GMST.png</file>
+	<file>Info.png</file>
+	<file>ingredient.png</file>
+	<file>landpaint.png</file>
+	<file>land.png</file>
+	<file>LandTexture.png</file>
+	<file>leveled-creature.png</file>
+	<file>light.png</file>
+	<file>lockpick.png</file>
+	<file>magic-effect.png</file>
+	<file>magicrabbit.png</file>
+	<file>map.png</file>
+	<file>miscellaneous.png</file>
+	<file>modified.png</file>
+	<file>npc.png</file>
+	<file>PathGrid.png</file>
+	<file>potion.png</file>
+	<file>probe.png</file>
+	<file>race.png</file>
+	<file>random-item.png</file>
+	<file>random.png</file>
+	<file>removed.png</file>
+	<file>repair.png</file>
+	<file>script.png</file>
+	<file>skill.png</file>
+	<file>soundgen.png</file>
+	<file>sound.png</file>
+	<file>spell.png</file>
+	<file>static.png</file>
+	<file>weapon.png</file>
         <file alias="startup/create-addon">raster/startup/big/create-addon.png</file>
         <file alias="startup/create-game">raster/startup/big/new-game.png</file>
         <file alias="startup/edit-content">raster/startup/big/edit-content.png</file>

issue912

@@ -0,0 +1 @@
+branch for issue912