Skip to content

Commit bbd73aa

Browse files
authored
Merge pull request #245 from UnstableDesign/mark-origin
Processing a Laundry List of Concerns
2 parents 8cec2e7 + 5e86e95 commit bbd73aa

32 files changed

+1205
-456
lines changed

.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/dist
2+
/node_modules
3+
/e2e
4+
/src/environments/
5+
6+
firebase.json
7+
upload_to_4.1
8+
9+
10+
# System Files
11+
.DS_Store
12+
Thumbs.db
13+
14+
15+
.angular/
16+
.firebase/
17+
.vscode/

src/app/app.component.html

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<mat-menu #file="matMenu">
4747
<button mat-menu-item (click)="loadBlankFile()">New Workspace</button>
48-
<button mat-menu-item [disabled]="!files.connected || !auth.isLoggedIn" (click)="openAdaFiles(false)">Manage Saved Files</button>
48+
<button mat-menu-item [disabled]="!files.connected || !auth.isLoggedIn" (click)="openAdaFiles('load')">Manage Saved Files</button>
4949
<button mat-menu-item [matMenuTriggerFor]="openFile">Open File</button >
5050
<!-- <button mat-menu-item (click)="redo()" >Import Bitmaps</button> -->
5151
<button mat-menu-item [matMenuTriggerFor]="downloadMenu">Export</button>
@@ -64,7 +64,7 @@
6464

6565
<mat-menu #openFile="matMenu">
6666
<button mat-menu-item (click)="openNewFileDialog()">From Computer</button>
67-
<button mat-menu-item [disabled]="!files.connected || !auth.isLoggedIn" (click)="openAdaFiles(true)">From AdaCAD Cloud
67+
<button mat-menu-item [disabled]="!files.connected || !auth.isLoggedIn" (click)="openAdaFiles('load')">From AdaCAD Cloud
6868
<span *ngIf="!auth.isLoggedIn">you must login to use this feature </span>
6969
</button>
7070
</mat-menu>
@@ -96,47 +96,9 @@
9696

9797

9898

99-
<button mat-icon-button [matMenuTriggerFor]="settings"><i class="fa-solid fa-gear"></i></button>
99+
<button mat-icon-button (click)="openWorkspaceSettings()"><i class="fa-solid fa-gear"></i></button>
100100

101-
<mat-menu #settings="matMenu">
102-
<button mat-menu-item [matMenuTriggerFor]="defaultOrigin">Origin</button>
103-
104-
<mat-menu #defaultOrigin="matMenu">
105-
<button *ngFor="let opt of originOptions" [class.active]="this.ws.selected_origin_option === opt.value" mat-menu-item (click)="selectOriginOption(opt.value)">{{opt.view}}</button>
106-
</mat-menu>
107-
108-
<button mat-menu-item [matMenuTriggerFor]="defaultLoomType">Loom Type</button>
109-
<mat-menu #defaultLoomType="matMenu">
110-
<button *ngFor="let loom of loomOptions" [class.active]="this.ws.type === loom.value" mat-menu-item (click)="selectLoom(loom.value)">{{loom.viewValue}}</button>
111-
</mat-menu>
112-
113-
114-
<!-- <button mat-menu-item >Default Draft View</button> -->
115-
<button mat-menu-item [matMenuTriggerFor]="defaultUnits">Units</button>
116-
<mat-menu #defaultUnits="matMenu">
117-
<button *ngFor="let unit of unitOptions" [class.active]="this.ws.units === unit.value" mat-menu-item (click)="selectUnit(unit.value)">{{unit.viewValue}}</button>
118-
</mat-menu>
119-
120-
121-
<!-- <button mat-menu-item >Default Draft View</button> -->
122-
<button mat-menu-item [matMenuTriggerFor]="showDrafts">Show Drafts on Dataflow by Default</button>
123-
124-
<mat-menu #showDrafts="matMenu">
125-
<button [class.active]="!this.ws.hide_mixer_drafts" mat-menu-item (click)="setDraftsViewable(false)">yes</button>
126-
<button [class.active]="this.ws.hide_mixer_drafts" mat-menu-item (click)="setDraftsViewable(true)">no</button>
127-
</mat-menu>
128-
129-
<button mat-menu-item [matMenuTriggerFor]="showAdvancedOps">Show Advanced Operations</button>
130-
<mat-menu #showAdvancedOps="matMenu">
131-
<button [class.active]="this.ws.show_advanced_operations" mat-menu-item (click)="setAdvancedOperations(true)">yes</button>
132-
<button [class.active]="!this.ws.show_advanced_operations" mat-menu-item (click)="setAdvancedOperations(false)">no</button>
133-
</mat-menu>
134-
135-
<button mat-menu-item (click)="optimizeWorkspace()">Optimize Workspace</button>
136-
137-
138-
<!-- <button mat-menu-item >Optimize for Device</button> -->
139-
</mat-menu>
101+
140102

141103
<button mat-icon-button [matMenuTriggerFor]="help"><i class="fa-solid fa-question"></i></button>
142104
<mat-menu #help="matMenu">

0 commit comments

Comments
 (0)