added close button to settings dialogs.

4 files changed, 61 insertions, 5 deletions

diff --git a/ComicRackWebViewer/tablet/app/controller/ComicListSettings.js b/ComicRackWebViewer/tablet/app/controller/ComicListSettings.js
index aba323b..c6e19dc 100644
--- a/ComicRackWebViewer/tablet/app/controller/ComicListSettings.js
+++ b/ComicRackWebViewer/tablet/app/controller/ComicListSettings.js
@@ -29,13 +29,17 @@ Ext.define('Comic.controller.ComicListSettings', {
     config: {
         refs: {
           comiclistview: 'comiclistview',
-          comiclistsettingsview: 'comiclistsettingsview'
+          comiclistsettingsview: 'comiclistsettingsview',
+          closeButton: 'comiclistsettingsview [name=closeButton]'
         },
         
         control: {
           comiclistsettingsview: {
             show: 'onShow',
             hide: 'onHide'
+          },
+        closeButton: {
+            tap: 'onTapCloseButton'
           }
         }
     },
@@ -91,5 +95,14 @@ Ext.define('Comic.controller.ComicListSettings', {
 
       var treelistcontroller = me.getApplication().getController('TreeList');
       treelistcontroller.onSettingsChanged();
+    },
+
+
+    onTapCloseButton: function ()
+    {
+      var me = this,
+          comiclistsettingsview = me.getComiclistsettingsview();
+
+      comiclistsettingsview.hide();
     }
 });
\ No newline at end of file
diff --git a/ComicRackWebViewer/tablet/app/controller/ComicSettings.js b/ComicRackWebViewer/tablet/app/controller/ComicSettings.js
index 5751dcc..e9dce58 100644
--- a/ComicRackWebViewer/tablet/app/controller/ComicSettings.js
+++ b/ComicRackWebViewer/tablet/app/controller/ComicSettings.js
@@ -39,7 +39,8 @@ Ext.define('Comic.controller.ComicSettings', {
           pageChangeAreaWidth: 'comicsettingsview [name=page_change_area_width]',
           openNextComic: 'comicsettingsview [name=open_next_comic]',
           //openCurrentComicAtLaunch: 'comicsettingsview [name=open_current_comic_at_launch]',
-          pageFitMode: 'comicsettingsview [name=page_fit_mode]'
+          pageFitMode: 'comicsettingsview [name=page_fit_mode]',
+          closeButton: 'comicsettingsview [name=closeButton]'
         },
         
         control: {
@@ -53,6 +54,9 @@ Ext.define('Comic.controller.ComicSettings', {
           },
           usePageChangeArea: {
             change: 'onChangeUsePageChangeArea'
+          },
+          closeButton: {
+            tap: 'onTapCloseButton'
           }
           
           
@@ -157,6 +161,7 @@ Ext.define('Comic.controller.ComicSettings', {
         //pageTurnDragThreshold.setValue(pageTurnDragThreshold.getMinValue());
       }
     },
+
     onChangeUsePageChangeArea: function( checkbox, newValue, oldValue, eOpts )
     {
       var pageChangeAreaWidth = this.getPageChangeAreaWidth();
@@ -169,5 +174,13 @@ Ext.define('Comic.controller.ComicSettings', {
       {
         pageChangeAreaWidth.disable();
       }
-    }    
+    },
+
+    onTapCloseButton: function()
+    {
+      var me = this,
+          comicsettingsview = me.getComicsettingsview();
+
+      comicsettingsview.hide();
+    }
 });
\ No newline at end of file
diff --git a/ComicRackWebViewer/tablet/app/view/ComicListSettings.js b/ComicRackWebViewer/tablet/app/view/ComicListSettings.js
index 22e55aa..97ec6fc 100644
--- a/ComicRackWebViewer/tablet/app/view/ComicListSettings.js
+++ b/ComicRackWebViewer/tablet/app/view/ComicListSettings.js
@@ -37,9 +37,22 @@ Ext.define('Comic.view.ComicListSettings', {
     items: [
       {
         xtype: 'fieldset',
-        title: 'Comic List Order',
         items: [
             {
+              xtype: 'titlebar',
+              title: 'Comic List Order',
+              ui: 'light',
+              items: [
+                {
+                  xtype: 'button',
+                  iconCls: 'delete',
+                  align: 'right',
+                  style: 'background-image:none; background-color: rgb(255, 0, 0);',
+                  name: 'closeButton'
+                }
+              ]
+            },
+            {
               xtype: 'selectfield',
               label: 'Sort by',
               name: 'orderby_1',
diff --git a/ComicRackWebViewer/tablet/app/view/ComicSettings.js b/ComicRackWebViewer/tablet/app/view/ComicSettings.js
index 0805737..c57c11b 100644
--- a/ComicRackWebViewer/tablet/app/view/ComicSettings.js
+++ b/ComicRackWebViewer/tablet/app/view/ComicSettings.js
@@ -33,10 +33,26 @@ Ext.define('Comic.view.ComicSettings', {
     width: '90%',
     height: '90%',
     items: [
+      
       {
         xtype: 'fieldset',
-        title: 'Interface Settings',
         items: [
+          {
+            xtype: 'titlebar',
+            title: 'Interface Settings',
+            ui: 'light',
+            items: [
+              {
+                xtype: 'button',
+                iconCls: 'delete',
+                align: 'right',
+                style: 'background-image:none; background-color: rgb(255, 0, 0);',
+                name: 'closeButton'
+                //text: 'Close'
+              }
+            ]
+          },
+
           //{
           //  xtype: 'checkboxfield',
           //  label: 'Open current comic at app launch',
@@ -51,6 +67,7 @@ Ext.define('Comic.view.ComicSettings', {
           //  name: 'open_next_comic',
           //  disabled: true
           //},
+          
           {
             xtype: 'selectfield',
             label: 'Page fit mode',