diff --git a/docs/api/app.md b/docs/api/app.md index 370ee386626d..f1f6890cd61f 100755 --- a/docs/api/app.md +++ b/docs/api/app.md @@ -1137,8 +1137,8 @@ badge. On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher. -**Note:** Unity launcher requires the existence of a `.desktop` file to work, -for more information please read [Desktop Environment Integration][unity-requirement]. +**Note:** Unity launcher requires a `.desktop` file to work. For more information, +please read the [Unity integration documentation][unity-requirement]. ### `app.getBadgeCount()` _Linux_ _macOS_ @@ -1376,8 +1376,8 @@ An `Integer` property that returns the badge count for current app. Setting the On macOS, setting this with any nonzero integer shows on the dock icon. On Linux, this property only works for Unity launcher. -**Note:** Unity launcher requires the existence of a `.desktop` file to work, -for more information please read [Desktop Environment Integration][unity-requirement]. +**Note:** Unity launcher requires a `.desktop` file to work. For more information, +please read the [Unity integration documentation][unity-requirement]. **Note:** On macOS, you need to ensure that your application has the permission to display notifications for this property to take effect. @@ -1405,7 +1405,7 @@ A `Boolean` property that returns `true` if the app is packaged, `false` otherw [LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme [handoff]: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html [activity-type]: https://developer.apple.com/library/ios/documentation/Foundation/Reference/NSUserActivity_Class/index.html#//apple_ref/occ/instp/NSUserActivity/activityType -[unity-requirement]: ../tutorial/desktop-environment-integration.md#unity-launcher +[unity-requirement]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher [mas-builds]: ../tutorial/mac-app-store-submission-guide.md [Squirrel-Windows]: https://github.com/Squirrel/Squirrel.Windows [JumpListBeginListMSDN]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378398(v=vs.85).aspx diff --git a/docs/tutorial/desktop-environment-integration.md b/docs/tutorial/desktop-environment-integration.md deleted file mode 100644 index 1eb883b46306..000000000000 --- a/docs/tutorial/desktop-environment-integration.md +++ /dev/null @@ -1,35 +0,0 @@ -# Desktop Environment Integration - -Different operating systems provide different features for integrating desktop -applications into their desktop environments. For example, on Windows, -applications can put shortcuts in the JumpList of task bar, and on Mac, -applications can put a custom menu in the dock menu. - -This guide explains how to integrate your application into those desktop -environments with Electron APIs. - -## Notifications - -See the [Notifications documentation](notifications.md). - -## Recent Documents - -See [Recent Documents documentation](recent-documents.md). - -## Progress Bar - -See the [Progress Bar documentation](progress-bar.md). - -## Unity Launcher - -See the [Unity Launcher documentation][unity-launcher]. - -## Represented File for macOS Window - -See the [Represented File documentation](represented-file.md). - -## Dragging files out of the window - -See the [Native File Drag & Drop documentation](native-file-drag-drop.md). - -[unity-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher diff --git a/spec/ts-smoke/electron/main.ts b/spec/ts-smoke/electron/main.ts index d5aed3a755bb..6992f92e8b2f 100644 --- a/spec/ts-smoke/electron/main.ts +++ b/spec/ts-smoke/electron/main.ts @@ -172,7 +172,6 @@ app.whenReady().then(() => { app.getLocale() // Desktop environment integration -// https://github.com/electron/electron/blob/master/docs/tutorial/desktop-environment-integration.md app.addRecentDocument('/Users/USERNAME/Desktop/work.type') app.clearRecentDocuments()