From bcd6c0e846a8703916ce3f293b594b0504cc976a Mon Sep 17 00:00:00 2001 From: chinons098 Date: Tue, 21 Nov 2023 11:43:23 -0500 Subject: [PATCH] desktop v0.6.16 --- .../system-apps/desktop/desktop.component.css | 18 +++++- .../desktop/desktop.component.html | 18 +++--- .../system-apps/desktop/desktop.component.ts | 60 ++++++++++++++++-- src/osdrive.json | 2 +- src/osdrive/icons/chkmark32.png | Bin 0 -> 233 bytes src/osdrive/icons/circle.png | Bin 0 -> 379 bytes 6 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 src/osdrive/icons/chkmark32.png create mode 100644 src/osdrive/icons/circle.png diff --git a/src/app/system-apps/desktop/desktop.component.css b/src/app/system-apps/desktop/desktop.component.css index 3d43c311..f6a175ca 100644 --- a/src/app/system-apps/desktop/desktop.component.css +++ b/src/app/system-apps/desktop/desktop.component.css @@ -93,6 +93,7 @@ span{ span.head{ max-width: 25%; padding-left: 4px; + } span.mid{ @@ -100,7 +101,7 @@ span.mid{ padding: 0 4px; color: black; /* Black text color */ text-align: left; - font-size: 11px; + font-size: 12px; font-weight: normal; } @@ -123,3 +124,18 @@ img{ margin: 0 0 0 0; } +.img-alt{ + height: 8px; + width: 8px; + image-rendering:optimizeQuality; + position: relative; +} + +.figure-alt{ + position: relative; + align-items: center; + display: inline-flex; + min-width: 18px; + top: -25%; + left: 35%; +} diff --git a/src/app/system-apps/desktop/desktop.component.html b/src/app/system-apps/desktop/desktop.component.html index d486ac0b..d3540e3b 100644 --- a/src/app/system-apps/desktop/desktop.component.html +++ b/src/app/system-apps/desktop/desktop.component.html @@ -5,23 +5,23 @@
View -
+
-
+
Large icons
-
+
Medium icons
-
+
Small icon
@@ -59,27 +59,27 @@
Sort by -
+
-
+
Name
-
+
Size
-
+
Item type
-
+
Date modified
diff --git a/src/app/system-apps/desktop/desktop.component.ts b/src/app/system-apps/desktop/desktop.component.ts index c95fd0a5..e6dc706d 100644 --- a/src/app/system-apps/desktop/desktop.component.ts +++ b/src/app/system-apps/desktop/desktop.component.ts @@ -46,6 +46,11 @@ export class DesktopComponent implements OnInit, OnDestroy, AfterViewInit{ readonly sortBySize = SortBys.SIZE; readonly sortByDateModified = SortBys.DATE_MODIFIED; + isSortByName = false; + isSortByItemType = false; + isSortBySize = false; + isSortByDateModified = false; + autoAlignIcons = true; autoArrangeIcons = true; showDesktopIcons = true; @@ -190,9 +195,60 @@ export class DesktopComponent implements OnInit, OnDestroy, AfterViewInit{ } viewBy(viewBy:string):void{ + if(viewBy === IconsSizes.LARGE_ICONS){ + this.isLargeIcon = true; + this.isMediumIcon = false; + this.isSmallIcon = false; + } + + if(viewBy === IconsSizes.MEDIUM_ICONS){ + this.isMediumIcon = true; + this.isLargeIcon = false; + this.isSmallIcon = false; + } + + if(viewBy === IconsSizes.SMALL_ICONS){ + this.isSmallIcon = true; + this.isMediumIcon = false; + this.isLargeIcon = false; + } + this._fileManagerServices.viewByNotify.next(viewBy); } + sortBy(sortBy:string):void{ + + if(sortBy === SortBys.DATE_MODIFIED){ + this.isSortByDateModified = true; + this.isSortByItemType = false; + this.isSortByName = false; + this.isSortBySize = false; + } + + if(sortBy === SortBys.ITEM_TYPE){ + this.isSortByItemType = true; + this.isSortByDateModified = false; + this.isSortByName = false; + this.isSortBySize = false; + } + + if(sortBy === SortBys.SIZE){ + this.isSortBySize = true; + this.isSortByItemType = false; + this.isSortByName = false; + this.isSortByDateModified = false; + } + + if(sortBy === SortBys.NAME){ + this.isSortByName = true; + this.isSortByItemType = false; + this.isSortByDateModified = false; + this.isSortBySize = false; + } + + this._fileManagerServices.sortByNotify.next(sortBy); + } + autoArrangeIcon():void{ this.autoArrangeIcons = !this.autoArrangeIcons this._fileManagerServices.autoArrangeIconsNotify.next(this.autoArrangeIcons) @@ -203,10 +259,6 @@ export class DesktopComponent implements OnInit, OnDestroy, AfterViewInit{ this._fileManagerServices.alignIconsToGridNotify.next(this.autoAlignIcons) } - sortBy(sortBy:string):void{ - this._fileManagerServices.sortByNotify.next(sortBy); - } - refresh():void{ this._fileManagerServices.refreshNotify.next(); } diff --git a/src/osdrive.json b/src/osdrive.json index 81f60c1b..8d241d6c 100644 --- a/src/osdrive.json +++ b/src/osdrive.json @@ -1 +1 @@ -{"osdrive":{"audio":{"jazz-club-in-new-orleans.mp3":null,"titanium.mp3":null},"desktop":{"audioplayer.url":null,"fileexplorer.url":null,"heat.url":null,"hello.url":null,"taskmanager.url":null,"videoplayer.url":null},"download":{"anothertest.txt":null},"games":{"D3D.url":null,"Diggers.url":null,"Doom.url":null,"data":{"3d_duke.jsdos":null,"Digger.jsdos":null,"Doom.jsdos":null,"Jill_of_the_Jungle.jsdos":null,"Machine_Nation.jsdos":null,"Shadow_knight.jsdos":null},"icons":{"d3d.png":null,"diggers.png":null,"doom.png":null}},"home":{},"icons":{"arrow_down.png":null,"arrow_next.png":null,"arrow_up.png":null,"audio.ico":null,"audioplayer.png":null,"chkmark26.png":null,"cmd.ico":null,"config.ico":null,"download_folder.ico":null,"econo.png":null,"empty_folder.ico":null,"empty_recycle.ico":null,"file.ico":null,"file_explorer.ico":null,"floppy.ico":null,"folder.ico":null,"generic-program.ico":null,"image.ico":null,"js-dos-logo.png":null,"movie_folder.ico":null,"music_folder.ico":null,"my_computer.ico":null,"non_empty_folder.ico":null,"non_empty_recycle.ico":null,"picture_folder.ico":null,"taskmanger.png":null,"taskmanger_2.png":null,"unknown.ico":null,"video.ico":null,"videoplayer.png":null,"zip_folder.ico":null},"picture":{"favicon.ico":null,"favicon1.ico":null,"favicon_nice.png":null,"heat.png":null},"simple.txt":null,"video":{"nuts.mp4":null,"surfs.mp4":null,"test_video1.mp4":null}}} +{"osdrive":{"audio":{"jazz-club-in-new-orleans.mp3":null,"titanium.mp3":null},"desktop":{"audioplayer.url":null,"fileexplorer.url":null,"heat.url":null,"hello.url":null,"taskmanager.url":null,"videoplayer.url":null},"download":{"anothertest.txt":null},"games":{"D3D.url":null,"Diggers.url":null,"Doom.url":null,"data":{"3d_duke.jsdos":null,"Digger.jsdos":null,"Doom.jsdos":null,"Jill_of_the_Jungle.jsdos":null,"Machine_Nation.jsdos":null,"Shadow_knight.jsdos":null},"icons":{"d3d.png":null,"diggers.png":null,"doom.png":null}},"home":{},"icons":{"arrow_down.png":null,"arrow_next.png":null,"arrow_up.png":null,"audio.ico":null,"audioplayer.png":null,"chkmark26.png":null,"chkmark32.png":null,"circle.png":null,"cmd.ico":null,"config.ico":null,"download_folder.ico":null,"econo.png":null,"empty_folder.ico":null,"empty_recycle.ico":null,"file.ico":null,"file_explorer.ico":null,"floppy.ico":null,"folder.ico":null,"generic-program.ico":null,"image.ico":null,"js-dos-logo.png":null,"movie_folder.ico":null,"music_folder.ico":null,"my_computer.ico":null,"non_empty_folder.ico":null,"non_empty_recycle.ico":null,"picture_folder.ico":null,"taskmanger.png":null,"taskmanger_2.png":null,"unknown.ico":null,"video.ico":null,"videoplayer.png":null,"zip_folder.ico":null},"picture":{"favicon.ico":null,"favicon1.ico":null,"favicon_nice.png":null,"heat.png":null},"simple.txt":null,"video":{"nuts.mp4":null,"surfs.mp4":null,"test_video1.mp4":null}}} diff --git a/src/osdrive/icons/chkmark32.png b/src/osdrive/icons/chkmark32.png new file mode 100644 index 0000000000000000000000000000000000000000..706c9dd572c78e9c0bf1b4cc80b51fe78cbc74be GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC^*~G z#WAE}&f6*8Tnz?1tks=r-yHo{92d1;9>}EU(jAhk?8Mf^y-=U`q(!zSfiT2mRS!i0$X;){Y^a7?elxK-vjQw@2m_@1XfqB5-#$y d=Xv~ojc<5iDu?;SP@ppzJYD@<);T3K0RW-PR^k8v literal 0 HcmV?d00001 diff --git a/src/osdrive/icons/circle.png b/src/osdrive/icons/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..e5eb8df584c86df1f2eb2ed2df474364267cb864 GIT binary patch literal 379 zcmV->0fhdEP)25@r2M>ncyw|U4s>_%jJt80?UPQ*gvxv-rx4`XpI2!@Zx0JjC=zcP^v$TDa5d+)`>z*>8hsTAQkJ~3S& zn|C2~AsL$#0E3R@SOCW+2duRRz-8!UW#sqKHILYohQMQ(YTL0LI157tI9LB_J$jf8 ZJ^?W}Q*Z;6!kqvB002ovPDHLkV1jhUm0bV; literal 0 HcmV?d00001