From f084c9ea17106273a57e85325341b7f0fb003f55 Mon Sep 17 00:00:00 2001
From: coyotte508 <coyotte508@gmail.com>
Date: Sat, 11 Jan 2014 18:38:33 +0100
Subject: [PATCH] Warning in database editor plugin

---
 scripts/deploy-linux.sh                              |  1 +
 scripts/deploy-windows.sh                            |  1 -
 src/Shared/config.h                                  |  2 +-
 src/Teambuilder/Teambuilder.pro                      |  3 ++-
 .../DatabaseEditor/pokemoneditordialog.cpp           |  2 +-
 .../DatabaseEditor/pokemoneditordialog.ui            | 12 +++++++++++-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/scripts/deploy-linux.sh b/scripts/deploy-linux.sh
index 024b6dfffa..7eef3d4ecf 100755
--- a/scripts/deploy-linux.sh
+++ b/scripts/deploy-linux.sh
@@ -44,6 +44,7 @@ cp bin/Server $DEST
 cp bin/BattleServer $DEST
 cp bin/StatsExtracter $DEST
 cp bin/RelayStation $DEST
+cp bin/MoveMachine $DEST
 cp bin/libqtwebsocket.so.1.0.0 $DEST/libqtwebsocket.so.1
 cp bin/libqjson.so.1.0.0 $DEST/libqtjson.so.1
 cp bin/libpo-utilities.so.1.0.0 $DEST/libpo-utilities.so.1
diff --git a/scripts/deploy-windows.sh b/scripts/deploy-windows.sh
index 7a7e0aec80..984fc49861 100644
--- a/scripts/deploy-windows.sh
+++ b/scripts/deploy-windows.sh
@@ -38,7 +38,6 @@ cp bin/qml $DEST -R
 cp bin/usage_stats $DEST -R
 cp bin/Themes $DEST -R
 cp bin/languages.txt $DEST
-cp bin/Pokemon-Online.exe $DEST
 cp bin/*.exe $DEST
 cp bin/*.dll $DEST
 rm $DEST/*_debug.exe
diff --git a/src/Shared/config.h b/src/Shared/config.h
index 330d73d0f8..77baa137cf 100644
--- a/src/Shared/config.h
+++ b/src/Shared/config.h
@@ -3,7 +3,7 @@
 
 #include <qglobal.h>
 
-#define VERSION QString("2.4.0")
+#define VERSION QString("2.4.1")
 
 static const quint16 PROTOCOL_VERSION = 3;
 static const quint16 PROTOCOL_SUBVERSION = 0;
diff --git a/src/Teambuilder/Teambuilder.pro b/src/Teambuilder/Teambuilder.pro
index 6c933744af..f22aa791f1 100644
--- a/src/Teambuilder/Teambuilder.pro
+++ b/src/Teambuilder/Teambuilder.pro
@@ -105,7 +105,8 @@ HEADERS += mainwindow.h \
     downloadmanager.h \
     teambuilderinterface.h \
     Teambuilder/pokedex.h \
-    Teambuilder/pokedexpokeselection.h
+    Teambuilder/pokedexpokeselection.h \
+    ../Shared/config.h
 
 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
   DEFINES += QT5
diff --git a/src/client-plugins/DatabaseEditor/pokemoneditordialog.cpp b/src/client-plugins/DatabaseEditor/pokemoneditordialog.cpp
index 30dd81f431..88d4150bf4 100644
--- a/src/client-plugins/DatabaseEditor/pokemoneditordialog.cpp
+++ b/src/client-plugins/DatabaseEditor/pokemoneditordialog.cpp
@@ -42,7 +42,7 @@ namespace {
     };
 
     int learningToId(const QString &method) {
-        for (int i = 0; i < sizeof(learningMethods)/sizeof(QString); i++) {
+        for (unsigned i = 0; i < sizeof(learningMethods)/sizeof(QString); i++) {
             if (learningMethods[i] == method) {
                 return i;
             }
diff --git a/src/client-plugins/DatabaseEditor/pokemoneditordialog.ui b/src/client-plugins/DatabaseEditor/pokemoneditordialog.ui
index 4a747da380..48980a3864 100644
--- a/src/client-plugins/DatabaseEditor/pokemoneditordialog.ui
+++ b/src/client-plugins/DatabaseEditor/pokemoneditordialog.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Database Editor</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,1,0">
+  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,1,0,0">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -163,6 +163,16 @@
      </attribute>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Run MoveMachine and do Ctrl+S after having done  all your changes, to propagate them through the various files correctly.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>