Git commit 4c39b68ccf3d95a864da965ee928f1c9354cafce by Yuri Chornoivan. Committed on 13/08/2013 at 17:11. Pushed by yurchor into branch 'master'.
Update docs to 2.8.0 M +- -- doc/Face-smile.png M +- -- doc/Icon-action-dynamic-amarok.png M +- -- doc/Icon-application-exit.png M +- -- doc/Icon-bookmark-new-list.png M +- -- doc/Icon-configure.png M +- -- doc/Icon-dialog-information.png M +- -- doc/Icon-document-export.png M +- -- doc/Icon-document-import.png M +- -- doc/Icon-document-new.png M +- -- doc/Icon-document-properties.png M +- -- doc/Icon-document-save.png M +- -- doc/Icon-edit-clear-list.png M +- -- doc/Icon-edit-clear-locationbar-rtl.png M +- -- doc/Icon-edit-copy.png M +- -- doc/Icon-edit-delete.png M +- -- doc/Icon-emblem-favorite.png M +- -- doc/Icon-emblem-mounted.png M +- -- doc/Icon-flag-green.png M +- -- doc/Icon-folder-new.png M +- -- doc/Icon-folder-remote.png M +- -- doc/Icon-go-down.png M +- -- doc/Icon-go-home.png M +- -- doc/Icon-go-next.png M +- -- doc/Icon-go-previous.png M +- -- doc/Icon-go-up.png M +- -- doc/Icon-list-add.png M +- -- doc/Icon-list-remove.png M +- -- doc/Icon-media-playback-pause.png M +- -- doc/Icon-media-playback-start.png M +- -- doc/Icon-media-playback-stop.png M +- -- doc/Icon-preferences-other.png M +- -- doc/Icon-view-list-tree.png M +- -- doc/Icon-view-refresh.png M +- -- doc/action-collection-amarok48.png D +- -- doc/advancedtok.png D +- -- doc/albumbar.png M +- -- doc/amarok-2-6-duplicates-during-collection-scan.png M +- -- doc/amarok-apg-presets-toolbar.png D +- -- doc/amarok-context.png M +- -- doc/amarok-e17.png M +- -- doc/amarok-fluxbox.png M +- -- doc/amarok-gnome.png M +- -- doc/amarok-lxde.png M +- -- doc/amarok-mac-port-install.png M +- -- doc/amarok-maintoolbar.png M +- -- doc/amarok-managing-media.png M +- -- doc/amarok-newdynamic-detail.png M +- -- doc/amarok-newdynamic.png M +- -- doc/amarok-slimtoolbar.png M +- -- doc/amarok-statsyncing.png M +- -- doc/amarok-xfce.png M +- -- doc/amarok2-4-1albumtageditdialog.png M +- -- doc/amarok2-4-1albumtageditpertrackdialog.png D +- -- doc/amarok2-4-1configuredialogcollection.png M +- -- doc/amarok2-4-1editfilterdialog.png M +- -- doc/amarok2-4-1filenamelayoutchooseroptions.png D +- -- doc/amarok2-4-1mergedviewcollection.png D +- -- doc/amarok2-4-1non-mergedviewcollection.png M +- -- doc/amarok2-4-1tageditdialog.png D +- -- doc/amarok2-4-1viewmenu.png D +- -- doc/amarok2-4collectionsortingmenu.png M +- -- doc/amarok2-4musicbrainztagger.png M +- -- doc/amarok2-4organizefilesadvanceddialog.png D +- -- doc/amarok2-4organizefilesbasicdialog.png M +- -- doc/amarok2-4queueeditor.png M +- -- doc/amarok2-4searchplaylist.png D +- -- doc/amarok2-6.png D +- -- doc/amarok2-6appletbrowser.png M +- -- doc/amarok2-6configgeneralmenu.png M +- -- doc/amarok2-6flactranscodemenu.png M +- -- doc/amarok2-6helpmenu.png M +- -- doc/amarok2-6playlistalbumcontextmenu.png D +- -- doc/amarok2-6pluginsconfigmenu.png D +- -- doc/amarok2-6scriptsconfigmenu.png M +- -- doc/amarok2-6trackcontextmenu.png D +- -- doc/amarok2-6transcodemenu.png M +- -- doc/amarok2-6viewconfigmenu.png M +- -- doc/amarok2-6viewundocksymbols.png D +- -- doc/amarok2-7addtoplaylist.png D +- -- doc/amarok2-7aftersplash.png M +- -- doc/amarok2-7menutools.png M +- -- doc/amarok2-7networkrequestsviewer.png D +- -- doc/amarok2-7removefromplaylist.png M +- -- doc/amarok2-7renamesavedplaylist.png D +- -- doc/amarok2-7saveplaylistchoices.png A +- -- doc/amarok2-7scriptsconfigmenu.png D +- -- doc/amarok2-7settingsplugins.png D +- -- doc/amarok2-7themediasources.png D +- -- doc/amarok2-7theplaylist.png M +- -- doc/amarok2-7thetoolbar.png M +- -- doc/amarok24_configureshortcutdetail.png M +- -- doc/amarok24_configureshortcutsdialog.png M +- -- doc/amarok24_settingsmenu.png M +- -- doc/amarok24_settingsmenu_withreplaygain.png M +- -- doc/amarok2_moodbar.png A +- -- doc/amarok2dot8pud.png M +- -- doc/amarok_2-6_layout.png A +- -- doc/amarok_2-8_appletexplorer_default.png A +- -- doc/amarok_2-8_collectionbrowser_merged.png A +- -- doc/amarok_2-8_collectionbrowser_nonmerged.png A +- -- doc/amarok_2-8_collectionbrowsersearchfield.png A +- -- doc/amarok_2-8_collectionsortingmenu.png A +- -- doc/amarok_2-8_configurationdialogdatabase.png A +- -- doc/amarok_2-8_configurationdialogdatabaseenabled.png A +- -- doc/amarok_2-8_configurationdialoggeneral.png A +- -- doc/amarok_2-8_configurationdialoglocalcollection.png A +- -- doc/amarok_2-8_configurationdialognotifications.png A +- -- doc/amarok_2-8_configurationdialogplayback.png A +- -- doc/amarok_2-8_configurationdialogplugins.png A +- -- doc/amarok_2-8_configurationdialogscripts.png A +- -- doc/amarok_2-8_contextview_default.png A +- -- doc/amarok_2-8_default.png A +- -- doc/amarok_2-8_mediasourcespanedefault.png A +- -- doc/amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png A +- -- doc/amarok_2-8_organizefilestranscode.png A +- -- doc/amarok_2-8_organizetracks.png A +- -- doc/amarok_2-8_playlistbottombar.png A +- -- doc/amarok_2-8_playlistfilteroptions.png A +- -- doc/amarok_2-8_playlistlayouteditor.png A +- -- doc/amarok_2-8_playlistpane.png A +- -- doc/amarok_2-8_playlistsortinglevels.png A +- -- doc/amarok_2-8_popupdropperadd.png A +- -- doc/amarok_2-8_popupdropperremove.png A +- -- doc/amarok_2-8_remotecollections_samba_server.png A +- -- doc/amarok_2-8_remotecollections_samba_server1.png A +- -- doc/amarok_2-8_savecurrentplaylistoptions.png A +- -- doc/amarok_2-8_startwindowdefault.png A +- -- doc/amarok_2-8_systray_window.png A +- -- doc/amarok_2-8_upnp_collection.png A +- -- doc/amarok_2-8_upnp_collection_plugin.png M +- -- doc/amarok_add-on_installer.png M +- -- doc/amarok_addtoplaylist1.png M +- -- doc/amarok_amarokmenu2-4.png M +- -- doc/amarok_ampache_client2.png M +- -- doc/amarok_connecting_media_devices.png M +- -- doc/amarok_cover_manager.png M +- -- doc/amarok_cover_manager_newcover.png M +- -- doc/amarok_dynamic_playlist.png M +- -- doc/amarok_layout11.png M +- -- doc/amarok_layout22.png M +- -- doc/amarok_layout23.png M +- -- doc/amarok_layout24.png M +- -- doc/amarok_layout25.png M +- -- doc/amarok_layout26.png M +- -- doc/amarok_layout27.png M +- -- doc/amarok_layout28.png M +- -- doc/amarok_loading_media_devices.png M +- -- doc/amarok_locale_selection.png M +- -- doc/amarok_main_toolbar.png M +- -- doc/amarok_media_devices.png M +- -- doc/amarok_on_mac.png M +- -- doc/amarok_playlist_layout_d_ss.png M +- -- doc/amarok_playlist_layout_editor.png M +- -- doc/amarok_playlist_layout_nog1_s.png M +- -- doc/amarok_playlist_layout_nog2_s.png M +- -- doc/amarok_playlist_layout_v1_s.png D +- -- doc/amarok_playlist_manipulation.png M +- -- doc/amarok_playlist_search_ex.png M +- -- doc/amarok_saved_playlists.png M +- -- doc/amarok_show_only_matches.png M +- -- doc/amarok_slim_toolbar.png A +- -- doc/amarok_systray_2-8_4-11.png M +- -- doc/amarok_tracks_media_devices1.png M +- -- doc/amarokbreadcrumb.png D +- -- doc/amarokconfigurationdialog2-7database.png D +- -- doc/amarokconfigurationdialog2-7notifications.png M +- -- doc/amarokconfigurationdialog2-7phononbackend.png M +- -- doc/amarokconfigurationdialog2-7phonondevice.png M +- -- doc/amarokconfigurationdialog2-7phononhardware.png D +- -- doc/amarokconfigurationdialog2-7playback.png M +- -- doc/amarokconfigurationdialog2-7scriptconsole.png D +- -- doc/amarokconfigurationdialoggeneral2-7.png D +- -- doc/amarokconfigurationdialoglocalcollection2-7.png M +- -- doc/amarokmediasources-files.png M +- -- doc/amarokmediasources-home.png M +- -- doc/amaroknepomukcollectionbrowser2-7.png D +- -- doc/amaroknepomukpluginconfig2-7.png M +- -- doc/amaroknew2-4.png D +- -- doc/amarokrightmenu.png M +- -- doc/amarokripcd.png D +- -- doc/amaroksystray.png M +- -- doc/amaroktoplevelmenus2-4.png D +- -- doc/amarokwindow_context.png M +- -- doc/apgpresetsmatchallgroup.png D +- -- doc/applet_explorer.png M +- -- doc/applications-internet.png M +- -- doc/bookmarking_menu.png M +- -- doc/cd_collection_sansa.png D +- -- doc/contextpane.png D +- -- doc/contextpanestopped.png M +- -- doc/controlamarok.png D +- -- doc/desktop_search.png M +- -- doc/document-save.png M +- -- doc/edit-redo.png M +- -- doc/edit-undo.png M +- -- doc/favor.png M +- -- doc/firstruncollection2.png M +- -- doc/folder-amarok.png M +- -- doc/generatedlist.png M +- -- doc/generatingtree.png A +- -- doc/hi48-action-amarok_lyrics.png M +- -- doc/hi48-action-clear-playlist-amarok.png A +- -- doc/hi48-action-current-track-amarok.png M +- -- doc/hi48-action-edit-playlist-queue.png A +- -- doc/hi48-action-filename-album-amarok.png A +- -- doc/hi48-action-filename-genre-amarok.png A +- -- doc/hi48-action-info-amarok.png A +- -- doc/hi48-action-label-amarok.png M +- -- doc/hi48-action-media-standard-track-progression-amarok.png M +- -- doc/hi48-action-music-amarok.png M +- -- doc/hi48-action-podcast-amarok.png A +- -- doc/hi48-action-similarartists-amarok.png A +- -- doc/hi48-action-upcomingevents-amarok.png A +- -- doc/hi48-action-view-media-analyzer-amarok.png A +- -- doc/hi48-image-x-generic.png M +426 -185 doc/index.docbook M +- -- doc/installation1-1.png M +- -- doc/installation2.png M +- -- doc/installation3.png M +- -- doc/installation4.png M +- -- doc/ipod-connected-dialog.png M +- -- doc/last-fm-spelling-correction.png M +- -- doc/matchedtrackspage.png M +- -- doc/media_sources1.png D +- -- doc/media_sources3.png M +- -- doc/mediasources.png M +- -- doc/mediasources10.png M +- -- doc/mediasources5.png M +- -- doc/mediasources6.png M +- -- doc/mediasources7.png M +- -- doc/mediasources8.png M +- -- doc/mediasourcesex.png M +- -- doc/metadatadialog.png M +- -- doc/nocover_amarok.png M +- -- doc/oraganize_menu.png M +- -- doc/otherplatforms_nonkde.png M +- -- doc/otherplatforms_osx.png M +- -- doc/otherplatforms_windows.png D +- -- doc/playlist-layout-editor-amarok.png M +- -- doc/playlist-layout-item-configuration-amarok.png M +- -- doc/playlist_save.png M +- -- doc/playlistlayout1.png M +- -- doc/playlistlayout2.png M +- -- doc/playlistlayout3.png M +- -- doc/playlistlayout4.png M +- -- doc/playlistmenu.png M +- -- doc/playlistpic.png M +- -- doc/playlistqueue.png D +- -- doc/playlistsearch.png M +- -- doc/queue.png M +- -- doc/queueend.png M +- -- doc/remotecollections_ampache_client1.png M +- -- doc/remotecollections_ampache_client2.png D +- -- doc/remotecollections_client.png M +- -- doc/remotecollections_daap.png D +- -- doc/remotecollections_samba_server.png D +- -- doc/remotecollections_samba_server1.png D +- -- doc/remotecollections_samba_server2.png D +- -- doc/remotecollections_samba_server3.png D +- -- doc/searchincollection.png M +- -- doc/searchincollection_example_editbox.png M +- -- doc/searchincollection_example_editbox2.png M +- -- doc/slim_toolbar.png M +- -- doc/sorting.png D +- -- doc/sorting2.png M +- -- doc/tagedit_fromfile_advanced.png M +- -- doc/tagedit_fromfile_advanced_example.png M +- -- doc/tagedit_fromfile_basic.png M +- -- doc/tagedit_fromfile_basic_example.png M +- -- doc/toolbar_main.png M +- -- doc/tools_bookmarkmanager.png M +- -- doc/tools_covermanager.png M +- -- doc/tools_equalizer.png M +- -- doc/track_progression.png M +- -- doc/view-media-playlist.png http://commits.kde.org/amarok/4c39b68ccf3d95a864da965ee928f1c9354cafce diff --git a/doc/Face-smile.png b/doc/Face-smile.png index 14b5ca9..19ecfd3 100644 Binary files a/doc/Face-smile.png and b/doc/Face-smile.png differ diff --git a/doc/Icon-action-dynamic-amarok.png b/doc/Icon-action-dynamic-amarok.png index 4694d6c..12c0191 100644 Binary files a/doc/Icon-action-dynamic-amarok.png and b/doc/Icon-action-dynamic-amarok.png differ diff --git a/doc/Icon-application-exit.png b/doc/Icon-application-exit.png index 8768e7f..28f9ead 100644 Binary files a/doc/Icon-application-exit.png and b/doc/Icon-application-exit.png differ diff --git a/doc/Icon-bookmark-new-list.png b/doc/Icon-bookmark-new-list.png index 9bedf67..682c13b 100644 Binary files a/doc/Icon-bookmark-new-list.png and b/doc/Icon-bookmark-new-list.png differ diff --git a/doc/Icon-configure.png b/doc/Icon-configure.png index 19badca..b118357 100644 Binary files a/doc/Icon-configure.png and b/doc/Icon-configure.png differ diff --git a/doc/Icon-dialog-information.png b/doc/Icon-dialog-information.png index 9ec7912..c0d4cbd 100644 Binary files a/doc/Icon-dialog-information.png and b/doc/Icon-dialog-information.png differ diff --git a/doc/Icon-document-export.png b/doc/Icon-document-export.png index 8229798..fa4e5f5 100644 Binary files a/doc/Icon-document-export.png and b/doc/Icon-document-export.png differ diff --git a/doc/Icon-document-import.png b/doc/Icon-document-import.png index e7124e6..323ee08 100644 Binary files a/doc/Icon-document-import.png and b/doc/Icon-document-import.png differ diff --git a/doc/Icon-document-new.png b/doc/Icon-document-new.png index 259e3a2..4a3d99d 100644 Binary files a/doc/Icon-document-new.png and b/doc/Icon-document-new.png differ diff --git a/doc/Icon-document-properties.png b/doc/Icon-document-properties.png index 88d40c6..bc277af 100644 Binary files a/doc/Icon-document-properties.png and b/doc/Icon-document-properties.png differ diff --git a/doc/Icon-document-save.png b/doc/Icon-document-save.png index 5f1c1d3..29db77b 100644 Binary files a/doc/Icon-document-save.png and b/doc/Icon-document-save.png differ diff --git a/doc/Icon-edit-clear-list.png b/doc/Icon-edit-clear-list.png index f0df601..46a5e25 100644 Binary files a/doc/Icon-edit-clear-list.png and b/doc/Icon-edit-clear-list.png differ diff --git a/doc/Icon-edit-clear-locationbar-rtl.png b/doc/Icon-edit-clear-locationbar-rtl.png index 10423dd..df37b5a 100644 Binary files a/doc/Icon-edit-clear-locationbar-rtl.png and b/doc/Icon-edit-clear-locationbar-rtl.png differ diff --git a/doc/Icon-edit-copy.png b/doc/Icon-edit-copy.png index c67149b..60dc6e9 100644 Binary files a/doc/Icon-edit-copy.png and b/doc/Icon-edit-copy.png differ diff --git a/doc/Icon-edit-delete.png b/doc/Icon-edit-delete.png index f78a091..e5cca23 100644 Binary files a/doc/Icon-edit-delete.png and b/doc/Icon-edit-delete.png differ diff --git a/doc/Icon-emblem-favorite.png b/doc/Icon-emblem-favorite.png index 6716714..98b769c 100644 Binary files a/doc/Icon-emblem-favorite.png and b/doc/Icon-emblem-favorite.png differ diff --git a/doc/Icon-emblem-mounted.png b/doc/Icon-emblem-mounted.png index c83f065..0f3fce3 100644 Binary files a/doc/Icon-emblem-mounted.png and b/doc/Icon-emblem-mounted.png differ diff --git a/doc/Icon-flag-green.png b/doc/Icon-flag-green.png index a959cc3..9881965 100644 Binary files a/doc/Icon-flag-green.png and b/doc/Icon-flag-green.png differ diff --git a/doc/Icon-folder-new.png b/doc/Icon-folder-new.png index d1f2fd9..1a3788b 100644 Binary files a/doc/Icon-folder-new.png and b/doc/Icon-folder-new.png differ diff --git a/doc/Icon-folder-remote.png b/doc/Icon-folder-remote.png index 26e7fd3..ffa7bb0 100644 Binary files a/doc/Icon-folder-remote.png and b/doc/Icon-folder-remote.png differ diff --git a/doc/Icon-go-down.png b/doc/Icon-go-down.png index 6f7aeae..de63890 100644 Binary files a/doc/Icon-go-down.png and b/doc/Icon-go-down.png differ diff --git a/doc/Icon-go-home.png b/doc/Icon-go-home.png index a2599bd..4aa3456 100644 Binary files a/doc/Icon-go-home.png and b/doc/Icon-go-home.png differ diff --git a/doc/Icon-go-next.png b/doc/Icon-go-next.png index 777dfed..844dc0f 100644 Binary files a/doc/Icon-go-next.png and b/doc/Icon-go-next.png differ diff --git a/doc/Icon-go-previous.png b/doc/Icon-go-previous.png index ef4f725..d5cb5f5 100644 Binary files a/doc/Icon-go-previous.png and b/doc/Icon-go-previous.png differ diff --git a/doc/Icon-go-up.png b/doc/Icon-go-up.png index 9c4549f..433b51e 100644 Binary files a/doc/Icon-go-up.png and b/doc/Icon-go-up.png differ diff --git a/doc/Icon-list-add.png b/doc/Icon-list-add.png index 9b38236..e1afc26 100644 Binary files a/doc/Icon-list-add.png and b/doc/Icon-list-add.png differ diff --git a/doc/Icon-list-remove.png b/doc/Icon-list-remove.png index a6000b0..af25b34 100644 Binary files a/doc/Icon-list-remove.png and b/doc/Icon-list-remove.png differ diff --git a/doc/Icon-media-playback-pause.png b/doc/Icon-media-playback-pause.png index 8489dce..ea606f9 100644 Binary files a/doc/Icon-media-playback-pause.png and b/doc/Icon-media-playback-pause.png differ diff --git a/doc/Icon-media-playback-start.png b/doc/Icon-media-playback-start.png index 9471d22..7b091c1 100644 Binary files a/doc/Icon-media-playback-start.png and b/doc/Icon-media-playback-start.png differ diff --git a/doc/Icon-media-playback-stop.png b/doc/Icon-media-playback-stop.png index 3157a62..9c5d4cc 100644 Binary files a/doc/Icon-media-playback-stop.png and b/doc/Icon-media-playback-stop.png differ diff --git a/doc/Icon-preferences-other.png b/doc/Icon-preferences-other.png index 28df532..e80efb0 100644 Binary files a/doc/Icon-preferences-other.png and b/doc/Icon-preferences-other.png differ diff --git a/doc/Icon-view-list-tree.png b/doc/Icon-view-list-tree.png index 3d52383..1e22752 100644 Binary files a/doc/Icon-view-list-tree.png and b/doc/Icon-view-list-tree.png differ diff --git a/doc/Icon-view-refresh.png b/doc/Icon-view-refresh.png index 80f4f49..24cea10 100644 Binary files a/doc/Icon-view-refresh.png and b/doc/Icon-view-refresh.png differ diff --git a/doc/action-collection-amarok48.png b/doc/action-collection-amarok48.png index 4e0bd24..94c3912 100644 Binary files a/doc/action-collection-amarok48.png and b/doc/action-collection-amarok48.png differ diff --git a/doc/advancedtok.png b/doc/advancedtok.png deleted file mode 100644 index 6fb2fb8..0000000 Binary files a/doc/advancedtok.png and /dev/null differ diff --git a/doc/albumbar.png b/doc/albumbar.png deleted file mode 100644 index e05a058..0000000 Binary files a/doc/albumbar.png and /dev/null differ diff --git a/doc/amarok-2-6-duplicates-during-collection-scan.png b/doc/amarok-2-6-duplicates-during-collection-scan.png index 0216eaa..04b2973 100644 Binary files a/doc/amarok-2-6-duplicates-during-collection-scan.png and b/doc/amarok-2-6-duplicates-during-collection-scan.png differ diff --git a/doc/amarok-apg-presets-toolbar.png b/doc/amarok-apg-presets-toolbar.png index f3aceef..3702619 100644 Binary files a/doc/amarok-apg-presets-toolbar.png and b/doc/amarok-apg-presets-toolbar.png differ diff --git a/doc/amarok-context.png b/doc/amarok-context.png deleted file mode 100644 index b595e2f..0000000 Binary files a/doc/amarok-context.png and /dev/null differ diff --git a/doc/amarok-e17.png b/doc/amarok-e17.png index a64d22d..2409a97 100644 Binary files a/doc/amarok-e17.png and b/doc/amarok-e17.png differ diff --git a/doc/amarok-fluxbox.png b/doc/amarok-fluxbox.png index 75270fe..07b0ef9 100644 Binary files a/doc/amarok-fluxbox.png and b/doc/amarok-fluxbox.png differ diff --git a/doc/amarok-gnome.png b/doc/amarok-gnome.png index 54fe823..e7518d5 100644 Binary files a/doc/amarok-gnome.png and b/doc/amarok-gnome.png differ diff --git a/doc/amarok-lxde.png b/doc/amarok-lxde.png index 75d4317..3292aa1 100644 Binary files a/doc/amarok-lxde.png and b/doc/amarok-lxde.png differ diff --git a/doc/amarok-mac-port-install.png b/doc/amarok-mac-port-install.png index 016e813..85815ef 100644 Binary files a/doc/amarok-mac-port-install.png and b/doc/amarok-mac-port-install.png differ diff --git a/doc/amarok-maintoolbar.png b/doc/amarok-maintoolbar.png index b7d980b..c05a5fa 100644 Binary files a/doc/amarok-maintoolbar.png and b/doc/amarok-maintoolbar.png differ diff --git a/doc/amarok-managing-media.png b/doc/amarok-managing-media.png index 149aca7..daa16d8 100644 Binary files a/doc/amarok-managing-media.png and b/doc/amarok-managing-media.png differ diff --git a/doc/amarok-newdynamic-detail.png b/doc/amarok-newdynamic-detail.png index c7fd3c5..defb4eb 100644 Binary files a/doc/amarok-newdynamic-detail.png and b/doc/amarok-newdynamic-detail.png differ diff --git a/doc/amarok-newdynamic.png b/doc/amarok-newdynamic.png index cc30cb8..a65767c 100644 Binary files a/doc/amarok-newdynamic.png and b/doc/amarok-newdynamic.png differ diff --git a/doc/amarok-slimtoolbar.png b/doc/amarok-slimtoolbar.png index 797207c..4d75775 100644 Binary files a/doc/amarok-slimtoolbar.png and b/doc/amarok-slimtoolbar.png differ diff --git a/doc/amarok-statsyncing.png b/doc/amarok-statsyncing.png index eaac809..ec31a52 100644 Binary files a/doc/amarok-statsyncing.png and b/doc/amarok-statsyncing.png differ diff --git a/doc/amarok-xfce.png b/doc/amarok-xfce.png index 6ce38e4..59cd8fc 100644 Binary files a/doc/amarok-xfce.png and b/doc/amarok-xfce.png differ diff --git a/doc/amarok2-4-1albumtageditdialog.png b/doc/amarok2-4-1albumtageditdialog.png index 31bb4e5..70b499c 100644 Binary files a/doc/amarok2-4-1albumtageditdialog.png and b/doc/amarok2-4-1albumtageditdialog.png differ diff --git a/doc/amarok2-4-1albumtageditpertrackdialog.png b/doc/amarok2-4-1albumtageditpertrackdialog.png index 073bac8..244428e 100644 Binary files a/doc/amarok2-4-1albumtageditpertrackdialog.png and b/doc/amarok2-4-1albumtageditpertrackdialog.png differ diff --git a/doc/amarok2-4-1configuredialogcollection.png b/doc/amarok2-4-1configuredialogcollection.png deleted file mode 100644 index c539abf..0000000 Binary files a/doc/amarok2-4-1configuredialogcollection.png and /dev/null differ diff --git a/doc/amarok2-4-1editfilterdialog.png b/doc/amarok2-4-1editfilterdialog.png index 60e6fe3..775b44d 100644 Binary files a/doc/amarok2-4-1editfilterdialog.png and b/doc/amarok2-4-1editfilterdialog.png differ diff --git a/doc/amarok2-4-1filenamelayoutchooseroptions.png b/doc/amarok2-4-1filenamelayoutchooseroptions.png index db85355..3bfdb9a 100644 Binary files a/doc/amarok2-4-1filenamelayoutchooseroptions.png and b/doc/amarok2-4-1filenamelayoutchooseroptions.png differ diff --git a/doc/amarok2-4-1mergedviewcollection.png b/doc/amarok2-4-1mergedviewcollection.png deleted file mode 100644 index 2e679ba..0000000 Binary files a/doc/amarok2-4-1mergedviewcollection.png and /dev/null differ diff --git a/doc/amarok2-4-1non-mergedviewcollection.png b/doc/amarok2-4-1non-mergedviewcollection.png deleted file mode 100644 index 111170f..0000000 Binary files a/doc/amarok2-4-1non-mergedviewcollection.png and /dev/null differ diff --git a/doc/amarok2-4-1tageditdialog.png b/doc/amarok2-4-1tageditdialog.png index 6b46018..5ddeda9 100644 Binary files a/doc/amarok2-4-1tageditdialog.png and b/doc/amarok2-4-1tageditdialog.png differ diff --git a/doc/amarok2-4-1viewmenu.png b/doc/amarok2-4-1viewmenu.png deleted file mode 100644 index db44e28..0000000 Binary files a/doc/amarok2-4-1viewmenu.png and /dev/null differ diff --git a/doc/amarok2-4collectionsortingmenu.png b/doc/amarok2-4collectionsortingmenu.png deleted file mode 100644 index 61793c6..0000000 Binary files a/doc/amarok2-4collectionsortingmenu.png and /dev/null differ diff --git a/doc/amarok2-4musicbrainztagger.png b/doc/amarok2-4musicbrainztagger.png index a11457c..acd6ff9 100644 Binary files a/doc/amarok2-4musicbrainztagger.png and b/doc/amarok2-4musicbrainztagger.png differ diff --git a/doc/amarok2-4organizefilesadvanceddialog.png b/doc/amarok2-4organizefilesadvanceddialog.png index 302e12f..c9f948b 100644 Binary files a/doc/amarok2-4organizefilesadvanceddialog.png and b/doc/amarok2-4organizefilesadvanceddialog.png differ diff --git a/doc/amarok2-4organizefilesbasicdialog.png b/doc/amarok2-4organizefilesbasicdialog.png deleted file mode 100644 index 89bb496..0000000 Binary files a/doc/amarok2-4organizefilesbasicdialog.png and /dev/null differ diff --git a/doc/amarok2-4queueeditor.png b/doc/amarok2-4queueeditor.png index d6c97f7..c7edf69 100644 Binary files a/doc/amarok2-4queueeditor.png and b/doc/amarok2-4queueeditor.png differ diff --git a/doc/amarok2-4searchplaylist.png b/doc/amarok2-4searchplaylist.png index 4c29da9..ba1b8f0 100644 Binary files a/doc/amarok2-4searchplaylist.png and b/doc/amarok2-4searchplaylist.png differ diff --git a/doc/amarok2-6.png b/doc/amarok2-6.png deleted file mode 100644 index a1ee141..0000000 Binary files a/doc/amarok2-6.png and /dev/null differ diff --git a/doc/amarok2-6appletbrowser.png b/doc/amarok2-6appletbrowser.png deleted file mode 100644 index e4cff00..0000000 Binary files a/doc/amarok2-6appletbrowser.png and /dev/null differ diff --git a/doc/amarok2-6configgeneralmenu.png b/doc/amarok2-6configgeneralmenu.png index 3b0e97a..c1e6339 100644 Binary files a/doc/amarok2-6configgeneralmenu.png and b/doc/amarok2-6configgeneralmenu.png differ diff --git a/doc/amarok2-6flactranscodemenu.png b/doc/amarok2-6flactranscodemenu.png index 909f11d..e7a13ac 100644 Binary files a/doc/amarok2-6flactranscodemenu.png and b/doc/amarok2-6flactranscodemenu.png differ diff --git a/doc/amarok2-6helpmenu.png b/doc/amarok2-6helpmenu.png index 9cd858a..dde0eeb 100644 Binary files a/doc/amarok2-6helpmenu.png and b/doc/amarok2-6helpmenu.png differ diff --git a/doc/amarok2-6playlistalbumcontextmenu.png b/doc/amarok2-6playlistalbumcontextmenu.png index 90d71d1..1c324c6 100644 Binary files a/doc/amarok2-6playlistalbumcontextmenu.png and b/doc/amarok2-6playlistalbumcontextmenu.png differ diff --git a/doc/amarok2-6pluginsconfigmenu.png b/doc/amarok2-6pluginsconfigmenu.png deleted file mode 100644 index efc099e0..0000000 Binary files a/doc/amarok2-6pluginsconfigmenu.png and /dev/null differ diff --git a/doc/amarok2-6scriptsconfigmenu.png b/doc/amarok2-6scriptsconfigmenu.png deleted file mode 100644 index 04341bb..0000000 Binary files a/doc/amarok2-6scriptsconfigmenu.png and /dev/null differ diff --git a/doc/amarok2-6trackcontextmenu.png b/doc/amarok2-6trackcontextmenu.png index eda955e..164d407 100644 Binary files a/doc/amarok2-6trackcontextmenu.png and b/doc/amarok2-6trackcontextmenu.png differ diff --git a/doc/amarok2-6transcodemenu.png b/doc/amarok2-6transcodemenu.png deleted file mode 100644 index 8dbb33a..0000000 Binary files a/doc/amarok2-6transcodemenu.png and /dev/null differ diff --git a/doc/amarok2-6viewconfigmenu.png b/doc/amarok2-6viewconfigmenu.png index f7658ec..c757bf8 100644 Binary files a/doc/amarok2-6viewconfigmenu.png and b/doc/amarok2-6viewconfigmenu.png differ diff --git a/doc/amarok2-6viewundocksymbols.png b/doc/amarok2-6viewundocksymbols.png index ee16b8b..c31e741 100644 Binary files a/doc/amarok2-6viewundocksymbols.png and b/doc/amarok2-6viewundocksymbols.png differ diff --git a/doc/amarok2-7addtoplaylist.png b/doc/amarok2-7addtoplaylist.png deleted file mode 100644 index 5cf389a..0000000 Binary files a/doc/amarok2-7addtoplaylist.png and /dev/null differ diff --git a/doc/amarok2-7aftersplash.png b/doc/amarok2-7aftersplash.png deleted file mode 100644 index 031fef2..0000000 Binary files a/doc/amarok2-7aftersplash.png and /dev/null differ diff --git a/doc/amarok2-7menutools.png b/doc/amarok2-7menutools.png index 6b76012..ed27a5e 100644 Binary files a/doc/amarok2-7menutools.png and b/doc/amarok2-7menutools.png differ diff --git a/doc/amarok2-7networkrequestsviewer.png b/doc/amarok2-7networkrequestsviewer.png index 0e60015..e383580 100644 Binary files a/doc/amarok2-7networkrequestsviewer.png and b/doc/amarok2-7networkrequestsviewer.png differ diff --git a/doc/amarok2-7removefromplaylist.png b/doc/amarok2-7removefromplaylist.png deleted file mode 100644 index f5abd18..0000000 Binary files a/doc/amarok2-7removefromplaylist.png and /dev/null differ diff --git a/doc/amarok2-7renamesavedplaylist.png b/doc/amarok2-7renamesavedplaylist.png index 407d87e..305d48f 100644 Binary files a/doc/amarok2-7renamesavedplaylist.png and b/doc/amarok2-7renamesavedplaylist.png differ diff --git a/doc/amarok2-7saveplaylistchoices.png b/doc/amarok2-7saveplaylistchoices.png deleted file mode 100644 index 747bd03..0000000 Binary files a/doc/amarok2-7saveplaylistchoices.png and /dev/null differ diff --git a/doc/amarok2-7scriptsconfigmenu.png b/doc/amarok2-7scriptsconfigmenu.png new file mode 100644 index 0000000..cddc4bb Binary files /dev/null and b/doc/amarok2-7scriptsconfigmenu.png differ diff --git a/doc/amarok2-7settingsplugins.png b/doc/amarok2-7settingsplugins.png deleted file mode 100644 index acde950..0000000 Binary files a/doc/amarok2-7settingsplugins.png and /dev/null differ diff --git a/doc/amarok2-7themediasources.png b/doc/amarok2-7themediasources.png deleted file mode 100644 index 3cb34c6..0000000 Binary files a/doc/amarok2-7themediasources.png and /dev/null differ diff --git a/doc/amarok2-7theplaylist.png b/doc/amarok2-7theplaylist.png deleted file mode 100644 index b9682e8..0000000 Binary files a/doc/amarok2-7theplaylist.png and /dev/null differ diff --git a/doc/amarok2-7thetoolbar.png b/doc/amarok2-7thetoolbar.png index a8bf526..a1d18d5 100644 Binary files a/doc/amarok2-7thetoolbar.png and b/doc/amarok2-7thetoolbar.png differ diff --git a/doc/amarok24_configureshortcutdetail.png b/doc/amarok24_configureshortcutdetail.png index e801e85..04f9ad6 100644 Binary files a/doc/amarok24_configureshortcutdetail.png and b/doc/amarok24_configureshortcutdetail.png differ diff --git a/doc/amarok24_configureshortcutsdialog.png b/doc/amarok24_configureshortcutsdialog.png index 910f6fd..64a3d4f 100644 Binary files a/doc/amarok24_configureshortcutsdialog.png and b/doc/amarok24_configureshortcutsdialog.png differ diff --git a/doc/amarok24_settingsmenu.png b/doc/amarok24_settingsmenu.png index 167679a..8565e25 100644 Binary files a/doc/amarok24_settingsmenu.png and b/doc/amarok24_settingsmenu.png differ diff --git a/doc/amarok24_settingsmenu_withreplaygain.png b/doc/amarok24_settingsmenu_withreplaygain.png index 9214277..d4e512a 100644 Binary files a/doc/amarok24_settingsmenu_withreplaygain.png and b/doc/amarok24_settingsmenu_withreplaygain.png differ diff --git a/doc/amarok2_moodbar.png b/doc/amarok2_moodbar.png index ae4d0e3..fc9d044 100644 Binary files a/doc/amarok2_moodbar.png and b/doc/amarok2_moodbar.png differ diff --git a/doc/amarok2dot8pud.png b/doc/amarok2dot8pud.png new file mode 100644 index 0000000..34db430 Binary files /dev/null and b/doc/amarok2dot8pud.png differ diff --git a/doc/amarok_2-6_layout.png b/doc/amarok_2-6_layout.png index 135450c..fd7d6b8 100644 Binary files a/doc/amarok_2-6_layout.png and b/doc/amarok_2-6_layout.png differ diff --git a/doc/amarok_2-8_appletexplorer_default.png b/doc/amarok_2-8_appletexplorer_default.png new file mode 100644 index 0000000..9cefcd1 Binary files /dev/null and b/doc/amarok_2-8_appletexplorer_default.png differ diff --git a/doc/amarok_2-8_collectionbrowser_merged.png b/doc/amarok_2-8_collectionbrowser_merged.png new file mode 100644 index 0000000..73381ca Binary files /dev/null and b/doc/amarok_2-8_collectionbrowser_merged.png differ diff --git a/doc/amarok_2-8_collectionbrowser_nonmerged.png b/doc/amarok_2-8_collectionbrowser_nonmerged.png new file mode 100644 index 0000000..248e9b0 Binary files /dev/null and b/doc/amarok_2-8_collectionbrowser_nonmerged.png differ diff --git a/doc/amarok_2-8_collectionbrowsersearchfield.png b/doc/amarok_2-8_collectionbrowsersearchfield.png new file mode 100644 index 0000000..616119f Binary files /dev/null and b/doc/amarok_2-8_collectionbrowsersearchfield.png differ diff --git a/doc/amarok_2-8_collectionsortingmenu.png b/doc/amarok_2-8_collectionsortingmenu.png new file mode 100644 index 0000000..465a2d0 Binary files /dev/null and b/doc/amarok_2-8_collectionsortingmenu.png differ diff --git a/doc/amarok_2-8_configurationdialogdatabase.png b/doc/amarok_2-8_configurationdialogdatabase.png new file mode 100644 index 0000000..3ae5c5b Binary files /dev/null and b/doc/amarok_2-8_configurationdialogdatabase.png differ diff --git a/doc/amarok_2-8_configurationdialogdatabaseenabled.png b/doc/amarok_2-8_configurationdialogdatabaseenabled.png new file mode 100644 index 0000000..4244f72 Binary files /dev/null and b/doc/amarok_2-8_configurationdialogdatabaseenabled.png differ diff --git a/doc/amarok_2-8_configurationdialoggeneral.png b/doc/amarok_2-8_configurationdialoggeneral.png new file mode 100644 index 0000000..617620d Binary files /dev/null and b/doc/amarok_2-8_configurationdialoggeneral.png differ diff --git a/doc/amarok_2-8_configurationdialoglocalcollection.png b/doc/amarok_2-8_configurationdialoglocalcollection.png new file mode 100644 index 0000000..ba57a97 Binary files /dev/null and b/doc/amarok_2-8_configurationdialoglocalcollection.png differ diff --git a/doc/amarok_2-8_configurationdialognotifications.png b/doc/amarok_2-8_configurationdialognotifications.png new file mode 100644 index 0000000..d9fe262 Binary files /dev/null and b/doc/amarok_2-8_configurationdialognotifications.png differ diff --git a/doc/amarok_2-8_configurationdialogplayback.png b/doc/amarok_2-8_configurationdialogplayback.png new file mode 100644 index 0000000..d96c6ef Binary files /dev/null and b/doc/amarok_2-8_configurationdialogplayback.png differ diff --git a/doc/amarok_2-8_configurationdialogplugins.png b/doc/amarok_2-8_configurationdialogplugins.png new file mode 100644 index 0000000..011f274 Binary files /dev/null and b/doc/amarok_2-8_configurationdialogplugins.png differ diff --git a/doc/amarok_2-8_configurationdialogscripts.png b/doc/amarok_2-8_configurationdialogscripts.png new file mode 100644 index 0000000..23db335 Binary files /dev/null and b/doc/amarok_2-8_configurationdialogscripts.png differ diff --git a/doc/amarok_2-8_contextview_default.png b/doc/amarok_2-8_contextview_default.png new file mode 100644 index 0000000..584574a Binary files /dev/null and b/doc/amarok_2-8_contextview_default.png differ diff --git a/doc/amarok_2-8_default.png b/doc/amarok_2-8_default.png new file mode 100644 index 0000000..568d7f4 Binary files /dev/null and b/doc/amarok_2-8_default.png differ diff --git a/doc/amarok_2-8_mediasourcespanedefault.png b/doc/amarok_2-8_mediasourcespanedefault.png new file mode 100644 index 0000000..75cd84b Binary files /dev/null and b/doc/amarok_2-8_mediasourcespanedefault.png differ diff --git a/doc/amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png b/doc/amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png new file mode 100644 index 0000000..adbbfa8 Binary files /dev/null and b/doc/amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png differ diff --git a/doc/amarok_2-8_organizefilestranscode.png b/doc/amarok_2-8_organizefilestranscode.png new file mode 100644 index 0000000..1d3266c Binary files /dev/null and b/doc/amarok_2-8_organizefilestranscode.png differ diff --git a/doc/amarok_2-8_organizetracks.png b/doc/amarok_2-8_organizetracks.png new file mode 100644 index 0000000..38fb45d Binary files /dev/null and b/doc/amarok_2-8_organizetracks.png differ diff --git a/doc/amarok_2-8_playlistbottombar.png b/doc/amarok_2-8_playlistbottombar.png new file mode 100644 index 0000000..f82f58c Binary files /dev/null and b/doc/amarok_2-8_playlistbottombar.png differ diff --git a/doc/amarok_2-8_playlistfilteroptions.png b/doc/amarok_2-8_playlistfilteroptions.png new file mode 100644 index 0000000..a079a4a Binary files /dev/null and b/doc/amarok_2-8_playlistfilteroptions.png differ diff --git a/doc/amarok_2-8_playlistlayouteditor.png b/doc/amarok_2-8_playlistlayouteditor.png new file mode 100644 index 0000000..c0ef923 Binary files /dev/null and b/doc/amarok_2-8_playlistlayouteditor.png differ diff --git a/doc/amarok_2-8_playlistpane.png b/doc/amarok_2-8_playlistpane.png new file mode 100644 index 0000000..89f37c7 Binary files /dev/null and b/doc/amarok_2-8_playlistpane.png differ diff --git a/doc/amarok_2-8_playlistsortinglevels.png b/doc/amarok_2-8_playlistsortinglevels.png new file mode 100644 index 0000000..7ad3d05 Binary files /dev/null and b/doc/amarok_2-8_playlistsortinglevels.png differ diff --git a/doc/amarok_2-8_popupdropperadd.png b/doc/amarok_2-8_popupdropperadd.png new file mode 100644 index 0000000..59c4f6e Binary files /dev/null and b/doc/amarok_2-8_popupdropperadd.png differ diff --git a/doc/amarok_2-8_popupdropperremove.png b/doc/amarok_2-8_popupdropperremove.png new file mode 100644 index 0000000..e5ea892 Binary files /dev/null and b/doc/amarok_2-8_popupdropperremove.png differ diff --git a/doc/amarok_2-8_remotecollections_samba_server.png b/doc/amarok_2-8_remotecollections_samba_server.png new file mode 100644 index 0000000..5b4c4e5 Binary files /dev/null and b/doc/amarok_2-8_remotecollections_samba_server.png differ diff --git a/doc/amarok_2-8_remotecollections_samba_server1.png b/doc/amarok_2-8_remotecollections_samba_server1.png new file mode 100644 index 0000000..4815ea0 Binary files /dev/null and b/doc/amarok_2-8_remotecollections_samba_server1.png differ diff --git a/doc/amarok_2-8_savecurrentplaylistoptions.png b/doc/amarok_2-8_savecurrentplaylistoptions.png new file mode 100644 index 0000000..a333368 Binary files /dev/null and b/doc/amarok_2-8_savecurrentplaylistoptions.png differ diff --git a/doc/amarok_2-8_startwindowdefault.png b/doc/amarok_2-8_startwindowdefault.png new file mode 100644 index 0000000..a4d256d Binary files /dev/null and b/doc/amarok_2-8_startwindowdefault.png differ diff --git a/doc/amarok_2-8_systray_window.png b/doc/amarok_2-8_systray_window.png new file mode 100644 index 0000000..f8ab24c Binary files /dev/null and b/doc/amarok_2-8_systray_window.png differ diff --git a/doc/amarok_2-8_upnp_collection.png b/doc/amarok_2-8_upnp_collection.png new file mode 100644 index 0000000..355fe7d Binary files /dev/null and b/doc/amarok_2-8_upnp_collection.png differ diff --git a/doc/amarok_2-8_upnp_collection_plugin.png b/doc/amarok_2-8_upnp_collection_plugin.png new file mode 100644 index 0000000..9b77f28 Binary files /dev/null and b/doc/amarok_2-8_upnp_collection_plugin.png differ diff --git a/doc/amarok_add-on_installer.png b/doc/amarok_add-on_installer.png index c888429..0014fa8 100644 Binary files a/doc/amarok_add-on_installer.png and b/doc/amarok_add-on_installer.png differ diff --git a/doc/amarok_addtoplaylist1.png b/doc/amarok_addtoplaylist1.png index ea9ce78..b5b9187 100644 Binary files a/doc/amarok_addtoplaylist1.png and b/doc/amarok_addtoplaylist1.png differ diff --git a/doc/amarok_amarokmenu2-4.png b/doc/amarok_amarokmenu2-4.png index 742173d..803a74e 100644 Binary files a/doc/amarok_amarokmenu2-4.png and b/doc/amarok_amarokmenu2-4.png differ diff --git a/doc/amarok_ampache_client2.png b/doc/amarok_ampache_client2.png index efd868e..8c60156 100644 Binary files a/doc/amarok_ampache_client2.png and b/doc/amarok_ampache_client2.png differ diff --git a/doc/amarok_connecting_media_devices.png b/doc/amarok_connecting_media_devices.png index fdc7e86..7276f0b 100644 Binary files a/doc/amarok_connecting_media_devices.png and b/doc/amarok_connecting_media_devices.png differ diff --git a/doc/amarok_cover_manager.png b/doc/amarok_cover_manager.png index f207899..6f78078 100644 Binary files a/doc/amarok_cover_manager.png and b/doc/amarok_cover_manager.png differ diff --git a/doc/amarok_cover_manager_newcover.png b/doc/amarok_cover_manager_newcover.png index 35e4908..0ac3ae0 100644 Binary files a/doc/amarok_cover_manager_newcover.png and b/doc/amarok_cover_manager_newcover.png differ diff --git a/doc/amarok_dynamic_playlist.png b/doc/amarok_dynamic_playlist.png index 06f25b6..6ca948c 100644 Binary files a/doc/amarok_dynamic_playlist.png and b/doc/amarok_dynamic_playlist.png differ diff --git a/doc/amarok_layout11.png b/doc/amarok_layout11.png index a106dc8..4bcb982 100644 Binary files a/doc/amarok_layout11.png and b/doc/amarok_layout11.png differ diff --git a/doc/amarok_layout22.png b/doc/amarok_layout22.png index e87936e..cd55789 100644 Binary files a/doc/amarok_layout22.png and b/doc/amarok_layout22.png differ diff --git a/doc/amarok_layout23.png b/doc/amarok_layout23.png index 57d4b1b..51a8bac 100644 Binary files a/doc/amarok_layout23.png and b/doc/amarok_layout23.png differ diff --git a/doc/amarok_layout24.png b/doc/amarok_layout24.png index 00365cd..82e583c 100644 Binary files a/doc/amarok_layout24.png and b/doc/amarok_layout24.png differ diff --git a/doc/amarok_layout25.png b/doc/amarok_layout25.png index dae62b8..87836a3 100644 Binary files a/doc/amarok_layout25.png and b/doc/amarok_layout25.png differ diff --git a/doc/amarok_layout26.png b/doc/amarok_layout26.png index ae82028..17c42de 100644 Binary files a/doc/amarok_layout26.png and b/doc/amarok_layout26.png differ diff --git a/doc/amarok_layout27.png b/doc/amarok_layout27.png index edc266b..a953253 100644 Binary files a/doc/amarok_layout27.png and b/doc/amarok_layout27.png differ diff --git a/doc/amarok_layout28.png b/doc/amarok_layout28.png index 3096e99..1cf4840 100644 Binary files a/doc/amarok_layout28.png and b/doc/amarok_layout28.png differ diff --git a/doc/amarok_loading_media_devices.png b/doc/amarok_loading_media_devices.png index 813e2e1..2e71b6c 100644 Binary files a/doc/amarok_loading_media_devices.png and b/doc/amarok_loading_media_devices.png differ diff --git a/doc/amarok_locale_selection.png b/doc/amarok_locale_selection.png index deefab2..9db847c 100644 Binary files a/doc/amarok_locale_selection.png and b/doc/amarok_locale_selection.png differ diff --git a/doc/amarok_main_toolbar.png b/doc/amarok_main_toolbar.png index bed520f..4b6a5fa 100644 Binary files a/doc/amarok_main_toolbar.png and b/doc/amarok_main_toolbar.png differ diff --git a/doc/amarok_media_devices.png b/doc/amarok_media_devices.png index cd72a46..a447394 100644 Binary files a/doc/amarok_media_devices.png and b/doc/amarok_media_devices.png differ diff --git a/doc/amarok_on_mac.png b/doc/amarok_on_mac.png index 6bffd15..ee89f7d 100644 Binary files a/doc/amarok_on_mac.png and b/doc/amarok_on_mac.png differ diff --git a/doc/amarok_playlist_layout_d_ss.png b/doc/amarok_playlist_layout_d_ss.png index c8c5744..44ae53f 100644 Binary files a/doc/amarok_playlist_layout_d_ss.png and b/doc/amarok_playlist_layout_d_ss.png differ diff --git a/doc/amarok_playlist_layout_editor.png b/doc/amarok_playlist_layout_editor.png index 1543104..f73072f 100644 Binary files a/doc/amarok_playlist_layout_editor.png and b/doc/amarok_playlist_layout_editor.png differ diff --git a/doc/amarok_playlist_layout_nog1_s.png b/doc/amarok_playlist_layout_nog1_s.png index b15160e..c178fd8 100644 Binary files a/doc/amarok_playlist_layout_nog1_s.png and b/doc/amarok_playlist_layout_nog1_s.png differ diff --git a/doc/amarok_playlist_layout_nog2_s.png b/doc/amarok_playlist_layout_nog2_s.png index baa65cf..091b49e 100644 Binary files a/doc/amarok_playlist_layout_nog2_s.png and b/doc/amarok_playlist_layout_nog2_s.png differ diff --git a/doc/amarok_playlist_layout_v1_s.png b/doc/amarok_playlist_layout_v1_s.png index fbd26d6..13a85bf 100644 Binary files a/doc/amarok_playlist_layout_v1_s.png and b/doc/amarok_playlist_layout_v1_s.png differ diff --git a/doc/amarok_playlist_manipulation.png b/doc/amarok_playlist_manipulation.png deleted file mode 100644 index 7a6b4f4..0000000 Binary files a/doc/amarok_playlist_manipulation.png and /dev/null differ diff --git a/doc/amarok_playlist_search_ex.png b/doc/amarok_playlist_search_ex.png index c05be86..f4ef7e7 100644 Binary files a/doc/amarok_playlist_search_ex.png and b/doc/amarok_playlist_search_ex.png differ diff --git a/doc/amarok_saved_playlists.png b/doc/amarok_saved_playlists.png index 33c53dd..e98d098 100644 Binary files a/doc/amarok_saved_playlists.png and b/doc/amarok_saved_playlists.png differ diff --git a/doc/amarok_show_only_matches.png b/doc/amarok_show_only_matches.png index 2d85a1f..82b7710 100644 Binary files a/doc/amarok_show_only_matches.png and b/doc/amarok_show_only_matches.png differ diff --git a/doc/amarok_slim_toolbar.png b/doc/amarok_slim_toolbar.png index c3a8939..de5833d 100644 Binary files a/doc/amarok_slim_toolbar.png and b/doc/amarok_slim_toolbar.png differ diff --git a/doc/amarok_systray_2-8_4-11.png b/doc/amarok_systray_2-8_4-11.png new file mode 100644 index 0000000..0faf96e Binary files /dev/null and b/doc/amarok_systray_2-8_4-11.png differ diff --git a/doc/amarok_tracks_media_devices1.png b/doc/amarok_tracks_media_devices1.png index 1e59585..32fc3b0 100644 Binary files a/doc/amarok_tracks_media_devices1.png and b/doc/amarok_tracks_media_devices1.png differ diff --git a/doc/amarokbreadcrumb.png b/doc/amarokbreadcrumb.png index ef61ef4..9bae0ff 100644 Binary files a/doc/amarokbreadcrumb.png and b/doc/amarokbreadcrumb.png differ diff --git a/doc/amarokconfigurationdialog2-7database.png b/doc/amarokconfigurationdialog2-7database.png deleted file mode 100644 index c69aaa6..0000000 Binary files a/doc/amarokconfigurationdialog2-7database.png and /dev/null differ diff --git a/doc/amarokconfigurationdialog2-7notifications.png b/doc/amarokconfigurationdialog2-7notifications.png deleted file mode 100644 index 6cba117..0000000 Binary files a/doc/amarokconfigurationdialog2-7notifications.png and /dev/null differ diff --git a/doc/amarokconfigurationdialog2-7phononbackend.png b/doc/amarokconfigurationdialog2-7phononbackend.png index c7785ac..a449336 100644 Binary files a/doc/amarokconfigurationdialog2-7phononbackend.png and b/doc/amarokconfigurationdialog2-7phononbackend.png differ diff --git a/doc/amarokconfigurationdialog2-7phonondevice.png b/doc/amarokconfigurationdialog2-7phonondevice.png index c1fbf40..a1e5cc0 100644 Binary files a/doc/amarokconfigurationdialog2-7phonondevice.png and b/doc/amarokconfigurationdialog2-7phonondevice.png differ diff --git a/doc/amarokconfigurationdialog2-7phononhardware.png b/doc/amarokconfigurationdialog2-7phononhardware.png index 3b54647..5327227 100644 Binary files a/doc/amarokconfigurationdialog2-7phononhardware.png and b/doc/amarokconfigurationdialog2-7phononhardware.png differ diff --git a/doc/amarokconfigurationdialog2-7playback.png b/doc/amarokconfigurationdialog2-7playback.png deleted file mode 100644 index 3050d9c..0000000 Binary files a/doc/amarokconfigurationdialog2-7playback.png and /dev/null differ diff --git a/doc/amarokconfigurationdialog2-7scriptconsole.png b/doc/amarokconfigurationdialog2-7scriptconsole.png index e785430..b8db26b 100644 Binary files a/doc/amarokconfigurationdialog2-7scriptconsole.png and b/doc/amarokconfigurationdialog2-7scriptconsole.png differ diff --git a/doc/amarokconfigurationdialoggeneral2-7.png b/doc/amarokconfigurationdialoggeneral2-7.png deleted file mode 100644 index e460989..0000000 Binary files a/doc/amarokconfigurationdialoggeneral2-7.png and /dev/null differ diff --git a/doc/amarokconfigurationdialoglocalcollection2-7.png b/doc/amarokconfigurationdialoglocalcollection2-7.png deleted file mode 100644 index 912f2e5..0000000 Binary files a/doc/amarokconfigurationdialoglocalcollection2-7.png and /dev/null differ diff --git a/doc/amarokmediasources-files.png b/doc/amarokmediasources-files.png index d104d40..5f585b0 100644 Binary files a/doc/amarokmediasources-files.png and b/doc/amarokmediasources-files.png differ diff --git a/doc/amarokmediasources-home.png b/doc/amarokmediasources-home.png index 7178d5d..2f559eb 100644 Binary files a/doc/amarokmediasources-home.png and b/doc/amarokmediasources-home.png differ diff --git a/doc/amaroknepomukcollectionbrowser2-7.png b/doc/amaroknepomukcollectionbrowser2-7.png index bec5505..e02670f 100644 Binary files a/doc/amaroknepomukcollectionbrowser2-7.png and b/doc/amaroknepomukcollectionbrowser2-7.png differ diff --git a/doc/amaroknepomukpluginconfig2-7.png b/doc/amaroknepomukpluginconfig2-7.png deleted file mode 100644 index c9f0854..0000000 Binary files a/doc/amaroknepomukpluginconfig2-7.png and /dev/null differ diff --git a/doc/amaroknew2-4.png b/doc/amaroknew2-4.png index a77fed2..f727d73 100644 Binary files a/doc/amaroknew2-4.png and b/doc/amaroknew2-4.png differ diff --git a/doc/amarokrightmenu.png b/doc/amarokrightmenu.png deleted file mode 100644 index 401fa08..0000000 Binary files a/doc/amarokrightmenu.png and /dev/null differ diff --git a/doc/amarokripcd.png b/doc/amarokripcd.png index 7076770..3cf5c5a 100644 Binary files a/doc/amarokripcd.png and b/doc/amarokripcd.png differ diff --git a/doc/amaroksystray.png b/doc/amaroksystray.png deleted file mode 100644 index 142882b..0000000 Binary files a/doc/amaroksystray.png and /dev/null differ diff --git a/doc/amaroktoplevelmenus2-4.png b/doc/amaroktoplevelmenus2-4.png index f563b2a..5b544d7 100644 Binary files a/doc/amaroktoplevelmenus2-4.png and b/doc/amaroktoplevelmenus2-4.png differ diff --git a/doc/amarokwindow_context.png b/doc/amarokwindow_context.png deleted file mode 100644 index bd36ad2..0000000 Binary files a/doc/amarokwindow_context.png and /dev/null differ diff --git a/doc/apgpresetsmatchallgroup.png b/doc/apgpresetsmatchallgroup.png index 792b686..4f667fc 100644 Binary files a/doc/apgpresetsmatchallgroup.png and b/doc/apgpresetsmatchallgroup.png differ diff --git a/doc/applet_explorer.png b/doc/applet_explorer.png deleted file mode 100644 index 4ee63ea..0000000 Binary files a/doc/applet_explorer.png and /dev/null differ diff --git a/doc/applications-internet.png b/doc/applications-internet.png index 08b787d..1be75c9 100644 Binary files a/doc/applications-internet.png and b/doc/applications-internet.png differ diff --git a/doc/bookmarking_menu.png b/doc/bookmarking_menu.png index a10260a..063b67f 100644 Binary files a/doc/bookmarking_menu.png and b/doc/bookmarking_menu.png differ diff --git a/doc/cd_collection_sansa.png b/doc/cd_collection_sansa.png index f7f031b..f8247d2 100644 Binary files a/doc/cd_collection_sansa.png and b/doc/cd_collection_sansa.png differ diff --git a/doc/contextpane.png b/doc/contextpane.png deleted file mode 100644 index 83f538d..0000000 Binary files a/doc/contextpane.png and /dev/null differ diff --git a/doc/contextpanestopped.png b/doc/contextpanestopped.png deleted file mode 100644 index f17cc5a..0000000 Binary files a/doc/contextpanestopped.png and /dev/null differ diff --git a/doc/controlamarok.png b/doc/controlamarok.png index e018811..3677238 100644 Binary files a/doc/controlamarok.png and b/doc/controlamarok.png differ diff --git a/doc/desktop_search.png b/doc/desktop_search.png deleted file mode 100644 index 4045029..0000000 Binary files a/doc/desktop_search.png and /dev/null differ diff --git a/doc/document-save.png b/doc/document-save.png index a8f2418..e7d0389 100644 Binary files a/doc/document-save.png and b/doc/document-save.png differ diff --git a/doc/edit-redo.png b/doc/edit-redo.png index eb2a622..bc9b988 100644 Binary files a/doc/edit-redo.png and b/doc/edit-redo.png differ diff --git a/doc/edit-undo.png b/doc/edit-undo.png index c16a9ca..254bc3f 100644 Binary files a/doc/edit-undo.png and b/doc/edit-undo.png differ diff --git a/doc/favor.png b/doc/favor.png index f56db2e..8c426e6 100644 Binary files a/doc/favor.png and b/doc/favor.png differ diff --git a/doc/firstruncollection2.png b/doc/firstruncollection2.png index ba05d47..5db7d3c 100644 Binary files a/doc/firstruncollection2.png and b/doc/firstruncollection2.png differ diff --git a/doc/folder-amarok.png b/doc/folder-amarok.png index 23cb6e3..f612555 100644 Binary files a/doc/folder-amarok.png and b/doc/folder-amarok.png differ diff --git a/doc/generatedlist.png b/doc/generatedlist.png index 70d9b95..90b9c90 100644 Binary files a/doc/generatedlist.png and b/doc/generatedlist.png differ diff --git a/doc/generatingtree.png b/doc/generatingtree.png index c4c97ca..bad969c 100644 Binary files a/doc/generatingtree.png and b/doc/generatingtree.png differ diff --git a/doc/hi48-action-amarok_lyrics.png b/doc/hi48-action-amarok_lyrics.png new file mode 100644 index 0000000..d68c715 Binary files /dev/null and b/doc/hi48-action-amarok_lyrics.png differ diff --git a/doc/hi48-action-clear-playlist-amarok.png b/doc/hi48-action-clear-playlist-amarok.png index 40bb5ec..928e8eb 100644 Binary files a/doc/hi48-action-clear-playlist-amarok.png and b/doc/hi48-action-clear-playlist-amarok.png differ diff --git a/doc/hi48-action-current-track-amarok.png b/doc/hi48-action-current-track-amarok.png new file mode 100644 index 0000000..8e301e4 Binary files /dev/null and b/doc/hi48-action-current-track-amarok.png differ diff --git a/doc/hi48-action-edit-playlist-queue.png b/doc/hi48-action-edit-playlist-queue.png index 764d7f2..14fd180 100644 Binary files a/doc/hi48-action-edit-playlist-queue.png and b/doc/hi48-action-edit-playlist-queue.png differ diff --git a/doc/hi48-action-filename-album-amarok.png b/doc/hi48-action-filename-album-amarok.png new file mode 100644 index 0000000..cabbf35 Binary files /dev/null and b/doc/hi48-action-filename-album-amarok.png differ diff --git a/doc/hi48-action-filename-genre-amarok.png b/doc/hi48-action-filename-genre-amarok.png new file mode 100644 index 0000000..04bbcf5 Binary files /dev/null and b/doc/hi48-action-filename-genre-amarok.png differ diff --git a/doc/hi48-action-info-amarok.png b/doc/hi48-action-info-amarok.png new file mode 100644 index 0000000..94c2460 Binary files /dev/null and b/doc/hi48-action-info-amarok.png differ diff --git a/doc/hi48-action-label-amarok.png b/doc/hi48-action-label-amarok.png new file mode 100644 index 0000000..862b41a Binary files /dev/null and b/doc/hi48-action-label-amarok.png differ diff --git a/doc/hi48-action-media-standard-track-progression-amarok.png b/doc/hi48-action-media-standard-track-progression-amarok.png index c147b69..ee1c021 100644 Binary files a/doc/hi48-action-media-standard-track-progression-amarok.png and b/doc/hi48-action-media-standard-track-progression-amarok.png differ diff --git a/doc/hi48-action-music-amarok.png b/doc/hi48-action-music-amarok.png index 3478d1a..6476f46 100644 Binary files a/doc/hi48-action-music-amarok.png and b/doc/hi48-action-music-amarok.png differ diff --git a/doc/hi48-action-podcast-amarok.png b/doc/hi48-action-podcast-amarok.png index 657233a..a1fac5a 100644 Binary files a/doc/hi48-action-podcast-amarok.png and b/doc/hi48-action-podcast-amarok.png differ diff --git a/doc/hi48-action-similarartists-amarok.png b/doc/hi48-action-similarartists-amarok.png new file mode 100644 index 0000000..082bf31 Binary files /dev/null and b/doc/hi48-action-similarartists-amarok.png differ diff --git a/doc/hi48-action-upcomingevents-amarok.png b/doc/hi48-action-upcomingevents-amarok.png new file mode 100644 index 0000000..5d20add Binary files /dev/null and b/doc/hi48-action-upcomingevents-amarok.png differ diff --git a/doc/hi48-action-view-media-analyzer-amarok.png b/doc/hi48-action-view-media-analyzer-amarok.png new file mode 100644 index 0000000..8010769 Binary files /dev/null and b/doc/hi48-action-view-media-analyzer-amarok.png differ diff --git a/doc/hi48-image-x-generic.png b/doc/hi48-image-x-generic.png new file mode 100644 index 0000000..c538b1c Binary files /dev/null and b/doc/hi48-image-x-generic.png differ diff --git a/doc/index.docbook b/doc/index.docbook index d73f945..2f60f4d 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -16,8 +16,8 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> <legalnotice>&FDLNotice;</legalnotice> -<date>2013-04-24</date> - <releaseinfo>2.7.0</releaseinfo> +<date>2013-08-13</date> + <releaseinfo>2.8.0</releaseinfo> <abstract> <para>&amarok; is a free, versatile and powerful music player for &Linux;. The latest 2.x release series, often referred to as <quote>Amarok 2</quote>, is cross-platform (can be used on many platforms, including &Linux;, &MacOS; and &Microsoft; &Windows;) and implements a completely reworked code base that will enable it to incorporate exciting new features as the release matures. The current stable release is version 2.4.</para> </abstract> @@ -33,7 +33,7 @@ <keyword>sound</keyword> </keywordset> </bookinfo> -<!--userbase <timestamp>2013-04-24T10:00:01Z</timestamp>--> +<!--userbase <timestamp>2013-07-30T12:51:14Z</timestamp>--> <!--userbase-content--> <chapter id="amarok--rediscover-your-music"><title>Amarok: Rediscover your music!</title> @@ -48,7 +48,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-6.png" format="PNG"/> + <imagedata fileref="amarok_2-8_default.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -59,7 +59,7 @@ </row> <row> <entry> - <para>Amarok 2.7, playing Free Music from Jamendo</para></entry> + <para>Amarok 2.8 default layout</para></entry> </row> </tbody> </tgroup> @@ -174,7 +174,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4-1configuredialogcollection.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialoglocalcollection.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -200,7 +200,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokrightmenu.png" format="PNG"/> + <imagedata fileref="amarok_2-8_systray_window.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -215,7 +215,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amaroksystray.png" format="PNG"/> + <imagedata fileref="amarok_systray_2-8_4-11.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -241,10 +241,10 @@ <imagedata fileref="amaroknew2-4.png" format="PNG"/> </imageobject> <textobject> - <phrase>Amarok 2.5, newly installed</phrase> + <phrase>Amarok 2.8, newly installed</phrase> </textobject> <caption> - <para>Amarok 2.5, newly installed</para> + <para>Amarok 2.8, newly installed</para> </caption> </mediaobject> </screenshot> @@ -282,13 +282,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialoglocalcollection2-7.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialoglocalcollection.png" format="PNG"/> </imageobject> <textobject> - <phrase>Configure Collection Dialog, as of version 2.7</phrase> + <phrase>Configure Collection Dialog, as of version 2.8</phrase> </textobject> <caption> - <para>Configure Collection Dialog, as of version 2.7</para> + <para>Configure Collection Dialog, as of version 2.8</para> </caption> </mediaobject> </screenshot> @@ -579,13 +579,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4collectionsortingmenu.png" format="PNG"/> + <imagedata fileref="amarok_2-8_collectionsortingmenu.png" format="PNG"/> </imageobject> <textobject> - <phrase>The Collection sort options</phrase> + <phrase>The Collection sort options for version 2.8</phrase> </textobject> <caption> - <para>The Collection sort options</para> + <para>The Collection sort options for version 2.8</para> </caption> </mediaobject> </screenshot> @@ -613,25 +613,29 @@ </para> </sect2> <sect2 id="adding-music-to-a-playlist"><title>Adding music to a playlist</title> -<para>There are four ways to add music to the playlist. +<para>There are five ways to add music to the playlist. </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7addtoplaylist.png" format="PNG"/> + <imagedata fileref="amarok_2-8_popupdropperadd.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Pop-up Dropper when adding a single track</phrase> </textobject> + <caption> + <para>Pop-up Dropper when adding a single track</para> + </caption> </mediaobject> </screenshot> </para> <orderedlist> <listitem><para>Choose some of your music in the content browser and drag it to the right. If you drag it over the <guilabel>Context</guilabel> pane you will see the <emphasis>Pop-Up Dropper</emphasis>, also known as <emphasis>PUD</emphasis>. The image above shows PUD in action. PUD provides three options: <guilabel>Add to Playlist</guilabel>, <guilabel>Replace Playlist</guilabel>, and <guilabel>More...</guilabel>. The option highlighted in the gray area (<guilabel>Add to Playlist</guilabel> in this image) is the active one. Dropping the album there adds it to the playlist in the <guilabel>Playlist</guilabel> pane. Choose one of the other options to do something else with your selection. Dragging it over <guilabel>More...</guilabel> brings up a new menu of choices in <emphasis>PUD</emphasis>.</para></listitem> <listitem><para>Drag your selection all the way onto the <guilabel>Playlist</guilabel> pane on the right-hand side of the &amarok; screen.</para></listitem> -<listitem><para><keycap>Double-click</keycap> the album/track you wish to transfer to the playlist.</para></listitem> +<listitem><para><keycap>Double-click</keycap> the album/track to append to the playlist, doesn't start to play.</para></listitem> +<listitem><para><keycap>Middle-click</keycap> the album/track to append it to the playlist and play immediately.</para></listitem> <listitem><para><keycap>Right-click</keycap> the album or track. In your right-click menu, you will find similar choices. The image below shows the context menu that appears after an item has been right-clicked. Select <guilabel>Add to Playlist</guilabel>.</para></listitem> </orderedlist> <para> @@ -687,11 +691,14 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7removefromplaylist.png" format="PNG"/> + <imagedata fileref="amarok_2-8_popupdropperremove.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Pop-up Dropper when removing a track</phrase> </textobject> + <caption> + <para>Pop-up Dropper when removing a track</para> + </caption> </mediaobject> </screenshot> </para> @@ -868,13 +875,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7saveplaylistchoices.png" format="PNG"/> + <imagedata fileref="amarok_2-8_savecurrentplaylistoptions.png" format="PNG"/> </imageobject> <textobject> - <phrase>Click and hold, scroll to save playlist</phrase> + <phrase>Current playlist saving options</phrase> </textobject> <caption> - <para>Click and hold, scroll to save playlist</para> + <para>Current playlist saving options</para> </caption> </mediaobject> </screenshot> @@ -900,24 +907,27 @@ <para>The power of &amarok; is in the <emphasis>Context</emphasis> pane (in the center of the default &amarok; window), where you can install various <emphasis>applets</emphasis> to help you enjoy and explore your music. Most of this additional information is obtained from the Internet, so a connection is important to get the most out of your <emphasis>Context</emphasis> pane. By default, three <emphasis>applets</emphasis> are preset: <emphasis>Current Track</emphasis>, <emphasis>Lyrics</emphasis> and <emphasis>Wikipedia</emphasis>. </para> <sect2 id="default-layout"><title>Default layout</title> -<para>The default <emphasis>Context</emphasis> pane searches for the lyrics of the song you are playing. If it finds the lyrics, it displays this in the bottom half of the <emphasis>Context</emphasis> pane, while the top banner of the <emphasis>Context</emphasis> pane displays the album cover and track information for the current music. +<para>The default <emphasis>Context</emphasis> pane shows the following items: CurrentTrack, Analyzer, Wikipedia and Lyrics. Depending on the screen size the Lyrics might not be visible, but clicking on the button at the bottom will make it visible. When nothing is playing, the CurrentTrack applet will show the last played tracks and information about the Local Collection </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok-context.png" format="PNG"/> + <imagedata fileref="amarok_2-8_contextview_default.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>The default view as of Amarok 2.8</phrase> </textobject> + <caption> + <para>The default view as of Amarok 2.8</para> + </caption> </mediaobject> </screenshot> </para> </sect2> <sect2 id="customizing-the-context-pane"><title>Customizing the Context pane</title> -<para>At the bottom of the <emphasis>Context</emphasis> pane are three buttons for the default applets. On the right of these buttons you see <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject>, clicking on it will show <inlinemediaobject> <imageobject> <imagedata fileref="Icon-application-exit.png" format="PNG"/> </imageobject> </inlinemediaobject> allowing you to remove these applets. Click the applets to add them to the pane. Drag the labeled buttons to re-order the applets you have, and click <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject> again to save your selections. +<para>At the bottom of the <emphasis>Context</emphasis> pane are four buttons for the default applets. On the right of these buttons you see <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject>, clicking on it will show <inlinemediaobject> <imageobject> <imagedata fileref="Icon-application-exit.png" format="PNG"/> </imageobject> </inlinemediaobject> allowing you to remove these applets. Click the applets to add them to the pane. Drag the labeled buttons to re-order the applets you have, and click <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject> again to save your selections. </para> <para>This makes the <emphasis>Context</emphasis> pane extremely flexible, maximizing the possibility of a custom display that fits your preferences. More <link linkend="the-context-pane">here</link>. </para> @@ -926,7 +936,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="applet_explorer.png" format="PNG"/> + <imagedata fileref="amarok_2-8_appletexplorer_default.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1003,18 +1013,21 @@ </sect1> </chapter> <chapter id="the-amarok-window0"><title>The Amarok Window</title> -<para>When you first open &amarok;, this is what you will see, once the splash screen disappears and &amarok; has fully loaded: +<para>When you open &amarok;, this is what you will see, once &amarok; has fully loaded: </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7aftersplash.png" format="PNG"/> + <imagedata fileref="amarok_2-8_startwindowdefault.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Default startup window</phrase> </textobject> + <caption> + <para>Default startup window</para> + </caption> </mediaobject> </screenshot> </para> @@ -1068,7 +1081,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7themediasources.png" format="PNG"/> + <imagedata fileref="amarok_2-8_mediasourcespanedefault.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1086,7 +1099,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokwindow_context.png" format="PNG"/> + <imagedata fileref="amarok_2-8_contextview_default.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1104,7 +1117,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7theplaylist.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistpane.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1127,7 +1140,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4-1viewmenu.png" format="PNG"/> + <imagedata fileref="amarok2-6viewconfigmenu.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1302,7 +1315,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4-1non-mergedviewcollection.png" format="PNG"/> + <imagedata fileref="amarok_2-8_collectionbrowser_nonmerged.png" format="PNG"/> </imageobject> <textobject> <phrase>Regular non-merged view</phrase> @@ -1319,7 +1332,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4-1mergedviewcollection.png" format="PNG"/> + <imagedata fileref="amarok_2-8_collectionbrowser_merged.png" format="PNG"/> </imageobject> <textobject> <phrase>Merged view</phrase> @@ -1341,7 +1354,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="media_sources3.png" format="PNG"/> + <imagedata fileref="amarok_2-8_collectionsortingmenu.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1676,13 +1689,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="contextpanestopped.png" format="PNG"/> + <imagedata fileref="amarok_2-8_contextview_default.png" format="PNG"/> </imageobject> <textobject> - <phrase>Context pane with Current Track, Lyrics and Tabs applets</phrase> + <phrase>Context pane when not playing</phrase> </textobject> <caption> - <para>Context pane with Current Track, Lyrics and Tabs applets</para> + <para>Context pane when not playing</para> </caption> </mediaobject> </screenshot> @@ -1699,7 +1712,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-6appletbrowser.png" format="PNG"/> + <imagedata fileref="amarok_2-8_appletexplorer_default.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1712,33 +1725,20 @@ </sect3> </sect2> <sect2 id="applets"><title>Applets</title> -<para> -<screenshot> -<screeninfo></screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="contextpane.png" format="PNG"/> - </imageobject> - <textobject> - <phrase>Context pane in action showing lyrics and song information</phrase> - </textobject> - <caption> - <para>Context pane in action showing lyrics and song information</para> - </caption> - </mediaobject> -</screenshot> -</para> <para>There are several applets available to dock in your <emphasis>Context</emphasis> pane; below is a description of each. </para> <para> <informaltable> - <tgroup cols="2"> + <tgroup cols="3"> <tbody> <row> <entry> <para><guilabel>Applet</guilabel></para> </entry> <entry> + <para><guilabel>Icon</guilabel></para> + </entry> + <entry> <para><guilabel>Description</guilabel></para> </entry> </row> @@ -1747,7 +1747,21 @@ <para><guilabel>Current Track</guilabel></para> </entry> <entry> - <para>Information about the current track. You may rate it by clicking on the stars, add a position marker, or edit track metadata.</para> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-current-track-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> + <para>Information about the current track. You may rate it by clicking on the stars, add a position marker, or edit track metadata. When not playing, the applet displays collection information and <emphasis>Recently Played Tracks</emphasis>, which allows you to view the tracks and add them to the playlist.</para> </entry> </row> <row> @@ -1755,6 +1769,20 @@ <para><guilabel>Similar Artists</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-similarartists-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>Fetches artists similar to the currently playing one, with a short description and options to find them in your collection, or on <emphasis>Last.fm</emphasis>, and add to your current playlist.</para> </entry> </row> @@ -1763,6 +1791,20 @@ <para><guilabel>Upcoming Events</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-upcomingevents-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>Displays upcoming events that involve the current artist or group. You can set a venue locale to be watched by entering the applet settings and narrowing it down under the Favorites section.</para> </entry> </row> @@ -1771,6 +1813,9 @@ <para><guilabel>Wikipedia</guilabel></para> </entry> <entry> + <para></para> + </entry> + <entry> <para><emphasis>Wikipedia</emphasis> page for the track or artist. Also browse other <emphasis>Wikipedia</emphasis> links, and use the back button to go back to the starting page.</para> </entry> </row> @@ -1779,6 +1824,20 @@ <para><guilabel>Labels</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-label-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>View, add and edit Labels for the current song. To add a Label just type it in the text box and press &Enter;. Suggested Labels are user-contributed tags from <emphasis>Last.fm</emphasis>.</para> </entry> </row> @@ -1787,6 +1846,20 @@ <para><guilabel>Tabs</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-filename-genre-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>Fetches and displays guitar and bass tabs (if available). Not editable.</para> </entry> </row> @@ -1795,6 +1868,20 @@ <para><guilabel>Lyrics</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-amarok_lyrics.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>Displays the lyrics of the song that is currently playing. Add or change lyrics scripts in the <link linkend="scripts">Script Manager</link>.</para> </entry> </row> @@ -1803,6 +1890,20 @@ <para><guilabel>Albums</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-filename-album-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>View albums from the current artist or band that are available in your local Collection.</para> </entry> </row> @@ -1811,7 +1912,43 @@ <para><guilabel>Photos</guilabel></para> </entry> <entry> - <para>This applet queries <emphasis>Flickr.com</emphasis> for pictures of the band you're listening to. Open the settings to add more keywords to your query (⪚: live in tokyo).</para> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-image-x-generic.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> + <para>This applet queries <emphasis>Flickr.com</emphasis> for pictures of the band you're listening to. Open the settings to add more keywords to your query (⪚: live in tokyo).></para> + </entry> + </row> + <row> + <entry> + <para><guilabel>Analyzer</guilabel></para> + </entry> + <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-view-media-analyzer-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> + <para>This is a new applet in version 2.8. It provides basic audio visualizations. A right click on it allows to configure the applet settings.</para> </entry> </row> <row> @@ -1819,6 +1956,20 @@ <para><guilabel>Info</guilabel></para> </entry> <entry> + <para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="hi48-action-info-amarok.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot></para> + </entry> + <entry> <para>Information about the current media source. Allows you to navigate through internet services such as <emphasis>Librivox.org</emphasis>.</para></entry> </row> </tbody> @@ -1835,7 +1986,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7theplaylist.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistpane.png" format="PNG"/> </imageobject> <textobject> <phrase>&amarok; Playlist pane</phrase> @@ -1852,13 +2003,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok_playlist_manipulation.png" format="PNG"/> + <imagedata fileref="amarok2dot8pud.png" format="PNG"/> </imageobject> <textobject> - <phrase>Playlist context menu</phrase> + <phrase>Playlist Pop Up Dropper menu</phrase> </textobject> <caption> - <para>Playlist context menu</para> + <para>Playlist Pop Up Dropper menu</para> </caption> </mediaobject> </screenshot> @@ -1871,7 +2022,9 @@ </para> <para>Right-clicking on a track, album, or selected group will bring up a context menu from which you can <guilabel>Add to Playlist</guilabel>, or <guilabel>Replace Playlist</guilabel>. </para> -<para>Double-clicking a selection in the <emphasis>Media Sources</emphasis> pane will perform the same as <guilabel>Add to Playlist</guilabel>. +<para>Double-clicking a selection or pressing &Enter; while a track is selected in the <emphasis>Media Sources</emphasis> pane will perform the same as <guilabel>Add to Playlist</guilabel>. +</para> +<para>Middle-clicking an item will append it to the playlist and begin playing from the start of the playlist. </para> <para>If you tell the file browser to open a supported multimedia file, &amarok; will append the selected file to the current playlist. Some multimedia files contain playlists themselves or may have playlist files associated by name (⪚ <emphasis>wav</emphasis> with <emphasis>cue</emphasis>). If &amarok; detects such an association, it may add several items to the playlist. </para> @@ -1949,7 +2102,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="playlistsearch.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistfilteroptions.png" format="PNG"/> </imageobject> <textobject> <phrase>Playlist searching options</phrase> @@ -2010,7 +2163,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="sorting2.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistsortinglevels.png" format="PNG"/> </imageobject> <textobject> <phrase>Menu for adding a sorting level</phrase> @@ -2061,7 +2214,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="albumbar.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistbottombar.png" format="PNG"/> </imageobject> <textobject> <phrase>Playlist bottom bar</phrase> @@ -2297,16 +2450,19 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialoggeneral2-7.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialoggeneral.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>General configuration options</phrase> </textobject> + <caption> + <para>General configuration options</para> + </caption> </mediaobject> </screenshot> </para> <sect1 id="general"><title>General</title> -<para>In the screenshot above, see some <emphasis>General Options</emphasis> you can set. Depending on the distribution, the default settings can vary; sometimes the <emphasis>Splash Screen</emphasis> is disabled for example. When hovering over the options with the mouse pointer, a tooltip will show to explain the individual settings. +<para>In the screenshot above, see some <emphasis>General Options</emphasis> you can set. Depending on the distribution, the default settings can vary. When hovering over the options with the mouse pointer, a tooltip will show to explain the individual settings. </para> <para>General options: </para> @@ -2322,14 +2478,6 @@ <tbody> <row> <entry> - <para><guilabel>Show splash-screen on startup</guilabel></para> - </entry> - <entry> - <para>Check to enable the splash screen on &amarok; startup.</para> - </entry> - </row> - <row> - <entry> <para><guilabel>Show tray icon</guilabel></para> </entry> <entry> @@ -2388,11 +2536,14 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialoglocalcollection2-7.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialoglocalcollection.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Local Collection configuration</phrase> </textobject> + <caption> + <para>Local Collection configuration</para> + </caption> </mediaobject> </screenshot> </para> @@ -2585,11 +2736,14 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialog2-7playback.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogplayback.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Playback configuration dialog</phrase> </textobject> + <caption> + <para>Playback configuration dialog</para> + </caption> </mediaobject> </screenshot> </para> @@ -2615,6 +2769,14 @@ </row> <row> <entry> + <para><guilabel>Fadeout on pause</guilabel></para> + </entry> + <entry> + <para>If checked, &amarok; will slowly fade the volume of the playing track on pausing the current track.</para> + </entry> + </row> + <row> + <entry> <para><guilabel>Fadeout duration</guilabel></para> </entry> <entry> @@ -2623,6 +2785,22 @@ </row> <row> <entry> + <para><guilabel>Inhibit automatic suspend if playing</guilabel></para> + </entry> + <entry> + <para>If checked, &amarok; will prevent the computer from being suspended will a track is playing.</para> + </entry> + </row> + <row> + <entry> + <para><guilabel>Pause playback on suspend</guilabel></para> + </entry> + <entry> + <para>If checked, &amarok; will pause playing of the current track when the computer is about to suspend.</para> + </entry> + </row> + <row> + <entry> <para><guilabel>Resume playback on start</guilabel></para> </entry> <entry> @@ -2702,11 +2880,14 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialog2-7notifications.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialognotifications.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Notifications configuration dialog</phrase> </textobject> + <caption> + <para>Notifications configuration dialog</para> + </caption> </mediaobject> </screenshot> </para> @@ -2802,11 +2983,14 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarokconfigurationdialog2-7database.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogdatabase.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>External Database configuration dialog</phrase> </textobject> + <caption> + <para>External Database configuration dialog</para> + </caption> </mediaobject> </screenshot> </para> @@ -2886,13 +3070,13 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-7settingsplugins.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogplugins.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>Plugins configuration dialog</phrase> </textobject> <caption> - <para></para> + <para>Plugins configuration dialog</para> </caption> </mediaobject> </screenshot> @@ -3249,7 +3433,7 @@ </mediaobject> </screenshot> </para> -<para>The visibility of each of the three &amarok; panes is indicated in the <guilabel>View</guilabel> menu (part of the top-level menu, see above). If you unlock the layout, each of the three panes will show two clickable boxes. These two boxes allow you to rearrange or customize the layout of your &amarok; window. Clicking the <guilabel>X</guilabel> closes that particular pane. Having been closed, a pane can be activated again by checking the appropriate box in the <guilabel>View menu</guilabel>. +<para>The visibility of each of the three &amarok; panes is indicated in the <guilabel>View</guilabel> menu (part of the top-level menu). If you unlock the layout, each of the three panes will show two clickable boxes. These two boxes allow you to rearrange or customize the layout of your &amarok; window. Clicking the <guilabel>X</guilabel> closes that particular pane. Having been closed, a pane can be activated again by checking the appropriate box in the <guilabel>View menu</guilabel>. Clicking <guilabel>Reset Layout</guilabel> will of course reset the layout back to the default look. </para> <sect3 id="undocking-amarok-panes"><title>Undocking Amarok panes</title> <para> @@ -3334,7 +3518,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="playlist-layout-editor-amarok.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistlayouteditor.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -3555,7 +3739,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="searchincollection.png" format="PNG"/> + <imagedata fileref="amarok_2-8_collectionbrowsersearchfield.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -3566,6 +3750,8 @@ <sect3 id="edit-box"><title>Edit Box</title> <para>When you type in the input field, &amarok; will search for the text in all available tags such as artist, album and title. Your view of the collection will update automatically to display only the matches of the search. </para> +<para>Pressing &Enter; after searching will populate your playlist with all of the found search items and clear the search box. This is a great way to quickly add hundreds or thousands of tracks to a playlist instantly! +</para> <para>To search in a specific tag, type <varname>tag:value</varname> into the search bar. Operators like <quote>></quote> and <quote><</quote> can be used to create more general conditions. Several conditions can be used together by separating them by a space character. For time conditions, use the following abbreviations: d=day, w=week, m=month, y=year. </para> </sect3> @@ -3685,7 +3871,9 @@ <sect2 id="organize-collection"><title>Organize Collection</title> <para>While organizing your collection in &amarok; is a straight-forward task, you will be manipulating the actual files on your hard drive. Please be sure you have a backup of your files before you begin. </para> -<para>With the <guilabel>Organize Files</guilabel> dialog of &amarok;, you can easily manage the media files on your hard drive. When you change the naming scheme of media files, you will organize them, which is very powerful. To access the <guilabel>Organize Files</guilabel> dialog, right-click <menuchoice><guimenu>Local Collection</guimenu><guimenuitem>Organize Files</guimenuitem></menuchoice> in the <guilabel>Media Sources</guilabel> pane and the menu interface will pop-up. +<para>With the <guilabel>Organize Files</guilabel> dialog of &amarok; you can easily manage the media files on your hard drive. When you change the naming scheme of media files, you will organize them, which is very powerful. To access the <guilabel>Organize Files</guilabel> dialog, right-click <menuchoice><guimenu>Local Collection</guimenu><guimenuitem>Organize Files</guimenuitem></menuchoice> in the <guilabel>Media Sources</guilabel> pane and the menu interface will pop-up. +</para> +<para><warning><para>Using this option will move the files to a new location, so you not only need appropriate rights for both the origin and the destination location, but also enough space, usually the double of the total file size to have the action perform smoothly. If you are unsure, do NOT use this option.</para></warning> </para> <para> <screenshot> @@ -3703,21 +3891,44 @@ </mediaobject> </screenshot> </para> -<para>If the option of <guilabel>Organize Files</guilabel> does not appear, you may have Merged View on (toggled by <inlinemediaobject> <imageobject> <imagedata fileref="Icon-view-list-tree.png" format="PNG"/> </imageobject> </inlinemediaobject>). In order to safely organize your files, you need to see your collections separated, not merged. +<para>If the option <guilabel>Organize Files</guilabel> does not appear, you may have Merged View on (toggled by <inlinemediaobject> <imageobject> <imagedata fileref="Icon-view-list-tree.png" format="PNG"/> </imageobject> </inlinemediaobject>). In order to safely organize your files, you need to see your collections separated, not merged. </para> <sect3 id="organizing-files-interface"><title>Organizing Files Interface</title> -<para>Organize using the following interface: +<para>After selecting the option <guilabel>Organize Files</guilabel> you will first see an additional option that allows you to move the files to a new location, as well as transcode them at the same time. Depending on the codecs you have installed on the system, some format options might not be available and will be grayed out: </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4organizefilesbasicdialog.png" format="PNG"/> + <imagedata fileref="amarok_2-8_organizefilestranscode.png" format="PNG"/> </imageobject> <textobject> - <phrase></phrase> + <phrase>First screen when choosing the Organize Files option</phrase> </textobject> + <caption> + <para>First screen when choosing the Organize Files option</para> + </caption> + </mediaobject> +</screenshot> +</para> +<para>For more information about Transcoding, please see the <link linkend="transcoding">Transcoding</link> section. +</para> +<para>After clicking on the <guilabel>Move</guilabel> button on top of the screen, the following interface will show: +</para> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="amarok_2-8_organizetracks.png" format="PNG"/> + </imageobject> + <textobject> + <phrase>Organize Tracks dialog</phrase> + </textobject> + <caption> + <para>Organize Tracks dialog</para> + </caption> </mediaobject> </screenshot> </para> @@ -3818,19 +4029,6 @@ </para> </sect3> <sect3 id="advanced-contents"><title>Advanced Contents</title> -<para> -<screenshot> -<screeninfo></screeninfo> - <mediaobject> - <imageobject> - <imagedata fileref="advancedtok.png" format="PNG"/> - </imageobject> - <textobject> - <phrase></phrase> - </textobject> - </mediaobject> -</screenshot> -</para> <para>The code version of the <guilabel>Token Bar</guilabel>, which allows you to code the name format of media files. Activate it by pressing <guilabel>Advanced...</guilabel> in the interface menu. To change back click <guilabel>Basic...</guilabel>. </para> <para>Enclose conditional inclusion arguments such as CD number in braces, like this: @@ -3984,12 +4182,14 @@ </para> </sect4> <sect4 id="choosing-directories-to-index"><title>Choosing Directories to Index</title> +<para>Directories that are to be indexed can be changed in <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Desktop Search</guisubmenu><guimenuitem>Indexing</guimenuitem><guimenuitem>Customizing folders</guimenuitem></menuchoice>. As of KDE 4.11, this is the dialog you will see: +</para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="desktop_search.png" format="PNG"/> + <imagedata fileref="amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -3997,8 +4197,6 @@ </mediaobject> </screenshot> </para> -<para>Directories that are to be indexed can be changed in <menuchoice><guimenu>System Settings</guimenu><guisubmenu>Desktop Search</guisubmenu><guimenuitem>Desktop Query</guimenuitem><guimenuitem>Customizing index folders</guimenuitem></menuchoice> -</para> </sect4> <sect4 id="enabling-nepomuk-collection-in-amarok"><title>Enabling Nepomuk Collection In Amarok</title> <para> @@ -4006,7 +4204,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amaroknepomukpluginconfig2-7.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogplugins.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4064,24 +4262,21 @@ </para> </sect3> <sect3 id="ampache-client"><title>Ampache Client</title> -<para>Activate the <guilabel>Ampache</guilabel> service using <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>Plugins</guimenuitem></menuchoice>. -</para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-6pluginsconfigmenu.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogplugins.png" format="PNG"/> </imageobject> <textobject> - <phrase>Click on the wrench icon to open the configuration dialog</phrase> + <phrase></phrase> </textobject> - <caption> - <para>Click on the wrench icon to open the configuration dialog</para> - </caption> </mediaobject> </screenshot> </para> +<para>Activate the <guilabel>Ampache</guilabel> service using <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>Plugins</guimenuitem></menuchoice>. Click on the <inlinemediaobject> <imageobject> <imagedata fileref="Icon-configure.png" format="PNG"/> </imageobject> </inlinemediaobject> icon to open the configuration dialog. +</para> <para>Select <guilabel>Add Server</guilabel>: </para> <para> @@ -4173,7 +4368,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="remotecollections_samba_server.png" format="PNG"/> + <imagedata fileref="amarok_2-8_remotecollections_samba_server.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4181,14 +4376,14 @@ </mediaobject> </screenshot> </para> -<para>Click <guilabel>Configure File Sharing...</guilabel> to open the configuration dialog. +<para>To share the folder, just check the <guilabel>Share with Samba (Microsoft Windows)</guilabel> field and set the share name under the <guilabel>Name</guilabel> field. Check the <guilabel>Allow Guests</guilabel> checkbox to allow anonymous users access to the folder. </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="remotecollections_samba_server1.png" format="PNG"/> + <imagedata fileref="amarok_2-8_remotecollections_samba_server1.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4196,14 +4391,20 @@ </mediaobject> </screenshot> </para> -<para>Change the settings to <guilabel>Advanced Sharing</guilabel> and the <guilabel>Allowed Users</guilabel> to <guilabel>Allow all users to share folders</guilabel>. +<para>The folder should now be accessible to the network. Please see the <link linkend="client">Client section</link> for details on how to use it in &amarok;. +</para> +</sect3> +<sect3 id="universal-plug-and-play-upnp---dlna"><title>Universal Plug and Play (UPnP) / DLNA</title> +<para><emphasis>UPnP</emphasis> is a set of protocols to share media on the network. It is also supported by a wide range of residential gateways and Network Attached Storage devices. UPnP support is now commonly marketed as <ulink url="http://en.wikipedia.org/wiki/DLNA";>DLNA</ulink>. +</para> +<para>&amarok; has a built-in UPnP media share client so it can play tracks shared on the network. To enable it, use <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>Plugins</guimenuitem><guimenuitem>Collections</guimenuitem></menuchoice> and check the box by the <guilabel>UPnP Collection</guilabel> plugin. </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="remotecollections_samba_server2.png" format="PNG"/> + <imagedata fileref="amarok_2-8_upnp_collection_plugin.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4211,14 +4412,14 @@ </mediaobject> </screenshot> </para> -<para>Then you can add the folder to the shares. Click at <guilabel>Add...</guilabel> and share the desired folder with <guilabel>Samba</guilabel>. +<para>When a media share is discovered it will be shown in <guilabel>Local Music</guilabel>. </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="remotecollections_samba_server3.png" format="PNG"/> + <imagedata fileref="amarok_2-8_upnp_collection.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4226,14 +4427,6 @@ </mediaobject> </screenshot> </para> -<para>The folder should now be accessible to the network. To tell &amarok; to look for your <guilabel>Samba</guilabel> share, go to <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>Plugins</guimenuitem><guimenuitem>Local Collection Backends</guimenuitem></menuchoice> and click the box. Your tracks will show up in <guilabel>Local Collection</guilabel>. -</para> -</sect3> -<sect3 id="universal-plug-and-play-upnp---dlna"><title>Universal Plug and Play (UPnP) / DLNA</title> -<para><emphasis>UPnP</emphasis> is a set of protocols to share media on the network. It is also supported by a wide range of residential gateways and Network Attached Storage devices. UPnP support is now commonly marketed as <ulink url="http://en.wikipedia.org/wiki/DLNA";>DLNA</ulink>. -</para> -<para>&amarok; has a built-in UPnP media share client so it can play tracks shared on the network. To enable it, use <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>Plugins</guimenuitem><guimenuitem>Collections</guimenuitem></menuchoice> and check the box. When a media share is discovered it will be shown in <guilabel>Local Music</guilabel>. -</para> <para>The UPnP feature depends on <guilabel>KDE's</guilabel> UPnP media server support. </para> </sect3> @@ -4296,7 +4489,7 @@ <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="remotecollections_client.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogdatabaseenabled.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4510,6 +4703,15 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </informaltable> </para> </sect3> +<sect3 id="troubleshooting-media-device-support"><title>Troubleshooting Media Device support</title> +<para>As of Amarok 2.8, the following devices should work with Amarok: +</para> +<itemizedlist> +<listitem><para>Generic Media Players connected through the UMS protocol.</para></listitem> +<listitem><para>iPods/iPhones, depending on their support by the libgpod library. The status depends on the version of this library installed on your system, please refer to <ulink url="http://www.gtkpod.org/wiki/Home";>the libgpod support listing</ulink> on their homepage.</para></listitem> +<listitem><para>limited support for devices using the MTP protocol, the support for new Android devices is currently implemented for the next Amarok version.</para></listitem> +</itemizedlist> +</sect3> </sect2> </sect1> <sect1 id="cover-manager"><title>Cover Manager</title> @@ -4745,7 +4947,7 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </sect3> </sect2> <sect2 id="get-tags-from-musicbrainz"><title>Get Tags from MusicBrainz</title> -<para>&amarok; 2.7 has the ability to guess tags from the <guilabel>MusicBrainz</guilabel> database. Click the <guilabel>Get Tags from MusicBrainz</guilabel>, wait a moment for the database to be searched for matches, and then <guilabel>Update Tags</guilabel>, or <guilabel>Cancel</guilabel>. +<para>&amarok; 2.8 has the ability to guess tags from the <guilabel>MusicBrainz</guilabel> database. Click the <guilabel>Get Tags from MusicBrainz</guilabel>, wait a moment for the database to be searched for matches, and then <guilabel>Update Tags</guilabel>, or <guilabel>Cancel</guilabel>. </para> <para>If you have the packages <emphasis>libofa</emphasis> and <emphasis>ffmpeg</emphasis> installed, and &amarok; is compiled with them, <guilabel>Musicbrainz</guilabel> will be able to use <quote>fingerprinting</quote> (the <emphasis>MusicDNS</emphasis> service) to search for albums and tracks without good filenames or existing tags. </para> @@ -4806,13 +5008,13 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </para> </sect3> <sect3 id="example"><title>Example</title> -<para>Filename: 03-social_distortion-dont_take_me_for_granted.mp3 +<para>Filename: 01-The Beatles-Hey Jude.mp3 </para> -<para>Tracknumber: 03 +<para>Tracknumber: 01 </para> -<para>Artist: Social Distortion +<para>Artist: The Beatles </para> -<para>Title: Don't Take Me For Granted +<para>Title: Hey Jude </para> <para> <screenshot> @@ -4846,13 +5048,13 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </para> </sect3> <sect3 id="example11"><title>Example</title> -<para>Filename: 03-social_distortion-dont_take_me_for_granted.mp3 +<para>Filename: 01-The Beatles-Hey Jude.mp3 </para> -<para>Tracknumber: 03 +<para>Tracknumber: 01 </para> -<para>Artist: Social Distortion +<para>Artist: The Beatles </para> -<para>Title: Don't Take Me For Granted +<para>Title: Hey Jude </para> <para> <screenshot> @@ -4871,21 +5073,21 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </sect2> </sect1> <sect1 id="transcoding"><title>Transcoding</title> -<para><emphasis>Transcoding</emphasis> allows you to encode media files to a variety of formats while copying or moving them to a collection (<guilabel>Local Collection</guilabel>, USB <guilabel>Universal Mass Storage Collection</guilabel> and <guilabel>iPod, iPad & iPhone Collection</guilabel> support transcoding as of &amarok; 2.6). A word of warning: be careful when you use this feature, as you are working with actual files on your hard drive. Have a backup! +<para><guilabel>Transcoding</guilabel> allows you to encode media files to a variety of formats while copying or moving them to a collection (<guilabel>Local Collection</guilabel>, USB <guilabel>Universal Mass Storage Collection</guilabel> and <guilabel>iPod, iPad & iPhone Collection</guilabel> support transcoding as of &amarok; 2.8). A word of warning: be careful when you use this feature, as you are working with actual files on your hard drive. Have a backup! </para> <sect2 id="interface"><title>Interface</title> -<para>Transcoding dialog will appear whenever you copy or move tracks to one of the collections that support transcoding. You can also transcode tracks within the <emphasis>Local Collection</emphasis> by using the <guilabel>Organize files</guilabel> functionality. +<para>The <emphasis>Transcoding</emphasis> dialog will appear whenever you copy or move tracks to one of the collections that support transcoding. You can also transcode tracks within the <emphasis>Local Collection</emphasis> by using the <guilabel>Organize files</guilabel> functionality. </para> </sect2> -<sect2 id="transcode-dialog"><title>Transcode Dialog</title> -<para>If you choose to copy or move files to a supported collection, the following dialog will pop up. +<sect2 id="transcode-tracks-dialog"><title>Transcode Tracks Dialog</title> +<para>If you choose to copy or move files to a supported collection, the following dialog will pop up: </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-6transcodemenu.png" format="PNG"/> + <imagedata fileref="amarok_2-8_organizefilestranscode.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -4921,6 +5123,30 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </row> <row> <entry> + <para><guilabel>Transcode all tracks</guilabel></para> + </entry> + <entry> + <para>Transcode every selected track to the chosen codec</para> + </entry> + </row> + <row> + <entry> + <para><guilabel>Transcode only when needed for playability</guilabel></para> + </entry> + <entry> + <para>Only transcode tracks which need to be transcoded to play in the destination system</para> + </entry> + </row> + <row> + <entry> + <para><guilabel>Transcode only if source and destination formats are different</guilabel></para> + </entry> + <entry> + <para>Transcode only if source and destination file formats are different</para> + </entry> + </row> + <row> + <entry> <para><guilabel>Remember this choice for the next time</guilabel></para> </entry> <entry> @@ -5002,7 +5228,7 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-6scriptsconfigmenu.png" format="PNG"/> + <imagedata fileref="amarok_2-8_configurationdialogscripts.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -5104,7 +5330,7 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="playlistsearch.png" format="PNG"/> + <imagedata fileref="amarok_2-8_playlistfilteroptions.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -5386,7 +5612,7 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> <para>To change the name of a playlist, either use the <inlinemediaobject> <imageobject> <imagedata fileref="Icon-document-properties.png" format="PNG"/> </imageobject> </inlinemediaobject> button or right click on it and select <guilabel>Rename playlist</guilabel>. A bias can be edited with the same button or by right-clicking and selecting <guilabel>Edit bias</guilabel>, and for biases which have sub-biases, a new sub-bias can be added by right clicking and selecting <guilabel>Add new bias</guilabel>. </para> <sect3 id="biases"><title>Biases</title> -<para>An explanation of each available bias and any options it takes follows. +<para>Because multiple biases may be defined, &amarok; may at times return an empty playlist. This occurs if it is given a set of impossible-to-fulfill conditions. To avoid this and to better understand each available bias, along with any options it takes, please see below: </para> <variablelist> <varlistentry><term><emphasis role="bold">Search</emphasis></term> @@ -5669,9 +5895,9 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> <sect1 id="the-moodbar"><title>The Moodbar</title> <para>The <emphasis>Moodbar</emphasis> shows you the <quote>mood</quote> of a track, which you can then use to figure out when something interesting happens in the song. </para> -<para>In order for &amarok; to analyze your music files to create moodbars, you will need the <guilabel>Moodbar</guilabel> program (see below for <link linkend="source-downloads">downloads</link> and binary packages). +<para>In order for &amarok; to display moodbars for your music, you will need the <guilabel>Moodbar</guilabel> program (see below for <link linkend="source-downloads">downloads</link> and binary packages). </para> -<para>The <guilabel>Moodbar</guilabel> package requires <emphasis>GStreamer</emphasis> and various plugins depending on the filetypes you use (see <link linkend="supported-filetypes">Supported filetypes</link>). You will <emphasis>not</emphasis> need the phonon-backend-gstreamer package to create .mood files. +<para>The <guilabel>Moodbar</guilabel> package requires <guilabel>GStreamer</guilabel> and various plugins depending on the filetypes you use (see <link linkend="supported-filetypes">Supported filetypes</link>). You will <emphasis>not</emphasis> need the phonon-backend-gstreamer package to create .mood files. </para> <para>There are two parts to the new <guilabel>Moodbar</guilabel> implementation: the <guilabel>Moodbar</guilabel> package, which contains a program that takes a music file and generates a .mood file, and support code in the &amarok; source, which runs the binary and displays the Moodbar. The <guilabel>Moodbar</guilabel> package depends on the <emphasis>GStreamer</emphasis> libraries. Without the <guilabel>Moodbar</guilabel> package, &amarok; cannot generate the moodbars for your music. </para> @@ -5690,7 +5916,7 @@ mysql -u amarokuser -p amarok < amarok.mysql</userinput> </para> </sect2> <sect2 id="usage"><title>Usage</title> -<para>Currently .mood files must generated manually. To do this for your entire collection, use the <link linkend="moodbar-file-generation-script">Moodbar File Generation Script</link> described below. +<para>Currently .mood files <emphasis>must</emphasis> be generated manually. &amarok; cannot do it for you. To do this for your entire collection, use the <link linkend="moodbar-file-generation-script">Moodbar File Generation Script</link> described below. </para> <para>To enable the display of moodbars in &amarok;, activate it in the configuration: <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure Amarok</guisubmenu><guimenuitem>General</guimenuitem><guimenuitem>Show Moodbar in Progress Slider</guimenuitem></menuchoice>. Moodbars should now appear in the track sliders in the player window and <guilabel>Playlist</guilabel>; there will also be a mood field that you may add to your playlist layouts. </para> @@ -6128,7 +6354,7 @@ ftpProxy=http://username:password at proxyserver:port/ </sect3> </sect2> <sect2 id="amarok-on-windows"><title>Amarok on Windows</title> -<para><warning><para>This pages needs screenshots for the Amarok 2.6 version</para></warning> +<para><warning><para>This pages needs screenshots for the Amarok 2.8 version</para></warning> </para> <para>As you already know, a normal Windows install doesn't use KDE, so if you want to install &amarok;, you can't just download the &amarok; package. You must install a compatible compiler first. Here is described how to download, install and run &amarok; in the Windows operating system. </para> @@ -6218,18 +6444,10 @@ ftpProxy=http://username:password at proxyserver:port/ </sect3> </sect2> <sect2 id="amarok-on-mac-os-x"><title>Amarok on &MacOS; X</title> -<para><warning><para>Current Macports 2.1.2 only ships an outdated Amarok 2.4.3 version</para></warning> +<para><warning><para>Current Macports 2.1.3 only ships an outdated Amarok 2.6.0 version</para></warning> </para> <para>&amarok; can be installed and used on the &MacOS; X. </para> -<sect3 id="dependencies"><title>Dependencies</title> -<para>The following are the dependencies required to install &amarok; on &MacOS; X. These will be automatically installed if one is using MacPorts. -</para> -<para><screen> -automoc cmake qt4-mac dbus libmng kdebase4-runtime exiv2 hicolor-icon-theme kdelibs4 aspell texinfo xz aspell-dict-en attica phonon glib2 avahi dbus-python26 dbus-glib gtk-doc docbook-xml docbook-xml-4.1.2 docbook-xml-4.2 docbook-xml-4.3 docbook-xml-4.4 docbook-xml-4.5 docbook-xml-5.0 gnome-doc-utils intltool gnome-common p5-getopt-long p5-pathtools p5-scalar-list-utils p5-xml-parser iso-codes py27-libxml2 python27 rarian getopt py26-gobject libffi libdaemon libglade2 gtk2 atk gdk-pixbuf2 jasper pango cairo libpixman shared-mime-info xorg-libXcomposite xorg-compositeproto xorg-libXfixes xorg-fixesproto xorg-libXcursor xorg-libXdamage xorg-damageproto xorg-libXi xorg-libXinerama xorg-xineramaproto xorg-libXrandr xorg-randrproto py26-gtk py26-cairo py26-numpy atlas gcc44 gmp mpfr gzip fftw-3 py26-nose dbusmenu-qt qjson enchant hunspell flex gmake grantlee libart_lgpl liblzma openexr ilmbase gsed pcre qca shared-desktop-ontologies soprano clucene libiodbc redland raptor rasqal strigi virtuoso gawk libssh openslp oxygen-icons qimageblitz libgpod libplist swig-python python_select swig libusb py27-gobject py27-mutagen taglib liblastfm fftw-3-single libsamplerate libsndfile flac libogg libvorbis ruby libmtp libusb-compat loudmouth gnutls libgcrypt libgpg-error libtasn1 lzo qtscriptgenerator taglib-extras -</screen> -</para> -</sect3> <sect3 id="installation-using-macports"><title>Installation using MacPorts</title> <para>To install &amarok; on &MacOS; X, first one needs to install MacPorts from <ulink url="http://www.macports.org/install.php";>here</ulink>. Once MacPorts is installed one needs to run the following command in the terminal: </para> @@ -6352,12 +6570,14 @@ automoc cmake qt4-mac dbus libmng kdebase4-runtime exiv2 hicolor-icon-theme kdel <listitem><para>You can edit metadata of one of the files from within &amarok; File browser to differentiate them somehow, perhaps by editing (album) artist, year, composer or a comment</para></listitem> </itemizedlist> </para></listitem> -<listitem><para>The files have the same Amarok AFT unique id<itemizedlist><listitem><para>This is often a result of running amarok_afttagger and then creating multiple copies of a tagged file; tag reader such as Kid3 or MP3Diags can be used to verify this, look for <varname>Amarok 2 AFTv1</varname> string in tags</para></listitem> +<listitem><para>The files have the same Amarok AFT unique id<itemizedlist> +<listitem><para>This is often a result of running amarok_afttagger and then creating multiple copies of a tagged file; tag reader such as Kid3 or MP3Diags can be used to verify this, look for <varname>Amarok 2 AFTv1</varname> string in tags</para></listitem> <listitem><para>You can use <varname>amarok_afttagger</varname> command-line utility to reset unique id of one of the tracks: <userinput>amarok_afttagger --newid --verbose path/to/one/of/the/tracks.mp3</userinput></para></listitem> <listitem><para>Alternatively, you can remove the unique id from one of the tracks, loosing the track-even-if-changed-from-outside functionality: <userinput>amarok_afttagger --delete --verbose path/to/one/of/the/tracks.mp3</userinput></para></listitem> </itemizedlist> </para></listitem> -<listitem><para>(for Amarok before <ulink url="http://commits.kde.org/amarok/216c18bdaf1";>v2.7.0-96-g216c18b</ulink>) The files have the same MusicBrainz id<itemizedlist><listitem><para>Released versions up to &amarok; 2.7 treated MusizBrainz id embedded in tags (filled in by MusicBrainz-enabled tagger such as Picard) as unique identifiers of tracks. However, MusicBrainz changed the semantics of the id to mean <quote>recording id</quote> since it was originally implemented in &amarok;, which means that you may get false duplicates for example for tracks that appear on the original album and the Best of one. See <emphasis role="strikethrough"><ulink url="https://bugs.kde.org/show_bug.cgi?id=315329";>bug #315329</ulink></emphasis> for more info</para></listitem> +<listitem><para>(for Amarok before <ulink url="http://commits.kde.org/amarok/216c18bdaf1";>v2.7.0-96-g216c18b</ulink>) The files have the same MusicBrainz id<itemizedlist> +<listitem><para>Released versions up to &amarok; 2.7 treated MusizBrainz id embedded in tags (filled in by MusicBrainz-enabled tagger such as Picard) as unique identifiers of tracks. However, MusicBrainz changed the semantics of the id to mean <quote>recording id</quote> since it was originally implemented in &amarok;, which means that you may get false duplicates for example for tracks that appear on the original album and the Best of one. See <emphasis role="strikethrough"><ulink url="https://bugs.kde.org/show_bug.cgi?id=315329";>bug #315329</ulink></emphasis> for more info</para></listitem> <listitem><para>You can use any advanced tag reader to verify this (look for <varname>MusicBrainz</varname> string in tags) and to remove the MusicBrainz id from one of the tracks</para></listitem> <listitem><para>As an alternative solution, you can use <varname>amarok_afttagger</varname> to add &amarok; AFT id to one of the tracks because &amarok; will then prefer its own id rather than the MusicBrainz one: <userinput>amarok_afttagger --newid --verbose path/to/one/of/the/tracks.mp3</userinput></para></listitem> </itemizedlist> @@ -6475,7 +6695,7 @@ automoc cmake qt4-mac dbus libmng kdebase4-runtime exiv2 hicolor-icon-theme kdel </sect2> <sect2 id="playback-questions"><title>Playback Questions</title> <sect3 id="how-do-i-play-audio-cds"><title>How do I play audio CDs?</title> -<para>When you insert an audio CD, it will be shown as a local collection. Drag to the playlist or <emphasis>Pop-Up Dropper</emphasis>, or right-click the selected tracks and choose <guilabel>Add to Playlist</guilabel> or <guilabel>Replace Playlist</guilabel>. +<para>Audio CDs are treated differently than data CDs, which are also supported. When you insert an audio CD, it will be shown as a local collection. Drag to the playlist or <emphasis>Pop-Up Dropper</emphasis>, or right-click the selected tracks and choose <guilabel>Add to Playlist</guilabel> or <guilabel>Replace Playlist</guilabel>. </para> </sect3> <sect3 id="what-media-types-does-amarok-support"><title>What media types does Amarok support?</title> @@ -6535,11 +6755,11 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </para> <para> <userinput>flat-volume=yes</userinput> </para> -<para>enabled. Depending on your distribution this is located either in the file <guilabel>$HOME/.pulse/daemon.conf</guilabel> or in the system file <guilabel>/etc/pulse/daemon.conf</guilabel>. More information about Pulseudio-specific settings can be found in <ulink url="http://linux.die.net/man/5/pulse-daemon.conf";>pulse-daemon.conf man page</ulink>. +<para>enabled. Depending on your distribution this is located either in the file <filename>$HOME/.pulse/daemon.conf</filename> or in the system file <filename>/etc/pulse/daemon.conf</filename>. More information about Pulseudio-specific settings can be found in <ulink url="http://linux.die.net/man/5/pulse-daemon.conf";>pulse-daemon.conf man page</ulink>. </para> </sect3> <sect3 id="how-do-i-turn-on-visualizations"><title>How do I turn on visualizations?</title> -<para>Visualizations are not implemented yet, but they will be very soon. +<para>Visualizations come in the form of an applet. For more information please see the <link linkend="applets">applets page</link>. Visualizations are currently under development and may be buggy at this time. </para> </sect3> <sect3 id="how-can-i-add-podcasts"><title>How can I add podcasts?</title> @@ -6895,7 +7115,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="amarok2-4-1viewmenu.png" format="PNG"/> + <imagedata fileref="amarok2-6viewconfigmenu.png" format="PNG"/> </imageobject> <textobject> <phrase>View Menu</phrase> @@ -7975,7 +8195,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Search in playlist</para> + <para>Search in Playlist</para> </entry> <entry> <para><keycombo>&Ctrl;<keycap>J</keycap></keycombo></para> @@ -7983,6 +8203,14 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> + <para>Shuffle Playlist</para> + </entry> + <entry> + <para><keycombo>&Ctrl;<keycap>H</keycap></keycombo></para> + </entry> + </row> + <row> + <entry> <para>Play Media...</para> </entry> <entry> @@ -8007,6 +8235,14 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> + <para>Copy the Currently Playing Artist and Title to the Clipboard</para> + </entry> + <entry> + <para><keycombo>&Ctrl;<keycap>C</keycap></keycombo></para> + </entry> + </row> + <row> + <entry> <para>Queue Track</para> </entry> <entry> @@ -8031,7 +8267,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Forward By 2 seconds</para> + <para>Seek Forward By 2 seconds*</para> </entry> <entry> <para><keycombo>&Ctrl;<keycap>Right</keycap></keycombo></para> @@ -8039,7 +8275,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Forward By 10 seconds</para> + <para>Seek Forward By 10 seconds*</para> </entry> <entry> <para><keycap>Right</keycap></para> @@ -8047,7 +8283,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Forward By 60 seconds</para> + <para>Seek Forward By 60 seconds*</para> </entry> <entry> <para><keycombo>&Shift;<keycap>Right</keycap></keycombo></para> @@ -8055,7 +8291,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Backward by 2 seconds</para> + <para>Seek Backward By 2 seconds*</para> </entry> <entry> <para><keycombo>&Ctrl;<keycap>Left</keycap></keycombo></para> @@ -8063,7 +8299,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Backward By 10 seconds</para> + <para>Seek Backward By 10 seconds*</para> </entry> <entry> <para><keycap>Left</keycap></para> @@ -8071,7 +8307,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </row> <row> <entry> - <para>Seek Backward by 60 seconds</para> + <para>Seek Backward by 60 seconds*</para> </entry> <entry> <para><keycombo>&Shift;<keycap>Left</keycap></keycombo></para> @@ -8128,6 +8364,9 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </tgroup> </informaltable> </para> +<itemizedlist> +<listitem><para>These durations are configurable in the <filename>amarokrc</filename>.</para></listitem> +</itemizedlist> </sect3> <sect3 id="how-to-make-shortcuts"><title>How to make shortcuts</title> <para>You can configure shortcuts from <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice> where you can change or make new shortcuts. @@ -8244,7 +8483,7 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a <sect1 id="program-copyright"><title>Program copyright</title> <para>Copyright 2002, 2003 Mark Kretschmann (kretschmann kde.org). </para> -<para>Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Amarok Development Squad +<para>Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The Amarok Development Squad </para> </sect1> <sect1 id="documentation-copyright"><title>Documentation copyright</title> @@ -8278,6 +8517,8 @@ ffmpeg -i example.mp4 -acodec copy -vn example.m4a </para> <para>Myriam Schweingruber (myriam kde.org) </para> +<para>Nick Adams (runey676 gmail.com) +</para> <para>Paul Ivan (bit.alex001 gmail.com) </para> <para>Pedro Raimundo (pedrooraimundo gmail.com) diff --git a/doc/installation1-1.png b/doc/installation1-1.png index b5e3ec6..1a9676e 100644 Binary files a/doc/installation1-1.png and b/doc/installation1-1.png differ diff --git a/doc/installation2.png b/doc/installation2.png index d653f34..770d64d 100644 Binary files a/doc/installation2.png and b/doc/installation2.png differ diff --git a/doc/installation3.png b/doc/installation3.png index 8ccb2e9..6bbfb73 100644 Binary files a/doc/installation3.png and b/doc/installation3.png differ diff --git a/doc/installation4.png b/doc/installation4.png index fe10eeb..4e69948 100644 Binary files a/doc/installation4.png and b/doc/installation4.png differ diff --git a/doc/ipod-connected-dialog.png b/doc/ipod-connected-dialog.png index cfe0a0c..6a5f9ce 100644 Binary files a/doc/ipod-connected-dialog.png and b/doc/ipod-connected-dialog.png differ diff --git a/doc/last-fm-spelling-correction.png b/doc/last-fm-spelling-correction.png index 8219d63..b7b6da6 100644 Binary files a/doc/last-fm-spelling-correction.png and b/doc/last-fm-spelling-correction.png differ diff --git a/doc/matchedtrackspage.png b/doc/matchedtrackspage.png index c057286..e6aa7ed 100644 Binary files a/doc/matchedtrackspage.png and b/doc/matchedtrackspage.png differ diff --git a/doc/media_sources1.png b/doc/media_sources1.png index 6fd2d69..926591e 100644 Binary files a/doc/media_sources1.png and b/doc/media_sources1.png differ diff --git a/doc/media_sources3.png b/doc/media_sources3.png deleted file mode 100644 index 90e46bb..0000000 Binary files a/doc/media_sources3.png and /dev/null differ diff --git a/doc/mediasources.png b/doc/mediasources.png index 839714b..21ab390 100644 Binary files a/doc/mediasources.png and b/doc/mediasources.png differ diff --git a/doc/mediasources10.png b/doc/mediasources10.png index c37faf7..7d42db6 100644 Binary files a/doc/mediasources10.png and b/doc/mediasources10.png differ diff --git a/doc/mediasources5.png b/doc/mediasources5.png index 49a509a..44c4b2e 100644 Binary files a/doc/mediasources5.png and b/doc/mediasources5.png differ diff --git a/doc/mediasources6.png b/doc/mediasources6.png index 4829545..0ad150a 100644 Binary files a/doc/mediasources6.png and b/doc/mediasources6.png differ diff --git a/doc/mediasources7.png b/doc/mediasources7.png index 9238c85..678a94a 100644 Binary files a/doc/mediasources7.png and b/doc/mediasources7.png differ diff --git a/doc/mediasources8.png b/doc/mediasources8.png index 0e38848..f2a8e35 100644 Binary files a/doc/mediasources8.png and b/doc/mediasources8.png differ diff --git a/doc/mediasourcesex.png b/doc/mediasourcesex.png index 21e508d..b2a5be0 100644 Binary files a/doc/mediasourcesex.png and b/doc/mediasourcesex.png differ diff --git a/doc/metadatadialog.png b/doc/metadatadialog.png index ea0e869..cbc33f4 100644 Binary files a/doc/metadatadialog.png and b/doc/metadatadialog.png differ diff --git a/doc/nocover_amarok.png b/doc/nocover_amarok.png index f9cae59..83e29d4 100644 Binary files a/doc/nocover_amarok.png and b/doc/nocover_amarok.png differ diff --git a/doc/oraganize_menu.png b/doc/oraganize_menu.png index 8547421..82fd630 100644 Binary files a/doc/oraganize_menu.png and b/doc/oraganize_menu.png differ diff --git a/doc/otherplatforms_nonkde.png b/doc/otherplatforms_nonkde.png index 2312977..d11bdd4 100644 Binary files a/doc/otherplatforms_nonkde.png and b/doc/otherplatforms_nonkde.png differ diff --git a/doc/otherplatforms_osx.png b/doc/otherplatforms_osx.png index 3f64923..0677d93 100644 Binary files a/doc/otherplatforms_osx.png and b/doc/otherplatforms_osx.png differ diff --git a/doc/otherplatforms_windows.png b/doc/otherplatforms_windows.png index fd44ff1..370a4a7 100644 Binary files a/doc/otherplatforms_windows.png and b/doc/otherplatforms_windows.png differ diff --git a/doc/playlist-layout-editor-amarok.png b/doc/playlist-layout-editor-amarok.png deleted file mode 100644 index 868d570..0000000 Binary files a/doc/playlist-layout-editor-amarok.png and /dev/null differ diff --git a/doc/playlist-layout-item-configuration-amarok.png b/doc/playlist-layout-item-configuration-amarok.png index 96a1b3e..6e6e297 100644 Binary files a/doc/playlist-layout-item-configuration-amarok.png and b/doc/playlist-layout-item-configuration-amarok.png differ diff --git a/doc/playlist_save.png b/doc/playlist_save.png index 513b0b0..546a968 100644 Binary files a/doc/playlist_save.png and b/doc/playlist_save.png differ diff --git a/doc/playlistlayout1.png b/doc/playlistlayout1.png index e5f0ef0..5b58bd6 100644 Binary files a/doc/playlistlayout1.png and b/doc/playlistlayout1.png differ diff --git a/doc/playlistlayout2.png b/doc/playlistlayout2.png index 058be01..4d3888f 100644 Binary files a/doc/playlistlayout2.png and b/doc/playlistlayout2.png differ diff --git a/doc/playlistlayout3.png b/doc/playlistlayout3.png index e3ca9a8..2e4427c 100644 Binary files a/doc/playlistlayout3.png and b/doc/playlistlayout3.png differ diff --git a/doc/playlistlayout4.png b/doc/playlistlayout4.png index 29b52fb..5e4e2b8 100644 Binary files a/doc/playlistlayout4.png and b/doc/playlistlayout4.png differ diff --git a/doc/playlistmenu.png b/doc/playlistmenu.png index 251580b..9d72d70 100644 Binary files a/doc/playlistmenu.png and b/doc/playlistmenu.png differ diff --git a/doc/playlistpic.png b/doc/playlistpic.png index fc46644..526b385 100644 Binary files a/doc/playlistpic.png and b/doc/playlistpic.png differ diff --git a/doc/playlistqueue.png b/doc/playlistqueue.png index 1ff1ee3..5b1bb55 100644 Binary files a/doc/playlistqueue.png and b/doc/playlistqueue.png differ diff --git a/doc/playlistsearch.png b/doc/playlistsearch.png deleted file mode 100644 index 9ee4823..0000000 Binary files a/doc/playlistsearch.png and /dev/null differ diff --git a/doc/queue.png b/doc/queue.png index 4fbfdee..c1e373f 100644 Binary files a/doc/queue.png and b/doc/queue.png differ diff --git a/doc/queueend.png b/doc/queueend.png index ba61b70..95c0ee2 100644 Binary files a/doc/queueend.png and b/doc/queueend.png differ diff --git a/doc/remotecollections_ampache_client1.png b/doc/remotecollections_ampache_client1.png index 738ed0b..49bb1bc 100644 Binary files a/doc/remotecollections_ampache_client1.png and b/doc/remotecollections_ampache_client1.png differ diff --git a/doc/remotecollections_ampache_client2.png b/doc/remotecollections_ampache_client2.png index 38394ce..2c52c5c 100644 Binary files a/doc/remotecollections_ampache_client2.png and b/doc/remotecollections_ampache_client2.png differ diff --git a/doc/remotecollections_client.png b/doc/remotecollections_client.png deleted file mode 100644 index 4be7c9f..0000000 Binary files a/doc/remotecollections_client.png and /dev/null differ diff --git a/doc/remotecollections_daap.png b/doc/remotecollections_daap.png index 3483214..af6372c 100644 Binary files a/doc/remotecollections_daap.png and b/doc/remotecollections_daap.png differ diff --git a/doc/remotecollections_samba_server.png b/doc/remotecollections_samba_server.png deleted file mode 100644 index 452ba04..0000000 Binary files a/doc/remotecollections_samba_server.png and /dev/null differ diff --git a/doc/remotecollections_samba_server1.png b/doc/remotecollections_samba_server1.png deleted file mode 100644 index eed136c..0000000 Binary files a/doc/remotecollections_samba_server1.png and /dev/null differ diff --git a/doc/remotecollections_samba_server2.png b/doc/remotecollections_samba_server2.png deleted file mode 100644 index ff34473..0000000 Binary files a/doc/remotecollections_samba_server2.png and /dev/null differ diff --git a/doc/remotecollections_samba_server3.png b/doc/remotecollections_samba_server3.png deleted file mode 100644 index d6b45b5..0000000 Binary files a/doc/remotecollections_samba_server3.png and /dev/null differ diff --git a/doc/searchincollection.png b/doc/searchincollection.png deleted file mode 100644 index ad8cb7e..0000000 Binary files a/doc/searchincollection.png and /dev/null differ diff --git a/doc/searchincollection_example_editbox.png b/doc/searchincollection_example_editbox.png index 9ebae3f..5d481ce 100644 Binary files a/doc/searchincollection_example_editbox.png and b/doc/searchincollection_example_editbox.png differ diff --git a/doc/searchincollection_example_editbox2.png b/doc/searchincollection_example_editbox2.png index a332d0e..006c8e5 100644 Binary files a/doc/searchincollection_example_editbox2.png and b/doc/searchincollection_example_editbox2.png differ diff --git a/doc/slim_toolbar.png b/doc/slim_toolbar.png index 9c03f3f..2e4c52d 100644 Binary files a/doc/slim_toolbar.png and b/doc/slim_toolbar.png differ diff --git a/doc/sorting.png b/doc/sorting.png index e512ea0..7f97100 100644 Binary files a/doc/sorting.png and b/doc/sorting.png differ diff --git a/doc/sorting2.png b/doc/sorting2.png deleted file mode 100644 index 3f11d17..0000000 Binary files a/doc/sorting2.png and /dev/null differ diff --git a/doc/tagedit_fromfile_advanced.png b/doc/tagedit_fromfile_advanced.png index f17b1cb..8380e6e 100644 Binary files a/doc/tagedit_fromfile_advanced.png and b/doc/tagedit_fromfile_advanced.png differ diff --git a/doc/tagedit_fromfile_advanced_example.png b/doc/tagedit_fromfile_advanced_example.png index 5a1c6e7..c402afc 100644 Binary files a/doc/tagedit_fromfile_advanced_example.png and b/doc/tagedit_fromfile_advanced_example.png differ diff --git a/doc/tagedit_fromfile_basic.png b/doc/tagedit_fromfile_basic.png index 07fa29e..0714f65 100644 Binary files a/doc/tagedit_fromfile_basic.png and b/doc/tagedit_fromfile_basic.png differ diff --git a/doc/tagedit_fromfile_basic_example.png b/doc/tagedit_fromfile_basic_example.png index 69dad3f..54a679c 100644 Binary files a/doc/tagedit_fromfile_basic_example.png and b/doc/tagedit_fromfile_basic_example.png differ diff --git a/doc/toolbar_main.png b/doc/toolbar_main.png index 037d9a3..31d58ce 100644 Binary files a/doc/toolbar_main.png and b/doc/toolbar_main.png differ diff --git a/doc/tools_bookmarkmanager.png b/doc/tools_bookmarkmanager.png index 0508b2a..6aa34d1 100644 Binary files a/doc/tools_bookmarkmanager.png and b/doc/tools_bookmarkmanager.png differ diff --git a/doc/tools_covermanager.png b/doc/tools_covermanager.png index 0f90a0f..b545f1d 100644 Binary files a/doc/tools_covermanager.png and b/doc/tools_covermanager.png differ diff --git a/doc/tools_equalizer.png b/doc/tools_equalizer.png index fd2b4e7..86e5dab 100644 Binary files a/doc/tools_equalizer.png and b/doc/tools_equalizer.png differ diff --git a/doc/track_progression.png b/doc/track_progression.png index 1b4781a..31ac549 100644 Binary files a/doc/track_progression.png and b/doc/track_progression.png differ diff --git a/doc/view-media-playlist.png b/doc/view-media-playlist.png index bac3265..19be443 100644 Binary files a/doc/view-media-playlist.png and b/doc/view-media-playlist.png differ
