3 files changed, 131 insertions, 1 deletions
diff --git a/src/org/traccar/web/client/view/UserDialog.ui.xml b/src/org/traccar/web/client/view/UserDialog.ui.xml
index c16ad4c3..9f7fe21d 100644
--- a/src/org/traccar/web/client/view/UserDialog.ui.xml
+++ b/src/org/traccar/web/client/view/UserDialog.ui.xml
@@ -11,7 +11,7 @@
     <ui:attributes width="1" height="-1" />
   </ui:with>
  
-  <gxt:Window ui:field="window" pixelSize="300, 140" modal="true" headingText="Account" focusWidget="{saveButton}">
+  <gxt:Window ui:field="window" pixelSize="300, 150" modal="true" headingText="Account" focusWidget="{saveButton}">
     <container:VerticalLayoutContainer>
       <container:child layoutData="{verticalLayoutData}">
         <form:FieldLabel text="User">
diff --git a/src/org/traccar/web/client/view/UserSettingsDialog.java b/src/org/traccar/web/client/view/UserSettingsDialog.java
new file mode 100644
index 00000000..be13eca8
--- /dev/null
+++ b/src/org/traccar/web/client/view/UserSettingsDialog.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web.client.view;
+
+import java.util.Arrays;
+
+import org.traccar.web.client.model.EnumKeyProvider;
+import org.traccar.web.client.model.UserSettingsProperties;
+import org.traccar.web.shared.model.UserSettings;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.editor.client.Editor;
+import com.google.gwt.editor.client.SimpleBeanEditorDriver;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.ui.Widget;
+import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
+import com.sencha.gxt.data.shared.ListStore;
+import com.sencha.gxt.widget.core.client.Window;
+import com.sencha.gxt.widget.core.client.event.SelectEvent;
+import com.sencha.gxt.widget.core.client.form.ComboBox;
+
+public class UserSettingsDialog implements Editor<UserSettings> {
+
+    private static UserSettingsDialogUiBinder uiBinder = GWT.create(UserSettingsDialogUiBinder.class);
+
+    interface UserSettingsDialogUiBinder extends UiBinder<Widget, UserSettingsDialog> {
+    }
+
+    private UserSettingsDriver driver = GWT.create(UserSettingsDriver.class);
+
+    interface UserSettingsDriver extends SimpleBeanEditorDriver<UserSettings, UserSettingsDialog> {
+    }
+
+    public interface UserSettingsHandler {
+        public void onSave(UserSettings userSettings);
+    }
+
+    private UserSettingsHandler userSettingsHandler;
+
+    @UiField
+    Window window;
+
+    @UiField(provided = true)
+    ComboBox<UserSettings.SpeedUnit> speedUnit;
+
+    public UserSettingsDialog(UserSettings userSettings, UserSettingsHandler userSettingsHandler) {
+        this.userSettingsHandler = userSettingsHandler;
+
+        ListStore<UserSettings.SpeedUnit> speedUnitStore = new ListStore<UserSettings.SpeedUnit>(
+                new EnumKeyProvider<UserSettings.SpeedUnit>());
+        speedUnitStore.addAll(Arrays.asList(UserSettings.SpeedUnit.values()));
+
+        speedUnit = new ComboBox<UserSettings.SpeedUnit>(
+                speedUnitStore, new UserSettingsProperties.SpeedUnitLabelProvider());
+        speedUnit.setForceSelection(true);
+        speedUnit.setTriggerAction(TriggerAction.ALL);
+
+        uiBinder.createAndBindUi(this);
+        driver.initialize(this);
+        driver.edit(userSettings);
+    }
+
+    public void show() {
+        window.show();
+    }
+
+    public void hide() {
+        window.hide();
+    }
+
+    @UiHandler("saveButton")
+    public void onLoginClicked(SelectEvent event) {
+        window.hide();
+        userSettingsHandler.onSave(driver.flush());
+    }
+
+    @UiHandler("cancelButton")
+    public void onRegisterClicked(SelectEvent event) {
+        window.hide();
+    }
+
+}
diff --git a/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml b/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml
new file mode 100644
index 00000000..db6c6932
--- /dev/null
+++ b/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml
@@ -0,0 +1,33 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder
+    xmlns:ui="urn:ui:com.google.gwt.uibinder"
+    xmlns:g="urn:import:com.google.gwt.user.client.ui"
+    xmlns:gxt="urn:import:com.sencha.gxt.widget.core.client"
+  	xmlns:container="urn:import:com.sencha.gxt.widget.core.client.container"
+  	xmlns:form="urn:import:com.sencha.gxt.widget.core.client.form"
+  	xmlns:button="urn:import:com.sencha.gxt.widget.core.client.button">
+
+  <ui:with type="com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData" field="verticalLayoutData">
+    <ui:attributes width="1" height="-1" />
+  </ui:with>
+  
+  <gxt:Window ui:field="window" pixelSize="300, 110" modal="true" headingText="Preferences" focusWidget="{saveButton}">
+    <container:VerticalLayoutContainer>
+      <container:child layoutData="{verticalLayoutData}">
+        <form:FieldLabel text="Speed Units">
+          <form:widget>
+            <form:ComboBox ui:field="speedUnit" />
+          </form:widget>
+        </form:FieldLabel>
+      </container:child>
+    </container:VerticalLayoutContainer>
+      
+    <gxt:button>
+      <button:TextButton ui:field="saveButton" text="Save" />
+    </gxt:button>
+    <gxt:button>
+      <button:TextButton ui:field="cancelButton" text="Cancel" />
+    </gxt:button>
+  </gxt:Window>
+
+</ui:UiBinder>