diff --git a/ADeditor/ADeditor.pro.user b/ADeditor/ADeditor.pro.user index 61855d0..0457252 100644 --- a/ADeditor/ADeditor.pro.user +++ b/ADeditor/ADeditor.pro.user @@ -157,17 +157,61 @@ false + -j2 -w /usr/bin/make true /home/andrey/AD/aliendefender/ADeditor + + -j2 + buildconfiguration-Debug-cleanstep0 Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-wExeabp7q4,guid=18815993df3603fdc64a3f6d4c7b5822 + DEFAULTS_PATH=/usr/share/gconf/gnome.default.path + DESKTOP_SESSION=gnome + DISPLAY=:0.0 + GDMSESSION=gnome + GDM_KEYBOARD_LAYOUT=us + GDM_LANG=ru_RU.UTF-8 + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + GNOME_KEYRING_CONTROL=/tmp/keyring-4vN5uf + GTK_MODULES=canberra-gtk-module + HOME=/home/andrey + LANG=ru_RU.UTF-8 + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=andrey + MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path + ORBIT_SOCKETDIR=/tmp/orbit-andrey + PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/andrey + QTDIR=/usr/share/qt4 + SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205 + SHELL=/bin/bash + SPEECHD_PORT=6561 + SSH_AGENT_PID=1239 + SSH_AUTH_SOCK=/tmp/keyring-4vN5uf/ssh + USER=andrey + USERNAME=andrey + XAUTHORITY=/var/run/gdm/auth-for-andrey-x9URui/database + XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg + XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1283151906.338331-318132279 + + true + + clean + -w + + /usr/bin/make + true + /home/andrey/AD/aliendefender/ADeditor true clean @@ -234,7 +278,7 @@ defaultFileEncoding - System + UTF-8 project diff --git a/ADeditor/ADeditor.qrc b/ADeditor/ADeditor.qrc index 36b0f98..ee0da6b 100644 --- a/ADeditor/ADeditor.qrc +++ b/ADeditor/ADeditor.qrc @@ -2,4 +2,11 @@ adeditor_ru.qm + + icons/document-save.png + icons/edit-undo.png + icons/list-add.png + icons/list-remove.png + icons/view-refresh.png + diff --git a/ADeditor/icons/document-save.png b/ADeditor/icons/document-save.png new file mode 100644 index 0000000..8072aea Binary files /dev/null and b/ADeditor/icons/document-save.png differ diff --git a/ADeditor/icons/edit-undo.png b/ADeditor/icons/edit-undo.png new file mode 100644 index 0000000..83e41dc Binary files /dev/null and b/ADeditor/icons/edit-undo.png differ diff --git a/ADeditor/icons/edit.png b/ADeditor/icons/edit.png new file mode 100644 index 0000000..5200e14 Binary files /dev/null and b/ADeditor/icons/edit.png differ diff --git a/ADeditor/icons/list-add.png b/ADeditor/icons/list-add.png new file mode 100644 index 0000000..e029787 Binary files /dev/null and b/ADeditor/icons/list-add.png differ diff --git a/ADeditor/icons/list-remove.png b/ADeditor/icons/list-remove.png new file mode 100644 index 0000000..2bb1a59 Binary files /dev/null and b/ADeditor/icons/list-remove.png differ diff --git a/ADeditor/icons/view-refresh.png b/ADeditor/icons/view-refresh.png new file mode 100644 index 0000000..86b6f82 Binary files /dev/null and b/ADeditor/icons/view-refresh.png differ diff --git a/ADeditor/mainwindow.cpp b/ADeditor/mainwindow.cpp index 0b21f2c..ef55a9f 100644 --- a/ADeditor/mainwindow.cpp +++ b/ADeditor/mainwindow.cpp @@ -3,26 +3,32 @@ #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); - ui->pbSave->setIcon(QIcon::fromTheme("filesave")); - ui->pbReload->setIcon(QIcon::fromTheme("edit-undo")); - ui->pbAlAdd->setIcon(QIcon::fromTheme("add")); - ui->pbAlDel->setIcon(QIcon::fromTheme("remove")); - ui->pbTrigAdd->setIcon(QIcon::fromTheme("add")); - ui->pbTrigDel->setIcon(QIcon::fromTheme("remove")); - ui->pbTwAdd->setIcon(QIcon::fromTheme("add")); - ui->pbTwDel->setIcon(QIcon::fromTheme("remove")); - ui->pbMapAdd->setIcon(QIcon::fromTheme("add")); - ui->pbMapDelete->setIcon(QIcon::fromTheme("remove")); - ui->pbSplAdd->setIcon(QIcon::fromTheme("add")); - ui->pbSlpDel->setIcon(QIcon::fromTheme("remove")); - ui->pbTwSplashEdit->setIcon(QIcon::fromTheme("forward")); - ui->pbMapEdit->setIcon(QIcon::fromTheme("forward")); + ui->pbSave->setIcon(/*QIcon::fromTheme("documment-save",*/ + QIcon(":/icons/icons/documment-save.png")); + ui->pbReload->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/icons/edit-undo.png"))); + ui->pbAlAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbAlDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbTrigAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbTrigDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbTwAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbTwDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbMapAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbMapDelete->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbSplAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbSlpDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbAnimAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbAnimDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbImgAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png"))); + ui->pbImgDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png"))); + ui->pbTwSplashEdit->setIcon(QIcon::fromTheme("edit", QIcon(":/icons/icons/edit.png"))); + ui->pbMapEdit->setIcon(QIcon::fromTheme("edit", QIcon(":/icons/icons/edit.png"))); adloader = new Loader(this); adloader->load("data2.xml"); @@ -42,17 +48,20 @@ MainWindow::MainWindow(QWidget *parent) : alModel = new AlienModel(adloader->aliens.values()); ui->lvAliens->setModel((QAbstractItemModel * )alModel); + ui->cbAlImage->setModel((QAbstractItemModel * )animModel); connect(ui->lvAliens->selectionModel(),SIGNAL(currentChanged(QModelIndex, QModelIndex)),this,SLOT(lvAliens_select(QModelIndex, QModelIndex))); ui->lvAliens->selectionModel()->setCurrentIndex(ui->lvAliens->model()->index(0,0),QItemSelectionModel::ClearAndSelect); splModel = new SplashModel(adloader->splashes.values()); ui->lvSplashes->setModel((QAbstractItemModel * )splModel); + ui->cbSplImage->setModel((QAbstractItemModel * )animModel); connect(ui->lvSplashes->selectionModel(),SIGNAL(currentChanged(QModelIndex, QModelIndex)),this,SLOT(lvSplashes_select(QModelIndex, QModelIndex))); ui->lvSplashes->selectionModel()->setCurrentIndex(ui->lvSplashes->model()->index(0,0),QItemSelectionModel::ClearAndSelect); twModel = new TowerModel(adloader->towers.values()); ui->lvTowers->setModel((QAbstractItemModel * )twModel); ui->cbTwSplash->setModel((QAbstractItemModel * )splModel); + ui->cbTwImage->setModel((QAbstractItemModel * )animModel); connect(ui->lvTowers->selectionModel(),SIGNAL(currentChanged(QModelIndex, QModelIndex)),this,SLOT(lvTowers_select(QModelIndex, QModelIndex))); ui->lvTowers->selectionModel()->setCurrentIndex(ui->lvTowers->model()->index(0,0),QItemSelectionModel::ClearAndSelect); @@ -68,6 +77,16 @@ MainWindow::MainWindow(QWidget *parent) : ui->cbTrigType->addItem(tr("on alien in radius"),QVariant(srcTriggerType::onAlienInRadius)); ui->cbTrigType->addItem(tr("on timer"),QVariant(srcTriggerType::onTimer)); isSaved = true; + QSettings sett("Alien_Defender","aliendefender"); + this->restoreGeometry(sett.value("session/geometry").toByteArray()); + this->restoreState(sett.value("session/mainwindow").toByteArray()); + ui->splitter->restoreState(sett.value("session/split1").toByteArray()); + ui->splitter_2->restoreState(sett.value("session/split2").toByteArray()); + ui->splitter_3->restoreState(sett.value("session/split3").toByteArray()); + ui->splitter_4->restoreState(sett.value("session/split4").toByteArray()); + ui->splitter_5->restoreState(sett.value("session/split5").toByteArray()); + ui->splitter_6->restoreState(sett.value("session/split6").toByteArray()); + ui->tabWidget->setCurrentIndex(sett.value("session/tab").toInt()); } @@ -172,7 +191,7 @@ void MainWindow::lvMaps_select(QModelIndex index, QModelIndex) mapScene->addPixmap(pix); ui->gvMap->centerOn(0,0); //ui->gvMap->resetCachedContent(); - ui->pbMapEdit->setIcon(QIcon(pix)); + //ui->pbMapEdit->setIcon(QIcon(pix)); } } @@ -294,6 +313,16 @@ void MainWindow::lvTriggers_select(QModelIndex index, QModelIndex) void MainWindow::closeEvent(QCloseEvent *event) { + QSettings sett("Alien_Defender","aliendefender"); + sett.setValue("session/geometry",this->saveGeometry()); + sett.setValue("session/mainwindow",this->saveState()); + sett.setValue("session/split1",ui->splitter->saveState()); + sett.setValue("session/split2",ui->splitter_2->saveState()); + sett.setValue("session/split3",ui->splitter_3->saveState()); + sett.setValue("session/split4",ui->splitter_4->saveState()); + sett.setValue("session/split5",ui->splitter_5->saveState()); + sett.setValue("session/split6",ui->splitter_6->saveState()); + sett.setValue("session/tab",ui->tabWidget->currentIndex()); if (!isSaved) { QMessageBox msgBox; @@ -343,6 +372,14 @@ void MainWindow::on_pbReload_clicked() twModel->refresh(adloader->towers.values()); splModel->refresh(adloader->splashes.values()); trigModel->refresh(adloader->triggers.values()); + animModel->refresh(adloader->animations.values()); + mapModel->refresh(adloader->maps.values()); + ui->lvAnimations->setModel((QAbstractItemModel * )animModel); + ui->lvAnimations->reset(); + ui->lvAnimations->selectionModel()->setCurrentIndex(ui->lvAnimations->model()->index(0,0),QItemSelectionModel::ClearAndSelect); + ui->lvMaps->setModel((QAbstractItemModel * )mapModel); + ui->lvMaps->reset(); + ui->lvMaps->selectionModel()->setCurrentIndex(ui->lvMaps->model()->index(0,0),QItemSelectionModel::ClearAndSelect); ui->lvAliens->setModel(alModel); ui->lvAliens->reset(); ui->lvAliens->selectionModel()->setCurrentIndex(ui->lvAliens->model()->index(0,0),QItemSelectionModel::ClearAndSelect); diff --git a/ADeditor/mainwindow.ui b/ADeditor/mainwindow.ui index 6ee205d..88d9160 100644 --- a/ADeditor/mainwindow.ui +++ b/ADeditor/mainwindow.ui @@ -24,24 +24,10 @@ 2 - - - - Cancel - - - - - - - Save - - - - 5 + 0 @@ -350,7 +336,7 @@ - + @@ -368,39 +354,7 @@ - - - true - - - - 0 - 0 - - - - - 48 - 32 - - - - ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - + @@ -427,1223 +381,1195 @@ Towers - - - - - - - - QFrame::StyledPanel + + + + + Qt::Horizontal - - QFrame::Raised - - - - - - - - - 0 - 0 - - - - Name - - - Qt::AlignCenter - - - - - - - - - - - - - - - 0 - 0 - - - - Build time - - - Qt::AlignCenter - - - - - - - 1 - - - 999999999 - - - 50 - - - 50 - - - - - - - - - - - - 0 - 0 - - - - Cost - - - Qt::AlignCenter - - - - - - - 1 - - - 999999999 - - - - - - - - - - - - 0 - 0 - - - - Splash - - - Qt::AlignCenter - - - - - - - true - - - - - - - - 0 - 0 - - - - Edit - - - - - - - - - - - - 0 - 0 - - - - Reload - - - Qt::AlignCenter - - - - - - - 1 - - - 999999999 - - - - - - - - - - - - 0 - 0 - - - - Radius - - - Qt::AlignCenter - - - - - - - 3 - - - 1.000000000000000 - - - 0.100000000000000 - - - - - - - - - - - - 0 - 0 - - - - ExpByShot - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - - - - - - 0 - 0 - - - - ExpByDam - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - - - - - - 0 - 0 - - - - ExpByKill - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - - - - - - 0 - 0 - - - - Image - - - Qt::AlignCenter - - - - - - - true - - - - 0 - 0 - - - - - 48 - 32 - - - - ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + + + + + + 20 + + + + + + 0 + 0 + + + + Add + + + + + + + + 0 + 0 + + + + Delete + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + 0 + 0 + + + + Name + + + Qt::AlignCenter + + + + + + + + + + + + + + + 0 + 0 + + + + Build time + + + Qt::AlignCenter + + + + + + + 1 + + + 999999999 + + + 50 + + + 50 + + + + + + + + + + + + 0 + 0 + + + + Cost + + + Qt::AlignCenter + + + + + + + 1 + + + 999999999 + + + + + + + + + + + + 0 + 0 + + + + Splash + + + Qt::AlignCenter + + + + + + + true + + + + + + + + 0 + 0 + + + + Edit + + + + + + + + + + + + 0 + 0 + + + + Reload + + + Qt::AlignCenter + + + + + + + 1 + + + 999999999 + + + + + + + + + + + + 0 + 0 + + + + Radius + + + Qt::AlignCenter + + + + + + + 3 + + + 1.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 0 + + + + ExpByShot + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 0 + + + + ExpByDam + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 0 + + + + ExpByKill + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 0 + + + + Image + + + Qt::AlignCenter + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - 20 - - - - - - 0 - 0 - - - - Add - - - - - - - - 0 - 0 - - - - Delete - - - - - Splashes - - - - - QAbstractItemView::AllEditTriggers + + + + + Qt::Horizontal + + + + + + QAbstractItemView::AllEditTriggers + + + + + + + 20 + + + + + + 0 + 0 + + + + Add + + + + + + + + 0 + 0 + + + + Delete + + + + + + + + + + true + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + QLayout::SetDefaultConstraint + + + 5 + + + 5 + + + 2 + + + + + + + + 0 + 0 + + + + Name + + + Qt::AlignCenter + + + + + + + + + + + + + + + 0 + 0 + + + + Speed + + + Qt::AlignCenter + + + + + + + true + + + + + + 5 + + + 9999.000000000000000 + + + 0.001000000000000 + + + 0.010000000000000 + + + + + + + + + + + + 0 + 0 + + + + LifeTime + + + Qt::AlignCenter + + + + + + + 1 + + + 999999999 + + + 1 + + + + + + + + + + + + 0 + 0 + + + + Qt::LeftToRight + + + AutoControl + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + 0 + + + + Image + + + Qt::AlignCenter + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - true - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - QLayout::SetDefaultConstraint - - - 5 - - - 5 - - - 2 - - - - - - - - 0 - 0 - - - - Name - - - Qt::AlignCenter - - - - - - - - - - - - - - - 0 - 0 - - - - Speed - - - Qt::AlignCenter - - - - - - - true - - - - - - 5 - - - 9999.000000000000000 - - - 0.001000000000000 - - - 0.010000000000000 - - - - - - - - - - - - 0 - 0 - - - - LifeTime - - - Qt::AlignCenter - - - - - - - 1 - - - 999999999 - - - 1 - - - - - - - - - - - - 0 - 0 - - - - Qt::LeftToRight - - - AutoControl - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 0 - - - - Image - - - Qt::AlignCenter - - - - - - - true - - - - 0 - 0 - - - - - 48 - 32 - - - - ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 20 - - - - - - 0 - 0 - - - - Add - - - - - - - - 0 - 0 - - - - Delete - - - - - Triggers - - - - - - - - QFrame::StyledPanel + + + + + Qt::Horizontal - - QFrame::Raised - - - - - - - - - 0 - 0 - - - - Name - - - Qt::AlignCenter - - - - - - - - - - - - - - - 0 - 0 - - - - Count - - - - - - - false - - - 0 - - - 999999999 - - - 0 - - - - - - - - - - - - 0 - 0 - - - - Random radius - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - - - - - - 0 - 0 - - - - Chance - - - - - - - false - - - 1 - - - 100 - - - 100 - - - - - - - - - Delete parent - - - - - - - - - - 0 - 0 - - - - Child aim - - - Qt::AlignCenter - - - - - - - true - - - - - - - - - - - - 0 - 0 - - - - Type - - - Qt::AlignCenter - - - - - - - true - - - - - - - - - - - - 0 - 0 - - - - Timer - - - Qt::AlignCenter - - - - - - - true - - - 1 - - - 999999999 - - - - - - - - - - - - 0 - 0 - - - - Damage - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - - - - - - - - - - 0 - 0 - - - - Damage radius - - - - - - - false - - - 3 - - - 999999999.000000000000000 - - - 0.100000000000000 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + + + + + + 20 + + + + + + 0 + 0 + + + + Add + + + + + + + + 0 + 0 + + + + Delete + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + 0 + 0 + + + + Name + + + Qt::AlignCenter + + + + + + + + + + + + + + + 0 + 0 + + + + Count + + + + + + + false + + + 0 + + + 999999999 + + + 0 + + + + + + + + + + + + 0 + 0 + + + + Random radius + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 0 + + + + Chance + + + + + + + false + + + 1 + + + 100 + + + 100 + + + + + + + + + Delete parent + + + + + + + + + + 0 + 0 + + + + Child aim + + + Qt::AlignCenter + + + + + + + true + + + + + + + + + + + + 0 + 0 + + + + Type + + + Qt::AlignCenter + + + + + + + true + + + + + + + + + + + + 0 + 0 + + + + Timer + + + Qt::AlignCenter + + + + + + + true + + + 1 + + + 999999999 + + + + + + + + + + + + 0 + 0 + + + + Damage + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + + + + + + + + + + 0 + 0 + + + + Damage radius + + + + + + + false + + + 3 + + + 999999999.000000000000000 + + + 0.100000000000000 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - 20 - - - - - - 0 - 0 - - - - Add - - - - - - - - 0 - 0 - - - - Delete - - - - - Maps - - - - - - - - QFrame::StyledPanel + + + + + Qt::Horizontal - - QFrame::Raised - - - - - - - - 193 - 199 - 189 - - - - - QGraphicsView::ScrollHandDrag - - - - - - - - - - 0 - 0 - - - - Name - - - - - - - true - - - - - - - - - - - - 0 - 0 - - - - Width - - - - - - - true - - - 99999999 - - - - - - - - - - - - 0 - 0 - - - - Height - - - - - - - true - - - 99999999 - - - - - - - - - - - - 0 - 0 - - - - MaxPlayers - - - - - - - true - - - 99999999 - - - - - - - - - Edit... - - - - + + + + + + + + + 20 + + + + + + 0 + 0 + + + + Add + + + + + + + + 0 + 0 + + + + Delete + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + 193 + 199 + 189 + + + + + QGraphicsView::ScrollHandDrag + + + + + + + + + + 0 + 0 + + + + Name + + + + + + + true + + + + + + + + + + + + 0 + 0 + + + + Width + + + + + + + true + + + 99999999 + + + + + + + + + + + + 0 + 0 + + + + Height + + + + + + + true + + + 99999999 + + + + + + + + + + + + 0 + 0 + + + + MaxPlayers + + + + + + + true + + + 99999999 + + + + + + + + + Edit... + + + + + - - - - 20 - - - - - - 0 - 0 - - - - Add - - - - - - - - 0 - 0 - - - - Delete - - - - - @@ -1749,6 +1675,20 @@ + + + + Cancel + + + + + + + Save + + + diff --git a/data2.xml b/data2.xml index babd331..7cec09d 100644 --- a/data2.xml +++ b/data2.xml @@ -25,52 +25,52 @@ - + - - - - + - + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + @@ -91,16 +91,16 @@ - + - + - - + +