- press 'shift' to safe boot + Booting kit +
+
+ Press [shift] to safe boot diff --git a/index.html b/index.html index 8fec04a..2417711 100644 --- a/index.html +++ b/index.html @@ -17,21 +17,13 @@ - + -
+
@@ -64,12 +56,11 @@ 通知 -
+
@@ -52,15 +44,14 @@ - 通知 + -
kitの初期設定
あとから「設定」アプリで設定を行うこともできます。パスワード
初期設定は終わりです
-以下の設定内容でよろしければ、下のボタンを押してkitの使用を開始します。
+以下の設定内容でkitの使用を開始します。
ユーザー名：
ユーザーカラー：
diff --git a/system.js b/system.js
index e2b0882..e15cb3c 100644
--- a/system.js
+++ b/system.js
@@ -90,6 +90,7 @@ class System {
Footer: {},
Launcher: {},
Sightre: {},
+ ContextMenu: {},
// Methods
getWindow: (pid) => document.querySelector(`#w${pid}`),
@@ -104,9 +105,22 @@ class System {
System.UI.Header.desktops = document.querySelector("#desktops");
System.UI.Header.sightre = document.querySelector("#kit-header-sightre");
System.UI.Header.username = document.querySelector("#kit-header-username");
- System.UI.Header.fullscreen = document.querySelector("#kit-header-fullscreen");
+ System.UI.Header.unmax = document.querySelector("#kit-header-unmax");
System.UI.Header.Dropdown.sound = document.querySelector("#dropdown-sound");
+ System.UI.Header.time = document.querySelector("#kit-header-time");
System.UI.Header.powerButton = document.querySelector(".power-button");
+
+ System.UI.Footer.footer = document.querySelector("footer");
+
+ System.UI.ContextMenu.contextMenu = document.querySelector("#kit-context");
+ System.UI.ContextMenu.input = document.querySelector("#kit-context-input");
+ System.UI.ContextMenu.elem = document.querySelector("#kit-context-elem");
+ System.UI.ContextMenu.elemGroup = document.querySelector("#kit-contextgroup-elem");
+ System.UI.ContextMenu.textGroup = document.querySelector("#kit-contextgroup-text");
+ System.UI.ContextMenu.desktopGroup = document.querySelector("#kit-contextgroup-desktop");
+ System.UI.ContextMenu.customGroup = document.querySelector("#kit-contextgroup-custom");
+
+ System.UI.desktopSelector = document.querySelector("#kit-desktop-selector");
System.UI.wallpaper = document.querySelector("#kit-wallpaper");
if (localStorage.getItem("kit-pid")) pid = localStorage.getItem("kit-pid");
@@ -129,13 +143,6 @@ class System {
if (!localStorage.getItem("kit-default-browser"))
localStorage.setItem("kit-default-browser", "browser");
- if (localStorage.getItem("kit-fusen")) {
- this.list = JSON.parse(localStorage.getItem("kit-fusen"));
- for (let i in this.list) {
- KWS.fusen.add(this.list[i]);
- }
- }
-
if (localStorage.getItem("kit-darkmode") == "true") KWS.darkmode = true;
if (System.bootopt.get("safe")) {
@@ -166,8 +173,6 @@ class System {
if (localStorage["kit-recycle"])
System.recycle = JSON.parse(localStorage["kit-recycle"]);
- System.moveDesktop("1");
-
if (localStorage.getItem("kit-shutted-down") == "false") {
Notification.push(
"お知らせ",
@@ -203,27 +208,83 @@ class System {
"現在、kitをセーフモードで起動しています。",
"system"
);
- System.alert({
- title: "セーフブート",
- content: "現在、kitをセーフモードで起動しています。
通常モードで再起動",
- windowTitle: "system"
- });
- } else for (let i of System.startup) if (i != "") System.launch(i);
+ };
+
+ KWS.Util.hide(System.UI.Header.unmax);
- System.UI.Header.fullscreen.style.display = "none";
+ if (System.bootopt.get('safe')) setInterval(System.updateTime, 1000);
+ else setInterval(System.updateTime, 100);
// Event handlers
- $("#desktops")
- .click(function () {
- $("#desktop-" + currentDesktop).toggleClass("selected-section");
- })
- .mousedown(function () {
- $(".window").css("opacity", "0.6");
- })
- .mouseup(function () {
- $(".window").css("opacity", "1.0");
- });
- //タスク一覧
+
+ // Virtual Desktops
+ System.UI.Header.desktops.addEventListener('click', () => {
+ const closeFunc = () => {
+ KWS.currentDesktop.elem.classList.remove('selected-section');
+ System.UI.desktopSelector.classList.remove('-is-open');
+ };
+ if (System.UI.desktopSelector.classList.contains('-is-open')) {
+ closeFunc();
+ }
+ else {
+ KWS.currentDesktop.elem.classList.add('selected-section');
+ System.UI.desktopSelector.classList.add('-is-open');
+ System.UI.desktopSelector.innerHTML = '';
+ KWS.desktops.forEach(desktop => {
+ const elem = document.createElement('div');
+ elem.dataset.index = desktop.index;
+ if (localStorage.getItem("kit-wallpaper")) {
+ elem.style.background = localStorage.getItem("kit-wallpaper");
+ elem.style.backgroundSize = "cover";
+ elem.style.backgroundPosition = "center center";
+ }
+ if (KWS.currentDesktopIndex === desktop.index) {
+ elem.classList.add('-active');
+ }
+ elem.addEventListener('click', () => {
+ if (KWS.currentDesktopIndex === desktop.index) closeFunc();
+ else {
+ KWS.currentDesktop = desktop.index;
+ // Switch unmax button and the footer
+ if (KWS.currentDesktop.maximized.pid === null) {
+ KWS.Util.show(System.UI.Footer.footer);
+ KWS.Util.hide(System.UI.Header.unmax);
+ }
+ else {
+ KWS.Util.hide(System.UI.Footer.footer);
+ KWS.Util.show(System.UI.Header.unmax);
+ }
+ }
+ });
+ const input = document.createElement('input');
+ input.type = 'text';
+ input.value = desktop.name;
+ input.addEventListener('click', (e) => e.stopPropagation());
+ input.addEventListener('blur', () => {
+ desktop.name = input.value;
+ desktop.elem.dataset.name = input.value;
+ });
+ elem.appendChild(input);
+ System.UI.desktopSelector.appendChild(elem);
+ });
+
+ const addButton = document.createElement('div');
+ addButton.classList.add("-add-button");
+ addButton.innerHTML = '+追加する';
+ addButton.addEventListener('click', () => {
+ new Desktop(`Desktop ${KWS.desktops.length}`);
+ closeFunc();
+ KWS.Util.show(System.UI.Footer.footer);
+ KWS.Util.hide(System.UI.Header.unmax);
+ });
+ System.UI.desktopSelector.appendChild(addButton);
+ }
+ });
+ // Unmax
+ System.UI.Header.unmax.addEventListener('click', () => {
+ KWS.unmax(KWS.currentDesktop.maximized.pid);
+ });
+ // Task List
$("#footer-tasks").click(function () {
if ($("#kit-tasks").is(":visible")) {
$("#kit-tasks").html("").fadeOut(300);
@@ -253,26 +314,38 @@ class System {
});
$.getJSON("config/desktop.json", (data) => {
- for (let i in data) {
- $(".desktop-icons").append(
- "
+ 通常モードで再起動`, + windowTitle: "system" + }); + } + if (localStorage.getItem("kit-lock") === "true") { + System.lock(); } - $(".desktop-icon").on("click", function () { - System.launch($(this).attr("data-launch")); - }); }).fail(function () { Notification.push( "読み込みに失敗", "デスクトップ(config/desktop.json)の読み込みに失敗しました。", "system" ); + new Desktop('Desktop'); }); $.getJSON("config/apps.json", System.initLauncher).fail(function () { @@ -310,9 +383,11 @@ class System { $("#notifications").hide("drop", { direction: "right" }, 300); $("#last-notification").hide("drop", { direction: "right" }, 300); $("#kit-wallpaper").css("filter", "blur(5px)"); + KWS.Util.hide(KWS.currentDesktop.elem); + KWS.currentDesktop.elem.classList.remove('selected-section'); + System.UI.desktopSelector.classList.remove('-is-open'); $( - "footer, header, #launcher, #task-ctx, #kit-sightre, .dropdown, #desktop-" + - currentDesktop + "footer, header, #launcher, #task-ctx, #kit-sightre, .dropdown" ).hide(); $("#kit-power").show(); }); @@ -321,15 +396,12 @@ class System { "filter", "none" ); - $("footer, header, #desktop-" + currentDesktop).show(); + KWS.Util.show(KWS.currentDesktop.elem); + $("footer, header").show(); $("#kit-power").hide(); }); - $("#kit-power-shutdown").click(function () { - System.shutdown(); - }); - $("#kit-power-reboot").click(function () { - System.reboot(); - }); + $("#kit-power-shutdown").click(System.shutdown); + $("#kit-power-reboot").click(System.reboot); $("#kit-power-suspend").click(function () { location.reload(); $("section, header, footer, #kit-wallpaper").css("filter", "none"); @@ -354,7 +426,8 @@ class System { $("header, footer").show(); $("section, header, footer, #kit-wallpaper").css("filter", "none"); $("#lock-password").val(""); - System.moveDesktop(1); + KWS.Util.show(KWS.currentDesktop.elem); + KWS.Util.hide(document.querySelector('#desktop-l')); } else $("#lock-password").effect("bounce", { distance: 12, times: 4 }, 500); }) .hover( @@ -370,11 +443,12 @@ class System { $("#notifications").hide("drop", { direction: "right" }, 300); if ($("#launcher").is(":visible")) { $("#kit-wallpaper").css("filter", "none"); - $("#desktop-" + currentDesktop).show(); + KWS.currentDesktop.elem.removeAttribute('hidden'); $("#launcher").hide(); } else { + KWS.currentDesktop.elem.setAttribute('hidden', ''); $("#kit-wallpaper").css("filter", "blur(5px)"); - $("section, #task-ctx").hide(); + $("#task-ctx").hide(); $("#launcher").show(); } }); @@ -587,68 +661,11 @@ class System { $("#kit-header-user").on("click", () => System.launch("user")); - $(":root section:not(#desktop-l)").on("contextmenu", function () { - let _ptelem = $(document.elementFromPoint(S.mouseX, S.mouseY)); - S.selectedElement = _ptelem; - S.selectedText = window.getSelection(); - $("#kit-context-input").val(S.selectedText); - if ($("#kit-context-input").val() == "") - $("#kit-contextgroup-text").hide(); - else $("#kit-contextgroup-text").show(); - if (_ptelem[0].id == "desktop-" + currentDesktop) { - $("#kit-contextgroup-desktop").show(); - $("#kit-contextgroup-elem").hide(); - } else { - $("#kit-contextgroup-desktop").hide(); - $("#kit-contextgroup-elem").show(); - } - $("#kit-context-elem").text( - _ptelem.prop("tagName").toLowerCase() + "要素" - ); - $("#kit-contextgroup-custom").hide(); - - let _ctxid = - _ptelem.attr("data-kit-contextid") || _ptelem.attr("kit-context"); - if (_ctxid) { - $("#kit-contextgroup-custom") - .show() - .html(''); - let _ctxname = KWS.context[_ctxid].name || _ctxid; - $("#kit-context-custom").text(_ctxname); - for (let i in KWS.context[_ctxid]) { - if (i == "name") continue; - $("#kit-contextgroup-custom").append( - " " + - KWS.context[_ctxid][i].label + - "" - ); - $("#kit-context-" + _ctxid + "-" + i).on("click", () => { - KWS.context[_ctxid][i].function(); - $("#kit-context").fadeOut(300); - }); - } - } - if (_ptelem[0].id) $("#kit-context-elem").append("#" + _ptelem[0].id); - $("#kit-context-size").text( - _ptelem[0].clientWidth + "✕" + _ptelem[0].clientHeight - ); - $("#kit-context").toggle().css("left", S.mouseX).css("top", S.mouseY); - return false; - }); $("#kit-context-open").on("click", function () { - S.alert("要素", S.selectedElement.clone()); - }); - $("#kit-context-save").on("click", function () { - S.obj2img(S.selectedElement, true); + System.alert("選択された要素", System.selectedElement.cloneNode(true)); }); $("#kit-context-search").on("click", function () { - $("#kit-context").fadeOut(300); + KWS.Util.hide(System.UI.ContextMenu.contextMenu, { duration: 300 }); System.launch("browser", { url: `https://www.bing.com/search?q=${$("#kit-context-input").val()}` }); @@ -657,7 +674,7 @@ class System { if (e.which == 13) $("#kit-context-search").click(); }); $("#kit-context a").on("click", function () { - $("#kit-context").fadeOut(300); + KWS.Util.hide(System.UI.ContextMenu.contextMenu, { duration: 300 }); }); $("#kit-context-vacuum").on("click", function () { for (let i in process) { @@ -671,10 +688,6 @@ class System { KWS.fusen.add(""); }); - $("section").on("click", function () { - $("#kit-context").fadeOut(300); - }); - $(document) .delegate("a", "click", function () { if (this.href) { @@ -702,21 +715,16 @@ class System { window.onresize = () => { System.display.width = window.innerWidth; - System.display.height = window.innerWidth; + System.display.height = window.innerHeight; - if (KWS.fullscreen.pid) { + if (KWS.currentDesktop.maximized.pid) { KWS.resize( - KWS.fullscreen.pid, + KWS.currentDesktop.maximized.pid, System.display.width, System.display.height - 30 ); } }; - - if (localStorage.getItem("kit-lock") == "true") { - $("section").hide(); - setTimeout(() => System.lock(), 100); - } }; static ajaxWait = () => { @@ -730,6 +738,28 @@ class System { }); }; + static updateTime = () => { + const now = new Date(); + System.time.obj = now; + let day = now.getDay(); + let y = now.getFullYear(); + let m = ('00' + (now.getMonth() + 1)).slice(-2); + let d = ('00' + now.getDate()).slice(-2); + let h = ('00' + now.getHours()).slice(-2); + let i = ('00' + now.getMinutes()).slice(-2); + let s = ('00' + now.getSeconds()).slice(-2); + System.time = { + obj: now, + day, + y, + m, + d, + h, + i, + s + } + System.UI.Header.time.innerText = `${h}:${i}:${s}`; + } static setBattery = function () { if (navigator.getBattery) navigator.getBattery().then((e) => { @@ -781,16 +811,16 @@ class System { return true; }; - static shutdown = (_opt) => { + static shutdown = (option = {reboot: false}) => { $("#last-notification-close").click(); $("#kit-power-back").click(); for (let i in process) { if (process[i].preventclose == true) { S.dialog( "シャットダウンの中断", - "pid" + - System.appCache[System.launchpath[i]].name + - "がシャットダウンを妨げています。
強制終了してシャットダウンを続行する場合は[OK]を押下してください。", + `${System.appCache[System.launchpath[i]].name}がシャットダウンを妨げています。 +
+ 強制終了してシャットダウンを続行する場合は[OK]を押してください。`, () => { process[i].preventclose = false; System.shutdown(); @@ -803,14 +833,18 @@ class System { $("body").css("background-color", "black"); $("header, footer").fadeOut(300); $("#kit-wallpaper").fadeOut(1500); - if (_opt == "reboot") location.href = "autorun.html"; localStorage.setItem("kit-shutted-down", true); + if (option.reboot) { + const path = "autorun.html" + (System.isMobile ? "?mobile" : ""); + location.href = path; + } }; - static reboot = () => System.shutdown("reboot"); + static reboot = () => System.shutdown({ reboot: true }); static lock = () => { - System.moveDesktop("l"); + KWS.Util.hide(KWS.currentDesktop.elem); + KWS.Util.show(document.querySelector('#desktop-l')); $("#lock-user-icon").css( "background", @@ -905,12 +939,11 @@ class System { localStorage.setItem("kit-wallpaper", str); }; + // [Deprecated] Use KWS.currentDesktop static moveDesktop = (id) => { - const str = String(id); - $("section").hide(); - $("#desktop-" + str).show(); - $("#desktops").html("Desktop" + str); - currentDesktop = str; + KWS.Util.hide(KWS.currentDesktop.elem); + KWS.Util.show(document.querySelector(`#desktop-${id}`)); + $("#desktops").html("Desktop" + id); }; static avoidMultiple = (_pid, _alert) => { @@ -987,7 +1020,9 @@ class System { System.launchpath[_pid] = _path; if (System.appCache[_path]) { - if (KWS.fullscreen.pid) KWS.unmax(KWS.fullscreen.pid); + if (KWS.currentDesktop.maximized.pid !== null) { + KWS.unmax(KWS.currentDesktop.maximized.pid); + } appData(System.appCache[_path]); } else { try { @@ -1065,10 +1100,129 @@ class System { })(); } +class Desktop { + constructor(name) { + const elem = document.createElement('section'); + elem.id = `desktop-${KWS.desktops.length}`; + elem.dataset.name = name; + + // Place icons on the desktop + const iconWrapper = document.createElement('div'); + iconWrapper.className = 'desktop-icons'; + + for (let key in Desktop.icons) { + const iconElem = document.createElement('div'); + iconElem.classList.add('desktop-icon'); + iconElem.addEventListener('click', () => System.launch(key)); + iconElem.innerHTML = `