Merge remote-tracking branch 'scrawl/master'

apps/openmw/mwbase/dialoguemanager.hpp

@@ -61,6 +61,8 @@ namespace MWBase
 
             virtual void persuade (int type) = 0;
             virtual int getTemporaryDispositionChange () const = 0;
+
+            /// @note This change is temporary and gets discarded when dialogue ends.
             virtual void applyDispositionChange (int delta) = 0;
 
             virtual int countSavedGameRecords() const = 0;

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -560,17 +560,7 @@ namespace MWDialogue
 
     void DialogueManager::applyDispositionChange(int delta)
     {
-        int oldTemp = mTemporaryDispositionChange;
         mTemporaryDispositionChange += delta;
-        // don't allow increasing beyond 100 or decreasing below 0
-        int curDisp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
-        if (curDisp + mTemporaryDispositionChange < 0)
-            mTemporaryDispositionChange = -curDisp;
-        else if (curDisp + mTemporaryDispositionChange > 100)
-            mTemporaryDispositionChange = 100 - curDisp;
-
-        int diff = mTemporaryDispositionChange - oldTemp;
-        mPermanentDispositionChange += diff;
     }
 
     bool DialogueManager::checkServiceRefused()

apps/openmw/mwdialogue/dialoguemanagerimp.hpp

@@ -84,6 +84,8 @@ namespace MWDialogue
 
             virtual void persuade (int type);
             virtual int getTemporaryDispositionChange () const;
+
+            /// @note This change is temporary and gets discarded when dialogue ends.
             virtual void applyDispositionChange (int delta);
 
             virtual int countSavedGameRecords() const;

apps/openmw/mwgui/dialogue.cpp

@@ -271,7 +271,8 @@ namespace MWGui
 
     void DialogueWindow::exit()
     {
-        if (!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
+        if ((!mEnabled || MWBase::Environment::get().getDialogueManager()->isInChoice())
+                && !mGoodbye)
             return;
         MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
     }
@@ -517,7 +518,7 @@ namespace MWGui
 
         MyGUI::Button* byeButton;
         getWidget(byeButton, "ByeButton");
-        if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
+        if(MWBase::Environment::get().getDialogueManager()->isInChoice() && !mGoodbye) {
             byeButton->setEnabled(false);
         }
         else {

apps/openmw/mwgui/itemmodel.cpp

@@ -100,7 +100,7 @@ namespace MWGui
         for (size_t i=0; i<mSourceModel->getItemCount(); ++i)
         {
             const ItemStack& item = mSourceModel->getItem(i);
-            if (item == itemToSearch)
+            if (item.mBase == itemToSearch.mBase)
                 return i;
         }
         return -1;
@@ -112,7 +112,7 @@ namespace MWGui
         for (size_t i=0; i<getItemCount(); ++i)
         {
             const ItemStack& item = getItem(i);
-            if (item == itemToSearch)
+            if (item.mBase == itemToSearch.mBase)
                 return i;
         }
         return -1;

apps/openmw/mwgui/mainmenu.cpp

@@ -142,7 +142,8 @@ namespace MWGui
     {
         if (mVideo && !show)
         {
-            MyGUI::Gui::getInstance().destroyWidget(mVideo);
+            MyGUI::Gui::getInstance().destroyWidget(mVideoBackground);
+            mVideoBackground = NULL;
             mVideo = NULL;
         }
         if (mBackground && !show)
@@ -199,7 +200,13 @@ namespace MWGui
     void MainMenu::update(float dt)
     {
         if (mVideo)
-            mVideo->update();
+        {
+            if (!mVideo->update())
+            {
+                // If finished playing, start again
+                mVideo->playVideo("video\\menu_background.bik", 0);
+            }
+        }
     }
 
     void MainMenu::updateMenu()

apps/openmw/mwgui/tradeitemmodel.cpp

@@ -35,7 +35,7 @@ namespace MWGui
         bool found = false;
         for (; it != out.end(); ++it)
         {
-            if (it->stacks(item))
+            if (it->mBase == item.mBase)
             {
                 it->mCount += item.mCount;
                 found = true;
@@ -52,7 +52,7 @@ namespace MWGui
         bool found = false;
         for (; it != out.end(); ++it)
         {
-            if (it->stacks(item))
+            if (it->mBase == item.mBase)
             {
                 if (it->mCount < count)
                     throw std::runtime_error("Not enough borrowed items to return");
@@ -114,7 +114,7 @@ namespace MWGui
             size_t i=0;
             for (; i<sourceModel->getItemCount(); ++i)
             {
-                if (it->stacks(sourceModel->getItem(i)))
+                if (it->mBase == sourceModel->getItem(i).mBase)
                     break;
             }
             if (i == sourceModel->getItemCount())
@@ -182,7 +182,7 @@ namespace MWGui
             std::vector<ItemStack>::iterator it = mBorrowedFromUs.begin();
             for (; it != mBorrowedFromUs.end(); ++it)
             {
-                if (it->stacks(item))
+                if (it->mBase == item.mBase)
                 {
                     if (item.mCount < it->mCount)
                         throw std::runtime_error("Lent more items than present");

apps/openmw/mwgui/tradewindow.cpp

@@ -74,6 +74,8 @@ namespace MWGui
         mDecreaseButton->eventMouseButtonPressed += MyGUI::newDelegate(this, &TradeWindow::onDecreaseButtonPressed);
         mDecreaseButton->eventMouseButtonReleased += MyGUI::newDelegate(this, &TradeWindow::onBalanceButtonReleased);
 
+        mTotalBalance->eventEditTextChange += MyGUI::newDelegate(this, &TradeWindow::onBalanceEdited);
+
         setCoord(400, 0, 400, 300);
     }
 
@@ -300,6 +302,9 @@ namespace MWGui
             }
         }
 
+        // Is the player buying?
+        bool buying = (mCurrentMerchantOffer < 0);
+
         if(mCurrentBalance > mCurrentMerchantOffer)
         {
             //if npc is a creature: reject (no haggle)
@@ -313,7 +318,7 @@ namespace MWGui
             int a = abs(mCurrentMerchantOffer);
             int b = abs(mCurrentBalance);
             int d = 0;
-            if (mCurrentBalance<0)
+            if (buying)
                 d = int(100 * (a - b) / a);
             else
                 d = int(100 * (b - a) / a);
@@ -334,7 +339,7 @@ namespace MWGui
             float pcTerm = (clampedDisposition - 50 + a1 + b1 + c1) * playerStats.getFatigueTerm();
             float npcTerm = (d1 + e1 + f1) * sellerStats.getFatigueTerm();
             float x = gmst.find("fBargainOfferMulti")->getFloat() * d + gmst.find("fBargainOfferBase")->getFloat();
-            if (mCurrentBalance<0)
+            if (buying)
                 x += abs(int(pcTerm - npcTerm));
             else
                 x += abs(int(npcTerm - pcTerm));
@@ -410,6 +415,19 @@ namespace MWGui
         mBalanceButtonsState = BBS_None;
     }
 
+    void TradeWindow::onBalanceEdited(MyGUI::EditBox *_sender)
+    {
+        try
+        {
+            unsigned int count = boost::lexical_cast<unsigned int>(_sender->getCaption());
+            mCurrentBalance = count * (mCurrentBalance >= 0 ? 1 : -1);
+            updateLabels();
+        }
+        catch (std::bad_cast&)
+        {
+        }
+    }
+
     void TradeWindow::onIncreaseButtonTriggered()
     {
         if(mCurrentBalance<=-1) mCurrentBalance -= 1;

apps/openmw/mwgui/tradewindow.hpp

@@ -55,7 +55,7 @@ namespace MWGui
             MyGUI::Button* mIncreaseButton;
             MyGUI::Button* mDecreaseButton;
             MyGUI::TextBox* mTotalBalanceLabel;
-            MyGUI::TextBox* mTotalBalance;
+            MyGUI::EditBox* mTotalBalance;
 
             MyGUI::Widget* mBottomPane;
 
@@ -91,6 +91,7 @@ namespace MWGui
             void onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
             void onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
             void onBalanceButtonReleased(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+            void onBalanceEdited(MyGUI::EditBox* _sender);
 
             void onIncreaseButtonTriggered();
             void onDecreaseButtonTriggered();

apps/openmw/mwworld/esmstore.cpp

@@ -68,13 +68,12 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
 
         if (it == mStores.end()) {
             if (n.val == ESM::REC_INFO) {
-                std::string id = esm.getHNOString("INAM");
+                if (dialogue)
-                if (dialogue) {
+                {
-                    ESM::DialInfo info;
+                    dialogue->readInfo(esm, esm.getIndex() != 0);
-                    info.mId = id;
+                }
-                    info.load(esm);
+                else
-                    dialogue->addInfo(info, esm.getIndex() != 0);
+                {
-                } else {
                     std::cerr << "error: info record without dialog" << std::endl;
                     esm.skipRecord();
                 }

components/esm/loaddial.cpp

@@ -40,21 +40,21 @@ void Dialogue::save(ESMWriter &esm) const
     }
 }
 
-    void Dialogue::blank()
+void Dialogue::blank()
-    {
-        mInfo.clear();
-    }
-
-void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
 {
-    if (!merge || mInfo.empty() || info.mNext.empty())
+    mInfo.clear();
+}
+
+void Dialogue::readInfo(ESMReader &esm, bool merge)
+{
+    const std::string& id = esm.getHNOString("INAM");
+
+    if (!merge || mInfo.empty())
     {
-        mLookup[info.mId] = mInfo.insert(mInfo.end(), info);
+        ESM::DialInfo info;
-        return;
+        info.mId = id;
-    }
+        info.load(esm);
-    if (info.mPrev.empty())
+        mLookup[id] = mInfo.insert(mInfo.end(), info);
-    {
-        mLookup[info.mId] = mInfo.insert(mInfo.begin(), info);
         return;
     }
 
@@ -62,11 +62,30 @@ void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
 
     std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
 
-    lookup = mLookup.find(info.mId);
+    lookup = mLookup.find(id);
     if (lookup != mLookup.end())
     {
         it = lookup->second;
-        *it = info;
+
+        // Merge with existing record. Only the subrecords that are present in
+        // the new record will be overwritten.
+        it->load(esm);
+        return;
+    }
+
+    // New record
+    ESM::DialInfo info;
+    info.mId = id;
+    info.load(esm);
+
+    if (info.mNext.empty())
+    {
+        mLookup[id] = mInfo.insert(mInfo.end(), info);
+        return;
+    }
+    if (info.mPrev.empty())
+    {
+        mLookup[id] = mInfo.insert(mInfo.begin(), info);
         return;
     }
 
@@ -75,7 +94,7 @@ void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
     {
         it = lookup->second;
 
-        mLookup[info.mId] = mInfo.insert(++it, info);
+        mLookup[id] = mInfo.insert(++it, info);
         return;
     }
 
@@ -84,11 +103,11 @@ void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
     {
         it = lookup->second;
 
-        mLookup[info.mId] = mInfo.insert(it, info);
+        mLookup[id] = mInfo.insert(it, info);
         return;
     }
 
-    std::cerr << "Failed to insert info " << info.mId << std::endl;
+    std::cerr << "Failed to insert info " << id << std::endl;
 }
 
 }

components/esm/loaddial.hpp

@@ -47,8 +47,9 @@ struct Dialogue
     void load(ESMReader &esm);
     void save(ESMWriter &esm) const;
 
+    /// Read the next info record
     /// @param merge Merge with existing list, or just push each record to the end of the list?
-    void addInfo (const ESM::DialInfo& info, bool merge);
+    void readInfo (ESM::ESMReader& esm, bool merge);
 
     void blank();
     ///< Set record to default state (does not touch the ID and does not change the type).

components/terrain/chunk.cpp

@@ -4,6 +4,7 @@
 #include <OgreHardwareBufferManager.h>
 #include <OgreRenderQueue.h>
 #include <OgreMaterialManager.h>
+#include <OgreStringConverter.h>
 
 #include <extern/shiny/Main/Factory.hpp>
 
@@ -15,6 +16,7 @@ namespace Terrain
 
     Chunk::Chunk(Ogre::HardwareVertexBufferSharedPtr uvBuffer, const Ogre::AxisAlignedBox& bounds, const LoadResponseData& data)
         : mBounds(bounds)
+        , mOwnMaterial(false)
     {
         mVertexData = OGRE_NEW Ogre::VertexData;
         mVertexData->vertexStart = 0;
@@ -70,7 +72,7 @@ namespace Terrain
 
     Chunk::~Chunk()
     {
-        if (!mMaterial.isNull())
+        if (!mMaterial.isNull() && mOwnMaterial)
         {
 #if TERRAIN_USE_SHADER
             sh::Factory::getInstance().destroyMaterialInstance(mMaterial->getName());
@@ -81,9 +83,19 @@ namespace Terrain
         OGRE_DELETE mIndexData;
     }
 
-    void Chunk::setMaterial(const Ogre::MaterialPtr &material)
+    void Chunk::setMaterial(const Ogre::MaterialPtr &material, bool own)
     {
+        // Clean up the previous material, if we own it
+        if (!mMaterial.isNull() && mOwnMaterial)
+        {
+#if TERRAIN_USE_SHADER
+            sh::Factory::getInstance().destroyMaterialInstance(mMaterial->getName());
+#endif
+            Ogre::MaterialManager::getSingleton().remove(mMaterial->getName());
+        }
+
         mMaterial = material;
+        mOwnMaterial = own;
     }
 
     const Ogre::AxisAlignedBox& Chunk::getBoundingBox(void) const

components/terrain/chunk.hpp

@@ -20,8 +20,8 @@ namespace Terrain
 
         virtual ~Chunk();
 
-        /// @note Takes ownership of \a material
+        /// @param own Should we take ownership of the material?
-        void setMaterial (const Ogre::MaterialPtr& material);
+        void setMaterial (const Ogre::MaterialPtr& material, bool own=true);
 
         void setIndexBuffer(Ogre::HardwareIndexBufferSharedPtr buffer);
 
@@ -43,6 +43,7 @@ namespace Terrain
     private:
         Ogre::AxisAlignedBox mBounds;
         Ogre::MaterialPtr mMaterial;
+        bool mOwnMaterial; // Should we remove mMaterial on destruction?
 
         Ogre::VertexData* mVertexData;
         Ogre::IndexData* mIndexData;

components/terrain/material.cpp

@@ -46,35 +46,28 @@ namespace Terrain
 
     }
 
-    Ogre::MaterialPtr MaterialGenerator::generate(Ogre::MaterialPtr mat)
+    Ogre::MaterialPtr MaterialGenerator::generate()
     {
         assert(!mLayerList.empty() && "Can't create material with no layers");
 
-        return create(mat, false, false);
+        return create(false, false);
     }
 
-    Ogre::MaterialPtr MaterialGenerator::generateForCompositeMapRTT(Ogre::MaterialPtr mat)
+    Ogre::MaterialPtr MaterialGenerator::generateForCompositeMapRTT()
     {
         assert(!mLayerList.empty() && "Can't create material with no layers");
 
-        return create(mat, true, false);
+        return create(true, false);
     }
 
-    Ogre::MaterialPtr MaterialGenerator::generateForCompositeMap(Ogre::MaterialPtr mat)
+    Ogre::MaterialPtr MaterialGenerator::generateForCompositeMap()
     {
-        return create(mat, false, true);
+        return create(false, true);
     }
 
-    Ogre::MaterialPtr MaterialGenerator::create(Ogre::MaterialPtr mat, bool renderCompositeMap, bool displayCompositeMap)
+    Ogre::MaterialPtr MaterialGenerator::create(bool renderCompositeMap, bool displayCompositeMap)
     {
         assert(!renderCompositeMap || !displayCompositeMap);
-        if (!mat.isNull())
-        {
-#if TERRAIN_USE_SHADER
-            sh::Factory::getInstance().destroyMaterialInstance(mat->getName());
-#endif
-            Ogre::MaterialManager::getSingleton().remove(mat->getName());
-        }
 
         static int count = 0;
         std::stringstream name;
@@ -82,7 +75,7 @@ namespace Terrain
 
         if (!mShaders)
         {
-            mat = Ogre::MaterialManager::getSingleton().create(name.str(),
+            Ogre::MaterialPtr mat = Ogre::MaterialManager::getSingleton().create(name.str(),
                                                                Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
             Ogre::Technique* technique = mat->getTechnique(0);
             technique->removeAllPasses();

components/terrain/material.hpp

@@ -29,23 +29,17 @@ namespace Terrain
         void enableSplitShadows(bool splitShadows) { mSplitShadows = splitShadows; }
 
         /// Creates a material suitable for displaying a chunk of terrain using alpha-blending.
-        /// @param mat Material that will be replaced by the generated material. May be empty as well, in which case
+        Ogre::MaterialPtr generate ();
-        ///            a new material is created.
-        Ogre::MaterialPtr generate (Ogre::MaterialPtr mat);
 
         /// Creates a material suitable for displaying a chunk of terrain using a ready-made composite map.
-        /// @param mat Material that will be replaced by the generated material. May be empty as well, in which case
+        Ogre::MaterialPtr generateForCompositeMap ();
-        ///            a new material is created.
-        Ogre::MaterialPtr generateForCompositeMap (Ogre::MaterialPtr mat);
 
         /// Creates a material suitable for rendering composite maps, i.e. for "baking" several layer textures
         /// into one. The main difference compared to a normal material is that no shading is applied at this point.
-        /// @param mat Material that will be replaced by the generated material. May be empty as well, in which case
+        Ogre::MaterialPtr generateForCompositeMapRTT ();
-        ///            a new material is created.
-        Ogre::MaterialPtr generateForCompositeMapRTT (Ogre::MaterialPtr mat);
 
     private:
-        Ogre::MaterialPtr create (Ogre::MaterialPtr mat, bool renderCompositeMap, bool displayCompositeMap);
+        Ogre::MaterialPtr create (bool renderCompositeMap, bool displayCompositeMap);
 
         std::vector<LayerInfo> mLayerList;
         std::vector<Ogre::TexturePtr> mBlendmapList;

components/terrain/quadtreenode.cpp

@@ -400,13 +400,13 @@ void QuadTreeNode::load(const LoadResponseData &data)
     {
         if (mSize == 1)
         {
-            mChunk->setMaterial(mMaterialGenerator->generate(mChunk->getMaterial()));
+            mChunk->setMaterial(mMaterialGenerator->generate());
         }
         else
         {
             ensureCompositeMap();
             mMaterialGenerator->setCompositeMap(mCompositeMap->getName());
-            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap(mChunk->getMaterial()));
+            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap());
         }
     }
     // else: will be loaded in loadMaterials() after background thread has finished loading layers
@@ -532,13 +532,13 @@ void QuadTreeNode::loadMaterials()
     {
         if (mSize == 1)
         {
-            mChunk->setMaterial(mMaterialGenerator->generate(mChunk->getMaterial()));
+            mChunk->setMaterial(mMaterialGenerator->generate());
         }
         else
         {
             ensureCompositeMap();
             mMaterialGenerator->setCompositeMap(mCompositeMap->getName());
-            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap(mChunk->getMaterial()));
+            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap());
         }
     }
 }
@@ -554,7 +554,7 @@ void QuadTreeNode::prepareForCompositeMap(Ogre::TRect<float> area)
         std::vector<LayerInfo> layer;
         layer.push_back(mTerrain->getStorage()->getDefaultLayer());
         matGen.setLayerList(layer);
-        makeQuad(sceneMgr, area.left, area.top, area.right, area.bottom, matGen.generateForCompositeMapRTT(Ogre::MaterialPtr()));
+        makeQuad(sceneMgr, area.left, area.top, area.right, area.bottom, matGen.generateForCompositeMapRTT());
         return;
     }
     if (mSize > 1)
@@ -577,7 +577,7 @@ void QuadTreeNode::prepareForCompositeMap(Ogre::TRect<float> area)
     else
     {
         // TODO: when to destroy?
-        Ogre::MaterialPtr material = mMaterialGenerator->generateForCompositeMapRTT(Ogre::MaterialPtr());
+        Ogre::MaterialPtr material = mMaterialGenerator->generateForCompositeMapRTT();
         makeQuad(sceneMgr, area.left, area.top, area.right, area.bottom, material);
     }
 }
@@ -612,9 +612,9 @@ void QuadTreeNode::applyMaterials()
         mMaterialGenerator->enableShadows(mTerrain->getShadowsEnabled());
         mMaterialGenerator->enableSplitShadows(mTerrain->getSplitShadowsEnabled());
         if (mSize <= 1)
-            mChunk->setMaterial(mMaterialGenerator->generate(Ogre::MaterialPtr()));
+            mChunk->setMaterial(mMaterialGenerator->generate());
         else
-            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap(Ogre::MaterialPtr()));
+            mChunk->setMaterial(mMaterialGenerator->generateForCompositeMap());
     }
     if (hasChildren())
         for (int i=0; i<4; ++i)

files/mygui/openmw_console.skin.xml

@@ -13,8 +13,8 @@
     </Skin>
 
     <Skin name="MW_ConsoleCommand" size="29 28">
-        <Child type="TextBox" skin="MW_EditClient" offset="4 2 19 22" align="Bottom Stretch" name="Client"/>
         <Child type="Widget" skin="MW_Box" offset="0 0 29 26" align="Bottom Stretch"/>
+        <Child type="TextBox" skin="MW_EditClient" offset="4 2 19 22" align="Bottom Stretch" name="Client"/>
     </Skin>
 
 </MyGUI>

files/mygui/openmw_edit.skin.xml

@@ -10,14 +10,12 @@
 
     </Skin>
 
-    <Skin name="MW_TextBoxEditClient" size="10 10">
-
-        <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
-
-    </Skin>
-
     <Skin name="MW_TextEdit" size="512 20">
 
+        <!-- Borders -->
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 512 20" align="Stretch"/>
+
         <!-- Input -->
 
         <Property key="FontName" value="Default"/>
@@ -26,11 +24,6 @@
 
         <Child type="TextBox" skin="MW_TextEditClient" offset="4 1 502 18" align="Stretch" name="Client"/>
 
-
-        <!-- Borders -->
-
-        <Child type="Widget" skin="MW_Box" offset="0 0 512 20" align="Stretch" name="Client"/>
-
     </Skin>
 
     <Skin name="MW_TextBoxEdit" size="512 20">
@@ -41,7 +34,7 @@
 
         <Property key="TextColour" value="0.75 0.6 0.35"/>
 
-        <Child type="TextBox" skin="MW_TextBoxEditClient" offset="2 2 490 18" align="Stretch" name="Client"/>
+        <Child type="TextBox" skin="MW_TextEditClient" offset="2 2 490 18" align="Stretch" name="Client"/>
 
         <Child type="MWScrollBar" skin="MW_VScroll" offset="494 3 14 14" align="Right VStretch" name="VScroll"/>
 

files/mygui/openmw_trade_window.layout

@@ -44,7 +44,7 @@
             </Widget>
 
             <Widget type="TextBox" skin="SandText" position="48 0 140 24" name="TotalBalanceLabel" align="Left Top "/>
-            <Widget type="TextBox" skin="SandText" position="48 28 140 24" name="TotalBalance" align="Left Top">
+            <Widget type="EditBox" skin="MW_TextEdit" position="48 28 140 24" name="TotalBalance" align="Left Top">
                 <Property key="TextAlign" value="Center"/>
             </Widget>