Changeset 1434 for trunk/src/org/expeditee/settings/UserSettings.java
- Timestamp:
- 10/02/19 14:19:48 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/settings/UserSettings.java
r1415 r1434 35 35 import org.expeditee.gui.FrameUtils; 36 36 import org.expeditee.gui.MessageBay; 37 import org.expeditee.gui.management.ProfileManager; 37 38 import org.expeditee.items.Text; 38 39 import org.expeditee.setting.BooleanSetting; … … 42 43 import org.expeditee.setting.IntegerSetting; 43 44 import org.expeditee.setting.ListSetting; 45 import org.expeditee.setting.Setting; 44 46 import org.expeditee.setting.StringSetting; 45 47 import org.expeditee.settings.folders.FolderSettings; … … 52 54 public abstract class UserSettings { 53 55 54 public static String DEFAULT_PROFILE_NAME = "default";56 public static final String DEFAULT_PROFILE_NAME = "default"; 55 57 56 58 public static Boolean PublicAndPrivateResources; … … 66 68 @Override 67 69 public boolean setSetting(Text text) { 68 if(text.getText().indexOf(':') == -1 || !text.hasLink()) { 69 text.setLink(UserSettings.ProfileName.get() + "1"); 70 String profileName = UserSettings.ProfileName.get(); 71 if(text.getText().indexOf(':') == -1 || !text.hasLink()) { 72 if (!profileName.equals(ProfileManager.USER_NAME_PATTERN)) { 73 text.setLink(profileName + "1"); 74 } 70 75 //text.setLink(FrameIO.LoadProfile(UserSettings.ProfileName.get()).getName()); 71 76 } … … 79 84 // MessageBay.warningMessage("Home frame: " + first 80 85 // + " is not a valid frame."); 81 _value = FrameIO.LoadProfile(UserSettings.ProfileName.get()).getName();86 _value = profileName + "1";//FrameIO.LoadProfile(UserSettings.ProfileName.get()).getName(); 82 87 } 83 88 return true; … … 104 109 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); 105 110 106 public static final StringSetting UserName = new StringSetting(" Profile name", FrameIO.ConvertToValidFramesetName(System.getProperty("user.name")));107 108 public static final StringSetting ProfileName = new StringSetting("Profile name", UserName.get());111 public static final StringSetting UserName = new StringSetting("User name", "${USER.NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name")) 112 113 public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER.NAME}"); 109 114 110 115 public static final BooleanSetting AntiAlias = new BooleanSetting("Whether anti-aliasing should be enabled", "AntiAlias", false); … … 246 251 if (PublicAndPrivateResources) { 247 252 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH); 248 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_ PRIVATE_PATH);253 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_USERNAME_PRIVATE_PATH); 249 254 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH); 250 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_ PRIVATE_PATH);255 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH); 251 256 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH); 252 257 if (AuthenticatorBrowser.isAuthenticated()) { … … 258 263 259 264 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH); 260 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_ PRIVATE_PATH);265 FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_USERNAME_PRIVATE_PATH); 261 266 FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get()); 262 267 263 268 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH); 264 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_ PRIVATE_PATH);269 FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_USERNAME_PRIVATE_PATH); 265 270 FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get()); 266 271 } else {
Note:
See TracChangeset
for help on using the changeset viewer.