Skip to content

[WIP] Add Virtual Desktop Feature #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mtsgi wants to merge 5 commits into
base: feature/modernize
Choose a base branch
from
Open

[WIP] Add Virtual Desktop Feature #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
868b5e7
Add Virtual Desktop Feature
mtsgi Jul 18, 2021
8830bd3
Fix mobile UI probrems and update browser
mtsgi Aug 7, 2021
735a4b5
Fix problem about maximized windows on virtual desktops and Add clock
mtsgi Aug 7, 2021
e39ddd4
Fix unmax bug
mtsgi Aug 7, 2021
a2f176a
Add mobile reboot and setup function
mtsgi Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/browser/browser.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
z-index: 1;
right: 0px;
background: white;
border-radius: 0px 0px 0px 5px;
border-radius: 0px 0px 0px 8px;
padding: 6px 0;
box-shadow: -2px 2px 4px -2px black;
box-shadow: -2px 2px 8px -2px rgba(0, 0, 0, .5);
overflow: hidden;
}
.kit-darkmode.winc-browser .browser-menu{
background: #505050;
Expand All @@ -63,4 +64,14 @@
.browser-menu a:hover{
background: dodgerblue;
color: white;
}
}
/* for mobile */
.kit-mobile .winc-browser iframe {
height: calc(100% - 48px);
}
.kit-mobile .browser-menu{
padding: 0;
}
.kit-mobile .browser-menu a{
padding: 8px 10px;
}
1 change: 0 additions & 1 deletion app/browser/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<a class="btn browser-bars"><span class="fa fa-bars"></span></a>
</div>
<div class="browser-menu">
<a id="browser-menu-reload"><span class="fa fa-redo"></span> 再読み込み</a>
<a onclick="launch('browser')"><span class="far fa-plus-square"></span> 新しいウィンドウ</a>
<a id="browser-menu-bookmark"><span class="far fa-bookmark"></span> ブックマーク</a>
<a id="browser-menu-default"><span class="far fa-hand-peace"></span> 標準のブラウザ</a>
Expand Down
2 changes: 1 addition & 1 deletion app/browser/define.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "browser",
"name": "ブラウザ",
"icon": "icon.png",
"version": "1.1.1",
"version": "1.1.2",
"author": "kit",

"support": {
Expand Down
2 changes: 1 addition & 1 deletion app/settings/define.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "settings",
"name": "設定",
"icon": "icon.png",
"version": "5.0.3",
"version": "5.0.4",
"author": "kit",

"support": {
Expand Down
2 changes: 1 addition & 1 deletion app/settings/theme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
else KWS.darkmode = false;
});
$(".settings-theme-path-set").on("click", function(){
set_theme( $("#settings-theme-path").val() );
KWS.setTheme( $("#settings-theme-path").val() );
});
</script>
<kit-btn kit-ref="default.html">
Expand Down
29 changes: 19 additions & 10 deletions autorun.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
<!DOCTYPE html>
<html lang="ja">
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>kit-autorun</title>
<script type="text/javascript">
const params = new URLSearchParams(location.search);
const isMobile = params.has("mobile");
setTimeout(() => {
let flag = localStorage.getItem("kit-setup-flag");
if( flag ) location.href = "index.html";
else location.href = "setup.html";
const flag = localStorage.getItem("kit-setup-flag");
if (flag) {
if (isMobile) location.href = "mobile.html";
else location.href = "index.html";
} else location.href = "setup.html" + (isMobile ? "?mobile" : "");
}, 400);
window.addEventListener("keydown", (e)=>{
if(e.shiftKey) location.href = "index.html?safe=true"
})
window.addEventListener("keydown", (e) => {
if (e.shiftKey) {
if (isMobile) location.href = "mobile.html?safe=true";
else location.href = "index.html?safe=true";
}
});
</script>
</head>

<body style="background: #222; color: #eee">
Booting kit...
<br>
press 'shift' to safe boot
Booting kit
<br />
<br />
Press [shift] to safe boot
</body>

</html>
20 changes: 7 additions & 13 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,13 @@
<!-- Theme -->
<link href="./system/theme/theme-default.css" rel="stylesheet" id="kit-theme-file">
<link rel="stylesheet" id="kit-darkmode">
<!-- アプリ固有CSS -->
<!-- Application Styles -->
</head>

<body id="body" spellcheck="false">
<div id="kit-wallpaper"></div>

<section id="desktop-0">
<div>Loading</div>
</section>

<section id="desktop-1">
<div class="desktop-icons"></div>
</section>

<section id="desktop-l">ロックされています<br>
<section id="desktop-l" hidden>ロックされています<br>
<div id="lock-user-icon"></div>
<div id="lock-username"></div>
<input type="password" id="lock-password" class="textbox">
Expand Down Expand Up @@ -64,12 +56,11 @@
<a id="footer-noti"><span class="fas fa-comment-alt"></span> 通知</a>
</footer>

<div id="kit-context">
<div id="kit-context" hidden>
<div id="kit-context-elem">要素</div>
<div id="kit-contextgroup-elem">
<div id="kit-context-size"></div>
<a id="kit-context-open"><span class="fa fa-external-link-alt"></span> 要素を開く</a>
<a id="kit-context-save"><span class="fa fa-file-download"></span> 要素を保存</a>
</div>
<div id="kit-contextgroup-text">
<div id="kit-context-text">テキスト</div>
Expand Down Expand Up @@ -123,9 +114,10 @@
<a id="desktops"><span class="far fa-clone"></span>Desktop</a>
<a id="kit-header-sightre"><span class="fa fa-search"></span>さがす</a>
<div class="kit-right">
<a id="kit-header-fullscreen"><span class="fa fa-window-maximize"></span>最大化を解除</a>
<a id="kit-header-unmax"><span class="fa fa-window-maximize"></span>最大化を解除</a>
<a id="kit-header-user"><span class="fa fa-user"></span><span id="kit-header-username"></span></a>
<a onclick="$('#dropdown-sound').toggle()"><span id="kit-header-sound-icon" class="fa fa-volume-up"></span></a>
<a id="kit-header-time"></a>
<a class="power-button"><span class="fa fa-power-off"></span>終了</a>
</div>
</header>
Expand All @@ -135,6 +127,8 @@
<div id="kit-sightre-results"></div>
</div>

<div id="kit-desktop-selector" hidden></div>

<div id="kit-power">
<a id="kit-power-back">もどる</a>
<a id="kit-power-shutdown">シャットダウン</a>
Expand Down
21 changes: 8 additions & 13 deletions mobile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,7 @@
<body id="body" spellcheck="false" class="kit-mobile">
<div id="kit-wallpaper"></div>

<section id="desktop-0">
<div>Loading</div>
</section>

<section id="desktop-1">
<div class="desktop-icons"></div>
</section>

<section id="desktop-l">ロックされています<br>
<section id="desktop-l" hidden>ロックされています<br>
<div id="lock-user-icon"></div>
<div id="lock-username"></div>
<input type="password" id="lock-password" class="textbox">
Expand All @@ -52,15 +44,14 @@
<a id="footer-mobile-close" class="fa fa-times" onclick="System.close(KWS.active)"></a>
<a id="footer-mobile-home" onclick="KWS.minAll()" class="fa fa-home"></a>
<a id="footer-mobile-tasks" class="far fa-square" onclick="$('#kit-mobile-tasks').toggle()"></a>
<a id="footer-noti"><span class="fas fa-comment-alt"></span> 通知</a>
<a id="footer-noti"><span class="fas fa-comment-alt"></span></a>
</footer>

<div id="kit-context">
<div id="kit-context" hidden>
<div id="kit-context-elem">要素</div>
<div id="kit-contextgroup-elem">
<div id="kit-context-size"></div>
<a id="kit-context-open"><span class="fa fa-external-link-alt"></span> 要素を開く</a>
<a id="kit-context-save"><span class="fa fa-file-download"></span> 要素を保存</a>
</div>
<div id="kit-contextgroup-text">
<div id="kit-context-text">テキスト</div>
Expand Down Expand Up @@ -130,9 +121,10 @@
<a id="desktops"><span class="far fa-clone"></span></a>
<a id="kit-header-sightre"><span class="fa fa-search"></span></a>
<div class="kit-right">
<!-- <a id="kit-header-fullscreen"><span class="fa fa-window-maximize"></span>最大化を解除</a> -->
<a id="kit-header-unmax"><span class="fa fa-window-maximize"></span></a>
<a id="kit-header-user"><span class="fa fa-user"></span><span id="kit-header-username"></span></a>
<a onclick="$('#dropdown-sound').toggle()"><span id="kit-header-sound-icon" class="fa fa-volume-up"></span></a>
<a id="kit-header-time"></a>
<a class="power-button"><span class="fa fa-power-off"></span></a>
</div>
</header>
Expand All @@ -142,11 +134,14 @@
<div id="kit-sightre-results"></div>
</div>

<div id="kit-desktop-selector" hidden></div>

<div id="kit-power">
<a id="kit-power-back">もどる</a>
<p>これはkitMobileベータ版です。</p>
<p><img src="./documents/mobile-logo-white.png" alt="kitMobile"></p>
<a id="kit-power-shutdown">シャットダウン</a>
<a id="kit-power-reboot">再起動</a>
<a id="kit-power-suspend">高速な再起動</a>
<a id="kit-power-lock">ロック</a>
</div>
Expand Down
20 changes: 13 additions & 7 deletions setup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<head>
<meta charset="UTF-8">
<title>kit - 初期設定</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="./system/jquery.min.js"></script>
<link rel="stylesheet" href="./system/jquery-ui-1.12.1/jquery-ui.min.css">
<script src="./system/jquery-ui-1.12.1/jquery-ui.min.js"></script>
<link href="./fa/css/all.css" rel="stylesheet">
<link href="./system/noto.css" rel="stylesheet">
<link href="./system/kitstrap/kitstrap.css" rel="stylesheet">
<style type="text/css">
*::selection {
Expand Down Expand Up @@ -70,6 +70,8 @@

</style>
<script type="text/javascript">
const isMobile = (new URLSearchParams(location.search)).has("mobile");
const bootPath = isMobile ? "mobile.html" : "index.html";
$(document).ready(Load);
function Load() {
$("section").hide();
Expand Down Expand Up @@ -97,14 +99,18 @@
localStorage.setItem("kit-user-color", $("#config-usercolor").val());
localStorage.setItem("kit-password", $("#config-password").val());
localStorage.setItem("kit-setup-flag", true);
location.href = "index.html";
location.href = bootPath;
}
function skip() {
$('section').text('kitを起動します。お待ち下さい');
setTimeout(function () { location.href = bootPath; }, 1000);
}
function discard() {
$('section').text('今回以降、初期設定の画面は表示されません。');
localStorage.setItem("kit-setup-flag", true);
setTimeout(function () {
$('section').text('kitを起動します。お待ち下さい');
localStorage.setItem("kit-setup-flag", true);
setTimeout(function () { location.href = "index.html"; }, 1000);
setTimeout(function () { location.href = bootPath; }, 1000);
}, 1000);
}
</script>
Expand All @@ -122,10 +128,10 @@ <h3><span class="fa fa-cogs"></span> kitの初期設定</h3>
あとから「設定」アプリで設定を行うこともできます。
</p>
<li>
<a href="./index.html" class="kit-hl-alt">初期設定をスキップ</a>
<a onclick="skip()" class="kit-hl-alt">初期設定をスキップ</a>
</li>
<li>
<a onclick="skip()" class="kit-hl-alt">以降表示しない</a>
<a onclick="discard()" class="kit-hl-alt">以降表示しない</a>
</li>
</section>

Expand Down Expand Up @@ -162,7 +168,7 @@ <h3><span class="fa fa-key"></span> パスワード</h3>

<section id="e">
<h3><span class="fa fa-toolbox"></span> 初期設定は終わりです</h3>
<p>以下の設定内容でよろしければ、下のボタンを押してkitの使用を開始します。</p>
<p>以下の設定内容でkitの使用を開始します。</p>
<p>
<span class="fa fa-user"></span>ユーザー名：<span id="view-username"></span><br>
<span class="fa fa-palette"></span>ユーザーカラー：<span id="view-usercolor"></span><br>
Expand Down
Loading