Add the System.log and S.preventClose method [0.1.5]

diff --git a/app/browser/browser.css b/app/browser/browser.css
index 11f8770..006b4dd 100644 (file)
--- a/app/browser/browser.css
+++ b/app/browser/browser.css
@@ -30,6 +30,9 @@
 .winc-browser #browser-url:focus{
     background: #ffffff;
 }
+.kit-darkmode.winc-browser #browser-url{
+    color: #303030;
+}
 .browser-message{
     display: none;
     background: white;
@@ -49,6 +52,9 @@
     padding: 6px 0;
     box-shadow: -2px 2px 4px -2px black;
 }
+.kit-darkmode.winc-browser .browser-menu{
+    background: #505050;
+}
 .browser-menu a{
     display: block;
     font-size: 15px;

diff --git a/app/dialog/default.html b/app/dialog/default.html
index 1fb3003..56a6a35 100644 (file)
--- a/app/dialog/default.html
+++ b/app/dialog/default.html
@@ -1,6 +1,6 @@
 <div style="max-width: 500px">
     <h3 class='dialog-title'></h3>
     <div class='dialog-content'></div>
-    <a class="kit-button dialog-cancel">キャンセル</a>
+    <a class="btn dialog-cancel">キャンセル</a>
     <a class="kit-button dialog-ok">OK</a>
 </div>
\ No newline at end of file

diff --git a/app/settings/settings.css b/app/settings/settings.css
index 2349f14..f2412d3 100644 (file)
--- a/app/settings/settings.css
+++ b/app/settings/settings.css
@@ -105,6 +105,6 @@
     font-size: 20px;
     font-weight: 600;
 }
-.winc-darkmode.winc-settings h4{
-    background: #606060 !important;
+.kit-darkmode.winc-settings h4{
+    background: #606060;
 }
\ No newline at end of file

diff --git a/app/settings/theme.html b/app/settings/theme.html
index b196e27..f0bc63e 100644 (file)
--- a/app/settings/theme.html
+++ b/app/settings/theme.html
@@ -5,11 +5,13 @@
             localStorage.setItem("kit-darkmode", "true");
             KWS.darkmode = true;
             $("#kit-darkmode").attr("href", "system/theme/kit-darkmode.css");
+            $(".winc-darkmode").addClass("kit-darkmode");
         }
         else{
             localStorage.setItem("kit-darkmode", "false");
             KWS.darkmode = false;
             $("#kit-darkmode").attr("href", null);
+            $(".winc-darkmode").removeClass("kit-darkmode");
         }
     })
 
@@ -25,7 +27,7 @@
 <a class='btn settings-default'><span class='fa fa-arrow-circle-left'></span>設定</a>
 <h3><span class='fa fa-palette'></span> テーマ設定</h3>
 
-<h4>ダークモード　<a onclick="S.alert('ダークモード','画面UI全体を黒色の構成にすることで目の疲れを軽減します。<br>一部のアプリやテーマで正しく機能しない場合があります。')" class="kit-hyperlink far fa-question-circle"></a></h4>
+<h4>ダークモード(試験的な機能)　<a onclick="S.alert('ダークモード','画面UI全体を黒色の構成にすることで目の疲れを軽減します。<br>一部のアプリやテーマで正しく機能しない場合があります。')" class="kit-hyperlink far fa-question-circle"></a></h4>
 <div class="kit-toggle">
     <input type="checkbox" id="settings-theme-darkmode">
     <label for="settings-theme-darkmode"></label>

diff --git a/system.js b/system.js
index 2a11dcc..5375548 100644 (file)
--- a/system.js
+++ b/system.js
@@ -40,6 +40,7 @@ function kit() {
     if( localStorage.getItem("kit-darkmode") == "true" ){
         KWS.darkmode = true;
         $("#kit-darkmode").attr("href", "system/theme/kit-darkmode.css");
+        $(".winc-darkmode").addClass("kit-darkmode");
     }
 
     if( System.bootopt.get("safe") ){
@@ -369,6 +370,7 @@ function appData( data ) {
     } );
     $( "#desktop-" + currentDesktop ).append( "<div id='w" + pid + "'><span id='wm" + pid + "'></span><span id='wx" + pid + "'></span><div id='wt" + pid + "' class='wt'><img src='./app/" + data.id + "/" + data.icon + "'>" + data.name + "</div><div class='winc winc-" + data.id + "' id='winc" + pid + "'></div></div>" );
     if( data.support && data.support.darkmode == true ) $("#winc"+pid).addClass("winc-darkmode");
+    if( KWS.darkmode ) $("#winc"+pid).addClass("kit-darkmode");
     var windowPos = 50 + ( pid % 10 ) * 20;
     //$( "#w" + pid ).addClass( "window" ).draggable( {cancel: ".winc", stack: ".window"} ).css( "left", windowPos + "px" ).css( "top", windowPos + "px" ).css( "z-index", $( ".window" ).length + 1 );
     KWS.windowIndex ++;
@@ -450,6 +452,8 @@ const System = new function() {
 
     this.battery = null;
 
+    this.log = new Array();
+
     this.setBattery = function(){
         if( navigator.getBattery ) navigator.getBattery().then((e)=>{
             let _lv =  e.level * 100;
@@ -488,14 +492,27 @@ const System = new function() {
     this.open = function(filename){
         launch("fivr", { "open" : filename });
     }
+
+    this.preventClose = function( _pid ){
+        if( !process[_pid] ) return false;
+        process[_pid].preventclose = true;
+        return true;
+    }
     
     this.shutdown = function() {
         $( "#last-notification-close" ).click();
         $( "#kit-power-back" ).click();
         for( let i in process ) {
-            close( i );
-            $( "section" ).hide();
+            if( process[i].preventclose == true ){
+                S.dialog( "シャットダウンの中断", "pid" + i + "がシャットダウンを妨げています。<br>強制終了してシャットダウンを続行する場合は[OK]を押下してください。", () => {
+                    process[i].preventclose = false;
+                    S.shutdown();
+                } );
+                return false;
+            }
+            else close( i );
         }
+        $( "section" ).hide();
         $( "body" ).css( "background-color", "black" );
         $( "header, footer" ).fadeOut( 300 );
         $( "#kit-wallpaper" ).fadeOut( 1500 );