Git commit 5efc2199407b3f09ac5cb60415c4a943e81c8ac3 by Gilles Caulier, on behalf of Wolfgang Scheffner. Committed on 05/02/2017 at 20:18. Pushed by cgilles into branch 'master'.
Apply 13 and 14 from Wolgang. file still missing : using-mainwindow-mapview.docbook M +1 -0 digikam/index.docbook M +2 -2 digikam/using-mainwindow-imageview.docbook M +1 -1 digikam/using-mainwindow-intro.docbook M +- -- digikam/using-mainwindow-mapsearch.png M +1 -0 digikam/using-mainwindow.docbook M +35 -48 digikam/using-sidebar-maps.docbook M +- -- digikam/using-sidebar-metadatagps.png M +3 -0 showfoto/index.docbook https://commits.kde.org/digikam-doc/5efc2199407b3f09ac5cb60415c4a943e81c8ac3 diff --git a/digikam/index.docbook b/digikam/index.docbook index c905884..081e5ba 100644 --- a/digikam/index.docbook +++ b/digikam/index.docbook @@ -30,6 +30,7 @@ <!ENTITY doc-using-mainwindow-timelineview SYSTEM "using-mainwindow-timelineview.docbook"> <!ENTITY doc-using-mainwindow-searchesview SYSTEM "using-mainwindow-searchesview.docbook"> <!ENTITY doc-using-mainwindow-fuzzysearches SYSTEM "using-mainwindow-fuzzysearches.docbook"> +<!-- <!ENTITY doc-using-mainwindow-mapview SYSTEM "using-mainwindow-mapview.docbook"> --> <!ENTITY doc-using-mainwindow-peopleview SYSTEM "using-mainwindow-peopleview.docbook"> <!ENTITY doc-using-sidebar SYSTEM "using-sidebar.docbook"> diff --git a/digikam/using-mainwindow-imageview.docbook b/digikam/using-mainwindow-imageview.docbook index 4f0ebc5..41fb605 100644 --- a/digikam/using-mainwindow-imageview.docbook +++ b/digikam/using-mainwindow-imageview.docbook @@ -191,11 +191,11 @@ </para> <para> - The next group in the menu is to control whether only the reference icon of the group (the first of the group according to the sorting order at the moment of grouping) is displayed or all of them. These two functions can also be accessed by the little grouping indicator (folder symbol) on the reference icon (see upper left icon on the screenshot). While the mouse pointer is hoovering over it there will pop up an information <quote>n grouped items. Group is closed/open.</quote> where n indicates the number of items in the group which are invisible if the group is closed. Clicking on the indicator toggles between open and closed. In the Table mode of the Image Area groups are indicated the way we know from many other lists and tables: with a little triangle in front of the reference item. Clicking on this triangle will fold out/in the grouped items. + The next group in the menu is to control whether only the reference icon of the group (the first of the group according to the sorting order at the moment of grouping) is displayed or all of them. These two functions can also be accessed by the little grouping indicator (folder symbol) on the reference icon (see upper left icon on the screenshot). While the mouse pointer is hovering over it there will pop up an information <quote>n grouped items. Group is closed/open.</quote> where n indicates the number of items in the group which are invisible if the group is closed. Clicking on the indicator toggles between open and closed. In the Table mode of the Image Area groups are indicated the way we know from many other lists and tables: with a little triangle in front of the reference item. Clicking on this triangle will fold out/in the grouped items. </para> <para> - The last group in the Group context menu allows to remove individual items from the group or to disband the whole group. The content of the menu will change depending on whether you use it on a selection of still ungrouped items, on a group or on single items of a group. + The last group in the Group context menu allows to remove individual items from the group or to disband the whole group. The content of the menu will change depending on whether you use it on a selection of still un-grouped items, on a group or on single items of a group. </para> <para> diff --git a/digikam/using-mainwindow-intro.docbook b/digikam/using-mainwindow-intro.docbook index 099a741..a752b74 100644 --- a/digikam/using-mainwindow-intro.docbook +++ b/digikam/using-mainwindow-intro.docbook @@ -15,7 +15,7 @@ </para> <para> - The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between eight <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search) and People (Tags). The Right Sidebar can be used to show all information about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars there will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show information. + The Image Area in the center is surrounded by the menu bar and the <link linkend="maininterface-toolbar">Main Toolbar</link> at the top, the <link linkend="maininterface-statusbar">Status Bar</link> at the bottom and the Left and <link linkend="using-sidebar-intro">Right Sidebar</link>. The Left Sidebar lets you switch between nine <quote>Views</quote>: Albums (shown here), Tags, Labels, Dates, Timeline, Search, Fuzzy (Search), Map and People (Tags). The Right Sidebar can be used to show all information about your images and partly also to edit them. You can use all these views to organize and find your photographs. If you click on one of the buttons on the sidebars there will fold out another area, offering possibilities to select, to make inputs, ⪚ for searches, to edit data and to show information. </para> <para> diff --git a/digikam/using-mainwindow-mapsearch.png b/digikam/using-mainwindow-mapsearch.png index 85a3397..c7f3ec1 100644 Binary files a/digikam/using-mainwindow-mapsearch.png and b/digikam/using-mainwindow-mapsearch.png differ diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook index f4cadf1..597787b 100644 --- a/digikam/using-mainwindow.docbook +++ b/digikam/using-mainwindow.docbook @@ -10,6 +10,7 @@ &doc-using-mainwindow-timelineview; &doc-using-mainwindow-searchesview; &doc-using-mainwindow-fuzzysearches; +<!-- &doc-using-mainwindow-mapview; --> &doc-using-mainwindow-peopleview; </sect1> diff --git a/digikam/using-sidebar-maps.docbook b/digikam/using-sidebar-maps.docbook index 62cc8af..49fae2a 100644 --- a/digikam/using-sidebar-maps.docbook +++ b/digikam/using-sidebar-maps.docbook @@ -1,52 +1,39 @@ -<sect2 id="using-sidebar-maps"> - <title>Maps</title> +<sect2 id="using-sidebar-maps"> <title>Maps</title> + + <para> + &digikam; offers three geolocation tools: + <orderedlist numeration="arabic"> + <listitem><para>The Map View on the Left Sidebar which is the search tool for finding images by their GPS data.</para></listitem> + <listitem><para>The <link linkend="tool-geolocationeditor">Geolocation Editor</link> which is accessible via <menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>G</keycap></keycombo></shortcut><guimenu>Item</guimenu><guimenuitem>Edit Geolocation...</guimenuitem></menuchoice> and allows to set and to edit GPS data.</para></listitem> + <listitem><para>This tab on the Right Sidebar which shows the location of the image on a map and is purely informative.</para></listitem> + </orderedlist> + All three are based on the Marble widget. + </para> + + <para> + This tab shows a map of orientation where you will find a marker or a thumnail to indicate the GPS location of the selected image. The GPS coordinates and the time information are displayed below the widget. You can zoom in and out with the mouse wheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button. + </para> + + <para> + <inlinemediaobject> + <imageobject> + <imagedata fileref="&path;using-sidebar-metadatagps.png" format="PNG"/> + </imageobject> + </inlinemediaobject> + </para> + + <para> + For navigating on the map refer to Marble handbook, Chapter 2. The meaning of <quote>GPS</quote> and functions and buttons that apply to all three geolocation parts are described in the <link linkend="tool-geolocationeditor">Geolocation Editor</link> chapter of this handbook. This applies to the context menu on the map and the line of buttons under the map except the last one. + </para> + + <para> + For information about the different map services you can use the drop-down field under the line of buttons. Choose a service here and then click the See-more-information-on-the-Internet button to the right. + </para> + + <para> + The displayed positioning data are actually stored in the image's EXIF tags. That allows the location to be read by any other application that can understand EXIF GPS data. + </para> - <sect3> - <title>Geolocate Images</title> - - <para> - This tab is based on the world-map widget to display a rough map of orientation. You can zoom in and out with the mousewheel by either scrolling it or hold and drag it. Pan by holding down the left mouse button. - </para> - - <example> - <title>The Geolocation tab</title> - <screenshot> - <screeninfo>For higher resolution maps choose "More Info"</screeninfo> - <mediaobject><imageobject> - <imagedata fileref="&path;using-sidebar-metadatagps.png" format="PNG" /> - </imageobject></mediaobject> - </screenshot> - </example> - - <para> - The left sidebar is a geo-search tool. Press the <keycombo action="press">&Ctrl;<keycap>left mouse button</keycap></keycombo> to pull-up a square as indicated. All images falling within the coordinates of that square will be shown. - </para> - - <para> - On the right sidebar you will find a cross to indicate the GPS location and the selected image's name next to it. The GPS coordinates and the time information are displayed below the widget. - </para> - - <para> - For higher resolution maps choose <guibutton>More Info</guibutton> button to open the detailed map service (choose before on the left scroll box) in a Internet browser. - </para> - - <para> - The displayed positioning data are actually stored in the image's EXIF tags (and not yet in the database). That allows the location to be read by any other application that can understand EXIF GPS data. - </para> - </sect3> - - <sect3> - <title>What is GPS</title> - - <para> - The <ulink url="http://en.wikipedia.org/wiki/Global_Positioning_System";>Global Positioning System</ulink> usually called GPS, is the only fully functional satellite navigation system. A constellation of more than two dozen GPS satellites broadcasts precise timing signals by radio, allowing any GPS receiver to accurately determine its location (longitude, latitude, and altitude) anywhere on Earth. GPS also provides an extremely precise time reference and gauge speed with a very high degree of accuracy. - </para> - - <para> - GPS information can be stored in images directly by supported cameras or by synchronizing photographs with an external GPS device track. Look at this <ulink url="help:/digikam/using-camera.html#using-gps">section</ulink> for more information. - </para> - - </sect3> </sect2> diff --git a/digikam/using-sidebar-metadatagps.png b/digikam/using-sidebar-metadatagps.png index 538ef46..dae2fe7 100644 Binary files a/digikam/using-sidebar-metadatagps.png and b/digikam/using-sidebar-metadatagps.png differ diff --git a/showfoto/index.docbook b/showfoto/index.docbook index b39fe7e..761ab55 100644 --- a/showfoto/index.docbook +++ b/showfoto/index.docbook @@ -13,6 +13,9 @@ <!ENTITY doc-intro-contrib SYSTEM "../digikam/intro-contrib.docbook"> <!ENTITY doc-intro-imageformats SYSTEM "../digikam/intro-imageformats.docbook"> + <!ENTITY doc-using-mainwindow SYSTEM "../digikam/using-mainwindow.docbook"> + <!ENTITY doc-using-mainwindow-mapview SYSTEM "../digikam/using-mainwindow-mapview.docbook"> + <!ENTITY doc-using-sidebar SYSTEM "../digikam/using-sidebar.docbook"> <!ENTITY doc-using-sidebar-intro SYSTEM "../digikam/using-sidebar-intro.docbook"> <!ENTITY doc-using-sidebar-properties SYSTEM "../digikam/using-sidebar-properties.docbook">
