Tidied question box layout.

Improved JSON logging a little bit.

Author: ccw808

MTA10/core/CQuestionBox.cpp

@@ -59,17 +59,17 @@ void CQuestionBox::Show ( void )
     SString strMsg = m_pMessage->GetText ();
     unsigned int uiNumLines = std::count( strMsg.begin(), strMsg.end(), '\n' ) + 1;
 
-    float fMsgWidth = 400;
-    float fMsgHeight = Max < unsigned int > ( 3, uiNumLines ) * m_pMessage->GetFontHeight ();
-    float fWinWidth = fMsgWidth;
+    float fMsgWidth = Max ( 400.f, m_pMessage->GetTextExtent () + 50.f );
+    float fMsgHeight = Max < float > ( 3, uiNumLines ) * m_pMessage->GetFontHeight ();
+    float fWinWidth = Max ( fMsgWidth, m_uiActiveButtons * ( 112 + 10.f ) );
     float fWinHeight = 50 + fMsgHeight + 50 + 30;
 
     CVector2D resolution = CCore::GetSingleton().GetGUI()->GetResolution();
-    m_pWindow->SetSize ( CVector2D ( fWinWidth, fWinHeight + 10  ), false );
     m_pWindow->SetPosition ( CVector2D ( resolution.fX / 2 - fWinWidth / 2, resolution.fY / 2 - fWinHeight / 2  ), false );
+    m_pWindow->SetSize ( CVector2D ( fWinWidth, fWinHeight + 10  ), false );
 
+    m_pMessage->SetPosition ( CVector2D ( fWinWidth / 2 - fMsgWidth / 2, fWinHeight / 2 - fMsgHeight / 2 - 10  ), false );
     m_pMessage->SetSize ( CVector2D ( fMsgWidth, fMsgHeight ), false );
-    m_pMessage->SetPosition ( CVector2D ( 0, fWinHeight / 2 - fMsgHeight / 2 - 10  ), false );
     m_pMessage->SetHorizontalAlign ( CGUI_ALIGN_HORIZONTALCENTER );
 
     // Position the buttons evenly across the bottom
@@ -82,11 +82,6 @@ void CQuestionBox::Show ( void )
             float fPosX = fWinWidth - ( ( i + 1 ) * fSpaceBetween + i * 112 ) - 112;
             m_ButtonList[ i ]->SetPosition ( CVector2D ( fPosX, fWinHeight - 35  ), false );
             m_ButtonList[ i ]->SetSize ( CVector2D ( 112, 24 ), false );
-            m_ButtonList[ i ]->SetVisible ( true );
-        }
-        else
-        {
-            m_ButtonList[ i ]->SetVisible ( false );
         }
     }
 
@@ -103,6 +98,8 @@ void CQuestionBox::Reset ( void )
     SetMessage ( "" );
     SetCallback ( NULL );
     m_uiActiveButtons = 0;
+    for ( unsigned int i = 0 ; i < m_ButtonList.size () ; i++ )
+        m_ButtonList[ i ]->SetVisible ( false );
 }
 
 
@@ -123,9 +120,10 @@ void CQuestionBox::SetButton ( unsigned int uiButton, const SString& strText )
     m_uiActiveButtons = Max ( m_uiActiveButtons, uiButton + 1 );
     while ( m_ButtonList.size () < m_uiActiveButtons )
     {
-        CGUIButton* pButton = reinterpret_cast < CGUIButton* > ( g_pCore->GetGUI ()->CreateButton ( m_pWindow, "Connect" ) );
+        CGUIButton* pButton = reinterpret_cast < CGUIButton* > ( g_pCore->GetGUI ()->CreateButton ( m_pWindow, "" ) );
         pButton->SetClickHandler ( GUI_CALLBACK ( &CQuestionBox::OnButtonClick, this ) );
         pButton->SetUserData ( reinterpret_cast < void* > ( m_ButtonList.size () ) );
+        pButton->SetVisible ( false );
         m_ButtonList.push_back ( pButton );
     }
 

MTA10/core/CSettings.cpp

@@ -1854,7 +1854,7 @@ void CSettings::SaveData ( void )
         strMessage += "\n\nDo you want to restart now?";
         CQuestionBox* pQuestionBox = CCore::GetSingleton ().GetLocalGUI ()->GetMainMenu ()->GetQuestionWindow ();
         pQuestionBox->Reset ();
-        pQuestionBox->SetTitle ( "Restart required" );
+        pQuestionBox->SetTitle ( "RESTART REQUIRED" );
         pQuestionBox->SetMessage ( strMessage );
         pQuestionBox->SetButton ( 0, "No" );
         pQuestionBox->SetButton ( 1, "Yes" );

MTA10/core/CVersionUpdater.cpp

@@ -92,7 +92,7 @@ void CVersionUpdater::DoPulse ( void )
 
     if ( m_strStage == "End" )
     {
-        m_strStage == "";
+        m_strStage = "";
     }
 }
 
@@ -307,7 +307,7 @@ void CVersionUpdater::StartDownload ( void )
 
     // Display dialog
     GetQuestionBox ().Reset ();
-    GetQuestionBox ().SetTitle ( "Downloading" );
+    GetQuestionBox ().SetTitle ( "DOWNLOADING" );
     GetQuestionBox ().SetMessage ( "waiting..." );
     GetQuestionBox ().SetButton ( 0, "Cancel" );
     GetQuestionBox ().Show ();
@@ -359,7 +359,7 @@ void CVersionUpdater::PollDownload ( void )
         if ( !bHashOk )
         {
             GetQuestionBox ().Reset ();
-            GetQuestionBox ().SetTitle ( "Error downloading" );
+            GetQuestionBox ().SetTitle ( "ERROR DOWNLOADING" );
             GetQuestionBox ().SetMessage ( "The file had an accident on the infomation superhighway" );
             GetQuestionBox ().SetButton ( 0, "OK" );
             GetQuestionBox ().Show ();
@@ -396,7 +396,7 @@ void CVersionUpdater::PollDownload ( void )
         if ( strPathFilename.length () == 0 )
         {
             GetQuestionBox ().Reset ();
-            GetQuestionBox ().SetTitle ( "Error saving" );
+            GetQuestionBox ().SetTitle ( "ERROR SAVING" );
             GetQuestionBox ().SetMessage ( "The file wants to stay in ram" );
             GetQuestionBox ().SetButton ( 0, "OK" );
             GetQuestionBox ().Show ();
@@ -409,7 +409,7 @@ void CVersionUpdater::PollDownload ( void )
 
         // Exit game after button press
         GetQuestionBox ().Reset ();
-        GetQuestionBox ().SetTitle ( "Download complete" );
+        GetQuestionBox ().SetTitle ( "DOWNLOAD COMPLETE" );
         GetQuestionBox ().SetMessage ( m_DownloadInfo.strMsg2 );
         GetQuestionBox ().SetButton ( 0, "OK" );
         GetQuestionBox ().Show ();

MTA10_Server/mods/deathmatch/logic/lua/CLuaArgument.cpp

@@ -976,7 +976,7 @@ bool CLuaArgument::ReadFromJSONObject ( json_object* object, std::vector < CLuaA
                             }
                             else 
                             {
-                                g_pGame->GetScriptDebugging()->LogError ( NULL, "Invalid element specified." );
+                                g_pGame->GetScriptDebugging()->LogError ( NULL, SString ( "Invalid element specified in JSON string '%s'.", szString ) );
                                 m_iType = LUA_TNIL;
                             }
                             break;
@@ -990,7 +990,7 @@ bool CLuaArgument::ReadFromJSONObject ( json_object* object, std::vector < CLuaA
                             }
                             else 
                             {
-                                g_pGame->GetScriptDebugging()->LogError ( NULL, "Invalid resource specified." );
+                                g_pGame->GetScriptDebugging()->LogError ( NULL, SString ( "Invalid resource specified in JSON string '%s'.", szString ) );
                                 m_iType = LUA_TNIL;
                             }
                             break;
@@ -1006,7 +1006,7 @@ bool CLuaArgument::ReadFromJSONObject ( json_object* object, std::vector < CLuaA
                             }
                             else
                             {
-                                g_pGame->GetScriptDebugging()->LogError ( NULL, "Invalid table reference specified." );
+                                g_pGame->GetScriptDebugging()->LogError ( NULL, SString ( "Invalid table reference specified in JSON string '%s'.", szString ) );
                                 m_iType = LUA_TNIL;
                             }
                             break;