wip: global update activity

joaomoreno · joaomoreno · commit e3c4a2f34d96 · 2017-05-23T14:58:29.000+02:00
diff --git a/src/vs/workbench/browser/activity.ts b/src/vs/workbench/browser/activity.ts
@@ -12,9 +12,7 @@ export interface IActivity {
 	cssClass: string;
 }
 
-export const Extensions = {
-	Activities: 'workbench.contributions.activities'
-};
+export const ActivityExtensions = 'workbench.contributions.activities';
 
 export interface IActivityRegistry {
 	registerActivity(descriptor: IConstructorSignature0<IActivity>): void;
@@ -36,4 +34,4 @@ export class ActivityRegistry implements IActivityRegistry {
 	}
 }
 
-Registry.add(Extensions.Activities, new ActivityRegistry());
+Registry.add(ActivityExtensions, new ActivityRegistry());
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -15,11 +15,11 @@ import { Builder, $, Dimension } from 'vs/base/browser/builder';
 import { Action } from 'vs/base/common/actions';
 import { ActionsOrientation, ActionBar, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
-import { IActivity, Extensions as ActivityExtensions, IActivityRegistry } from 'vs/workbench/browser/activity';
+import { IActivity, ActivityExtensions, IActivityRegistry } from 'vs/workbench/browser/activity';
 import { Registry } from 'vs/platform/platform';
 import { Part } from 'vs/workbench/browser/part';
 import { IViewlet } from 'vs/workbench/common/viewlet';
-import { ToggleViewletPinnedAction, ViewletActivityAction, ActivityAction, ViewletActionItem, ViewletOverflowActivityAction, ViewletOverflowActivityActionItem } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
+import { ToggleViewletPinnedAction, ViewletActivityAction, ActivityAction, ActivityActionItem, ViewletActionItem, ViewletOverflowActivityAction, ViewletOverflowActivityActionItem } from 'vs/workbench/browser/parts/activitybar/activitybarActions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IActivityBarService, IBadge } from 'vs/workbench/services/activity/common/activityBarService';
 import { IPartService, Position as SideBarPosition } from 'vs/workbench/services/part/common/partService';
@@ -47,10 +47,11 @@ class GlobalActivityAction extends ActivityAction {
 	}
 }
 
-class GlobalActivityActionItem extends ViewletActionItem {
+class GlobalActivityActionItem extends ActivityActionItem {
 
 	onClick(event: Event): void {
 		DOM.EventHelper.stop(event, true);
+		console.log('hello world');
 		// fire up native menu around this.builder.getHTMLElement()
 	}
 }
@@ -199,7 +200,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.createViewletSwitcher($result.clone());
 
 		// Top Actionbar with action items for each viewlet action
-		this.createActivityActionBar($result.getHTMLElement());
+		this.createGlobalActivityActionBar($result.getHTMLElement());
 
 		// Contextmenu for viewlets
 		$(parent).on('contextmenu', (e: MouseEvent) => {
@@ -273,8 +274,8 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		this.extensionService.onReady().then(() => this.updateViewletSwitcher());
 	}
 
-	private createActivityActionBar(container: HTMLElement): void {
-		const activityRegistry = Registry.as<IActivityRegistry>(ActivityExtensions.Activities);
+	private createGlobalActivityActionBar(container: HTMLElement): void {
+		const activityRegistry = Registry.as<IActivityRegistry>(ActivityExtensions);
 		const descriptors = activityRegistry.getActivities();
 		const actions = descriptors
 			.map(d => this.instantiationService.createInstance(d))
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css b/src/vs/workbench/browser/parts/activitybar/media/activitybarpart.css
@@ -9,6 +9,9 @@
 
 .monaco-workbench > .activitybar > .content {
 	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
 }
 
 .monaco-workbench > .activitybar > .content .monaco-action-bar {
diff --git a/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css b/src/vs/workbench/parts/update/electron-browser/media/update.contribution.css
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.update-activity {
+	-webkit-mask: url('update.svg') no-repeat 50% 50%;
+	-webkit-mask-size: 22px;
+}
diff --git a/src/vs/workbench/parts/update/electron-browser/media/update.svg b/src/vs/workbench/parts/update/electron-browser/media/update.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 260 260">
+    <path fill="#fff" d="M194 2L92.4 103.6 27.6 53.2 2 66v128l25.6 12.8 64.8-50.4L194 258l64-25.6V27.6L194 2zM27 169V91l39 39-39 39zm99.4-39L194 77v106l-67.6-53z" class="st0"/>
+</svg>
diff --git a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -6,12 +6,14 @@
 'use strict';
 
 import * as nls from 'vs/nls';
+import 'vs/css!./media/update.contribution';
 import { Registry } from 'vs/platform/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { ShowCurrentReleaseNotesAction, UpdateContribution } from 'vs/workbench/parts/update/electron-browser/update';
 import { ReleaseNotesEditor } from 'vs/workbench/parts/update/electron-browser/releaseNotesEditor';
 import { ReleaseNotesInput } from 'vs/workbench/parts/update/electron-browser/releaseNotesInput';
 import { EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { IActivityRegistry, ActivityExtensions, IActivity } from 'vs/workbench/browser/activity';
 import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
@@ -52,3 +54,12 @@ configurationRegistry.registerConfiguration({
 		}
 	}
 });
+
+class UpdateGlobalActivity implements IActivity {
+	id: string = 'update.activity';
+	name: string = 'Update';
+	cssClass: string = 'update-activity';
+}
+
+Registry.as<IActivityRegistry>(ActivityExtensions)
+	.registerActivity(UpdateGlobalActivity);

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ export interface IActivity {`
`12`	`12`	`cssClass: string;`
`13`	`13`	`}`
`14`	`14`
`15`		`-export const Extensions = {`
`16`		`- Activities: 'workbench.contributions.activities'`
`17`		`-};`
	`15`	`+export const ActivityExtensions = 'workbench.contributions.activities';`
`18`	`16`
`19`	`17`	`export interface IActivityRegistry {`
`20`	`18`	`registerActivity(descriptor: IConstructorSignature0<IActivity>): void;`
`@@ -36,4 +34,4 @@ export class ActivityRegistry implements IActivityRegistry {`
`36`	`34`	`}`
`37`	`35`	`}`
`38`	`36`
`39`		`-Registry.add(Extensions.Activities, new ActivityRegistry());`
	`37`	`+Registry.add(ActivityExtensions, new ActivityRegistry());`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`
`10`	`10`	`.monaco-workbench > .activitybar > .content {`
`11`	`11`	`height: 100%;`
	`12`	`+ display: flex;`
	`13`	`+ flex-direction: column;`
	`14`	`+ justify-content: space-between;`
`12`	`15`	`}`
`13`	`16`
`14`	`17`	`.monaco-workbench > .activitybar > .content .monaco-action-bar {`