diff --git a/mapeditor/inspector/inspector.cpp b/mapeditor/inspector/inspector.cpp index 570ac85ff..529aee69d 100644 --- a/mapeditor/inspector/inspector.cpp +++ b/mapeditor/inspector/inspector.cpp @@ -36,15 +36,6 @@ #include "PickObjectDelegate.h" #include "../mapcontroller.h" -static QList> CharacterIdentifiers -{ - {QObject::tr("Compliant"), QVariant::fromValue(int(CGCreature::Character::COMPLIANT))}, - {QObject::tr("Friendly"), QVariant::fromValue(int(CGCreature::Character::FRIENDLY))}, - {QObject::tr("Aggressive"), QVariant::fromValue(int(CGCreature::Character::AGGRESSIVE))}, - {QObject::tr("Hostile"), QVariant::fromValue(int(CGCreature::Character::HOSTILE))}, - {QObject::tr("Savage"), QVariant::fromValue(int(CGCreature::Character::SAVAGE))}, -}; - //===============IMPLEMENT OBJECT INITIALIZATION FUNCTIONS================ Initializer::Initializer(CGObjectInstance * o, const PlayerColor & pl) : defaultPlayer(pl) { @@ -429,7 +420,7 @@ void Inspector::updateProperties(CGCreature * o) addProperty(reusedTr[MESSAGE], o->message, false); { //Character auto * delegate = new InspectorDelegate; - delegate->options = CharacterIdentifiers; + delegate->options = characterIdentifiers; addProperty(reusedTr[CHARACTER], (CGCreature::Character)o->character, delegate, false); } addProperty(reusedTr[NEVER_FLEES], o->neverFlees, false); @@ -902,7 +893,7 @@ QTableWidgetItem * Inspector::addProperty(CGCreature::Character value) item->setFlags(Qt::NoItemFlags); item->setData(Qt::UserRole, QVariant::fromValue(int(value))); - for(auto & i : CharacterIdentifiers) + for(auto & i : characterIdentifiers) { if(i.second.toInt() == value) { @@ -953,6 +944,14 @@ Inspector::Inspector(MapController & c, CGObjectInstance * o, QTableWidget * t): { REPEAT_QUEST, QObject::tr("Repeat quest") }, { TIME_LIMIT, QObject::tr("Time limit") }, }; + + characterIdentifiers = { + { QObject::tr("Compliant"), QVariant::fromValue(int(CGCreature::Character::COMPLIANT)) }, + { QObject::tr("Friendly"), QVariant::fromValue(int(CGCreature::Character::FRIENDLY)) }, + { QObject::tr("Aggressive"), QVariant::fromValue(int(CGCreature::Character::AGGRESSIVE)) }, + { QObject::tr("Hostile"), QVariant::fromValue(int(CGCreature::Character::HOSTILE)) }, + { QObject::tr("Savage"), QVariant::fromValue(int(CGCreature::Character::SAVAGE)) }, + }; } /* diff --git a/mapeditor/inspector/inspector.h b/mapeditor/inspector/inspector.h index 3340caf85..cbdbddbd6 100644 --- a/mapeditor/inspector/inspector.h +++ b/mapeditor/inspector/inspector.h @@ -66,6 +66,7 @@ class Inspector // multiple times used translation strings enum ReusedKey { ARMY, OWNER, SAME_AS_TOWN, REMOVABLE_UNITS, PLACEHOLDER_TYPE, POWER_RANK, HERO_TYPE, EXPERIENCE, MALE, FEMALE, GENDER, NAME, BIOGRAPHY, SPELLS, NO_PATROL, PATROL_RADIUS, TOWN_NAME, MESSAGE, SPELL, PRODUCTIVITY, AMOUNT, CHARACTER, NEVER_FLEES, NOT_GROWING, REWARD, REMOVE_AFTER, HUMAN_TRIGGER, CPU_TRIGGER, FIRST_VISIT_TEXT, NEXT_VISIT_TEXT, COMPLETED_TEXT, REPEAT_QUEST, TIME_LIMIT }; QHash reusedTr; + QList> characterIdentifiers; protected: struct PropertyEditorPlaceholder {}; diff --git a/mapeditor/translation/chinese.ts b/mapeditor/translation/chinese.ts index 4e7a19745..3f2a37627 100644 --- a/mapeditor/translation/chinese.ts +++ b/mapeditor/translation/chinese.ts @@ -1102,293 +1102,293 @@ 高级 - + Compliant 屈服的 - + Friendly 友善的 - + Aggressive 好斗的 - + Hostile 有敌意的 - + Savage 野蛮的 - - - + + + No patrol 无巡逻 - + POWER RANK - + HERO TYPE - + Hero class - + Portrait 头像 - + Skills 技能 - + Artifacts 宝物 - - + + %n tile(s) %n格 - + Buildings 建筑 - + Events 事件 - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral 中立 - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells 魔法 - + Patrol radius - + Town name - + Message 消息 - + Spell 魔法 - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward 奖励 - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE 没有旗帜 diff --git a/mapeditor/translation/czech.ts b/mapeditor/translation/czech.ts index eaaa3da33..7a4e8f4d2 100644 --- a/mapeditor/translation/czech.ts +++ b/mapeditor/translation/czech.ts @@ -1102,70 +1102,70 @@ Expert - + Compliant Ochotná - + Friendly Přátelská - + Aggressive Agresivní - + Hostile Nepřátelská - + Savage Brutální - - - + + + No patrol Bez hlídky - + POWER RANK - + HERO TYPE - + Hero class - + Portrait Portrét - + Skills Dovednosti - + Artifacts Artefakty - - + + %n tile(s) %n pole @@ -1174,223 +1174,223 @@ - + Buildings Budovy - + Events Události - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral neutrální - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Kouzla - + Patrol radius - + Town name - + Message Zpráva - + Spell Kouzlo - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward Odměna - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE NEOZNAČITELNÝ diff --git a/mapeditor/translation/english.ts b/mapeditor/translation/english.ts index cf7f314b6..a3f8bfa49 100644 --- a/mapeditor/translation/english.ts +++ b/mapeditor/translation/english.ts @@ -1102,70 +1102,70 @@ - + Compliant - + Friendly - + Aggressive - + Hostile - + Savage - - - + + + No patrol - + POWER RANK - + HERO TYPE - + Hero class - + Portrait - + Skills - + Artifacts - - + + %n tile(s) @@ -1173,223 +1173,223 @@ - + Buildings - + Events - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells - + Patrol radius - + Town name - + Message - + Spell - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE diff --git a/mapeditor/translation/french.ts b/mapeditor/translation/french.ts index 1b0c89b5c..8e4e9f946 100644 --- a/mapeditor/translation/french.ts +++ b/mapeditor/translation/french.ts @@ -1102,70 +1102,70 @@ Expert - + Compliant Compérhensif - + Friendly Amical - + Aggressive Aggressif - + Hostile Hostile - + Savage Sauvage - - - + + + No patrol - + POWER RANK - + HERO TYPE - + Hero class - + Portrait Portrait - + Skills - + Artifacts - - + + %n tile(s) @@ -1173,223 +1173,223 @@ - + Buildings Bâtiments - + Events Événements - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral neutre - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Sorts - + Patrol radius - + Town name - + Message Message - + Spell Sort - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward Récompense - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE INCLASSABLE diff --git a/mapeditor/translation/german.ts b/mapeditor/translation/german.ts index 6a8e390ba..247a9ef37 100644 --- a/mapeditor/translation/german.ts +++ b/mapeditor/translation/german.ts @@ -1102,70 +1102,70 @@ Experte - + Compliant Konform - + Friendly Freundlich - + Aggressive Aggressiv - + Hostile Feindlich - + Savage Wild - - - + + + No patrol Keine Streife - + POWER RANK STÄRKE RANG - + HERO TYPE HELDENTYP - + Hero class Heldenklasse - + Portrait Porträt - + Skills Fertigkeiten - + Artifacts Artefakte - - + + %n tile(s) %n Kachel @@ -1173,223 +1173,223 @@ - + Buildings Gebäude - + Events Ereignisse - + Resource Ressource - + Artifact reward Artefakt-Belohnung - + Quest Aufgabe - + Identifier Identifier - + ID ID - + SubID SubID - + InstanceName InstanzName - + IsStatic IstStatisch - - + + neutral neutral - + Army Armee - + Owner Besitzer - + Same as town Wie die Stadt - + Removable units Entfernbare Einheiten - + Placeholder type Platzhalter-Typ - + Power rank Stärke Rang - + Hero type Helden-Typ - + Experience Erfahrung - + MALE MÄNNLICH - + FEMALE WEIBLICH - + Gender Geschlecht - + Name Name - + Biography Biografie - + Spells Zaubersprüche - + Patrol radius Patrouillenradius - + Town name Stadtname - + Message Nachricht - + Spell Zauberspruch - + Productivity Produktivität - + Amount Menge - + Character Charakter - + Never flees Flieht niemals - + Not growing Wächst nicht - + Reward Belohnung - + Remove after Nach Entfernen - + Human trigger Menschlich-Auslöser - + Cpu trigger CPU-Auslöser - + First visit text Erster Besuch Text - + Next visit text Nächster Besuch Text - + Completed text Abgeschlossener Text - + Repeat quest Wiederhole Quest - + Time limit Zeitlimit - + UNFLAGGABLE UNFLAGGBAR diff --git a/mapeditor/translation/polish.ts b/mapeditor/translation/polish.ts index 152c4fb3d..5b4bf3a2c 100644 --- a/mapeditor/translation/polish.ts +++ b/mapeditor/translation/polish.ts @@ -1102,70 +1102,70 @@ Ekspert - + Compliant Przyjazny - + Friendly Przychylny - + Aggressive Agresywny - + Hostile Wrogi - + Savage Nienawistny - - - + + + No patrol Brak patrolu - + POWER RANK - + HERO TYPE - + Hero class - + Portrait Portret - + Skills Umiejętności - + Artifacts Artefakty - - + + %n tile(s) %n pole @@ -1174,223 +1174,223 @@ - + Buildings Budynki - + Events Zdarzenia - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral neutralny - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Zaklęcia - + Patrol radius - + Town name - + Message Wiadomość - + Spell Zaklęcie - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward Nagroda - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE NIEFLAGOWALNY diff --git a/mapeditor/translation/portuguese.ts b/mapeditor/translation/portuguese.ts index c0670445f..7ef993eca 100644 --- a/mapeditor/translation/portuguese.ts +++ b/mapeditor/translation/portuguese.ts @@ -1102,70 +1102,70 @@ Experiente - + Compliant Complacente - + Friendly Amigável - + Aggressive Agressivo - + Hostile Hostil - + Savage Selvagem - - - + + + No patrol Sem patrulha - + POWER RANK - + HERO TYPE - + Hero class - + Portrait Retrato - + Skills Habilidades - + Artifacts Artefatos - - + + %n tile(s) %n bloco @@ -1173,223 +1173,223 @@ - + Buildings Estruturas - + Events Eventos - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral neutro - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Feitiços - + Patrol radius - + Town name - + Message Mensagem - + Spell Feitiço - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward Recompensa - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE NÃO TEM BANDEIRA diff --git a/mapeditor/translation/russian.ts b/mapeditor/translation/russian.ts index 5a2c17c5f..1bea21ec3 100644 --- a/mapeditor/translation/russian.ts +++ b/mapeditor/translation/russian.ts @@ -1102,70 +1102,70 @@ Эксперт - + Compliant Сговорчивый - + Friendly Дружелюбный - + Aggressive Агрессивный - + Hostile Враждебный - + Savage Дикий - - - + + + No patrol Без патруля - + POWER RANK - + HERO TYPE - + Hero class - + Portrait Портрет - + Skills Навыки - + Artifacts Артефакты - - + + %n tile(s) @@ -1174,223 +1174,223 @@ - + Buildings Постройки - + Events События - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral нейтральный - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Заклинания - + Patrol radius - + Town name - + Message Сообщение - + Spell Заклинание - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward Награда - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE НЕФЛАГУЕМЫЙ diff --git a/mapeditor/translation/spanish.ts b/mapeditor/translation/spanish.ts index 198d3f046..69c6a4761 100644 --- a/mapeditor/translation/spanish.ts +++ b/mapeditor/translation/spanish.ts @@ -1102,70 +1102,70 @@ - + Compliant - + Friendly - + Aggressive - + Hostile - + Savage - - - + + + No patrol - + POWER RANK - + HERO TYPE - + Hero class - + Portrait - + Skills - + Artifacts Artefactos - - + + %n tile(s) @@ -1173,223 +1173,223 @@ - + Buildings Edificios - + Events Eventos - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Hechizos - + Patrol radius - + Town name - + Message Mensaje - + Spell - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE diff --git a/mapeditor/translation/ukrainian.ts b/mapeditor/translation/ukrainian.ts index ed4ac5de6..09bb32ac0 100644 --- a/mapeditor/translation/ukrainian.ts +++ b/mapeditor/translation/ukrainian.ts @@ -1102,70 +1102,70 @@ - + Compliant - + Friendly - + Aggressive - + Hostile - + Savage - - - + + + No patrol - + POWER RANK - + HERO TYPE - + Hero class - + Portrait - + Skills Вміння - + Artifacts Артефакти - - + + %n tile(s) @@ -1174,223 +1174,223 @@ - + Buildings Будівлі - + Events Події - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Закляття - + Patrol radius - + Town name - + Message Повідомлення - + Spell - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE diff --git a/mapeditor/translation/vietnamese.ts b/mapeditor/translation/vietnamese.ts index ebbeeaae0..bcc2815d7 100644 --- a/mapeditor/translation/vietnamese.ts +++ b/mapeditor/translation/vietnamese.ts @@ -1102,293 +1102,293 @@ - + Compliant - + Friendly - + Aggressive - + Hostile - + Savage - - - + + + No patrol - + POWER RANK - + HERO TYPE - + Hero class - + Portrait - + Skills - + Artifacts Vật phẩm - - + + %n tile(s) - + Buildings Công trình - + Events Sự kiện - + Resource - + Artifact reward - + Quest - + Identifier - + ID - + SubID - + InstanceName - + IsStatic - - + + neutral - + Army - + Owner - + Same as town - + Removable units - + Placeholder type - + Power rank - + Hero type - + Experience - + MALE - + FEMALE - + Gender - + Name - + Biography - + Spells Phép - + Patrol radius - + Town name - + Message Thông báo - + Spell - + Productivity - + Amount - + Character - + Never flees - + Not growing - + Reward - + Remove after - + Human trigger - + Cpu trigger - + First visit text - + Next visit text - + Completed text - + Repeat quest - + Time limit - + UNFLAGGABLE