Ubuntu 21.10 Update

* Interface Update (Gnome 40) * Bugfixes * New Features
daqingzd · Sep 26, 2021 · cacba20 · cacba20
1 parent 61a022e
commit cacba20
Show file tree

Hide file tree

Showing 35 changed files with 324 additions and 101 deletions.
diff --git a/LICENCE_BSD3Clause.txt b/LICENCE_BSD3Clause.txt
@@ -0,0 +1,10 @@
+Copyright (c) 2012, Pierre Quentel [email protected]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-* This project licensed by [MPL](./LICENSE.txt).
+* This project licensed by [MPL2](./LICENSE.txt).
 
 * css/UbuntuRegular.ttf licensed by [Ubuntu Font License](./LICENSE_UFL.txt).
 
@@ -8,8 +8,12 @@
 
 * Bootstrap Icons licensed by [Mit License](./LICENSE_MIT.txt)
 
+* Brython licensed by [BSD-3-Clause License](./LICENCE_BSD3Clause.TXT)
+
 > Ubuntu and Canonical are registered trademarks of Canonical Ltd.
 
 > Gnome are registered trademarks of Gnome.
 
-> WineHQ are registered trademarks of WineHQ.
+> WineHQ are registered trademarks of WineHQ.
+
+> Python are registered trademarks of Python Software Foundation.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # Ubuntu Tour
 
-Web based Ubuntu 21.04 desktop remake. You can try latest ubuntu edition remake from [here](https://malisipi.github.io/ubuntu-tour/)
+Web based Ubuntu 21.10 desktop remake. You can try latest ubuntu edition remake from [here](https://malisipi.github.io/ubuntu-tour/)
 
 ## Features
 
 * Multi-window (You can open same application 2 (or more) times)
 * Resizable, draggable windows
-* Changable wallpapers
+* Changeable wallpapers
 * Similar interface with Gnome (Ubuntu Tour imitate Gnome Interface however never use Gnome code.)
 * Clone applications
 
@@ -20,8 +20,9 @@ For introduce the Ubuntu environment' beauty (on web) and for fun. :) I was insp
 ## To-Do List
 
 * Increase clone apps' functionality
-* [8] Create more clone aplication
-* [-] Update interface to similar Ubuntu 21.10 interface
+* [8] Create more clone application
+* [+] Update interface to similar Ubuntu 21.10 interface
+* [-] Update interface to similar Ubuntu 22.04 interface
 
 ## Notes
 
@@ -33,4 +34,4 @@ For introduce the Ubuntu environment' beauty (on web) and for fun. :) I was insp
 
 ## License
 
-This project licensed by MPL. Learn more from [here](./LICENSE.md)
+This project licensed by MPL2. Learn more from [here](./LICENSE.md)
diff --git a/apps/css/app-layout.css b/apps/css/app-layout.css
@@ -1,5 +1,7 @@
 body{
     background: #141414;
+    user-select: none;
+    -webkit-user-select: none;
 }
 
 .titlebar-container{

diff --git a/apps/css/app-styles.css b/apps/css/app-styles.css
@@ -15,6 +15,11 @@
     background: #888888; 
 }
 
+body{
+    user-select: none;
+    -webkit-user-select: none;
+}
+
 .special-button{
     border: #111111;
     background: #333333;

diff --git a/apps/filemanager/css/side.css b/apps/filemanager/css/side.css
@@ -17,6 +17,9 @@
 
 body{
     background: #222222;
+    margin: 0px;
+    user-select: none;
+    -webkit-user-select: none;
 }
 
 .location-inactive{

diff --git a/apps/settings/about.html b/apps/settings/about.html
@@ -47,7 +47,7 @@
             <table class="bar">
                 <tr>
                     <td class="bar-left">OS name</td>
-                    <td class="bar-right">Ubuntu 21.04</td>
+                    <td class="bar-right">Ubuntu Impish Indri (development branch)</td>
                 </tr>
             </table>
             <table class="bar">
@@ -59,7 +59,7 @@
             <table class="bar">
                 <tr>
                     <td class="bar-left">Gnome Version</td>
-                    <td class="bar-right">3.38.5</td>
+                    <td class="bar-right">40.4.0</td>
                 </tr>
             </table>
             <table class="bar">

diff --git a/apps/settings/css/side.css b/apps/settings/css/side.css
@@ -32,6 +32,9 @@
 
 body{
     background: #222222;
+    margin: 0px;
+    user-select: none;
+    -webkit-user-select: none;
 }
 
 .location-inactive{

diff --git a/apps/settings/js/background.js b/apps/settings/js/background.js
@@ -4,5 +4,6 @@ function showWallpaper(){
 
 function setWallpaper(file){
     parent.parent.document.getElementsByClassName("wallpaper")[0].src="icons/unsplash/"+file;
+    parent.parent.window.localStorage["wallpaper"]="icons/unsplash/"+file;
     document.getElementById("theWallpaper").src="../../icons/unsplash/"+file;
 }
diff --git a/apps/terminal/css/main.css b/apps/terminal/css/main.css
@@ -5,12 +5,12 @@ textarea{
     width: 100%;
     height: 100%;
     background: #0000;
-    color: #eee;
+    color: transparent;
+    text-shadow: 0 0 0 #fff;
     border: none;
     resize: none;
-}
-
-textarea{
     font-family: UbuntuMonoRegular !important;
     font-size: 16px !important;
+    outline: none;
+    word-break: break-all;
 }
diff --git a/apps/terminal/js/main.js b/apps/terminal/js/main.js
@@ -35,14 +35,17 @@ __console_info="Welcome to Terminal";
 outputs=__console_info;
 now_dir="/";
 now_command="";
+run_python3=0;
 
 function updateOutputs(){
     out.value=outputs;
 }
 
 function updateOutputsWithCommands(){
-    out.value=outputs+"\nuser@desktop:"+now_dir+"# "+now_command;
-    out.scrollBy(0,9999999999999999999999999);
+    setTimeout(() => {
+        out.value=outputs+"\nuser@desktop:"+now_dir+"# "+now_command;
+        out.scrollBy(0,9999999999999999999999999);
+    }, 1);
 }
 
 function clearOutputs(){
@@ -82,6 +85,9 @@ function runBashCommand(__command){
         writeOutput("You are already logged in as root user.")
     }else if(__the_command=="sh"||__the_command=="bash"){
         writeOutput(__console_info);
+    }else if(__the_command=="python3"){
+        run_python3=1;
+        brython({"debug":0});
     }else if(__the_command=="echo"){
         writeOutput(__command.join(" ").replace("echo ",""))
     }else if(__the_command=="cd"){
@@ -113,7 +119,7 @@ function runBashCommand(__command){
 mkdir    rmdir   cp      mv      rm\n\
 apt-get  apt     dpkg    su      sudo\n\
 sh       bash    echo    help    clear\n\
-cd       ls      dir")
+cd       ls      dir     python3 ")
     }else{
         writeOutput(__the_command+": Command not found")
     }
@@ -122,6 +128,7 @@ cd       ls      dir")
 }
 
 function handlerKeyPress(){
+    if(run_python3==1) return false;
     keyCode=window.event.keyCode;
     keyName=window.event.key;
     if(keyCode==8){

diff --git a/apps/terminal/main.html b/apps/terminal/main.html
@@ -5,9 +5,15 @@
     <link rel="stylesheet" href="../../css/Font.css">
     <link rel="stylesheet" href="../css/app-styles.css">
     <link rel="stylesheet" href="css/main.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.5/brython.min.js" integrity="sha512-Oe3i0p3zVIqykQ2TZhGOA/+JGe0WAqVoPVMHJGnubFjr3n+FYJTpctq98B9VBBvFMaHgDm18i1XsH2Lt1heQ1Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/brython/3.9.5/brython_stdlib.js" integrity="sha512-UwjF5/4q/UBE4ozW4XmBauIoIUDNcfOHb2al+IanIRNtUdbYv7WfzF+mxeCNuiMP/EfZwOLrhPydCYXo92XvmA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 </head>
 <body>
-    <textarea id="out" disabled></textarea>
+    <script type="text/python3">
+    from interpreter import Interpreter
+    Interpreter("out")
+    </script>
+    <textarea id="out" spellcheck="false"></textarea>
     <script src="js/main.js"></script>
 </body>
 </html>
diff --git a/contextmenu.html b/contextmenu.html
@@ -3,11 +3,22 @@
     <head>
         <link rel="stylesheet" href="css/contentmenu.css">
         <link rel="stylesheet" href="css/Font.css">
+        <script>
+            function itsJustDemo() {
+                alert("It's just a demo :)");
+            }
+        </script>
     </head>
-    <body>
-        <table class="option-list">
-            <tr><td class="option" onclick="parent.window_create_special(parent.createRandomWindowID(),'apps/filemanager/index.html?open=Desktop','Files','icons/Suru/Suru/48x48/apps/filemanager-app.png');parent.showHideContextMenu();">Open Desktop On Files</td></tr>
-            <tr><td class="option" onclick="parent.window_create_special(parent.createRandomWindowID(),'apps/settings/index.html?open=Background','Settings','icons/Suru/Suru/48x48/apps/system-settings.png');parent.showHideContextMenu();">Change Wallpaper...</td></tr>
-        </table>
-    </body>
+    <body oncontextmenu="return false;">
+            <div onclick="parent.showHideContextMenu();itsJustDemo();" class="section"><div>New Folder</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();" class="section"><div>Paste</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();" class="section"><div>Select All</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();"><div>Arrange Icons</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();" class="section"><div>Arrange By...</div></div>
+            <div onclick="parent.window_create_special(parent.createRandomWindowID(),'apps/filemanager/index.html?open=Desktop','Files','icons/Suru/Suru/48x48/apps/filemanager-app.png');parent.showHideContextMenu();"><div>Open Desktop On Files</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();" class="section"><div>Open In Terminal</div></div>
+            <div class="section" onclick="parent.window_create_special(parent.createRandomWindowID(),'apps/settings/index.html?open=Background','Settings','icons/Suru/Suru/48x48/apps/system-settings.png');parent.showHideContextMenu();"><div>Change Wallpaper...</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();"><div>Display Settings</div></div>
+            <div onclick="parent.showHideContextMenu();itsJustDemo();"><div>Desktop Symbol Settings</div></div>
+        </body>
 </html>
diff --git a/css/activities.css b/css/activities.css
@@ -0,0 +1,18 @@
+.activities{
+    position: fixed;
+    top: 26px;
+    left: 80px;
+    width: calc(100% - 80px);
+    height: calc(100% - 26px);
+    z-index: 99999999999999999999999999999999999999999;
+    background: #222222;
+}
+
+.activities-wallpaper{
+    position: fixed;
+    top: 106px;
+    left: 120px;
+    width: calc(100% - 160px);
+    height: calc(100% - 146px);
+    border-radius: 30px;
+}
diff --git a/css/app-menu.css b/css/app-menu.css
@@ -4,23 +4,31 @@
     top:26px;
     height: calc(100% - 26px);
     width: calc(100% - 80px);
-    background: #222222cc;
+    background: #222222;
     z-index: 99999999999999999999999999999999999999999;
 }
 
 .app-menu-container{
-    width: 80%;
-    height: 80%;
-    position: absolute;
-    left: 10%;
-    top: 10%;
+    position: fixed;
+    top: 206px;
+    left: 120px;
+    width: calc(100% - 160px);
+    height: calc(100% - 246px);
     overflow-x: hidden;
     overflow-y: auto;
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
 }
 
+.app-menu-container-wallpaper{
+    position: fixed;
+    top: 98px;
+    left: calc(50% - 40px);
+    height: 90px;
+    width: 160px;
+}
+
 .app-menu-app {
     width: 144px;
     height: 144px;

diff --git a/css/contentmenu.css b/css/contentmenu.css
@@ -1,24 +1,30 @@
 body{
-    cursor: default;
-}
-
-.option-list{
-    position: fixed;
-    top: 0px;
-    left: 0px;
-    height: 100%;
-    width: 100%;
     background: #222222;
+    display: grid;
+    grid-template-rows: auto auto;
+    margin: 5px 0px;
+    -webkit-user-select: none;
+    user-select: none;
 }
 
-.option{
-    width: 100%;
+body > div{
     transition-duration: 0.2s;
-    border-radius: 5px;
     color: #ffffff;
+    margin: 0px;
+    padding: 0px;
+    font-size: 16px;
+    line-height: 25px;
+}
+
+body > div > div{
+    margin: 0px 25px;
 }
 
-.option:hover{
+body > div:hover{
     transition-duration: 0.2s;
     background: #444444;
+}
+
+.section{
+    border-bottom: 1px #777777 solid;
 }
diff --git a/css/dock.css b/css/dock.css
@@ -2,7 +2,7 @@
     position: fixed;
     top:26px;
     left: 0px;
-    background: #222222;
+    background: #111111;
     width: 80px;
     z-index: 99999999999999999999999999999999999999999;
     height: calc(100% - 106px);
@@ -44,7 +44,7 @@
     left: 0px;
     width: 80px;
     height: 80px;
-    background: #222222;
+    background: #111111;
     z-index: 99999999999999999999999999999999999999999;
 }