cntxt menus still in progress

chinonso098 · Aug 17, 2024 · 6e82ee5 · 6e82ee5
1 parent 253fe0e
commit 6e82ee5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/src/app/shared/system-component/menu/menu.component.html b/src/app/shared/system-component/menu/menu.component.html
@@ -44,7 +44,7 @@
   <div class="dm-dsktp-vertical-menu">
     <div class="dm-dsktp-empty-line-container"></div>
 
-    <div class="dm-dsktp-vertical-sub-menu" *ngFor="let menuItem of desktopMenu" >
+    <div class="dm-dsktp-vertical-sub-menu" *ngFor="let menuItem of nestedMenu" >
 
       <div  *ngIf="menuItem.label !== paste" class="dm-dsktp-vertical-menu-item" (click)="onMenuItemClick(menuItem.action)">
         <div class="dm-dsktp-head"><figure class="dm-dsktp-figure"><img *ngIf="menuItem.icon1" class="dm-dsktp-img" [src]="menuItem.icon1"/></figure></div>
@@ -98,7 +98,7 @@
   <div class="dm-fileExplr-vertical-menu">
     <div class="dm-fileExplr-empty-line-container"></div>
 
-    <div class="dm-fileExplr-vertical-sub-menu" *ngFor="let menuItem of desktopMenu" >
+    <div class="dm-fileExplr-vertical-sub-menu" *ngFor="let menuItem of nestedMenu" >
 
       <div  *ngIf="menuItem.label !== paste" class="dm-fileExplr-vertical-menu-item" (click)="onMenuItemClick(menuItem.action)">
         <div class="dm-fileExplr-head"><figure class="dm-fileExplr-figure"><img *ngIf="menuItem.icon1" class="dm-fileExplr-img" [src]="menuItem.icon1"/></figure></div>

diff --git a/src/app/shared/system-component/menu/menu.component.ts b/src/app/shared/system-component/menu/menu.component.ts
@@ -11,7 +11,7 @@ import { Subscription } from 'rxjs';
 export class MenuComponent implements OnChanges, OnDestroy{
 
   @Input() generalMenu: GeneralMenu[] = [];
-  @Input() desktopMenu: NestedMenu[] = [];
+  @Input() nestedMenu: NestedMenu[] = [];
   @Input() fileExplorerMenu: NestedMenu[] = [];
   @Input() menuType = '';
 
@@ -20,16 +20,16 @@ export class MenuComponent implements OnChanges, OnDestroy{
   isPasteActive!:boolean;
 
   menuOption = '';
-  fileExplrMngrMenuOption = "file-explorer-file-manager-menu";
   tskBarMenuOption =  "taskbar-menu";
   deskTopMenuOption =  "desktop-menu";
   fileExplrMenuOption =  "file-explorer-menu";
+  fileExplrMngrMenuOption = "file-explorer-file-manager-menu";
+
   keys: string[] = [];
-  paste = 'Paste';
+  readonly paste = 'Paste';
 
   constructor(menuService:MenuService) { 
     this._menuService = menuService;
-
     this.isPasteActive = this._menuService.getPasteState();
     this._storeDataSub = this._menuService.storeData.subscribe(p => {
 

diff --git a/src/app/shared/system-service/file.service.ts b/src/app/shared/system-service/file.service.ts
@@ -12,7 +12,6 @@ import * as BrowserFS from 'browserfs';
 import { Buffer } from 'buffer';
 import osDriveFileSystemIndex from '../../../osdrive.json';
 import ini  from 'ini';
-import { P } from "@angular/cdk/keycodes";
 
 @Injectable({
     providedIn: 'root'

diff --git a/src/app/system-apps/desktop/desktop.component.html b/src/app/system-apps/desktop/desktop.component.html
@@ -4,7 +4,7 @@
         <img [src]="dsktpPrevImg"/>
     </div>
 
-    <cos-menu [desktopMenu]="deskTopMenu" *ngIf="showDesktopCntxtMenu" [style]="dskTopCntxtMenuStyle" [menuType]="deskTopMenuOption"> </cos-menu>
+    <cos-menu [nestedMenu]="deskTopMenu" *ngIf="showDesktopCntxtMenu" [style]="dskTopCntxtMenuStyle" [menuType]="deskTopMenuOption"> </cos-menu>
     <cos-taskbarpreview  [fadeState]="tskBarPreviewWindowState" [name]="appToPreview" [icon]="appToPreviewIcon" *ngIf="showTskBarPreviewWindow"  [ngStyle]="tskBarPrevWindowStyle">  </cos-taskbarpreview>
     <cos-menu [generalMenu]="taskBarMenuData" *ngIf="showTskBarCntxtMenu" [style]="tskBarCntxtMenuStyle" [menuType]="tskBarMenuOption"> </cos-menu>
     <ng-content> </ng-content>

diff --git a/src/app/system-apps/fileexplorer/fileexplorer.component.html b/src/app/system-apps/fileexplorer/fileexplorer.component.html
@@ -257,7 +257,7 @@
                 <!-- ngDraggable  [inBounds]="true" zIndex="1" [preventDefaultEvent]="true"
                     (stopped)="onDragEnd($event)" (started)="onDragStart($event)" -->
 
-                    <ol [ngClass]="olClassName" (dragover)="onDragOver($event)"  (drop)="onDrop($event)" (click)="onHideIconContextMenu()" (contextmenu)="showFileExplorerContextMenu($event)" id="olElmnt-{{this.processId}}"> 
+                    <ol [ngClass]="olClassName" (dragover)="onDragOver($event)"  (drop)="onDrop($event)" (click)="onHideIconContextMenu()" (contextmenu)="onShowFileExplorerContextMenu($event)" id="olElmnt-{{this.processId}}"> 
                         <ng-container [ngTemplateOutlet]="currentViewOption === smallIconsView ? iconsView :
                                                           currentViewOption === mediumIconsView ? iconsView :
                                                           currentViewOption === largeIconsView ? iconsView : 
@@ -397,8 +397,8 @@
                         </div>
 
 
-                        <cos-menu [generalMenu]="menuData" *ngIf="showCntxtMenu" [style]="fileExplrCntxtMenuStyle" [menuType]="fileExplrMngrMenuOption"> </cos-menu>
-                        <cos-menu [desktopMenu]="fileExplrMenu" *ngIf="showFileExplrCntxtMenu" [style]="fileExplrCntxtMenuStyle" [menuType]="fileExplrMenuOption"> </cos-menu>
+                        <cos-menu [generalMenu]="menuData" *ngIf="showIconCntxtMenu" [style]="fileExplrCntxtMenuStyle" [menuType]="fileExplrMngrMenuOption"> </cos-menu>
+                        <cos-menu [nestedMenu]="fileExplrMenu" *ngIf="showFileExplrCntxtMenu" [style]="fileExplrCntxtMenuStyle" [menuType]="fileExplrMenuOption"> </cos-menu>
 
                         <div class="fx-information-tip-container" id="fx-information-tip-{{this.processId}}"  *ngIf="showInformationTip">
                             <div class="fx-information-tip-item-container" *ngFor="let tip of fileInfoTipData;" >

diff --git a/src/app/system-apps/fileexplorer/fileexplorer.component.ts b/src/app/system-apps/fileexplorer/fileexplorer.component.ts
@@ -77,7 +77,7 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
   showPathHistory = false;
   onClearSearchIconHover = false;
   onSearchIconHover = false;
-  showCntxtMenu = false;
+  showIconCntxtMenu = false;
   showFileExplrCntxtMenu = false;
   showInformationTip = false;
   hasWindow = true;
@@ -746,6 +746,9 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
   }
 
   onShowIconContextMenu(evt:MouseEvent, file:FileInfo, id:number):void{
+
+    console.log('onShowIconContextMenu'); 
+
     const rect =  this.fileExplrCntntCntnr.nativeElement.getBoundingClientRect();
     const x = evt.clientX - rect.left;
     const y = evt.clientY - rect.top;
@@ -756,7 +759,7 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
     this.selectedFile = file;
     this.isIconInFocusDueToPriorAction = false;
     this.showInformationTip = false;
-    this.showCntxtMenu = !this.showCntxtMenu;
+    this.showIconCntxtMenu = !this.showIconCntxtMenu;
 
     // show IconContexMenu is still a btn click, just a different type
     this.doBtnClickThings(id);
@@ -878,7 +881,8 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
   }
 
   onHideIconContextMenu():void{
-    this.showCntxtMenu = false;
+    this.showIconCntxtMenu = false;
+    this.showFileExplrCntxtMenu = false;
 
     //First case - I'm clicking only on the desktop icons
     if((this.isBtnClickEvt && this.btnClickCnt >= 1) && (!this.isHideCntxtMenuEvt && this.hideCntxtMenuEvtCnt == 0)){  
@@ -913,7 +917,12 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
     }
   }
 
-  showFileExplorerContextMenu(evt:MouseEvent,):void{
+  onShowFileExplorerContextMenu(evt:MouseEvent,):void{
+
+    console.log('showFileExplorerContextMenu'); 
+
+    if(this.showIconCntxtMenu)
+        return;
 
     const rect =  this.fileExplrCntntCntnr.nativeElement.getBoundingClientRect();
     const x = evt.clientX - rect.left;
@@ -1526,9 +1535,7 @@ export class FileExplorerComponent implements BaseComponent, OnInit, AfterViewIn
     const titlesIcon:NestedMenuItem={ icon:'osdrive/icons/circle.png', label:'Titles icons', action: () => this.isTitleIcon = !this.isTitleIcon, variables:this.isTitleIcon,
         emptyline:false, styleOption:'A' }
 
-
-
-    const viewByMenu = [extraLargeIcon, largeIcon, mediumIcon, smallIcon, listIcon,detailsIcon, titlesIcon];
+    const viewByMenu = [extraLargeIcon, largeIcon, mediumIcon, smallIcon, listIcon, detailsIcon, titlesIcon];
 
     return viewByMenu;
   }