Merge branch 'development'

Moonshine-IDE · Aug 16, 2023 · de44320 · de44320
2 parents 61a7e43 + 4cf9b51
commit de44320
Show file tree

Hide file tree

Showing 18 changed files with 842 additions and 92 deletions.
diff --git a/Assets/text/en_US.json b/Assets/text/en_US.json
@@ -374,6 +374,20 @@
         "buttons":{
             "save": "Save",
             "cancel": "Cancel"
+        },
+        "browser": {
+        		"title": "Browser",
+        		"defaultbrowser": "Setup default Browser",
+        		"currentdefaultbrowser": "Current default Browser: %1",
+        		"titlesetupbrowser": "Browsers",
+        		"titlebrowserpath": "Setup %1 path",
+        		"browsername": "Browser name",
+        		"executablebrowserpath": "Executable Browser path",
+        		"locatebrowser": "Locate Browser",
+        		"defaultbrowser": "Default Browser",
+        		"browserlisthint": "Select default Browser",
+        		"browsernotdetected": "%1 not detected",
+        		"configurebrowser": "Configure"
         }
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ This release upgrade [demo-tasks](https://github.com/DominoVagrant/demo-tasks) p
 
 ### Added
 
-* Add MD5 hashes for newest version of installer Nomad-Web and Traveler ([#77](https://github.com/Moonshine-IDE/Super.Human.Installer/issues/77)
+* Add MD5 hashes for newest version of installer Nomad-Web and Traveler ([#77](https://github.com/Moonshine-IDE/Super.Human.Installer/issues/77))
 
 ### Changed
 

diff --git a/Genesis/Source/genesis/application/GenesisApplication.hx b/Genesis/Source/genesis/application/GenesisApplication.hx
@@ -30,6 +30,7 @@
 
 package genesis.application;
 
+import superhuman.browser.Browsers;
 import champaign.core.logging.Logger;
 import champaign.core.primitives.VersionInfo;
 import champaign.sys.logging.targets.FileTarget;
@@ -518,13 +519,7 @@ abstract class GenesisApplication extends Application {
     }
 
     function _visitGenesisDirectory( ?e:Dynamic ) {
-
-        #if linux
-		Shell.getInstance().open( [ GENESIS_ADDRESS ] );
-		#else
-        System.openURL( GENESIS_ADDRESS );
-        #end
-
+		Browsers.openLink(GENESIS_ADDRESS);
     }
 
     function _visitSourceCode( ?e:Dynamic ) {}

diff --git a/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx b/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx
@@ -95,6 +95,7 @@ class GenesisApplicationTheme extends ClassVariantTheme {
     public static final BUTTON_SMALL:String = "button-small";
     public static final BUTTON_TINY:String = "button-tiny";
     public static final BUTTON_WARNING:String = "button-warning";
+    public static final BUTTON_BROWSER_WARNING:String = "button-browser-warning";
     public static final CHECK_LARGE:String = "check-large";
     public static final CHECK_MEDIUM:String = "check-medium";
     public static final INVALID:String = "invalid";
@@ -107,6 +108,7 @@ class GenesisApplicationTheme extends ClassVariantTheme {
     public static final LABEL_LINK_SMALL:String = "label-link-small";
     public static final LABEL_SMALL_CENTERED:String = "label-small-centered";
     public static final LABEL_TITLE:String = "label-title";
+    public static final LABEL_ERROR:String = "label-error";
     public static final LAYOUT_GROUP_CREATE_ACCOUNT:String = "layout-group-create-account";
     public static final LAYOUT_GROUP_FOOTER:String = "layout-group-footer";
     public static final LAYOUT_GROUP_HEADER:String = "layout-group-header";
@@ -249,8 +251,10 @@ class GenesisApplicationTheme extends ClassVariantTheme {
 
             Button : new TextFormat( "_sans", 14, _themeColors.BtnText ),
             ButtonWarning : new TextFormat( "_sans", 14, _themeColors.BtnWarningText ),
+            Check: new TextFormat( "_sans", 14, White),
             ConsoleText:  new TextFormat( "_typewriter", 14, _themeColors.TextConsole ),
             ConsoleTextError:  new TextFormat( "_typewriter", 14, _themeColors.Error ),
+            LabelTextError: new TextFormat("_typewriter", 14, _themeColors.Error, true),
             ConsoleTextSelected:  new TextFormat( "_typewriter", 14, _themeColors.TextConsole ),
             Default : new TextFormat( "_sans", 14, _themeColors.Text ),
             DefaultCentered : new TextFormat( "_sans", 14, _themeColors.Text, null, null, null, null, null, TextFormatAlign.CENTER ),
@@ -276,6 +280,7 @@ class GenesisApplicationTheme extends ClassVariantTheme {
         this.styleProvider.setStyleFunction( Button, BUTTON_SMALL, _setButtonSmallStyles );
         this.styleProvider.setStyleFunction( Button, BUTTON_TINY, _setButtonTinyStyles );
         this.styleProvider.setStyleFunction( Button, BUTTON_WARNING, _setButtonWarningStyles );
+        this.styleProvider.setStyleFunction( Button, BUTTON_BROWSER_WARNING, _setButtonNoBackgrounIconStyles );
         this.styleProvider.setStyleFunction( Button, GenesisFormPupUpListView.CHILD_VARIANT_BUTTON, _setPopUpListViewButtonStyles );
         this.styleProvider.setStyleFunction( Button, GenesisFormPupUpListView.CHILD_VARIANT_BUTTON_INVALID, _setPopUpListViewInvalidButtonStyles );
         this.styleProvider.setStyleFunction( Button, PopUpListView.CHILD_VARIANT_BUTTON, _setPopUpListViewButtonStyles );
@@ -307,6 +312,7 @@ class GenesisApplicationTheme extends ClassVariantTheme {
         this.styleProvider.setStyleFunction( Label, LABEL_LINK_SMALL, _setLabelLinkSmallStyles );
         this.styleProvider.setStyleFunction( Label, LABEL_SMALL_CENTERED, _setLabelSmallCenteredStyles );
         this.styleProvider.setStyleFunction( Label, LABEL_TITLE, _setLabelTitleStyles );
+        this.styleProvider.setStyleFunction( Label, LABEL_ERROR, _setLabelErrorStyles );
         this.styleProvider.setStyleFunction( Label, null, _setLabelStyles );
         this.styleProvider.setStyleFunction( LayoutGroup, APPLICATION, _setApplicationLayoutGroupStyles );
         this.styleProvider.setStyleFunction( LayoutGroup, LAYOUT_GROUP_CREATE_ACCOUNT, _setLayoutGroupCreateAccountStyles );
@@ -405,6 +411,11 @@ class GenesisApplicationTheme extends ClassVariantTheme {
         button.setSkinForState( ButtonState.DISABLED, disabledSkin );
 
     }
+
+    function _setButtonNoBackgrounIconStyles( button:Button ) {
+    		var defaultSkin = new RectangleSkin( FillStyle.SolidColor( _themeColors.BtnWarning, 0 ) );
+        button.backgroundSkin = defaultSkin;
+	}
 
     function _setButtonSelectFileStyles( button:Button ) {
 
@@ -609,6 +620,10 @@ class GenesisApplicationTheme extends ClassVariantTheme {
 
     }
 
+    function _setLabelErrorStyles( label:Label ) {
+    		label.textFormat = _themeTypography.LabelTextError;
+    }
+
     function _setLabelHugeStyles( label:Label ) {
 
         label.textFormat = _themeTypography.Huge;
@@ -926,7 +941,7 @@ enum abstract Color( Int ) to Int {
     var GreyD = 0xDDDDDD;
     var Orange = 0xFFAE00;
     var OrangeLight = 0xFFC74E;
-    var Red = 0xff3a3a;
+    var Red = 0xec2222;
     var White = 0xFFFFFF;
 
 }
@@ -970,8 +985,10 @@ typedef Typography = {
 
     var Button:TextFormat;
     var ButtonWarning:TextFormat;
+    var Check:TextFormat;
     var ConsoleText:TextFormat;
     var ConsoleTextError:TextFormat;
+    var LabelTextError:TextFormat;
     var ConsoleTextSelected:TextFormat;
     var Default:TextFormat;
     var DefaultCentered:TextFormat;

diff --git a/Genesis/Source/prominic/sys/tools/SysTools.hx b/Genesis/Source/prominic/sys/tools/SysTools.hx
@@ -109,6 +109,17 @@ class SysTools {
 
     }
 
+    public static function getWindowsUserName() {
+    		var envs = Sys.environment();
+		if (envs.exists("USERNAME")) {
+			return envs["USERNAME"];
+		}
+
+		if (envs.exists("USER")) {
+			return envs["USER"];
+		}    
+		return null;
+    }
 }
 
 enum CPUArchitecture {