mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1967 from j13z/patch-1

Browse source 
Add minor grammar fixes
This commit is contained in:
Cheng Zhao 2015-06-16 10:30:06 +08:00
commit d9db657b43
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
docs/tutorial/desktop-environment-integration.md
View file

@ -1,17 +1,17 @@
# Desktop environment integration
Different operating systems provide different features on integrating desktop
applications into their desktop environments, for example, on Windows
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 introduces how to integrate your application into those desktop
This guide explains how to integrate your application into those desktop
environments with Electron APIs.
## Recent documents (Windows & OS X)
Windows and OS X have provided easy access to recent documents opened by the
application via JumpList and dock menu.
Windows and OS X provide easy access to a list of recent documents opened by
the application via JumpList and dock menu.
__JumpList:__
@ -39,12 +39,12 @@ app.clearRecentDocuments();
### Windows notes
In order to be able to use this feature on Windows, your application has to be
registered as handler of the file type of the document, otherwise the file won't
appear in JumpList even after you have added it. You can find everything on
registering your application in [Application Registration][app-registration].
registered as a handler of the file type of the document, otherwise the file
won't appear in JumpList even after you have added it. You can find everything
on registering your application in [Application Registration][app-registration].
When a user clicks a file from JumpList, a new instance of your application will
be started with the path of file appended in command line.
be started with the path of the file added as a command line argument.
### OS X notes
@ -53,7 +53,7 @@ of `app` module would be emitted for it.
## Custom dock menu (OS X)
OS X enables developers to specify a custom menu for dock, which usually
OS X enables developers to specify a custom menu for the dock, which usually
contains some shortcuts for commonly used features of your application:
__Dock menu of Terminal.app:__
@ -104,7 +104,7 @@ __Tasks of Internet Explorer:__
![IE](http://i.msdn.microsoft.com/dynimg/IC420539.png)
Unlike the dock menu in OS X which is a real menu, user tasks in Windows work
like application shortcuts that when user clicks a task a program would be
like application shortcuts that when user clicks a task, a program would be
executed with specified arguments.
To set user tasks for your application, you can use
@ -146,7 +146,7 @@ __Launcher shortcuts of Audacious:__
## Progress bar in taskbar (Windows & Unity)
On Windows, a taskbar button can be used to display a progress bar. This enables
a window to provide progress information to the user without that user having to
a window to provide progress information to the user without the user having to
switch to the window itself.
The Unity DE also has a similar feature that allows you to specify the progress
@ -171,11 +171,11 @@ window.setProgressBar(0.5);
## Represented file of window (OS X)
On OS X a window can set its represented file, so the file's icon can show in
title bar, and when users Command-Click or Control-Click on the tile a path
the title bar, and when users Command-Click or Control-Click on the tile a path
popup will show.
You can also set edited state of a window so the file icon can indicate whether
the document in this window has been modified.
You can also set the edited state of a window so that the file icon can indicate
whether the document in this window has been modified.
__Represented file popup menu:__