update

data.json

@@ -56,11 +56,12 @@
             "icon_tool_7": "Tutorial",
             "back_home": "Go to Home",
             "nav_language": "Language",
-            "close_editing":"Enable/Disable Editing",
+            "close_editing":"Disable Editing",
             "nav_devices": "Soon to launch",
             "nav_journal": "journal",
             "cloud_storage": "Cloud",
             "local_storage": "Files",
+            "help": "Help",
             "Connect": "Connect",
             "button_delete": "Delete all blocks",
             "uploadFiles": "Upload",
@@ -176,7 +177,14 @@
             "echart_text": "Please print data via serial monitor first",
             "get_data_cloud_event": "Getting a list of the latest events",
             "start_speech": "Start Recording",
-            "end_speech": "End recording"
+            "end_speech": "End recording",
+            "fullscreen": "Fullscreen",
+            "fullscreenExit": "Exit fullscreen",
+            "editing": "Enable Editing",
+            "copy_code": "Copy All Code",
+            "blockpy_toolbar_upload": "Upload to the cloud",
+            "blockpy_toolbar_download": "Download to local",
+            "repl_delete": "Clear all content"
         },
         "zh-hant": {
             "project": "項目",
@@ -235,9 +243,10 @@
             "nav_devices": "即將推出",
             "nav_journal": "日志",
             "nav_language": "語言設定",
-            "close_editing":"是否啟用編輯模式",
+            "close_editing":"關閉編輯模式",
             "cloud_storage": "雲端存儲",
             "local_storage": "檔案",
+            "help": "幫助",
             "Connect": "連接",
             "button_delete": "刪除所有積木",
             "uploadFiles": "上傳",
@@ -335,7 +344,14 @@
             "echart_text": "請先設定在序列埠中打印資料",
             "get_data_cloud_event": "正在獲取最新的事件列表",
             "start_speech": "開始錄音",
-            "end_speech": "結束錄音"
+            "end_speech": "結束錄音",
+            "fullscreen": "全屏",
+            "fullscreenExit": "退出全屏",
+            "editing":"啟用編輯模式",
+            "copy_code": "複製所有代碼",
+            "blockpy_toolbar_upload": "上傳到雲端",
+            "blockpy_toolbar_download": "下載到本地",
+            "repl_delete": "清除所有內容"
         },
         "zh-hans": {
             "project": "项目",
@@ -395,10 +411,11 @@
             "nav_devices": "即将推出",
             "nav_journal": "日誌",
             "nav_language": "语言设定",
-            "close_editing":"是否启用编辑模式",
+            "close_editing":"关闭编辑模式",
             "cloud_storage": "云端存储",
             "local_storage": "文件",
             "Connect": "连接",
+            "help": "帮助",
             "button_delete": "删除所有积木",
             "uploadFiles": "上传",
             "runCode": "执行",
@@ -505,7 +522,14 @@
             "echart_text": "请先设置在串口中打印数据",
             "get_data_cloud_event": "正在获取最新的事件列表",
             "start_speech": "开始录音",
-            "end_speech": "结束录音"
+            "end_speech": "结束录音",
+            "fullscreen": "全屏",
+            "fullscreenExit": "退出全屏",
+            "editing": "启用编辑模式",
+            "copy_code": "复制所有代码",
+            "blockpy_toolbar_upload": "上传到云端",
+            "blockpy_toolbar_download": "下载到本地",
+            "repl_delete": "清除所有内容"
         }
     },
     "examples": {

index.html

@@ -874,8 +874,8 @@
                 <div>
                     <div id='blockpy-content'>
                         <div class="blockpy-editor">
-                            <div class="white blockpy-blocks blockpy-editor-menu"> <img class="fullscreenIcon"
-                                    src="./images/icon-fullscreen.svg"> <img class="fullscreenIcon hidden"
+                            <div class="white blockpy-blocks blockpy-editor-menu"> <img id="fullscreenIcon" class="fullscreenIcon"
+                                    src="./images/icon-fullscreen.svg"> <img id="fullscreenExitIcon" class="fullscreenIcon hidden"
                                     src="./images/icon-fullscreen-exit.svg">
                                 <div class='blockly-div' style="width:100%;height:100%;"></div>
                             </div>
@@ -902,12 +902,12 @@
                                     </a>
                                     <a class="copy_code" style="position:absolute;top: 5px;right: 75px;"
                                         data-clipboard-action="copy">
-                                        <img src="./images/icon-view.svg" style="margin-top:7px;"> </a>
+                                        <img id="copy_code_view" src="./images/icon-view.svg" style="margin-top:7px;"> </a>
                                     <a class="blockpy-toolbar-download" style="position:absolute;top: 5px;right:
-                                        39px;"> <img src="./images/icon-download.svg" style="margin-top: 7px;">
+                                        39px;"> <img id="blockpy-toolbar-download" src="./images/icon-download.svg" style="margin-top: 7px;">
                                     </a>
                                     <a class="blockpy-toolbar-upload" style="position:absolute;top: 5px;right: 5px;">
-                                        <img src="./images/icon-upload.svg" style="margin-top: 7px;"> </a>
+                                        <img id="blockpy-toolbar-upload" src="./images/icon-upload.svg" style="margin-top: 7px;"> </a>
                                     <img class="fullscreenIcon hidden" src="./images/icon-fullscreen.svg">
                                     <img class="fullscreenIcon hidden" src="./images/icon-fullscreen-exit.svg">
 

python/data.json

@@ -61,6 +61,7 @@
             "nav_journal": "journal",
             "cloud_storage": "Cloud",
             "local_storage": "Files",
+            "help": "Help",
             "Connect": "Connect",
             "button_delete": "Delete all blocks",
             "uploadFiles": "Upload",
@@ -174,7 +175,9 @@
             "alert":"Please use the full screen(suggested resolution: 1280*726px)",
             "number_only":"Print data serial port no more than 10",
             "echart_text": "Please print data via serial monitor first",
-            "get_data_cloud_event": "Getting a list of the latest events"
+            "get_data_cloud_event": "Getting a list of the latest events",
+            "fullscreen": "Fullscreen",
+            "fullscreenExit": "Exit fullscreen"
         },
         "zh-hant": {
             "project": "項目",
@@ -236,6 +239,7 @@
             "close_editing":"是否啟用編輯模式",
             "cloud_storage": "雲端存儲",
             "local_storage": "檔案",
+            "help": "幫助",
             "Connect": "連接",
             "button_delete": "刪除所有積木",
             "uploadFiles": "上傳",
@@ -331,7 +335,9 @@
             "alert":"請使用全屏(建議分辨率1280*726px)",
             "number_only":"打贏數據串口不超過10個",
             "echart_text": "請先設定在序列埠中打印資料",
-            "get_data_cloud_event": "正在獲取最新的事件列表"
+            "get_data_cloud_event": "正在獲取最新的事件列表",
+            "fullscreen": "全屏",
+            "fullscreenExit": "退出全屏"
         },
         "zh-hans": {
             "project": "项目",
@@ -395,6 +401,7 @@
             "cloud_storage": "云端存储",
             "local_storage": "文件",
             "Connect": "连接",
+            "help": "帮助",
             "button_delete": "删除所有积木",
             "uploadFiles": "上传",
             "runCode": "执行",
@@ -499,7 +506,9 @@
             "alert":"请使用全屏(建议分辨率1280*726px)",
             "number_only":"打印数据串口打印不超过10个",
             "echart_text": "请先设置在串口中打印数据",
-            "get_data_cloud_event": "正在获取最新的事件列表"
+            "get_data_cloud_event": "正在获取最新的事件列表",
+            "fullscreen": "全屏",
+            "fullscreenExit": "退出全屏"
         }
     },
     "examples": {

python/index.html

@@ -876,8 +876,9 @@
                 <div>
                     <div id='blockpy-content' style="height:100%">
                         <div class="blockpy-editor" style="display:none">
-                            <div class="white blockpy-blocks blockpy-editor-menu"> <img class="fullscreenIcon"
-                                    src="./images/icon-fullscreen.svg"> <img class="fullscreenIcon hidden"
+                            <div class="white blockpy-blocks blockpy-editor-menu"> <img id="fullscreenIcon"
+                                    class="fullscreenIcon" src="./images/icon-fullscreen.svg"> <img
+                                    id="fullscreenExitIcon" class="fullscreenIcon hidden"
                                     src="./images/icon-fullscreen-exit.svg">
                                 <div class='blockly-div' style="width:100%;height:100%;"></div>
                             </div>
@@ -890,9 +891,10 @@
                                     translatable_pythonSourceCode switch_box switch_select"
                                     style='margin-left: 25px;'>Python
                                     Source Code</span> <span id="Serial_Interaction"
-                                    class="header-text switch_box1">串口交互窗</span><i id="repl_delete"
+                                    class="header-text switch_box1">串口交互窗</span>
+                                    <!-- <i id="repl_delete"
                                     class="material-icons sketch_name_icon right"
-                                    style="margin-left: 20px;cursor: pointer;position: absolute;top: 30px;left: 260px;display:none;">delete</i>
+                                    style="margin-left: 20px;cursor: pointer;position: absolute;top: 30px;left: 260px;display:none;">delete</i> -->
 
                                 <div class="editDiv" id="editDiv" style="top: 0;">
                                     <!-- <span class="translatable_editing">Enable Editing</span>
@@ -938,13 +940,17 @@
                                 <div class="card-content"
                                     style="position:relative;height: calc(100% - 245px);overflow:auto;padding:5px 10px;background-color: #fff; color: #000;"
                                     id="repl_box">
-                                    <div class="editDiv" id="editDiv" style="width: 100%;left: -10px;">
-                                        <span class="translatable_serial_plotter serial-active"
+                                    <div class="editDiv" id="editDiv"
+                                        style="width: 100%;left: -10px;background: #E6F1FF;">
+                                        <span class="translatable_serial_plotter switch_select"
                                             onclick="switchSerial('1')">The
                                             data to print</span>
                                         <span class="translatable_serial_visualization"
                                             onclick="switchSerial('2')">Visual
                                             display</span>
+
+                                        <i id="repl_delete" class="material-icons sketch_name_icon right"
+                                            style="margin-left: 20px;cursor: pointer;position: absolute;top: 6px;right: 12px;display:block;">delete</i>
                                     </div>
                                     <div class="blockpy-toolbar" id="repl_box_content"
                                         style="display:block;padding-top:35px;">

python/index.js

@@ -1201,8 +1201,9 @@ function switchSerial(type) {
     document.getElementById('repl_box_content').style.display = 'none';
     document.getElementById('echartsShow').style.display = 'block';
     document.getElementById('repl_box_content').innerHTML = ""
-    document.getElementsByClassName('translatable_serial_plotter')[0].classList.remove("serial-active")
-    document.getElementsByClassName('translatable_serial_visualization')[0].classList.add("serial-active")
+    document.getElementsByClassName('translatable_serial_plotter')[0].classList.remove("switch_select")
+    document.getElementsByClassName('translatable_serial_visualization')[0].classList.add("switch_select")
+    document.getElementById("repl_delete").style.display = 'none';
     // document.getElementById('echartsShow').innerHTML = `<div id="echartsMain" class="echartsMain"></div>`
     myChart.resize();
     var options = {
@@ -1226,8 +1227,9 @@ function switchSerial(type) {
   } else {
     document.getElementById('repl_box_content').style.display = 'block';
     document.getElementById('echartsShow').style.display = 'none';
-    document.getElementsByClassName('translatable_serial_plotter')[0].classList.add("serial-active")
-    document.getElementsByClassName('translatable_serial_visualization')[0].classList.remove("serial-active")
+    document.getElementsByClassName('translatable_serial_plotter')[0].classList.add("switch_select")
+    document.getElementsByClassName('translatable_serial_visualization')[0].classList.remove("switch_select")
+    document.getElementById("repl_delete").style.display = 'block';
     document.getElementById('repl_box_content').innerHTML = ""
   }
 }

python/src/blockly/cocoblockly.js

@@ -1413,9 +1413,10 @@ async function cocoblockly() {
         { selector: '#back_home', delay: 200, position: 'bottom', tooltip: CCB.str_group.back_home },
         { selector: '#nav_devices', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_devices },
         //{ selector: '#nav_journal', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_journal },
-        { selector: '#nav_language', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_language },
-        { selector: '#local_connect', delay: 200, position: 'bottom', tooltip: CCB.str_group.Connect },
-        { selector: '#local_storage', delay: 200, position: 'bottom', tooltip: CCB.str_group.local_storage },
+        // { selector: '#nav_language', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_language },
+        // { selector: '#local_connect', delay: 200, position: 'bottom', tooltip: CCB.str_group.Connect },
+        // { selector: '#local_storage', delay: 200, position: 'bottom', tooltip: CCB.str_group.local_storage },
+        // { selector: '#help', delay: 200, position: 'bottom', tooltip: CCB.str_group.help },
         { selector: '#button_delete', delay: 200, position: 'bottom', tooltip: CCB.str_group.button_delete },
         { selector: '#workspace_screenshot', delay: 200, position: 'bottom', tooltip: CCB.str_group.workspace_screenshot },
         { selector: '#nav_account', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_account },
@@ -1430,7 +1431,10 @@ async function cocoblockly() {
         { selector: '#uploadFiles', delay: 500, position: 'top', tooltip: CCB.str_group.uploadFiles },
         { selector: '#editDiv', delay: 200, position: 'bottom', tooltip: CCB.str_group.close_editing },
         { selector: '#cloudBtn-shares', delay: 500, position: 'bottom', tooltip: CCB.str_group.cloudShares },
-
+        { selector: '#fullscreenIcon', delay: 500, position: 'bottom', tooltip: CCB.str_group.fullscreen },
+        { selector: '#fullscreenExitIcon', delay: 500, position: 'bottom', tooltip: CCB.str_group.fullscreenExit },
+        { selector: '#repl_delete', delay: 500, position: 'bottom', tooltip: CCB.str_group.repl_delete },
+        { selector: '#refresh', delay: 500, position: 'bottom', tooltip: CCB.str_group.reset_device }
     ];
     // /* ************ ajax request - begin ************ */
     // // -------- get latest uploader version from release -------- //

src/blockly/cocoblockly.js

@@ -1413,9 +1413,10 @@ async function cocoblockly() {
         { selector: '#back_home', delay: 200, position: 'bottom', tooltip: CCB.str_group.back_home },
         { selector: '#nav_devices', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_devices },
         //{ selector: '#nav_journal', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_journal },
-        { selector: '#nav_language', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_language },
-        { selector: '#local_connect', delay: 200, position: 'bottom', tooltip: CCB.str_group.Connect },
-        { selector: '#local_storage', delay: 200, position: 'bottom', tooltip: CCB.str_group.local_storage },
+        // { selector: '#nav_language', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_language },
+        // { selector: '#local_connect', delay: 200, position: 'bottom', tooltip: CCB.str_group.Connect },
+        // { selector: '#local_storage', delay: 200, position: 'bottom', tooltip: CCB.str_group.local_storage },
+        // { selector: '#help', delay: 200, position: 'bottom', tooltip: CCB.str_group.help },
         { selector: '#button_delete', delay: 200, position: 'bottom', tooltip: CCB.str_group.button_delete },
         { selector: '#workspace_screenshot', delay: 200, position: 'bottom', tooltip: CCB.str_group.workspace_screenshot },
         { selector: '#nav_account', delay: 200, position: 'bottom', tooltip: CCB.str_group.nav_account },
@@ -1428,9 +1429,17 @@ async function cocoblockly() {
         { selector: '.cloudBtn-delete', delay: 500, position: 'top', tooltip: CCB.str_group.cloudFileDeleteMsg },
         { selector: '#runCode', delay: 500, position: 'top', tooltip: CCB.str_group.runCode },
         { selector: '#uploadFiles', delay: 500, position: 'top', tooltip: CCB.str_group.uploadFiles },
-        { selector: '#editDiv', delay: 200, position: 'bottom', tooltip: CCB.str_group.close_editing },
+        // { selector: '#editDiv', delay: 200, position: 'bottom', tooltip: CCB.str_group.close_editing },
         { selector: '#cloudBtn-shares', delay: 500, position: 'bottom', tooltip: CCB.str_group.cloudShares },
-
+        { selector: '#fullscreenIcon', delay: 500, position: 'bottom', tooltip: CCB.str_group.fullscreen },
+        { selector: '#fullscreenExitIcon', delay: 500, position: 'bottom', tooltip: CCB.str_group.fullscreenExit },
+        { selector: '#edit-off', delay: 500, position: 'bottom', tooltip: CCB.str_group.editing },
+        { selector: '#edit-on', delay: 500, position: 'bottom', tooltip: CCB.str_group.close_editing },
+        { selector: '#copy_code_view', delay: 500, position: 'bottom', tooltip: CCB.str_group.copy_code },
+        { selector: '#blockpy-toolbar-upload', delay: 500, position: 'bottom', tooltip: CCB.str_group.blockpy_toolbar_upload },
+        { selector: '#blockpy-toolbar-download', delay: 500, position: 'bottom', tooltip: CCB.str_group.blockpy_toolbar_download },
+        { selector: '#repl_delete', delay: 500, position: 'bottom', tooltip: CCB.str_group.repl_delete },
+        { selector: '#refresh', delay: 500, position: 'bottom', tooltip: CCB.str_group.reset_device }
     ];
     // /* ************ ajax request - begin ************ */
     // // -------- get latest uploader version from release -------- //