some improve UI in ADeditor

ADeditor/ADeditor.pro.user

@@ -157,17 +157,61 @@
    </valuelist>
    <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value>
    <valuelist key="abstractProcess.arguments" type="QVariantList">
+    <value type="QString">-j2</value>
     <value type="QString">-w</value>
    </valuelist>
    <value key="abstractProcess.command" type="QString">/usr/bin/make</value>
    <value key="abstractProcess.enabled" type="bool">true</value>
    <value key="abstractProcess.workingDirectory" type="QString">/home/andrey/AD/aliendefender/ADeditor</value>
+   <valuelist key="makeargs" type="QVariantList">
+    <value type="QString">-j2</value>
+   </valuelist>
   </valuemap>
  </data>
  <data>
   <variable>buildconfiguration-Debug-cleanstep0</variable>
   <valuemap type="QVariantMap">
    <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+   <valuelist key="abstractProcess.Environment" type="QVariantList">
+    <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-wExeabp7q4,guid=18815993df3603fdc64a3f6d4c7b5822</value>
+    <value type="QString">DEFAULTS_PATH=/usr/share/gconf/gnome.default.path</value>
+    <value type="QString">DESKTOP_SESSION=gnome</value>
+    <value type="QString">DISPLAY=:0.0</value>
+    <value type="QString">GDMSESSION=gnome</value>
+    <value type="QString">GDM_KEYBOARD_LAYOUT=us</value>
+    <value type="QString">GDM_LANG=ru_RU.UTF-8</value>
+    <value type="QString">GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
+    <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-4vN5uf</value>
+    <value type="QString">GTK_MODULES=canberra-gtk-module</value>
+    <value type="QString">HOME=/home/andrey</value>
+    <value type="QString">LANG=ru_RU.UTF-8</value>
+    <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator:</value>
+    <value type="QString">LOGNAME=andrey</value>
+    <value type="QString">MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path</value>
+    <value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-andrey</value>
+    <value type="QString">PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
+    <value type="QString">PWD=/home/andrey</value>
+    <value type="QString">QTDIR=/usr/share/qt4</value>
+    <value type="QString">SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205</value>
+    <value type="QString">SHELL=/bin/bash</value>
+    <value type="QString">SPEECHD_PORT=6561</value>
+    <value type="QString">SSH_AGENT_PID=1239</value>
+    <value type="QString">SSH_AUTH_SOCK=/tmp/keyring-4vN5uf/ssh</value>
+    <value type="QString">USER=andrey</value>
+    <value type="QString">USERNAME=andrey</value>
+    <value type="QString">XAUTHORITY=/var/run/gdm/auth-for-andrey-x9URui/database</value>
+    <value type="QString">XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg</value>
+    <value type="QString">XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
+    <value type="QString">XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1283151906.338331-318132279</value>
+   </valuelist>
+   <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value>
+   <valuelist key="abstractProcess.arguments" type="QVariantList">
+    <value type="QString">clean</value>
+    <value type="QString">-w</value>
+   </valuelist>
+   <value key="abstractProcess.command" type="QString">/usr/bin/make</value>
+   <value key="abstractProcess.enabled" type="bool">true</value>
+   <value key="abstractProcess.workingDirectory" type="QString">/home/andrey/AD/aliendefender/ADeditor</value>
    <value key="cleanConfig" type="bool">true</value>
    <valuelist key="makeargs" type="QVariantList">
     <value type="QString">clean</value>
@@ -234,7 +278,7 @@
  </data>
  <data>
   <variable>defaultFileEncoding</variable>
-  <value type="QByteArray">System</value>
+  <value type="QByteArray">UTF-8</value>
  </data>
  <data>
   <variable>project</variable>

ADeditor/ADeditor.qrc

@@ -2,4 +2,11 @@
     <qresource prefix="/translates">
         <file>adeditor_ru.qm</file>
     </qresource>
+    <qresource prefix="/icons">
+        <file>icons/document-save.png</file>
+        <file>icons/edit-undo.png</file>
+        <file>icons/list-add.png</file>
+        <file>icons/list-remove.png</file>
+        <file>icons/view-refresh.png</file>
+    </qresource>
 </RCC>

ADeditor/mainwindow.cpp

@@ -3,26 +3,32 @@
 
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QSettings>
 
 MainWindow::MainWindow(QWidget *parent) :
 		QMainWindow(parent),
 		ui(new Ui::MainWindow)
 {
 	ui->setupUi(this);
-	ui->pbSave->setIcon(QIcon::fromTheme("filesave"));
+	ui->pbSave->setIcon(/*QIcon::fromTheme("documment-save",*/
-	ui->pbReload->setIcon(QIcon::fromTheme("edit-undo"));
+										 QIcon(":/icons/icons/documment-save.png"));
-	ui->pbAlAdd->setIcon(QIcon::fromTheme("add"));
+	ui->pbReload->setIcon(QIcon::fromTheme("edit-undo", QIcon(":/icons/icons/edit-undo.png")));
-	ui->pbAlDel->setIcon(QIcon::fromTheme("remove"));
+	ui->pbAlAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png")));
-	ui->pbTrigAdd->setIcon(QIcon::fromTheme("add"));
+	ui->pbAlDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png")));
-	ui->pbTrigDel->setIcon(QIcon::fromTheme("remove"));
+	ui->pbTrigAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png")));
-	ui->pbTwAdd->setIcon(QIcon::fromTheme("add"));
+	ui->pbTrigDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png")));
-	ui->pbTwDel->setIcon(QIcon::fromTheme("remove"));
+	ui->pbTwAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png")));
-	ui->pbMapAdd->setIcon(QIcon::fromTheme("add"));
+	ui->pbTwDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png")));
-	ui->pbMapDelete->setIcon(QIcon::fromTheme("remove"));
+	ui->pbMapAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png")));
-	ui->pbSplAdd->setIcon(QIcon::fromTheme("add"));
+	ui->pbMapDelete->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png")));
-	ui->pbSlpDel->setIcon(QIcon::fromTheme("remove"));
+	ui->pbSplAdd->setIcon(QIcon::fromTheme("list-add", QIcon(":/icons/icons/list-add.png")));
-	ui->pbTwSplashEdit->setIcon(QIcon::fromTheme("forward"));
+	ui->pbSlpDel->setIcon(QIcon::fromTheme("list-remove", QIcon(":/icons/icons/list-remove.png")));
-	ui->pbMapEdit->setIcon(QIcon::fromTheme("forward"));
+	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);

ADeditor/mainwindow.ui

@@ -24,24 +24,10 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <item row="4" column="0">
-     <widget class="QPushButton" name="pbReload">
-      <property name="text">
-       <string>Cancel</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QPushButton" name="pbSave">
-      <property name="text">
-       <string>Save</string>
-      </property>
-     </widget>
-    </item>
     <item row="3" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>5</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tabAliens">
        <attribute name="title">
@@ -350,7 +336,7 @@
              </layout>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="10,0,0">
+             <layout class="QHBoxLayout" name="horizontalLayout_9">
               <item>
                <widget class="QLabel" name="label_8">
                 <property name="sizePolicy">
@@ -368,39 +354,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pushButton_3">
+               <widget class="QComboBox" name="cbAlImage"/>
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>48</width>
-                  <height>32</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
               </item>
              </layout>
             </item>
@@ -427,11 +381,52 @@
        <attribute name="title">
         <string>Towers</string>
        </attribute>
-       <layout class="QGridLayout" name="gridLayout_5" columnstretch="1,2">
+       <layout class="QVBoxLayout" name="verticalLayout_12">
-        <item row="0" column="0">
+        <item>
+         <widget class="QSplitter" name="splitter_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <widget class="QWidget" name="">
+           <layout class="QVBoxLayout" name="verticalLayout_11">
+            <item>
              <widget class="QListView" name="lvTowers"/>
             </item>
-        <item row="0" column="1" rowspan="2">
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="2,1">
+              <property name="spacing">
+               <number>20</number>
+              </property>
+              <item>
+               <widget class="QPushButton" name="pbTwAdd">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Add</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pbTwDel">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Delete</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
           <widget class="QFrame" name="frame_2">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -732,7 +727,7 @@
              </layout>
             </item>
             <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_33" stretch="10,1,0">
+             <layout class="QHBoxLayout" name="horizontalLayout_33">
               <item>
                <widget class="QLabel" name="label_25">
                 <property name="sizePolicy">
@@ -750,39 +745,7 @@
                </widget>
               </item>
               <item>
-              <widget class="QPushButton" name="pushButton_5">
+               <widget class="QComboBox" name="cbTwImage"/>
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>48</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>...</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_6">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
               </item>
              </layout>
             </item>
@@ -801,14 +764,36 @@
             </item>
            </layout>
           </widget>
+         </widget>
         </item>
-        <item row="1" column="0">
+       </layout>
-         <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="2,1">
+      </widget>
+      <widget class="QWidget" name="tabSplashes">
+       <attribute name="title">
+        <string>Splashes</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_14">
+        <item>
+         <widget class="QSplitter" name="splitter_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <widget class="QWidget" name="">
+           <layout class="QVBoxLayout" name="verticalLayout_13">
+            <item>
+             <widget class="QListView" name="lvSplashes">
+              <property name="editTriggers">
+               <set>QAbstractItemView::AllEditTriggers</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_12" stretch="2,0">
               <property name="spacing">
                <number>20</number>
               </property>
               <item>
-           <widget class="QPushButton" name="pbTwAdd">
+               <widget class="QPushButton" name="pbSplAdd">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -821,7 +806,7 @@
                </widget>
               </item>
               <item>
-           <widget class="QPushButton" name="pbTwDel">
+               <widget class="QPushButton" name="pbSlpDel">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -837,19 +822,6 @@
             </item>
            </layout>
           </widget>
-      <widget class="QWidget" name="tabSplashes">
-       <attribute name="title">
-        <string>Splashes</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_3" columnstretch="1,2">
-        <item row="0" column="0">
-         <widget class="QListView" name="lvSplashes">
-          <property name="editTriggers">
-           <set>QAbstractItemView::AllEditTriggers</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" rowspan="2">
           <widget class="QFrame" name="frameSplash">
            <property name="enabled">
             <bool>true</bool>
@@ -1011,7 +983,7 @@
              </layout>
             </item>
             <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_46" stretch="10,1,0">
+             <layout class="QHBoxLayout" name="horizontalLayout_46">
               <item>
                <widget class="QLabel" name="label_41">
                 <property name="sizePolicy">
@@ -1029,39 +1001,7 @@
                </widget>
               </item>
               <item>
-              <widget class="QPushButton" name="pushButton_7">
+               <widget class="QComboBox" name="cbSplImage"/>
-               <property name="enabled">
-                <bool>true</bool>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>48</width>
-                 <height>32</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>...</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_8">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
               </item>
              </layout>
             </item>
@@ -1080,14 +1020,32 @@
             </item>
            </layout>
           </widget>
+         </widget>
         </item>
-        <item row="1" column="0">
+       </layout>
-         <layout class="QHBoxLayout" name="horizontalLayout_12" stretch="2,0">
+      </widget>
+      <widget class="QWidget" name="tabTriggers">
+       <attribute name="title">
+        <string>Triggers</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_16">
+        <item>
+         <widget class="QSplitter" name="splitter_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <widget class="QWidget" name="">
+           <layout class="QVBoxLayout" name="verticalLayout_15">
+            <item>
+             <widget class="QListView" name="lvTriggers"/>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_15" stretch="2,1">
               <property name="spacing">
                <number>20</number>
               </property>
               <item>
-           <widget class="QPushButton" name="pbSplAdd">
+               <widget class="QPushButton" name="pbTrigAdd">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -1100,7 +1058,7 @@
                </widget>
               </item>
               <item>
-           <widget class="QPushButton" name="pbSlpDel">
+               <widget class="QPushButton" name="pbTrigDel">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -1116,15 +1074,6 @@
             </item>
            </layout>
           </widget>
-      <widget class="QWidget" name="tabTriggers">
-       <attribute name="title">
-        <string>Triggers</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout" columnstretch="1,2">
-        <item row="0" column="0">
-         <widget class="QListView" name="lvTriggers"/>
-        </item>
-        <item row="0" column="1" rowspan="2">
           <widget class="QFrame" name="frame_3">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -1427,14 +1376,32 @@
             </item>
            </layout>
           </widget>
+         </widget>
         </item>
-        <item row="1" column="0">
+       </layout>
-         <layout class="QHBoxLayout" name="horizontalLayout_15" stretch="2,1">
+      </widget>
+      <widget class="QWidget" name="tabMaps">
+       <attribute name="title">
+        <string>Maps</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_18">
+        <item>
+         <widget class="QSplitter" name="splitter_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <widget class="QWidget" name="">
+           <layout class="QVBoxLayout" name="verticalLayout_17">
+            <item>
+             <widget class="QListView" name="lvMaps"/>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_17" stretch="2,1">
               <property name="spacing">
                <number>20</number>
               </property>
               <item>
-           <widget class="QPushButton" name="pbTrigAdd">
+               <widget class="QPushButton" name="pbMapAdd">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -1447,7 +1414,7 @@
                </widget>
               </item>
               <item>
-           <widget class="QPushButton" name="pbTrigDel">
+               <widget class="QPushButton" name="pbMapDelete">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                   <horstretch>0</horstretch>
@@ -1463,15 +1430,6 @@
             </item>
            </layout>
           </widget>
-      <widget class="QWidget" name="tabMaps">
-       <attribute name="title">
-        <string>Maps</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_6" columnstretch="1,2">
-        <item row="0" column="0">
-         <widget class="QListView" name="lvMaps"/>
-        </item>
-        <item row="0" column="1" rowspan="2">
           <widget class="QFrame" name="frame_4">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -1610,40 +1568,8 @@
             </item>
            </layout>
           </widget>
-        </item>
-        <item row="1" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_17" stretch="2,1">
-          <property name="spacing">
-           <number>20</number>
-          </property>
-          <item>
-           <widget class="QPushButton" name="pbMapAdd">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Add</string>
-            </property>
          </widget>
         </item>
-          <item>
-           <widget class="QPushButton" name="pbMapDelete">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Delete</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="tabAnimation">
@@ -1749,6 +1675,20 @@
       </widget>
      </widget>
     </item>
+    <item row="4" column="0">
+     <widget class="QPushButton" name="pbReload">
+      <property name="text">
+       <string>Cancel</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="0">
+     <widget class="QPushButton" name="pbSave">
+      <property name="text">
+       <string>Save</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

data2.xml

@@ -25,52 +25,52 @@
   <wave prise="220" timeout="5" id="11"/>
  </waves>
  <levels>
-  <level map="2" id="1" score="145016824" name="First Level"/>
+  <level map="2" id="1" score="168114848" name="First Level"/>
  </levels>
  <waveParts>
   <wavePart alien="10" count="10" wave="1"/>
-  <wavePart alien="12" count="5" wave="2"/>
   <wavePart alien="10" count="5" wave="2"/>
-  <wavePart alien="10" count="1" wave="3"/>
+  <wavePart alien="12" count="5" wave="2"/>
-  <wavePart alien="10" count="2" wave="3"/>
-  <wavePart alien="12" count="3" wave="3"/>
   <wavePart alien="12" count="4" wave="3"/>
-  <wavePart alien="2" count="20" wave="4"/>
+  <wavePart alien="12" count="3" wave="3"/>
+  <wavePart alien="10" count="2" wave="3"/>
+  <wavePart alien="10" count="1" wave="3"/>
   <wavePart alien="4" count="60" wave="4"/>
-  <wavePart alien="4" count="6" wave="5"/>
+  <wavePart alien="2" count="20" wave="4"/>
-  <wavePart alien="12" count="16" wave="5"/>
-  <wavePart alien="10" count="16" wave="5"/>
-  <wavePart alien="4" count="16" wave="5"/>
-  <wavePart alien="12" count="26" wave="5"/>
-  <wavePart alien="10" count="26" wave="5"/>
   <wavePart alien="4" count="26" wave="5"/>
+  <wavePart alien="10" count="26" wave="5"/>
+  <wavePart alien="12" count="26" wave="5"/>
+  <wavePart alien="4" count="16" wave="5"/>
+  <wavePart alien="10" count="16" wave="5"/>
+  <wavePart alien="12" count="16" wave="5"/>
+  <wavePart alien="4" count="6" wave="5"/>
+  <wavePart alien="10" count="1" wave="6"/>
+  <wavePart alien="4" count="1" wave="6"/>
+  <wavePart alien="10" count="1" wave="6"/>
   <wavePart alien="4" count="1" wave="6"/>
   <wavePart alien="10" count="1" wave="6"/>
   <wavePart alien="4" count="1" wave="6"/>
   <wavePart alien="10" count="1" wave="6"/>
+  <wavePart alien="4" count="1" wave="6"/>
+  <wavePart alien="10" count="1" wave="6"/>
+  <wavePart alien="4" count="1" wave="6"/>
   <wavePart alien="12" count="1" wave="6"/>
-  <wavePart alien="4" count="1" wave="6"/>
   <wavePart alien="10" count="1" wave="6"/>
   <wavePart alien="4" count="1" wave="6"/>
   <wavePart alien="10" count="1" wave="6"/>
   <wavePart alien="4" count="1" wave="6"/>
-  <wavePart alien="10" count="1" wave="6"/>
-  <wavePart alien="4" count="1" wave="6"/>
-  <wavePart alien="10" count="1" wave="6"/>
-  <wavePart alien="4" count="1" wave="6"/>
-  <wavePart alien="10" count="1" wave="6"/>
   <wavePart alien="33" count="2" wave="7"/>
   <wavePart alien="33" count="50" wave="8"/>
  </waveParts>
  <wavesOnLevels>
-  <waveOnLevel wave="1" level="1"/>
-  <waveOnLevel wave="2" level="1"/>
-  <waveOnLevel wave="3" level="1"/>
-  <waveOnLevel wave="4" level="1"/>
-  <waveOnLevel wave="5" level="1"/>
-  <waveOnLevel wave="6" level="1"/>
-  <waveOnLevel wave="7" level="1"/>
   <waveOnLevel wave="8" level="1"/>
+  <waveOnLevel wave="7" level="1"/>
+  <waveOnLevel wave="6" level="1"/>
+  <waveOnLevel wave="5" level="1"/>
+  <waveOnLevel wave="4" level="1"/>
+  <waveOnLevel wave="3" level="1"/>
+  <waveOnLevel wave="2" level="1"/>
+  <waveOnLevel wave="1" level="1"/>
  </wavesOnLevels>
  <splashes>
   <splash speed="0.2" imageType="5" lifetime="9999" id="1" name="rocket"/>
@@ -91,16 +91,16 @@
   <trigger childAim="noAim" count="1" type="onTimer" id="4" name="smoke" timer="2"/>
  </triggers>
  <chains>
-  <chain tower="1" trigger="3" child="4" parent="2"/>
   <chain tower="1" trigger="4" child="5" parent="2"/>
+  <chain tower="1" trigger="3" child="4" parent="2"/>
   <chain tower="2" trigger="2" parent="3"/>
-  <chain tower="3" trigger="3" child="4" parent="1"/>
   <chain tower="3" trigger="4" child="5" parent="1"/>
+  <chain tower="3" trigger="3" child="4" parent="1"/>
  </chains>
  <towersOnLevels>
-  <towerOnLevel tower="1" level="1"/>
-  <towerOnLevel tower="2" level="1"/>
   <towerOnLevel tower="3" level="1"/>
+  <towerOnLevel tower="2" level="1"/>
+  <towerOnLevel tower="1" level="1"/>
  </towersOnLevels>
  <animations>
   <animation pathes="images/Aliens/Al_00_0.png;images/Aliens/Al_00_1.png;images/Aliens/Al_00_2.png;images/Aliens/Al_00_3.png;images/Aliens/Al_00_4.png;images/Aliens/Al_00_5.png;images/Aliens/Al_00_6.png;images/Aliens/Al_00_7.png;images/Aliens/Al_00_8.png;images/Aliens/Al_00_9.png;images/Aliens/Al_00_10.png;images/Aliens/Al_00_11.png;images/Aliens/Al_00_12.png;images/Aliens/Al_00_13.png;images/Aliens/Al_00_14.png;images/Aliens/Al_00_15.png;images/Aliens/Al_00_16.png;images/Aliens/Al_00_17.png;images/Aliens/Al_00_18.png;images/Aliens/Al_00_19.png" id="1"/>