Changeset 1393
- Timestamp:
- 05/30/19 11:09:16 (5 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/auth/account/Create.java
r1389 r1393 207 207 initialSettings.put("settings.identity.PublicKey", constructTextSetting("The RSA key used to decrypt things encrypted with your RSA public key.", "PublicKey", publicKey)); 208 208 initialSettings.put("settings.identity.Email", constructGenericSetting(String.class, "Your public-facing email address.", "Email", email, username)); 209 initialSettings.put("settings.UserSettings.UserName", constructGenericSetting(String.class, "User name", "Username", username, username));210 initialSettings.put("settings.UserSettings.ProfileName", constructGenericSetting(String.class, "Profile name", "Profilename", username, username));209 initialSettings.put("settings.UserSettings.UserName", constructGenericSetting(String.class, "UserName", "UserName", username, username)); 210 initialSettings.put("settings.UserSettings.ProfileName", constructGenericSetting(String.class, "ProfileName", "ProfileName", username, username)); 211 211 initialSettings.put("settings.UserSettings.HomeFrame", constructGenericSetting(String.class, "The home frame", "HomeFrame", username + 1, username)); 212 212 initialSettings.put("org.expeditee.gui.folders.FolderSettings.FrameDirs", FolderSettings.FrameDirs); -
trunk/src/org/expeditee/gui/FrameUtils.java
r1363 r1393 1604 1604 Setting setting = specifiedSettings.get(key); 1605 1605 String name = setting.getName(); 1606 Text representation = setting.generateRepresentation(name .substring(0, 1).toUpperCase() + name.substring(1).toLowerCase(), profile.getFramesetName());1606 Text representation = setting.generateRepresentation(name, profile.getFramesetName()); 1607 1607 Collection<Text> canditates = profile.getTextItems(); 1608 1608 canditates.removeIf(text -> !text.getText().startsWith(representation.getText().split(" ")[0])); -
trunk/src/org/expeditee/settings/Settings.java
r1304 r1393 93 93 94 94 String settingsPageName = clazz.getPackage().getName().toLowerCase().substring(SETTINGS_PACKAGE_PARENT.length()); 95 95 96 // System.out.println(settingsPage + " : " + clazz.getName()); 96 97 _pages.put(settingsPageName, new PageDescriptor(clazz)); … … 262 263 } 263 264 264 265 Iterator<String> keys = pd.orderedEntries. stream().map(t -> t.toLowerCase()).iterator();265 //Iterator<String> keys = pd.orderedEntries.stream().map(t -> t.toLowerCase()).iterator(); 266 Iterator<String> keys = pd.orderedEntries.iterator(); 266 267 while(keys.hasNext()) { 267 268 String key = keys.next(); 268 Setting setting = pd.settings.get(key );269 Setting setting = pd.settings.get(key.toLowerCase()); 269 270 if (setting == null) { 270 271 continue; … … 274 275 int x = 0, y = 0; 275 276 276 if (key. equals("pass")) {277 if (key.toLowerCase().equals("pass")) { 277 278 // Special case for Password widgets 278 279 Text passwordWidgetText = frames.addText("iw: org.expeditee.items.widgets.Passwsord", null, null, null, false); … … 285 286 } else { 286 287 // Determine the content for a setting label. 287 String name = key.substring(0, 1).toUpperCase() + key.substring(1); 288 //String name = key.substring(0, 1).toUpperCase() + key.substring(1); 289 //String name = key; 288 290 289 291 // Construct and add text representation for setting. 290 292 // If a setting has no initialised value then it is not included. 291 Text settingRepresentation = setting.generateRepresentation( name, frames.getCurrentFrame().getFramesetName()).copy();293 Text settingRepresentation = setting.generateRepresentation(key, frames.getCurrentFrame().getFramesetName()).copy(); 292 294 if (settingRepresentation.getBounds() == null) { 293 295 continue;
Note:
See TracChangeset
for help on using the changeset viewer.