diff -Nru gwenview-4.7.1/debian/changelog gwenview-4.7.2/debian/changelog --- gwenview-4.7.1/debian/changelog 2011-09-15 20:52:22.000000000 +0000 +++ gwenview-4.7.2/debian/changelog 2011-10-17 22:08:12.000000000 +0000 @@ -1,3 +1,16 @@ +gwenview (4:4.7.2-oneiric~ppa1up) oneiric; urgency=low + + * rebuild + + -- Philip Johnsson Tue, 18 Oct 2011 00:07:11 +0200 + +gwenview (4:4.7.2-0ubuntu1~ppa1) oneiric; urgency=low + + * New upstream release + * Use wildcard in install file + + -- Philip Muškovac Mon, 03 Oct 2011 22:57:24 +0200 + gwenview (4:4.7.1-0ubuntu2) oneiric; urgency=low * No-change rebuild so translations aren't stripped from .desktop diff -Nru gwenview-4.7.1/debian/control gwenview-4.7.2/debian/control --- gwenview-4.7.1/debian/control 2011-09-15 20:52:22.000000000 +0000 +++ gwenview-4.7.2/debian/control 2011-10-17 22:09:57.000000000 +0000 @@ -1,13 +1,13 @@ Source: gwenview Section: graphics Priority: optional -Maintainer: Kubuntu Developers +Maintainer: Philip Johnsson Build-Depends: cmake, debhelper (>= 7.0.50~), - kde-sc-dev-latest (>= 4:4.7.1), - libexiv2-dev, + kde-sc-dev-latest (>= 4:4.7.2), + libexiv2-dev (>= 0.22), libjpeg-dev, - libkipi-dev, + libkipi-dev (>= 4:4.7.2-oneiric~ppa1), libkonq5-dev, pkg-kde-tools, shared-desktop-ontologies diff -Nru gwenview-4.7.1/debian/gwenview.install gwenview-4.7.2/debian/gwenview.install --- gwenview-4.7.1/debian/gwenview.install 2011-09-15 20:52:22.000000000 +0000 +++ gwenview-4.7.2/debian/gwenview.install 2011-10-03 21:10:49.000000000 +0000 @@ -1,37 +1 @@ -usr/bin/gwenview -usr/bin/gwenview_importer -usr/lib/kde4/gvpart.so -usr/lib/libgwenviewlib.so.4 -usr/lib/libgwenviewlib.so.4.7.0 -usr/share/applications/kde4/gwenview.desktop -usr/share/doc/kde/HTML/en/gwenview/browse_mode.png -usr/share/doc/kde/HTML/en/gwenview/common -usr/share/doc/kde/HTML/en/gwenview/fullscreen_mode.png -usr/share/doc/kde/HTML/en/gwenview/index.cache.bz2 -usr/share/doc/kde/HTML/en/gwenview/index.docbook -usr/share/doc/kde/HTML/en/gwenview/view_mode.png -usr/share/icons/hicolor/128x128/actions/document-share.png -usr/share/icons/hicolor/128x128/apps/gwenview.png -usr/share/icons/hicolor/16x16/actions/document-share.png -usr/share/icons/hicolor/16x16/apps/gwenview.png -usr/share/icons/hicolor/22x22/actions/document-share.png -usr/share/icons/hicolor/22x22/apps/gwenview.png -usr/share/icons/hicolor/32x32/actions/document-share.png -usr/share/icons/hicolor/32x32/apps/gwenview.png -usr/share/icons/hicolor/48x48/actions/document-share.png -usr/share/icons/hicolor/48x48/apps/gwenview.png -usr/share/icons/hicolor/64x64/actions/document-share.png -usr/share/icons/hicolor/64x64/apps/gwenview.png -usr/share/icons/hicolor/scalable/actions/document-share.svgz -usr/share/icons/hicolor/scalable/apps/gwenview.svgz -usr/share/kde4/apps/gvpart/gvpart.rc -usr/share/kde4/apps/gwenview/cursors/zoom.png -usr/share/kde4/apps/gwenview/fullscreenthemes/blackglass/checked.png -usr/share/kde4/apps/gwenview/fullscreenthemes/blackglass/scroll-left.png -usr/share/kde4/apps/gwenview/fullscreenthemes/blackglass/scroll-right.png -usr/share/kde4/apps/gwenview/fullscreenthemes/blackglass/style.css -usr/share/kde4/apps/gwenview/gwenviewui.rc -usr/share/kde4/apps/solid/actions/gwenview_importer.desktop -usr/share/kde4/apps/solid/actions/gwenview_importer_camera.desktop -usr/share/kde4/services/ServiceMenus/slideshow.desktop -usr/share/kde4/services/gvpart.desktop +usr/* Binary files /tmp/n_IrdLd8EJ/gwenview-4.7.1/doc/importer.png and /tmp/S5Sqr2kmL9/gwenview-4.7.2/doc/importer.png differ Binary files /tmp/n_IrdLd8EJ/gwenview-4.7.1/doc/index.cache.bz2 and /tmp/S5Sqr2kmL9/gwenview-4.7.2/doc/index.cache.bz2 differ diff -Nru gwenview-4.7.1/doc/index.docbook gwenview-4.7.2/doc/index.docbook --- gwenview-4.7.1/doc/index.docbook 2011-08-22 13:25:23.000000000 +0000 +++ gwenview-4.7.2/doc/index.docbook 2011-10-02 12:50:22.000000000 +0000 @@ -1,8 +1,8 @@ - + Gwenview"> + @@ -42,8 +42,8 @@ &FDLNotice; -2005-08-21 -1.2.92 +2011-08-03 +2.7.0 (&kde; 4.7) &kappname; is an image viewer for &kde;. @@ -66,12 +66,13 @@ &kappname; is a fast and easy to use image viewer for KDE. - + -Gwenview features three main modes: Browse, View, and Full Screen. Browse Mode -lets you navigate through your computer showing thumbnails of your images, View -Mode lets you view images one at a time, and Full Screen lets you make quick -slideshows. +Gwenview features three main modes: Browse, View, and Full Screen. Browse Mode +lets you navigate through your computer showing thumbnails of your images, View +Mode lets you view images one at a time, and Full Screen lets you make quick +slideshows. There is also a start screen that displays a list of recently opened +folders and &URL;s as well as your places and tags. Image loading is handled by the Qt library, so &kappname; supports all @@ -88,8 +89,8 @@ The interface
Image Operations -Gwenview has a few features which are available in both Browse, View, and -Full Screen view. Gwenview has the capability to do basic alteration of your +&kappname; has a few features which are available in both Browse, View, and +Full Screen view. &kappname; has the capability to do basic alteration of your images. Rotate: A rotate operation will rotate the image either to the left @@ -100,8 +101,8 @@ Edit Rotate Right - -or + +or &Ctrl;L @@ -128,6 +129,9 @@ + + &Shift;R + Edit Resize : @@ -135,30 +139,21 @@ increase the size of an image, it may appear blurry and/or pixelated. - - - Edit - Crop - : - This operation lets you discard parts of the image you don't want. - - - +If you have installed the Kipi Plugins, a Plugins +menu will be available that will allow you to perform many additional operations +on your images. For more information, see the +Kipi Plugins documentation.
- +
Browse Mode - + When in Browse Mode, you can easily navigate through your files and folders. The preview window shows thumbnails of the images in the current folder, as well as subfolders. @@ -174,55 +169,53 @@ - Moving the mouse over an image shows buttons to rotate the image as well as - a button to enter Fullscreen Mode. Clicking on an image takes you into View - Mode. The sidebar on the left does not appear - by default, but its appearance can be toggled using - - - F11 - - View - Sidebar - - or using the little arrow on the top of the sidebar splitter. When clicked it - collapses or expands the sidebar. The collapser can overlap the image, but fades - away when the mouse cursor moves out of the sidebar. - - The slider at the bottom right allows you to change the size of the image - thumbnails. You can also filter the images by filename, date, tag or rating using the box on the - lower left. The toolbar (left) appears in both Browse mode as well as View - mode and contains the most commonly used actions. +Moving the mouse over an image shows buttons to select or rotate the image as well as +a button to enter Fullscreen Mode. Clicking on an image takes you into View +Mode. You may select multiple images and switch to View Mode to view them side-by-side. + +The slider at the bottom right allows you to change the size of the images. +You can also filter the images by filename, date, tag or rating using the box on the +lower left. The toolbar (left) appears in both Browse mode as well as View +mode and contains the most commonly used actions. -Browse: Switches to Browse Mode. -View: Switches to View Mode. -Full Screen: Switches to Full Screen Mode. -Go to Previous Image: Clicking this icon will go +Browse: Switches to Browse Mode. +View: Switches to View Mode. +Full Screen: Switches to Full Screen Mode. +Previous: Clicking this icon will go to the previous image in the folder. -Go to Next Image: Clicking this button will go to +Next: Clicking this button will go to the next image in the folder. -Rotate Left/Right: Same as discussed in +Rotate Left/Right: Same as discussed in Image Operations -Show Sidebar: Shows the sidebar (left) which -displays information about the current image. - +
View Mode -View Mode displays one image at a time. At the bottom, there is the -Thumbnail Bar, which allows you to scroll through the images in the current -folder. The Thumbnail Bar can be minimized by clicking on the Thumbnail Bar -button. Clicking again will restore it. +View Mode displays full-size images. The same +sidebar available in Browse Mode is displayed on +the left. At the bottom, there is the Thumbnail Bar, which allows you to scroll +through the images in the current folder. The Thumbnail Bar can be minimized by +clicking on the Thumbnail Bar button. Clicking again will +restore it. To change the size of the thumbnails move the splitter with the &LMB;. + +View Mode supports viewing multiple images side-by-side. You may select +multiple images in Browse Mode before switching to View Mode, or you may click the ++ button that appears when hovering over images in the +Thumbnail Bar to add a pane displaying that image. A - will +then appear that will permit you to remove its pane. + +When multiple images are displayed, a small toolbar appears below each image +that permits you to delete the image or remove its pane. You may perform zoom operations +independently for each image, or synchronize them. Toggle this by checking the +Synchronize to the left of the zoom slider or by pressing +&Ctrl;Y. You can switch images +by clicking on their pane, or using your keyboard. To switch to the image on the +right, press . To switch to the image +on the left, press &Shift; . View Mode Screenshot @@ -234,15 +227,39 @@ The slider at the bottom right controls the zoom of the image. The -Zoom to Fit button and the Actual Size +Fit button and the 100% button are next to the zoom slider and are two preset zoom levels. The -Zoom to Fit button zooms the current image to fit the size -of the window, and the Actual Size button zooms the image to +Fit button zooms the current image to fit the size +of the window, and the 100% button zooms the image to the actual pixel size. You can start directly in View mode by starting &kappname; from a -context menu like Open With in another program or by launching it from the -command line with an image as an argument. +context menu like Open With in another program or by +launching it from the command line with an image as an argument. + +The following additional image operations are available only in View Mode: + + + + + + &Shift;C + + Edit + Crop + : + This operation lets you discard parts of the image you don't want. + + + + + Edit + Red Eye Reduction + : + This operation reduces the "red eye" effect commonly found in photographs taken + with a flash camera. + +
@@ -251,7 +268,7 @@ The Full Screen Mode shows a slideshow of your images. Access Full Screen Mode by clicking on the button that appears when you move the mouse over the thumbnails in Browse Mode, by pressing the Full Screen -button on the taskbar, or by +button on the taskbar, or by &Ctrl;&Shift;F @@ -274,41 +291,135 @@ will not autohide. Most of the buttons on the bar are the same as the ones on the toolbar in Browse or View Modes, except for the Exit Full Screen Mode button which returns you to the &kappname; window, the -Start/Stop Slideshow button, and the +Start/Stop Slideshow button, and the Configure Full Screen Mode button which shows a small settings dialog that allows you to easily and quickly configure the slideshow. The slideshow controls there are: - - The Interval slider controls how long &kappname; will show - an image before it move to the next one. - If the Loop checkbox is checked, when the end of the - slideshow is reached, it will continue from the beginning instead of - stopping. - If the Random checkbox is checked, instead of progressing - through the folder alphabetically, images will be shown in random - order. + + The Interval slider controls how long + &kappname; will show an image before it move to the next one. + If the Loop checkbox is checked, when the + end of the slideshow is reached, it will continue from the beginning instead + of stopping. + If the Random checkbox is checked, + instead of progressing through the folder alphabetically, images will be + shown in random order. + Configure Displayed Metadata allows + you to define what metadata is displayed under the buttons on the toolbar. + + Appearance allows you to select a theme + for the Full Screen View. + If the Show thumbnails checkbox is checked, + thumbnails for all images in the current folder will be displayed to the left of + the toolbar. + The Height slider changes the size of the + thumbnails displayed. -Also in the top bar is an area that shows you the other images in the -current folder. Clicking on one will display it. +If enabled, an area that shows you the other images in the current folder will +be shown on the top bar. Clicking on one will display it. - Tips Using the mouse - + Panning with the mouse Holding down the left mouse button on an image allows you to @@ -323,11 +434,11 @@ Clicking the middle mouse button will toggle the auto zoom on/off. - Hold down the Control key, then either use the mouse wheel to + Hold down the &Ctrl; key, then either use the mouse wheel to zoom in and out or left click to zoom in and right click to zoom out. - The mouse wheel, used while holding down the Alt key, will + The mouse wheel, used while holding down the &Alt; key, will scroll the image horizontally. @@ -339,10 +450,10 @@ shows that image. When in Browse mode, scrolling the mouse wheel will scroll up or down the thumbail view area. - If the Mouse Behavior option in + If the Mouse Behavior option in SettingsConfigure &kappname; - is set to Browse, scrolling the mouse wheel while in View Mode will + is set to Browse, scrolling the mouse wheel while in View Mode will move you through the images in the folder. @@ -359,7 +470,7 @@ A few of the most useful default bindings are: - + Space: Displays the next image in the directory. @@ -367,60 +478,78 @@ Displays the previous image in the directory. &Alt;Up: -Moves to the parent folder of the current folder. +action="simul">&Alt;Up: +Moves to the parent folder of the current folder. &Ctrl;&Shift;F: -Switches into Full Screen Mode. +action="simul">&Ctrl;&Shift;F: +Switches into Full Screen Mode. &Esc;: Exits from Full Screen mode. &Ctrl;M: -Show or hide the menubar. +action="simul">&Ctrl;M: +Show or hide the menubar. &Ctrl;B: -Show or hide the Thumbnail bar. +action="simul">&Ctrl;B: +Show or hide the Thumbnail bar. -F11 -Show or hide the Sidebar. +F11: +Show or hide the Sidebar. -F6 +F6: Make the Location bar editable so that you can directly type in a file path. You can return to the standard Location Bar by pressing the arrow at the -right. +right. &Ctrl;R: -Rotate the current image to the right. +action="simul">&Ctrl;R: +Rotate the current image to the right. &Ctrl;L: -Rotate the current image to the left. +action="simul">&Ctrl;L: +Rotate the current image to the left. + +&Shift;R: +Resize the current image. + +&Shift;C: +Crop the current image. + +&Ctrl;Y: +When multiple images are displayed in View Mode, this synchronizes their views. + + + : +When multiple images are displayed in View Mode, this switched to the image to +the right of the currently selected image. + +&Shift; : +When multiple images are displayed in View Mode, this switched to the image to +the left of the currently selected image. &Ctrl;S: -Save any changes made to the image. +action="simul">&Ctrl;S: +Save any changes made to the image. -Del -Move the current image to the trash. +Del: +Move the current image to the trash. &Shift;Del: +action="simul">&Shift;Del: Permanently delete the image from the disk. Note that this operation is -irreversible and cannot be undone. +irreversible and cannot be undone. &Ctrl;P: -Print the current image. +action="simul">&Ctrl;P: +Print the current image. &Ctrl;O: -Open an image using the standard file selection dialog. - +action="simul">&Ctrl;O: +Open an image using the standard file selection dialog. + diff -Nru gwenview-4.7.1/lib/version.h gwenview-4.7.2/lib/version.h --- gwenview-4.7.1/lib/version.h 2011-09-01 21:04:41.000000000 +0000 +++ gwenview-4.7.2/lib/version.h 2011-10-02 13:53:56.000000000 +0000 @@ -21,6 +21,6 @@ #ifndef VERSION_H #define VERSION_H -#define GWENVIEW_VERSION "2.7.1" +#define GWENVIEW_VERSION "2.7.2" #endif /* VERSION_H */