From d443a3c2509889533ca812c163056bace396b586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 14 Jun 2023 20:35:58 +0200 Subject: New upstream version 0.32.1 --- help/C/figures/Shotwell.svg | 668 ++++++++++++++++++++++++++++++++++++ help/C/figures/edit_toolbar.png | Bin 6786 -> 0 bytes help/C/figures/editing_overview.png | Bin 183110 -> 0 bytes help/C/figures/shotwell_logo.png | Bin 5486 -> 0 bytes help/C/formats.page | 6 +- help/C/index.page | 28 +- help/C/organize-face-tagging.page | 57 +++ help/C/organize-tag.page | 29 +- help/C/other-multiple.page | 24 +- help/C/privacy-policy.page | 6 +- help/C/share-send.page | 8 +- help/C/share-slideshow.page | 2 +- help/C/share-upload.page | 8 +- help/C/view-information.page | 2 + 14 files changed, 798 insertions(+), 40 deletions(-) create mode 100644 help/C/figures/Shotwell.svg delete mode 100644 help/C/figures/edit_toolbar.png delete mode 100644 help/C/figures/editing_overview.png delete mode 100644 help/C/figures/shotwell_logo.png create mode 100644 help/C/organize-face-tagging.page (limited to 'help/C') diff --git a/help/C/figures/Shotwell.svg b/help/C/figures/Shotwell.svg new file mode 100644 index 0000000..7c31e1d --- /dev/null +++ b/help/C/figures/Shotwell.svg @@ -0,0 +1,668 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/help/C/figures/edit_toolbar.png b/help/C/figures/edit_toolbar.png deleted file mode 100644 index 0a5f5ae..0000000 Binary files a/help/C/figures/edit_toolbar.png and /dev/null differ diff --git a/help/C/figures/editing_overview.png b/help/C/figures/editing_overview.png deleted file mode 100644 index 266b639..0000000 Binary files a/help/C/figures/editing_overview.png and /dev/null differ diff --git a/help/C/figures/shotwell_logo.png b/help/C/figures/shotwell_logo.png deleted file mode 100644 index 23089a8..0000000 Binary files a/help/C/figures/shotwell_logo.png and /dev/null differ diff --git a/help/C/formats.page b/help/C/formats.page index d7e5170..f080f5c 100644 --- a/help/C/formats.page +++ b/help/C/formats.page @@ -4,16 +4,16 @@ - Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video files. + Shotwell supports JPEG, PNG, TIFF, BMP, GIF, WebP and RAW photo files as well as video files. Supported photo and video formats -

Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files. Shotwell does not yet support other graphics format such as GIF.

+

Shotwell supports JPEG, PNG, TIFF, BMP, GIF, WebP and RAW photo files.

-

Shotwell's RAW format support is currently limited. When you view a RAW photo, you are actually viewing a JPEG derived from the RAW photo, not the RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit - you can only export edited photos as 8-bit files. All supported formats can be used for export (JPEG, PNG, TIFF, BMP).

+

Shotwell's RAW format support is currently limited. When you view a RAW photo, you are actually viewing a JPEG derived from the RAW photo, not the RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit - you can only export edited photos as 8-bit files. Most supported formats can be used for export (JPEG, PNG, TIFF, BMP).

For more information about RAW-format photos in Shotwell, please see the RAW section. diff --git a/help/C/index.page b/help/C/index.page index e3221bb..1605541 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,25 +1,39 @@ + xmlns:its="http://www.w3.org/2005/11/its" + type="guide" id="index"> + Shotwell Shotwell + Shotwell + + + Jim Nelson + jim@yorba.org + + + Allison Barlow + allison@yorba.org + - Jim Nelson - jim@yorba.org - Allison Barlow - allison@yorba.org Robert Ancell robert.ancell@canonical.com + + Peter Smith pdo.smith@gmail.com + + Phil Bull philbull@gmail.com - <media type="image" src="figures/shotwell_logo.png"></media>Shotwell Photo Manager + + <media type="image" width="48px" height="48px" its:translate="no" + src="figures/Shotwell.svg" /> Shotwell Photo Manager +

Importing Photos diff --git a/help/C/organize-face-tagging.page b/help/C/organize-face-tagging.page new file mode 100644 index 0000000..2c21ff1 --- /dev/null +++ b/help/C/organize-face-tagging.page @@ -0,0 +1,57 @@ + + + + + Marking faces in photos + + + + + Faces in photos +

Shotwell supports tagging images using faces of persons and assigning a name to them. If enabled, Shotwell also supports + automatic detection of faces in images and recognition of already known faces in new images

+
+ Manual creation and modification of named faces + +

Double-click on an image in the collection, then press the Faces button on the toolbar

 +

Start dragging a rectangle around the face you are tagging using your left mouse button

+

You can also drag the rectangle by clicking into it or resize it by clicking on one of the borders

+

Once satisfied, enter a name in the text box below the rectangle and press Enter to assign the name to the marked face

 +

Repeat this process for as many faces as you want to mark

 +

After you marked all faces, click on Ok to save the marked faces.

 + +
+
+ Modifying or removing existing named faces +

An existing named face can be either be removed from an image using FacesRemove Face from Photo, by pressing CtrlR while in the face browser or by clicking Delete in the Faces tool

+

To rename the face, use FacesRename Face... or press CtrlE or by clicking on Edit in the Faces tool.

+
+
+ Automatic detection of faces +

It is possible to use automatic face detection to simplify the process of marking the faces. To trigger the face detection + algorithm, click on Detect faces...

+

If reference images for faces are defined, this will also try to match any found faces in the current image with known references.

+
+
+ Automatic recognition of faces +

A named face on a photo can be set as a reference for this particular name. Future calls to + the automatic face detection will try to associate similar faces the same name if considered matching.

+

To declare a face as the reference for its name use these steps

+ + +

Switch to the face browser by clicking on a face name in the navigation tree.

 +

Select an image that contains the representation of the face you want to make a reference

 +

Click on FacesTrain Face from Photo

 + +
+
+ Improving face recognition +

By default, Shotwell uses cascade classifier to find faces in images. There is a method to use a deep neural network to improve + detection rates significantly, but due to certain uncertainties with the licensing of the trained model it is not included by default. +

+

To enable DNN-based face detection, download the res10_300x300_ssd_iter_140000_fp16.caffemodel from the OpenCV third-party repository

+

Copy the file into your local data folder, usually $HOME/.local/share/shotwell and restart Shotwell

+
+ diff --git a/help/C/organize-tag.page b/help/C/organize-tag.page index 2c267fa..4f1a6ea 100644 --- a/help/C/organize-tag.page +++ b/help/C/organize-tag.page @@ -33,11 +33,13 @@

When you use CtrlT or TagsAdd Tags... you can type - in the names of one or more tags, separated by commas. + in the names of one or more tags, separated by commas. You can also + add tag hierarchies on the fly using / as if they + were paths in the file system. Once you have created a tag, you can rename it by selecting that tag in the sidebar and choosing TagsRename Tag "[name]"..., - by rightclicking on it and choose Rename... or + by right-clicking on it and choose Rename... or double-click on the tag in the sidebar.

@@ -51,7 +53,7 @@ in the sidebar, then select the photos you would like to remove, and choose TagsRemove Tag "[name]" from Photos - or right-click on the photos an select + or right-click on the photos and select Remove Tag "[name]" from Photos.

@@ -72,14 +74,29 @@
Hierarchical Tags

- Shotwell supports also hierarchial tags. You can + Shotwell supports also hierarchical tags. You can rearrange your tags by drag and drop a tag onto another. To create a new subtag right-click on a tag and select New.

- +

+ In all places where textual tag input is supported, tags + can also be created using /. For example, + using /World/Africa/Togo/Lomé will create + or extend the tag tree +

+ + World + Africa + Togo + Lomé + + + + +

- Hierarchial tags can help you to sort your tag list in + Hierarchical tags can help you to sort your tag list in ways that better match how you work or think; for example, you can store location tags like "Mountains" or "Beach" under a parent tag "Places", which itself can be placed diff --git a/help/C/other-multiple.page b/help/C/other-multiple.page index 1082ae9..a48b6b4 100644 --- a/help/C/other-multiple.page +++ b/help/C/other-multiple.page @@ -4,20 +4,26 @@ - You can open Shotwell with a different photo library by using the command line. + You can open Shotwell with a different photo library. Multiple libraries -

Shotwell normally stores its database and photo thumbnails in the directory ~/.shotwell . This directory does not hold photos, but the database in this directory contains a list of all the photos in the Shotwell library.

- -

As an advanced feature, it's possible for you to have multiple Shotwell libraries, each of which has its own set of photos. Each library needs its own database directory. To launch Shotwell with an alternate library, specify an alternate database directory on the command line as follows:

- - -shotwell -d [library-directory] - +

Shotwell supports multiple libraries on the same computer with the concept of profiles. A profile is a set of meta-data and settings associated with + a library folder. +

+

All profiles are completely isolated from each other. While it is possible to use the same library folder for different profiles, it is not recommended.

+
+ Managing profiles +

Profiles can either be created using the dedicated Shotwell Profile Manager, calling shotwell --profile-browser from the command + line or the Profiles section of the settings EditPreferences

+
+
+ Selecting a profile +

A profile can only be selected during start-up and cannot be switched during run-time.

+

To select a profile, start the Shotwell Profile Manager and select a profile using double-click, or calling shotwell --profile name

+
- diff --git a/help/C/privacy-policy.page b/help/C/privacy-policy.page index 25fc06c..a4c2932 100644 --- a/help/C/privacy-policy.page +++ b/help/C/privacy-policy.page @@ -10,7 +10,7 @@ Information Shotwell Stores and Transmits About You

The Shotwell Connect application and its data store reside locally on your personal computer.

During the course of its operation, Shotwell Connect may store an authentication token that it receives from YouTube and Google Photos on your computer. This authentication token is simply a session-identifying sequence of letters and numbers. It contains no password, user name, or other personal information.

-

At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Convervancy or any of the developers of the Shotwell Connect Application for Google services. +

At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Conservancy or any of the developers of the Shotwell Connect Application for Google services.

For Google's own privacy policy, please refer to https://policies.google.com/privacy

@@ -40,12 +40,12 @@
Flickr
Information Shotwell Stores and Transmits About You -

The Shotwell Connect application and its data store reside locally on your personal computer. During the course of its operation, Shotwell Connect may store an authentication token that it receives from Flickr on your computer. This authentication token is simply a session-identifying sequence of letters and numbers. It contains no password, user name, or other personal information. At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Convervancy or any of the developers of the Shotwell Connect Application for Flickr. +

The Shotwell Connect application and its data store reside locally on your personal computer. During the course of its operation, Shotwell Connect may store an authentication token that it receives from Flickr on your computer. This authentication token is simply a session-identifying sequence of letters and numbers. It contains no password, user name, or other personal information. At no time does Shotwell Connect transmit any information to the GNOME foundation, the Software Freedom Conservancy or any of the developers of the Shotwell Connect Application for Flickr.

Permissions you grant Shotwell for Flickr -

By using Shotwell, you grant the Shotwell Connect application acces to publish photos to your Flickr account. It will download the list of available albums to allow you to chose an existing album to upload to. It can also create new albums on your behalf. Other than creating albums and uploading photos, Shotwell does not modification whatsoever to the existing data on your Flickr account.

+

By using Shotwell, you grant the Shotwell Connect application access to publish photos to your Flickr account. It will download the list of available albums to allow you to chose an existing album to upload to. It can also create new albums on your behalf. Other than creating albums and uploading photos, Shotwell does not modification whatsoever to the existing data on your Flickr account.

diff --git a/help/C/share-send.page b/help/C/share-send.page index d788f6c..c752d23 100644 --- a/help/C/share-send.page +++ b/help/C/share-send.page @@ -12,13 +12,13 @@ Sending photos

Shotwell can send photos using the GNOME desktop's Send To mechanism, which - lets you send photos via email, instant messaging or in other ways.

+ lets you send photos via email.

To send photos, select them in Shotwell and choose FileSend To..., or right-click the photos and choose Send To... from the context menu. - A Send To dialog box will appear which lets you choose a mechanism for - sending the files (such as email or instant messaging) and a destination. You can - optionally choose to send the files in a compressed format. + A Send To dialog box will appear which lets you optionally remove + any meta-data, scale it or change the format before passing it on to your configured + email client.

diff --git a/help/C/share-slideshow.page b/help/C/share-slideshow.page index 41f131a..5bf48b4 100644 --- a/help/C/share-slideshow.page +++ b/help/C/share-slideshow.page @@ -11,7 +11,7 @@ Slideshows -

To see a sideshow of any collection in Shotwell, navigate to that collection and select ViewSlideshow or press F5.

+

To see a slideshow of any collection in Shotwell, navigate to that collection and select ViewSlideshow or press F5.

You can change some settings in a running slideshow:

diff --git a/help/C/share-upload.page b/help/C/share-upload.page index 2cbcbd5..b3dbc4a 100644 --- a/help/C/share-upload.page +++ b/help/C/share-upload.page @@ -15,11 +15,10 @@ and videos to the following services, each of which requires an account:

-

Facebook

Flickr

Google Photos

YouTube (videos only)

 -

Tumblr (videos only)

 +

Tumblr (Photos only)

Any site running the Piwigo photo gallery software (photos only)

 @@ -28,10 +27,5 @@ FilePublish, press the Publish toolbar button or use CtrlShiftP. You will see a dialog that lets you select a publishing service. You will then need to log in or create an account.

-

Publishing to Facebook requires you to grant certain permissions to the Shotwell Facebook application. - You only need to grant these permissions once, when you first associate Shotwell with your Facebook account. -

-

You will be only able to publish images with at most the permission you granted to the Shotwell Facebook application

 -

Similarly, publishing to Flickr, YouTube or Google Photos requires you to log in and permit Shotwell Connect to access your account.

diff --git a/help/C/view-information.page b/help/C/view-information.page index c62f27e..09fc088 100644 --- a/help/C/view-information.page +++ b/help/C/view-information.page @@ -13,6 +13,8 @@

The Basic Information pane appears at the bottom of the sidebar, and displays a brief summary of the photos you've selected. If no photos are selected, it displays a summary of the entire collection. You can toggle the display of this pane using the ViewBasic Information command.

+

The map pane appears at the bottom of the sidebar as part of the Basic Information pane, and displays an overview map the photos you've selected. If no photos are selected, it displays an overview of the entire collection. You can toggle the display of this pane using the ViewMap Overview command. Note that the map will only show when the Basic Information pane is displayed.

+

The floating Extended Information window displays more information about the selected photo. The ViewExtended Information command or CtrlShiftX toggles the display of this window.

-- cgit v1.2.3