# HG changeset patch # User Eugene Ostroukhov # Date 1277160568 25200 # Node ID 5b968742b72912a22c457b89be99109b27435259 # Parent 62472296236e5e72c84a9a4bf3c50396f9e05062 Preferences and event triggers were moved from the dialog into drawer in the window footer. diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/css/style.css --- a/org.symbian.tools.wrttools.previewer/preview/css/style.css Mon Jun 21 11:52:43 2010 -0700 +++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css Mon Jun 21 15:49:28 2010 -0700 @@ -12,6 +12,13 @@ * Contributors: */ +.tabs-bottom { position: relative; } +.tabs-bottom .ui-tabs-panel { height: 200px; overflow: auto; } +.tabs-bottom .ui-tabs-nav { position: absolute !important; left: 0; bottom: 0; right:0; padding: 0 0.2em 0.2em 0; } +.tabs-bottom .ui-tabs-nav li { margin-top: -2px !important; margin-bottom: 1px !important; border-top: none; border-bottom-width: 1px; } +.ui-tabs-selected { margin-top: -3px !important; } + + body { /* background-image: url(../images/Gradient0Background.png); */ background-image: url(../images/Gradient0Background_2.png); @@ -332,32 +339,14 @@ opacity: 0.9; } -div#PreferencesBtn{ - width: 75px; - height: 85px; -/* background-image: url(../images/settings-icon.png); */ - background-image: url(../images/settings_2.png); - position: absolute; - top: 10px; - left: 10px; - background-position: left bottom; - cursor: pointer; - z-index: 200; -} - -div#PreferencesBtn:hover{ - background-image: url(../images/settings_1.png); - background-position: left top; -} - div#InspectorBtn{ width: 75px; height: 85px; background-image: url(../images/inspector.png); position: absolute; top: 10px; - right: 10px; - float: right; + left: 10px; + float: left; background-position: left bottom; z-index: 200; cursor: pointer; @@ -670,8 +659,9 @@ #preview-ui-bottom-body{ overflow:auto; - background-color: #ffffff; - display: none; + background-color: white; + color: black; +/* display: none;*/ } #preview-ui-bottom-body p{ diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.png Binary file org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.png has changed diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/images/console-close-icon_bkup.png Binary file org.symbian.tools.wrttools.previewer/preview/images/console-close-icon_bkup.png has changed diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.png Binary file org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.png has changed diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/script/nokia.js --- a/org.symbian.tools.wrttools.previewer/preview/script/nokia.js Mon Jun 21 11:52:43 2010 -0700 +++ b/org.symbian.tools.wrttools.previewer/preview/script/nokia.js Mon Jun 21 15:49:28 2010 -0700 @@ -344,9 +344,6 @@ NOKIA.menu.is_dimmed = true; - $("#PreferencesBtn").hide(); - $("#PreferencesTab").dialog('close'); - }, setLsk : function(func) @@ -643,11 +640,8 @@ NOKIA.menu.createSFKArea(); $("#DeviceDisplayLayout").show(); - $("#PreferencesTab").show(); $("#InspectorTab").show(); - if(!NOKIA.menu.is_dimmed) - $("#PreferencesBtn").show(); if (/chrome/.test( navigator.userAgent.toLowerCase())) { $("#InspectorBtn").show(); } @@ -983,8 +977,6 @@ $("#loaderDiv").show(); $("#loaderDiv")[0].className = 'green'; - $("#PreferencesTab").dialog('close'); - window.setTimeout(function(){ document.location = document.location; }, 3000); @@ -1001,26 +993,7 @@ addListeners : function() { - /* - * Render Emulator for Interaction - */ - NOKIA.helper.prefDailog = $("#PreferencesTab").dialog({ - width: 550, minWidth: 550, minHeight: 350, height: 350, autoOpen: false, position : top, title : ' ', - buttons : { - Close : function(){ - $("#PreferencesTab").dialog('close'); - - // Hack for Mac firefox - if(/Mac/i.test(navigator.userAgent)) - { - $("#WidgetArea iframe").css({overflow:'auto'}); - } - - // select index : 0 tab selected - $('#tabs').tabs( 'select' , 0); - } - } - }); + NOKIA.helper.loadPreferences(); /* * Render Emulator for Interaction */ @@ -1035,17 +1008,6 @@ }} }); - $('#PreferencesBtn').click(function(){ - // Load preferences - NOKIA.helper.loadPreferences(); - $('#PreferencesTab').dialog('open'); - - // Hack for Mac firefox - if(/Mac/i.test(navigator.userAgent)) - { - $("#WidgetArea iframe").css({overflow:'hidden'}); - } - }); $('#InspectorBtn').click(function(){ $('#InspectorTab').dialog('open'); // Hack for Mac firefox @@ -1099,8 +1061,6 @@ $("#iframeMask").click(function(){ - - $("#PreferencesBtn").show(); $("#orientationIcon").hide(); $("#iframeMask").hide(); $("#loaderDiv").hide(); @@ -1152,7 +1112,9 @@ // // }} }); - + $(".tabs-bottom .ui-tabs-nav, .tabs-bottom .ui-tabs-nav > *") + .removeClass("ui-corner-all ui-corner-top") + .addClass("ui-corner-bottom"); /* * Event triggering @@ -1274,9 +1236,7 @@ $("#iframeMask").show(); $("#orientationIcon").show(); - $("#PreferencesBtn").hide(); - $("#PreferencesTab").dialog('close'); return true; } } @@ -1386,8 +1346,9 @@ NOKIA.layout = { _console_minimized : true, _console_enabled : false, - _consoleWindowHeight : 200, + _consoleWindowHeight : 290, _consoleHeaderHeight : 31, + _tabHeight : 27, init : function(){ @@ -1455,10 +1416,17 @@ height: NOKIA.layout._consoleHeaderHeight + 'px' }); - $('#preview-ui-bottom-body').css({ + $('#tabs').css({ height: parseInt(NOKIA.layout._consoleWindowHeight - NOKIA.layout._consoleHeaderHeight) + 'px', display : 'block' }); + $('#console').css({ + height : parseInt(NOKIA.layout._consoleWindowHeight + - NOKIA.layout._consoleHeaderHeight + - NOKIA.layout._tabHeight * 2) + + 'px', + display : 'block' + }); // Auto scroll when console window opened from MINIMIZED => MAXIMIZED state window.setTimeout(function(){ @@ -1483,10 +1451,10 @@ height: NOKIA.layout._consoleHeaderHeight + 'px', display : 'block' }); - - $('#preview-ui-bottom-body').css({ - display : 'none' - }); +// TODO +// $('#preview-ui-bottom-body').css({ +// display : 'none' +// }); } } diff -r 62472296236e -r 5b968742b729 org.symbian.tools.wrttools.previewer/preview/wrt_preview.html --- a/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Mon Jun 21 11:52:43 2010 -0700 +++ b/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Mon Jun 21 15:49:28 2010 -0700 @@ -62,14 +62,32 @@
-
-
-
    +
    +
    To open Web Inspector you need to: +
      +
    1. Disconnect debugger from Chrome browser.
      2. +
    2. Press Ctrl+Shift+ICommand+Option+I to open inspector.
      3. +
    +
    +
    +
+
+
+
Simulation Controls
+ +
+
+ +
+ +
+
+
@@ -97,10 +115,6 @@ Trigger new MMS -
-
-
-
Memory Card @@ -133,7 +147,6 @@
-
Back @@ -153,25 +166,6 @@
-
-
-
-
To open Web Inspector you need to: -
    -
  1. Disconnect debugger from Chrome browser.
    2. -
  2. Press Ctrl+Shift+ICommand+Option+I to open inspector.
    3. -
-
-
-
-
-
-
Console window
- - -
-
-