diff --git a/build/IWP_VERSION.txt b/build/IWP_VERSION.txt index a9366076..109b65fd 100644 --- a/build/IWP_VERSION.txt +++ b/build/IWP_VERSION.txt @@ -1 +1 @@ -v5.3.0 \ No newline at end of file +v5.3.1 \ No newline at end of file diff --git a/build/VM_VERSION.txt b/build/VM_VERSION.txt index fb1b946d..a4ec0d3f 100644 --- a/build/VM_VERSION.txt +++ b/build/VM_VERSION.txt @@ -1 +1 @@ -iwpserver-2.1.0 \ No newline at end of file +iwpserver-2.1.1 \ No newline at end of file diff --git a/core/config/iwp-osx.ini b/core/config/iwp-osx.ini index a7fc6a83..c57521de 100644 --- a/core/config/iwp-osx.ini +++ b/core/config/iwp-osx.ini @@ -73,5 +73,5 @@ showDeployInfo=yes HideReadMeFile=osx/noreadme WebServerWarnMessage=osx/webserverwarn readMeLimit=6 -showWPResourcesTab=yes +showWPResourcesTab=no diff --git a/core/controlpanel/iwp-resources.rkt b/core/controlpanel/iwp-resources.rkt index 9d413ec5..c5016f57 100644 --- a/core/controlpanel/iwp-resources.rkt +++ b/core/controlpanel/iwp-resources.rkt @@ -15,6 +15,14 @@ racket/gui/base "iwp-environment.rkt") +;; are we on macos? +(define (is-macos-bitmap?) + (equal? (system-type) 'macosx)) + +;; are we on windows? +(define (is-windows-bitmap?) + (equal? (system-type) 'windows)) + ;; define main button bitmaps (define (wp-admin-bitmap) (read-bitmap (build-path (iwp-images-dir-path) "settings.png"))) @@ -67,10 +75,12 @@ (define (info-sign) (read-bitmap (build-path (iwp-images-dir-path) "info.png"))) -(define (deploy-bitmap) - (read-bitmap (build-path (iwp-images-dir-path) "deploy-button.png"))) - ;; start up wizard bitmap (define (readme-bitmap) (read-bitmap (build-path (iwp-images-dir-path) "readme1.png"))) + +(define (deploy-bitmap) + (cond + [(is-windows-bitmap?) (read-bitmap (build-path (iwp-images-dir-path) "deploy-button.png"))] + [(is-macos-bitmap?) (read-bitmap (build-path (iwp-images-dir-path) "deploy-button-mac.png")) ])) diff --git a/core/images/deploy-button-mac.png b/core/images/deploy-button-mac.png new file mode 100644 index 00000000..2a74bf73 Binary files /dev/null and b/core/images/deploy-button-mac.png differ diff --git a/core/images/deploy-info.png b/core/images/deploy-info.png deleted file mode 100644 index 9ea60fec..00000000 Binary files a/core/images/deploy-info.png and /dev/null differ diff --git a/core/images/readme6.png b/core/images/readme6.png index 8e3fe016..b2bab84f 100644 Binary files a/core/images/readme6.png and b/core/images/readme6.png differ