Author: yradtsevich Date: 2011-11-17 14:13:02 -0500 (Thu, 17 Nov 2011) New Revision: 36410 Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java Removed: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesManager.java Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - refactored source - added missing WebKit handling Copied: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java (from rev 36409, workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesManager.java) =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListHolder.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.model; + +import java.util.Observable; + + +/** + * @author Yahor Radtsevich (yradtsevich) + */ +public class DevicesListHolder extends Observable { + private static DevicesListHolder instance; + private DevicesList devicesList; + + protected DevicesListHolder() { + } + + public static DevicesListHolder getInstance() { + if (instance == null) { + instance = new DevicesListHolder(); + } + return instance; + } + + public DevicesList getDevicesList() { + return devicesList; + } + + public void setDevicesList(DevicesList devicesList) { + if (this.devicesList != devicesList) { + this.devicesList = devicesList; + setChanged(); + } + } +} Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java (rev 0) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesListStorage.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -0,0 +1,170 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.browsersim.model; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.jboss.tools.browsersim.util.ResourcesUtil; + +/** + * @author Yahor Radtsevich (yradtsevich) + */ +public class DevicesListStorage { + + private static final String DEFAULT_PREFERENCES_RESOURCE = "/org/jboss/tools/browsersim/resources/config/devices.cfg"; + private static final String USER_PREFERENCES_FILE = "devices.cfg"; + private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.browsersim"; + + public static void saveUserDefinedDevicesList(DevicesList devicesList) { + File configFolder = new File(USER_PREFERENCES_FOLDER); + configFolder.mkdir(); + File configFile = new File(configFolder, USER_PREFERENCES_FILE); + + try { + saveDevicesList(devicesList, configFile); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static DevicesList loadUserDefinedDevicesList() { + File customConfigFile = new File(USER_PREFERENCES_FOLDER + '/' + USER_PREFERENCES_FILE); + DevicesList devicesList = null; + if (customConfigFile.exists()) { + try { + devicesList = loadDevicesList(customConfigFile); + } catch (IOException e) { + e.printStackTrace(); + } + } + + return devicesList; + } + + public static DevicesList loadDefaultDevicesList() { + DevicesList devicesList; + try { + devicesList = loadDevicesList(ResourcesUtil.getResourceAsStream( + DEFAULT_PREFERENCES_RESOURCE)); + } catch (IOException e) { + e.printStackTrace(); + devicesList = new DevicesList(new ArrayList<Device>(), 0); + } + + return devicesList; + } + + private static void saveDevicesList(DevicesList devicesList, File file) throws IOException { + BufferedWriter writer = new BufferedWriter(new FileWriter(file)); + + writer.write(String.valueOf(devicesList.getSelectedDeviceIndex())); + writer.write('\n'); + + for (Device device : devicesList.getDevices()) { + writer.write( encode(device.getName() )); + writer.write('\t'); + writer.write(encode( String.valueOf(device.getWidth()) )); + writer.write('\t'); + writer.write(encode( String.valueOf(device.getHeight()) )); + writer.write('\t'); + writer.write( encode(device.getUserAgent() )); + writer.write('\n'); + } + + writer.close(); + } + + private static DevicesList loadDevicesList(File file) throws IOException { + InputStream inputStream = new FileInputStream(file); + return loadDevicesList(inputStream); + } + + private static DevicesList loadDevicesList(InputStream inputStream) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); + + String nextLine = reader.readLine(); + int selectedDeviceIndex = 0; + if (nextLine != null) { + selectedDeviceIndex = Integer.parseInt(nextLine); + } + Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]*)\\t([0-9]*)\\t(.*)$"); + + List<Device> devices = new ArrayList<Device>(); + while ((nextLine = reader.readLine()) != null) { + Matcher deviceMatcher = devicePattern.matcher(nextLine); + if (deviceMatcher.matches()) { + devices.add(new Device( + decode(deviceMatcher.group(1)), + Integer.parseInt(deviceMatcher.group(2)), + Integer.parseInt(deviceMatcher.group(3)), + decode(deviceMatcher.group(4)) + )); + } + } + + reader.close(); + + return new DevicesList(devices, selectedDeviceIndex); + } + + private static String encode(String string) { + return string.replace("\\", "\\\\").replace("\n", "\\n").replace("\t", "\\t"); + } + + private static String decode(String string) { + StringBuilder result = new StringBuilder(); + + int i = 0; + while (i < string.length() - 1) { + char c0 = string.charAt(i); + if (c0 == '\\') { + char c1 = string.charAt(i + 1); + switch (c1) { + case '\\': + result.append('\\'); + i++; + break; + case 'n': + result.append('\n'); + i++; + break; + case 't': + result.append('\t'); + i++; + break; + default: + result.append(c0); + break; + } + } else { + result.append(c0); + } + i++; + } + + if (i < string.length()) { + result.append(string.charAt(i)); + } + + return result.toString(); + } +} Deleted: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesManager.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesManager.java 2011-11-17 16:27:48 UTC (rev 36409) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/model/DevicesManager.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -1,158 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.browsersim.model; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Observable; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -/** - * @author Yahor Radtsevich (yradtsevich) - */ -public class DevicesManager extends Observable { - private static DevicesManager instance; - private DevicesList devicesList; - public static final String IPHONE_OS_4_0_USER_AGENT = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"; - - protected DevicesManager() { - } - - public static DevicesManager getInstance() { - if (instance == null) { - instance = new DevicesManager(); - } - return instance; - } - - public DevicesList getDevicesList() { - return devicesList; - } - - public void setDevicesList(DevicesList devicesList) { - if (this.devicesList != devicesList) { - this.devicesList = devicesList; - setChanged(); - } - } - -// List<Device> devices = new ArrayList<Device>(); -// devices.add(new Device("Apple iPhone 3", 320, 480, IPHONE_OS_4_0_USER_AGENT)); -// devices.add(new Device("Apple iPhone 4", 640, 960, IPHONE_OS_4_0_USER_AGENT)); -// devices.add(new Device("BlackBerry Bold Touch 9900", 640, 480, "Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+")); -// devices.add(new Device("Samsung Galaxy S II", 640, 800, "Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1")); - - - public static String encode(String string) { - return string.replace("\\", "\\\\").replace("\n", "\\n").replace("\t", "\\t"); - } - - public static String decode(String string) { - StringBuilder result = new StringBuilder(); - - int i = 0; - while (i < string.length() - 1) { - char c0 = string.charAt(i); - if (c0 == '\\') { - char c1 = string.charAt(i + 1); - switch (c1) { - case '\\': - result.append('\\'); - i++; - break; - case 'n': - result.append('\n'); - i++; - break; - case 't': - result.append('\t'); - i++; - break; - default: - result.append(c0); - break; - } - } else { - result.append(c0); - } - i++; - } - - if (i < string.length()) { - result.append(string.charAt(i)); - } - - return result.toString(); - } - - public static void saveDevicesList(DevicesList devicesList, File file) throws IOException { - BufferedWriter writer = new BufferedWriter(new FileWriter(file)); - - writer.write(String.valueOf(devicesList.getSelectedDeviceIndex())); - writer.write('\n'); - - for (Device device : devicesList.getDevices()) { - writer.write( encode(device.getName() )); - writer.write('\t'); - writer.write(encode( String.valueOf(device.getWidth()) )); - writer.write('\t'); - writer.write(encode( String.valueOf(device.getHeight()) )); - writer.write('\t'); - writer.write( encode(device.getUserAgent() )); - writer.write('\n'); - } - - writer.close(); - } - - public static DevicesList loadDevicesList(File file) throws IOException { - InputStream inputStream = new FileInputStream(file); - return loadDevicesList(inputStream); - } - - public static DevicesList loadDevicesList(InputStream inputStream) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - - String nextLine = reader.readLine(); - int selectedDeviceIndex = 0; - if (nextLine != null) { - selectedDeviceIndex = Integer.parseInt(nextLine); - } - Pattern devicePattern = Pattern.compile("^(.*)\\t([0-9]*)\\t([0-9]*)\\t(.*)$"); - - List<Device> devices = new ArrayList<Device>(); - while ((nextLine = reader.readLine()) != null) { - Matcher deviceMatcher = devicePattern.matcher(nextLine); - if (deviceMatcher.matches()) { - devices.add(new Device( - decode(deviceMatcher.group(1)), - Integer.parseInt(deviceMatcher.group(2)), - Integer.parseInt(deviceMatcher.group(3)), - decode(deviceMatcher.group(4)) - )); - } - } - - reader.close(); - - return new DevicesList(devices, selectedDeviceIndex); - } -} Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-17 16:27:48 UTC (rev 36409) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; @@ -48,7 +49,8 @@ import org.eclipse.swt.widgets.ToolItem; import org.jboss.tools.browsersim.model.Device; import org.jboss.tools.browsersim.model.DevicesList; -import org.jboss.tools.browsersim.model.DevicesManager; +import org.jboss.tools.browsersim.model.DevicesListHolder; +import org.jboss.tools.browsersim.model.DevicesListStorage; import org.jboss.tools.browsersim.util.ResourcesUtil; import org.jboss.tools.browsersim.webkit.AbstractWebKitBrowser; import org.jboss.tools.browsersim.webkit.WebKitBrowserFactory; @@ -66,7 +68,7 @@ private ProgressBar progressBar; private String initialUrl; private Menu devicesMenu; - private DevicesManager devicesManager; + private DevicesListHolder devicesManager; public static void main(String[] args) { String initialUrl; @@ -95,13 +97,8 @@ shell = new Shell(display); shell.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - try { - File configFolder = new File(this.getClass().getPackage().getName()); - configFolder.mkdir(); - DevicesManager.saveDevicesList(devicesManager.getDevicesList(), - new File(configFolder, "devices.cfg")); - } catch (IOException ex) { - ex.printStackTrace(); + if (devicesManager != null) { + DevicesListStorage.saveUserDefinedDevicesList(devicesManager.getDevicesList()); } } }); @@ -135,6 +132,12 @@ browser = WebKitBrowserFactory.createWebKitBrowser(shell, SWT.NONE); } catch (SWTError e) { System.out.println(Messages.BrowserSim_COULD_NOT_INSTANTIATE_BROWSER + e.getMessage()); + + MessageBox messageBox = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR); + messageBox.setText("Error"); + messageBox.setMessage(Messages.BrowserSim_COULD_NOT_INSTANTIATE_BROWSER + e.getMessage()); + messageBox.open(); + display.dispose(); return; } @@ -189,7 +192,7 @@ } }); - DevicesList devicesList = DevicesManager.getInstance().getDevicesList(); + DevicesList devicesList = DevicesListHolder.getInstance().getDevicesList(); if (devicesList != null && devicesList.getDevices() != null && devicesList.getSelectedDeviceIndex() < devicesList.getDevices().size()) { setDevice(devicesList.getDevices().get(devicesList.getSelectedDeviceIndex())); @@ -284,10 +287,10 @@ }); devicesMenu = createDropDownMenu(appMenuBar, Messages.BrowserSim_DEVICES); - devicesManager = DevicesManager.getInstance(); + devicesManager = DevicesListHolder.getInstance(); devicesManager.addObserver(new Observer() { public void update(Observable o, Object arg) { - DevicesManager devicesManager = (DevicesManager) o; + DevicesListHolder devicesManager = (DevicesListHolder) o; DevicesList devicesList = devicesManager.getDevicesList(); setDevicesListForMenu(devicesList); setDevice(devicesList.getDevices().get(devicesList.getSelectedDeviceIndex())); @@ -299,18 +302,11 @@ } }); - DevicesList devicesList; - try { - File customConfigFile = new File(this.getClass().getPackage().getName() + "/devices.cfg"); - if (customConfigFile.exists()) { - devicesList = DevicesManager.loadDevicesList(customConfigFile); - } else { - devicesList = DevicesManager.loadDevicesList(ResourcesUtil.getResourceAsStream( - "/org/jboss/tools/browsersim/resources/config/devices.cfg")); - } - } catch (IOException e) { - devicesList = new DevicesList(new ArrayList<Device>(), 0); + DevicesList devicesList = DevicesListStorage.loadUserDefinedDevicesList(); + if (devicesList == null) { + devicesList = DevicesListStorage.loadDefaultDevicesList(); } + devicesManager.setDevicesList(devicesList); devicesManager.notifyObservers(); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java 2011-11-17 16:27:48 UTC (rev 36409) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/ManageDevicesDialog.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.TableItem; import org.jboss.tools.browsersim.model.Device; import org.jboss.tools.browsersim.model.DevicesList; -import org.jboss.tools.browsersim.model.DevicesManager; +import org.jboss.tools.browsersim.model.DevicesListStorage; import org.jboss.tools.browsersim.util.ResourcesUtil; /** @@ -147,7 +147,6 @@ buttonRemove.setText(Messages.ManageDevicesDialog_REMOVE); buttonRemove.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - System.out.println(devices.size()); if (devices.size() > 1) { devices.remove(selectedDeviceIndex); if (selectedDeviceIndex >= devices.size()) { @@ -159,7 +158,7 @@ }); Button buttonReset = new Button(compositeControls, SWT.NONE); - buttonReset.setText(Messages.ManageDevicesDialog_RESET); + buttonReset.setText(Messages.ManageDevicesDialog_REVERT_ALL); buttonReset.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -175,16 +174,10 @@ buttonLoadDefaults.setText(Messages.ManageDevicesDialog_LOAD_DEFAULTS); buttonLoadDefaults.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - DevicesList defaultDevicesList; - try { - defaultDevicesList = DevicesManager.loadDevicesList(ResourcesUtil.getResourceAsStream( - "/org/jboss/tools/browsersim/resources/config/devices.cfg")); - devices = defaultDevicesList.getDevices(); - selectedDeviceIndex = defaultDevicesList.getSelectedDeviceIndex(); - updateDevices(); - } catch (IOException e1) { - e1.printStackTrace(); - } + DevicesList defaultDevicesList = DevicesListStorage.loadDefaultDevicesList(); + devices = defaultDevicesList.getDevices(); + selectedDeviceIndex = defaultDevicesList.getSelectedDeviceIndex(); + updateDevices(); } }); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-17 16:27:48 UTC (rev 36409) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-17 19:13:02 UTC (rev 36410) @@ -21,6 +21,7 @@ public static String BrowserSim_BROWSER_SIM; public static String BrowserSim_COULD_NOT_INSTANTIATE_BROWSER; public static String BrowserSim_DEVICES; + public static String BrowserSim_ERROR; public static String BrowserSim_EXIT; public static String BrowserSim_FILE; public static String BrowserSim_MORE; @@ -42,7 +43,7 @@ public static String ManageDevicesDialog_NEW_USER_AGENT; public static String ManageDevicesDialog_OK; public static String ManageDevicesDialog_REMOVE; - public static String ManageDevicesDialog_RESET; + public static String ManageDevicesDialog_REVERT_ALL; public static String ManageDevicesDialog_LOAD_DEFAULTS; public static String ManageDevicesDialog_USER_AGENT; public static String ManageDevicesDialog_WIDTH; Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-17 16:27:48 UTC (rev 36409) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-17 19:13:02 UTC (rev 36410) @@ -2,6 +2,7 @@ BrowserSim_BROWSER_SIM=BrowserSim BrowserSim_COULD_NOT_INSTANTIATE_BROWSER=Could not instantiate Browser: BrowserSim_DEVICES=Devices +BrowserSim_ERROR=Error BrowserSim_EXIT=Exit BrowserSim_FILE=File BrowserSim_MORE=More... @@ -23,7 +24,7 @@ ManageDevicesDialog_NEW_USER_AGENT=New User-Agent ManageDevicesDialog_OK=OK ManageDevicesDialog_REMOVE=Remove -ManageDevicesDialog_RESET=Reset +ManageDevicesDialog_REVERT_ALL=Revert All ManageDevicesDialog_LOAD_DEFAULTS=Load Defaults ManageDevicesDialog_USER_AGENT=User-Agent ManageDevicesDialog_WIDTH=Width