Changeset 1442 for trunk

Timestamp:

11/07/19 13:15:36 (4 years ago)

Author:

bnemhaus

Message:

 

Location:

trunk/src/org/expeditee

Files:

• gui/FrameIO.java (modified) (1 diff)
• settings/UserSettings.java (modified) (1 diff)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -48 +48 @@
 import java.util.stream.Collectors;
 
-import org.apollo.io.AudioPathManager;
 import org.expeditee.actions.Actions;
 import org.expeditee.agents.ExistingFramesetException;

trunk/src/org/expeditee/settings/UserSettings.java

@@ -108 +108 @@
         public static final IntegerSetting TitlePosition = new IntegerSetting("Position of title item in frame (TODO: find whether this is x-offset or y-offset)", "TitlePosition", 150);
                 
-        public static final StringSetting UserName = new StringSetting("User name", "${USER_NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
-        
-        public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER_NAME}");
+        public static final StringSetting UserName = new StringSetting("User name", ProfileManager.USER_NAME_FLAG); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
+        
+        public static final StringSetting ProfileName = new StringSetting("Profile name", ProfileManager.USER_NAME_FLAG);
                 
         public static final BooleanSetting AntiAlias = new BooleanSetting("Whether anti-aliasing should be enabled", "AntiAlias", false);