# HG changeset patch # User unc0rr # Date 1256494600 0 # Node ID 4329597c85c886c2cb527504cf85bdddc6389f0d # Parent da9e986713d435830fd7108bf9fe7eb1331bfcdb Further work on missions editor diff -r da9e986713d4 -r 4329597c85c8 share/hedgewars/Data/Trainings/001_Shotgun.txt --- a/share/hedgewars/Data/Trainings/001_Shotgun.txt Sun Oct 25 16:51:20 2009 +0000 +++ b/share/hedgewars/Data/Trainings/001_Shotgun.txt Sun Oct 25 18:16:40 2009 +0000 @@ -1,5 +1,5 @@ seed 0 -$gmflags 268435458 +$gmflags 4098 $turntime 90000 $casefreq 0 $landadds 0 @@ -8,12 +8,12 @@ theme nature ammstore 00009000000000000000000000000000000000000000000000000000000000000000000000000000 -addteam 14483456 Team +addteam 14483456 Shotgun Team grave Simple fort Island voicepack Default -addhh 0 100 hedgehog 0 +addhh 0 1 Hunter hat NoHat hhcoords 2334 1254 diff -r da9e986713d4 -r 4329597c85c8 tools/MissionsEditor/MissionsEditor.pro --- a/tools/MissionsEditor/MissionsEditor.pro Sun Oct 25 16:51:20 2009 +0000 +++ b/tools/MissionsEditor/MissionsEditor.pro Sun Oct 25 18:16:40 2009 +0000 @@ -1,16 +1,12 @@ -#------------------------------------------------- -# +# ------------------------------------------------- # Project created by QtCreator 2009-10-21T19:51:57 -# -#------------------------------------------------- - +# ------------------------------------------------- TARGET = MissionsEditor TEMPLATE = app - - -SOURCES += main.cpp\ - editor.cpp - -HEADERS += editor.h - -FORMS += editor.ui +SOURCES += main.cpp \ + editor.cpp \ + teamedit.cpp +HEADERS += editor.h \ + teamedit.h +FORMS += editor.ui \ + teamedit.ui diff -r da9e986713d4 -r 4329597c85c8 tools/MissionsEditor/editor.ui --- a/tools/MissionsEditor/editor.ui Sun Oct 25 16:51:20 2009 +0000 +++ b/tools/MissionsEditor/editor.ui Sun Oct 25 18:16:40 2009 +0000 @@ -6,8 +6,8 @@ 0 0 - 601 - 526 + 419 + 476 @@ -18,7 +18,7 @@ - 0 + 2 @@ -283,6 +283,11 @@ Teams + + + + + @@ -298,7 +303,7 @@ 0 0 - 601 + 419 28 @@ -331,6 +336,14 @@ + + + TeamEdit + QWidget +
teamedit.h
+ 1 +
+
diff -r da9e986713d4 -r 4329597c85c8 tools/MissionsEditor/teamedit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/MissionsEditor/teamedit.cpp Sun Oct 25 18:16:40 2009 +0000 @@ -0,0 +1,26 @@ +#include "teamedit.h" +#include "ui_teamedit.h" + +TeamEdit::TeamEdit(QWidget *parent) : + QWidget(parent), + m_ui(new Ui::TeamEdit) +{ + m_ui->setupUi(this); +} + +TeamEdit::~TeamEdit() +{ + delete m_ui; +} + +void TeamEdit::changeEvent(QEvent *e) +{ + QWidget::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + m_ui->retranslateUi(this); + break; + default: + break; + } +} diff -r da9e986713d4 -r 4329597c85c8 tools/MissionsEditor/teamedit.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/MissionsEditor/teamedit.h Sun Oct 25 18:16:40 2009 +0000 @@ -0,0 +1,23 @@ +#ifndef TEAMEDIT_H +#define TEAMEDIT_H + +#include + +namespace Ui { + class TeamEdit; +} + +class TeamEdit : public QWidget { + Q_OBJECT +public: + TeamEdit(QWidget *parent = 0); + ~TeamEdit(); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::TeamEdit *m_ui; +}; + +#endif // TEAMEDIT_H diff -r da9e986713d4 -r 4329597c85c8 tools/MissionsEditor/teamedit.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/MissionsEditor/teamedit.ui Sun Oct 25 18:16:40 2009 +0000 @@ -0,0 +1,122 @@ + + + TeamEdit + + + + 0 + 0 + 437 + 354 + + + + Form + + + + + + Add Team + + + + + + + Qt::Horizontal + + + + 331 + 20 + + + + + + + + 0 + + + + Team + + + + + + + + Team name + + + + + + + + + + + + + Name + + + + + Health + + + + + Spawn pos + + + + + + + + Add hedgehog + + + + + + + Delete hedgehog + + + + + + + Qt::Vertical + + + + 117 + 102 + + + + + + + + Delete team + + + + + + + + + + + +