Josh Engebretson 10 years ago
parent
commit
cc86aef4f8

+ 1 - 1
Source/AtomicEditor/Source/License/UIManageLicense.cpp

@@ -83,7 +83,7 @@ bool UIManageLicense::OnEvent(const TBWidgetEvent &ev)
         {
             if (editor->IsProjectLoaded())
             {
-                editor->PostModalError("Close Project", "Please close the current project before deactiving license");
+                editor->PostModalError("Close Project", "Please close the current project before deactivating license");
             }
             else
             {

+ 3 - 3
Source/AtomicEditor/Source/UI/Modal/UIAbout.cpp

@@ -89,18 +89,18 @@ void UIAbout::GenerateAboutText(String& text)
 
     text += "<widget TBImageWidget: filename: 'AtomicEditor/editor/images/atomic_logo.png'>\n\n";
     text.AppendWithFormat("<color #D4FB79>Version  %i.%i.p%i</color>\n\n", ATOMIC_EDITOR_VERSION_MAJOR, ATOMIC_EDITOR_VERSION_MINOR, ATOMIC_EDITOR_VERSION_PATCH);
-    text += "(c) 2014-2015 THUNDERBEAST GAMES LLC\n\n";
+    text += "(c) 2014-2015 THUNDERBEAST GAMES LLC\n\n\n";
 
     text += "<color #D4FB79>Installed platforms and modules:</color>\n\n";
 
     if (licenseSystem->IsStandardLicense())
     {
-        text += "    <widget TBSkinImage: skin: 'LogoMac-Small'> <widget TBSkinImage: skin: 'LogoWindows-Small'> <widget TBSkinImage: skin: 'Module2D-Small'>\n\n";
+        text += "    <widget TBSkinImage: skin: 'LogoMac-Small'> <widget TBSkinImage: skin: 'LogoWindows-Small'> <widget TBSkinImage: skin: 'Module2D-Small'>\n\n\n";
 
         text += "<color #76D6FF>Available platforms and modules:</color>\n\n" \
         "    <widget TBSkinImage: skin: 'LogoHTML5-Small'> <widget TBSkinImage: skin: 'LogoAndroid-Small'> " \
         "<widget TBSkinImage: skin: 'LogoIOS-Small'> <widget TBSkinImage: skin: 'Module3D-Small'> "\
-        "<widget TBButton: text: 'Get Pro' skin: 'TBButton.greentext' id: 'purchase_pro' >\n\n";
+        "<widget TBButton: text: 'Get Pro' skin: 'TBButton.greentext' id: 'purchase_pro' >\n\n\n";
     }
     else
     {

+ 11 - 0
Source/AtomicEditor/Source/UI/Modal/UIBuildSettings.cpp

@@ -314,6 +314,17 @@ bool UIBuildSettings::OnEvent(const TBWidgetEvent &ev)
 
             }
 
+#ifdef ATOMIC_PLATFORM_WINDOWS
+
+                if (id == TBIDC("iOSBuildSettings"))
+                {
+                    Editor* editor = GetSubsystem<Editor>();
+                    editor->PostModalInfo("MacOSX Required", "iOS platform requires MacOSX Editor");
+                    return true;
+                }
+#endif
+
+
             RequestPlatformChange(id);
             return true;
 // END LICENSE MANAGEMENT

+ 4 - 0
Source/AtomicEditor/Source/UI/UIMainFrame.cpp

@@ -133,6 +133,10 @@ MainFrame::MainFrame(Context* context) :
     platformIndicator_ = delegate_->GetWidgetByIDAndType<TBSkinImage>(TBIDC("current_platform_indicator"));
     assert(platformIndicator_);
 
+    TBButton* developer = delegate_->GetWidgetByIDAndType<TBButton>(TBIDC("menu developer"));
+    assert(developer);
+    developer->SetVisibilility(WIDGET_VISIBILITY_GONE);
+
     consoletext_ = delegate_->GetWidgetByIDAndType<TBEditField>(TBIDC("consoletext"));
     consoletext_->SetText("Atomic Editor Initialized");