Hello community,
here is the log from the commit of package kdegraphics4
checked in at Sun Jun 3 21:35:35 CEST 2007.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2007-05-28 23:17:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-06-01 13:52:38.273345000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 1 13:31:58 CEST 2007 - coolo@suse.de
+
+- simplify spec file by using macros from kde4-filesystem
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.K11793/_old 2007-06-03 21:33:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K11793/_new 2007-06-03 21:33:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 3.90.1)
+# spec file for package kdegraphics4 (Version 3.90.1.svn670093)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,8 +26,8 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
URL: http://www.kde.org
-Version: 3.90.1
-Release: 9
+Version: 3.90.1.svn670093
+Release: 1
Source0: kdegraphics.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
@@ -46,7 +46,6 @@
Suggests: kde4-kpovmodeler
Suggests: kde4-okular
Suggests: libkscan4
-%define prefix /usr
%description
This package suggests the packages which are built from the kdegraphics
@@ -63,21 +62,12 @@
%patch
%build
- export CFLAGS="$RPM_OPT_FLAGS"
- export CXXFLAGS="$CFLAGS"
- mkdir build
- cd build
- %ifarch x86_64 ppc64 s390x mips64 sparc64
- cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ -DLIB_INSTALL_DIR=%prefix/lib64
- %else
- cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../
- %endif
- make
+ %cmake_kde4 -d build
+ %make_jobs
%install
cd build
- make install \
- DESTDIR="$RPM_BUILD_ROOT"
+ %makeinstall
%suse_update_desktop_file kolourpaint Graphics RasterGraphics
%suse_update_desktop_file kiconedit Graphics RasterGraphics
%suse_update_desktop_file kuickshow Graphics Viewer
@@ -90,6 +80,7 @@
%suse_update_desktop_file -r ligature Office Viewer
%suse_update_desktop_file -r okular Office Viewer
%suse_update_desktop_file kpovmodeler Graphics 3DGraphics
+ %kde_post_install
%post -p /sbin/ldconfig
@@ -150,7 +141,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kcoloredit
/usr/share/applications/kde4/kcoloredit.desktop
-/usr/share/apps/kcoloredit
+
+%_kde_share_dir/apps/kcoloredit
%doc %lang(en) /usr/share/doc/HTML/en/kcoloredit
/usr/share/icons/hicolor/*/apps/kcoloredit.*
%package -n kde4-kfax
@@ -179,7 +171,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kfax
/usr/share/applications/kde4/kfax.desktop
-/usr/share/apps/kfax
+
+%_kde_share_dir/apps/kfax
/usr/share/icons/hicolor/*/apps/kfax.*
%package -n kde4-kio_kamera
Group: System/GUI/KDE
@@ -212,8 +205,10 @@
/usr/share/icons/crystalsvg/*/apps/camera.*
/usr/share/icons/crystalsvg/*/devices/camera.*
/usr/share/icons/crystalsvg/*/places/camera.*
-/usr/share/kde4/services/camera.protocol
-/usr/share/kde4/services/kamera.desktop
+
+%_kde_share_dir/services/camera.protocol
+
+%_kde_share_dir/services/kamera.desktop
%package -n kde4-kghostview
Group: Productivity/Graphics/Viewers
Summary: PostScript Viewer
@@ -243,13 +238,18 @@
/usr/%_lib/kde4/libkghostviewpart.so
/usr/%_lib/libkghostviewlib.so.*
/usr/share/applications/kde4/kghostview.desktop
-/usr/share/apps/kconf_update/kghostview.upd
-/usr/share/apps/kghostview
-/usr/share/config.kcfg/kghostview.kcfg
+
+%_kde_share_dir/apps/kconf_update/kghostview.upd
+
+%_kde_share_dir/apps/kghostview
+
+%_kde_share_dir/config.kcfg/kghostview.kcfg
%doc %lang(en) /usr/share/doc/HTML/en/kghostview
/usr/share/icons/hicolor/*/apps/kghostview.*
-/usr/share/kde4/services/kghostview_part.desktop
-/usr/share/apps/kconf_update/update-to-xt-names.pl
+
+%_kde_share_dir/services/kghostview_part.desktop
+
+%_kde_share_dir/apps/kconf_update/update-to-xt-names.pl
%package -n kde4-kiconedit
Group: Productivity/Graphics/Bitmap Editors
Summary: Icon Editor
@@ -276,7 +276,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kiconedit
/usr/share/applications/kde4/kiconedit.desktop
-/usr/share/apps/kiconedit
+
+%_kde_share_dir/apps/kiconedit
%doc %lang(en) /usr/share/doc/HTML/en/kiconedit
/usr/share/icons/hicolor/*/apps/kiconedit.*
%package -n kde4-kolourpaint
@@ -305,7 +306,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kolourpaint
/usr/share/applications/kde4/kolourpaint.desktop
-/usr/share/apps/kolourpaint
+
+%_kde_share_dir/apps/kolourpaint
%doc %lang(en) /usr/share/doc/HTML/en/kolourpaint
%package -n kde4-kruler
Group: Productivity/Graphics/Other
@@ -333,7 +335,8 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kruler
/usr/share/applications/kde4/kruler.desktop
-/usr/share/apps/kruler
+
+%_kde_share_dir/apps/kruler
%doc %lang(en) /usr/share/doc/HTML/en/kruler
/usr/share/icons/hicolor/*/apps/kruler.*
%package -n kde4-ksnapshot
@@ -392,7 +395,8 @@
/usr/bin/kuickshow
/usr/share/applications/kde4/kuickshow.desktop
/usr/%_lib/libkdeinit4_kuickshow.so
-/usr/share/apps/kuickshow
+
+%_kde_share_dir/apps/kuickshow
%doc %lang(en) /usr/share/doc/HTML/en/kuickshow
/usr/share/icons/hicolor/*/apps/kuickshow.*
%package -n kde4-ligature
@@ -428,28 +432,46 @@
/usr/%_lib/libligaturePluginGUI.so.*
/usr/%_lib/libligaturecore.so.*
/usr/share/applications/kde4/ligature.desktop
-/usr/share/apps/ligature
-/usr/share/config.kcfg/ligature.kcfg
+
+%_kde_share_dir/apps/ligature
+
+%_kde_share_dir/config.kcfg/ligature.kcfg
/usr/share/dbus-1/interfaces/org.kde.ligature.MultiPage.xml
-/usr/share/kde4/servicetypes/ligaturePluginGUI.desktop
+
+%_kde_share_dir/servicetypes/ligaturePluginGUI.desktop
/usr/share/icons/hicolor/*/apps/kdvi.*
-/usr/share/kde4/services/kvs_djvu_part.desktop
-/usr/share/kde4/services/kvs_dvi_part.desktop
-/usr/share/kde4/services/kvs_fax_part.desktop
-/usr/share/kde4/services/kvs_ps_part.desktop
-/usr/share/apps/kviewerpart
+
+%_kde_share_dir/services/kvs_djvu_part.desktop
+
+%_kde_share_dir/services/kvs_dvi_part.desktop
+
+%_kde_share_dir/services/kvs_fax_part.desktop
+
+%_kde_share_dir/services/kvs_ps_part.desktop
+
+%_kde_share_dir/apps/kviewerpart
/usr/%_lib/libdjvu.so.*
-/usr/share/kde4/services/djvumultipage.desktop
-/usr/share/kde4/services/kdvimultipage.desktop
-/usr/share/kde4/services/kfaxmultipage.desktop
-/usr/share/kde4/services/psMultipage.desktop
-/usr/share/apps/ligaturepart
-/usr/share/apps/psMultipage.rc
-/usr/share/config.kcfg/djvumultipage.kcfg
-/usr/share/config.kcfg/kdvi.kcfg
+
+%_kde_share_dir/services/djvumultipage.desktop
+
+%_kde_share_dir/services/kdvimultipage.desktop
+
+%_kde_share_dir/services/kfaxmultipage.desktop
+
+%_kde_share_dir/services/psMultipage.desktop
+
+%_kde_share_dir/apps/ligaturepart
+
+%_kde_share_dir/apps/psMultipage.rc
+
+%_kde_share_dir/config.kcfg/djvumultipage.kcfg
+
+%_kde_share_dir/config.kcfg/kdvi.kcfg
/usr/share/icons/crystalsvg/*/apps/kviewshell.*
-/usr/share/apps/djvumultipage.rc
-/usr/share/apps/kdvi_part.rc
+
+%_kde_share_dir/apps/djvumultipage.rc
+
+%_kde_share_dir/apps/kdvi_part.rc
%package -n libkscan4
Group: System/GUI/KDE
Summary: KDE Scanner Library
@@ -524,7 +546,8 @@
/usr/%_lib/kde4/libkpovmodelerpart.so
/usr/%_lib/liblkpovmodeler.so.*
/usr/share/applications/kde4/kpovmodeler.desktop
-/usr/share/apps/kpovmodeler
+
+%_kde_share_dir/apps/kpovmodeler
/usr/share/dbus-1/interfaces/org.kde.kpovmodeler.xml
/usr/share/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
/usr/share/icons/hicolor/*/apps/kpovmodeler.*
@@ -557,14 +580,20 @@
/usr/%_lib/kde4/libokular*
/usr/%_lib/libokularcore.so.*
/usr/share/applications/kde4/okular*
-/usr/share/apps/okular
-/usr/share/apps/okularpart
-/usr/share/config.kcfg/okular.kcfg
+
+%_kde_share_dir/apps/okular
+
+%_kde_share_dir/apps/okularpart
+
+%_kde_share_dir/config.kcfg/okular.kcfg
%doc %lang(en) /usr/share/doc/HTML/en/okular
/usr/share/icons/hicolor/*/apps/okular.*
-/usr/share/kde4/services/libokularGenerator*
-/usr/share/kde4/services/okular*
-/usr/share/kde4/servicetypes/okularGenerator.desktop
+
+%_kde_share_dir/services/libokularGenerator*
+
+%_kde_share_dir/services/okular*
+
+%_kde_share_dir/servicetypes/okularGenerator.desktop
%package devel
Group: Productivity/Graphics/Other
Summary: kdegraphics base package: Build Environment
@@ -584,7 +613,6 @@
%files devel
%defattr(-,root,root)
/usr/include/okular
-/usr/include/ligaturePluginGUIInterface.h
/usr/%_lib/libokularcore.so
/usr/%_lib/libligaturecore.so
/usr/%_lib/libligaturePluginGUI.so
@@ -602,17 +630,23 @@
/usr/%_lib/strigi/strigiea_ps.so
/usr/%_lib/strigi/strigita_dvi.so
/usr/%_lib/strigi/strigita_ico.so
-/usr/share/kde4/services/gsthumbnail.desktop
-/usr/share/kde4/services/kfilewrite_jpeg.desktop
+
+%_kde_share_dir/services/gsthumbnail.desktop
+
+%_kde_share_dir/services/kfilewrite_jpeg.desktop
/usr/%_lib/kde4/kio_msits.so
-/usr/share/kde4/services/msits.protocol
+
+%_kde_share_dir/services/msits.protocol
/usr/share/icons/crystalsvg/*/actions/palette_color.*
/usr/share/icons/crystalsvg/*/actions/palette_gray.*
/usr/share/icons/crystalsvg/*/actions/palette_halftone.*
/usr/share/icons/crystalsvg/*/actions/palette_lineart.*
-/usr/share/kde4/services/scanservice.desktop
+
+%_kde_share_dir/services/scanservice.desktop
%changelog
+* Fri Jun 01 2007 - coolo@suse.de
+- simplify spec file by using macros from kde4-filesystem
* Mon May 28 2007 - dmueller@suse.de
- update to 3.90.1.svn668119
* Fri May 25 2007 - stbinner@suse.de
++++++ kdegraphics.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/cmake/modules/FindPoppler.cmake new/kdegraphics/cmake/modules/FindPoppler.cmake
--- old/kdegraphics/cmake/modules/FindPoppler.cmake 2007-04-04 20:15:48.000000000 +0200
+++ new/kdegraphics/cmake/modules/FindPoppler.cmake 2007-05-27 01:15:42.000000000 +0200
@@ -14,7 +14,7 @@
if(POPPLER_INCLUDE_DIR AND POPPLER_LIBRARY)
# in cache already
- set(POPPLER_FOUND)
+ set(POPPLER_FOUND TRUE)
else(POPPLER_INCLUDE_DIR AND POPPLER_LIBRARY)
@@ -36,15 +36,19 @@
endif(_PopplerLinkFlags)
if (POPPLER_FOUND)
- set(POPPLER_INCLUDE_DIR ${_PopplerIncDir})
set(POPPLER_LIBRARY ${_PopplerLinkFlags})
- # check whether we're using poppler HEAD
- set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR}/poppler ${QT_INCLUDE_DIR})
+ # the cflags for poppler-qt4 can contain more than one include path
+ separate_arguments(_PopplerCflags)
+ foreach(_includedir ${_PopplerCflags})
+ string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}")
+ set(POPPLER_INCLUDE_DIR ${POPPLER_INCLUDE_DIR} ${_includedir})
+ endforeach(_includedir)
+
+ # check whether we're using poppler 0.6
+ set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
check_cxx_source_compiles("
-#define UNSTABLE_POPPLER_QT4
-
#include
int main()
@@ -54,24 +58,27 @@
return 0;
}
-" HAVE_POPPLER_HEAD )
+" HAVE_POPPLER_0_6 )
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
- if (HAVE_POPPLER_HEAD)
- set(popplerHeadMessage "yes")
- else (HAVE_POPPLER_HEAD)
- set(popplerHeadMessage "no")
- endif (HAVE_POPPLER_HEAD)
+ if (HAVE_POPPLER_0_6)
+ set(poppler06Message "yes")
+ else (HAVE_POPPLER_0_6)
+ set(poppler06Message "no")
+ endif (HAVE_POPPLER_0_6)
if (NOT Poppler_FIND_QUIETLY)
- message(STATUS "Found Poppler-Qt4: ${POPPLER_LIBRARY}, HEAD? ${popplerHeadMessage}")
+ message(STATUS "Found Poppler-Qt4: ${POPPLER_LIBRARY}, 0.6.x? ${poppler06Message}")
endif (NOT Poppler_FIND_QUIETLY)
else (POPPLER_FOUND)
if (Poppler_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find Poppler-qt4")
+ message(FATAL_ERROR "Could NOT find Poppler-Qt4")
endif (Poppler_FIND_REQUIRED)
endif (POPPLER_FOUND)
-MARK_AS_ADVANCED(POPPLER_INCLUDE_DIR POPPLER_LIBRARY)
+# ensure that they are cached
+set(POPPLER_INCLUDE_DIR ${POPPLER_INCLUDE_DIR} CACHE INTERNAL "The Poppler-Qt4 include path")
+set(POPPLER_LIBRARY ${POPPLER_LIBRARY} CACHE INTERNAL "The Poppler-Qt4 library")
+set(HAVE_POPPLER_0_6 ${HAVE_POPPLER_0_6} CACHE INTERNAL "Whether the version of Poppler-Qt4 is 0.6")
endif(POPPLER_INCLUDE_DIR AND POPPLER_LIBRARY)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kamera/kcontrol/kamera.desktop new/kdegraphics/kamera/kcontrol/kamera.desktop
--- old/kdegraphics/kamera/kcontrol/kamera.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kamera/kcontrol/kamera.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -44,7 +44,7 @@
Comment[se]=Heivet govvenapperáhta
Comment[sl]=Nastavitve fotoaparata
Comment[sr]=Подеси Kamera-у
-Comment[sr@Latn]=Podesi Kamera-u
+Comment[sr@latin]=Podesi Kamera-u
Comment[sv]=Anpassa kamera
Comment[ta]=காமிராவை அமை
Comment[tg]=Танзимоти камера
@@ -90,7 +90,7 @@
Keywords[ru]=gphoto,camera,digicam,webcam,kamera,камера,фото
Keywords[sl]=gphoto,kamera,digicam,webcam,foto,fotoaparat,spletna kamera
Keywords[sr]=gphoto,camera,digicam,webcam,kamera,камера
-Keywords[sr@Latn]=gphoto,camera,digicam,webcam,kamera,kamera
+Keywords[sr@latin]=gphoto,camera,digicam,webcam,kamera,kamera
Keywords[sv]=gphoto,kamera,digital kamera,webbkamera,kamera
Keywords[ta]=ஜிபோட்டோ, காமிரா, டிஜிகேம்,வலைதள காமிரா, காமிரா
Keywords[tg]=gphoto,camera,digicam,webcam,kamera,камера,фото
@@ -144,7 +144,7 @@
Name[se]=Digitalalaš govvenapperáhtta
Name[sl]=Digitalni fotoaparat
Name[sr]=Дигитална камера
-Name[sr@Latn]=Digitalna kamera
+Name[sr@latin]=Digitalna kamera
Name[sv]=Digitalkamera
Name[ta]= Digital Camera
Name[tg]=Камераи digital
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kcoloredit/kcolorchooser.desktop new/kdegraphics/kcoloredit/kcolorchooser.desktop
--- old/kdegraphics/kcoloredit/kcolorchooser.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kcoloredit/kcolorchooser.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -50,7 +50,7 @@
GenericName[se]=Ivdneválljejeaddji
GenericName[sl]=Izbirnik barv
GenericName[sr]=Бирач боја
-GenericName[sr@Latn]=Birač boja
+GenericName[sr@latin]=Birač boja
GenericName[sv]=Färgväljare
GenericName[ta]=வண்ணத் தேர்வு
GenericName[tg]=Интихоби ранг
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kcoloredit/kcoloredit.desktop new/kdegraphics/kcoloredit/kcoloredit.desktop
--- old/kdegraphics/kcoloredit/kcoloredit.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kcoloredit/kcoloredit.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -50,7 +50,7 @@
GenericName[se]=Ivdnepaleahta doaimmaheaddji
GenericName[sl]=Urejevalnik barvne palete
GenericName[sr]=Уређивач палете боја
-GenericName[sr@Latn]=Uređivač palete boja
+GenericName[sr@latin]=Uređivač palete boja
GenericName[sv]=Färgpaletteditor
GenericName[ta]=வண்ணகளஞ்சியம்
GenericName[tg]=Муҳаррири палитра
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfax/kfax.desktop new/kdegraphics/kfax/kfax.desktop
--- old/kdegraphics/kfax/kfax.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kfax/kfax.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -43,7 +43,7 @@
GenericName[se]=Fáksačájeheaddji
GenericName[sl]=Pregledovalnik faksov
GenericName[sr]=Приказивач факсова
-GenericName[sr@Latn]=Prikazivač faksova
+GenericName[sr@latin]=Prikazivač faksova
GenericName[sv]=Faxvisare
GenericName[ta]=ஃபாக்ஸ் காட்சி
GenericName[tg]=Хондани факс
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/CMakeLists.txt new/kdegraphics/kfile-plugins/CMakeLists.txt
--- old/kdegraphics/kfile-plugins/CMakeLists.txt 2007-04-19 11:02:11.000000000 +0200
+++ new/kdegraphics/kfile-plugins/CMakeLists.txt 2007-05-26 01:57:03.000000000 +0200
@@ -5,7 +5,7 @@
macro_optional_find_package(PNG)
macro_optional_find_package(OpenEXR)
macro_optional_find_package(TIFF)
-macro_optional_find_package(PopplerQt4)
+macro_optional_find_package(Poppler)
add_subdirectory( dvi )
if(OPENEXR_FOUND)
@@ -16,9 +16,9 @@
#add_subdirectory(tiff)
endif(TIFF_FOUND)
-if(HAVE_POPPLER_HEAD)
+if(HAVE_POPPLER_0_6)
add_subdirectory(pdf)
-endif(HAVE_POPPLER_HEAD)
+endif(HAVE_POPPLER_0_6)
add_subdirectory( ps )
add_subdirectory( jpeg )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/dds/kfile_dds.desktop new/kdegraphics/kfile-plugins/dds/kfile_dds.desktop
--- old/kdegraphics/kfile-plugins/dds/kfile_dds.desktop 2007-04-07 06:57:03.000000000 +0200
+++ new/kdegraphics/kfile-plugins/dds/kfile_dds.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -36,7 +36,7 @@
Name[ru]=Сведения о поверхности DirectDraw
Name[sl]=Podatki o površini DirectDraw
Name[sr]=Информације о DirectDraw површини
-Name[sr@Latn]=Informacije o DirectDraw površini
+Name[sr@latin]=Informacije o DirectDraw površini
Name[sv]=Directdraw ytinformation
Name[ta]=நேரடி மேற்பரப்பு தகவல்
Name[tr]=DirectDraw Yüzey Bilgisi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop new/kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop
--- old/kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop 2007-05-03 07:03:28.000000000 +0200
+++ new/kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -39,7 +39,7 @@
Name[se]=DVI-dieđut
Name[sl]=Podatki o DVI
Name[sr]=DVI информације
-Name[sr@Latn]=DVI informacije
+Name[sr@latin]=DVI informacije
Name[sv]=DVI-information
Name[ta]=DVI தகவல்
Name[tg]=Иттилоот оиди DVI
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/exr/kfile_exr.desktop new/kdegraphics/kfile-plugins/exr/kfile_exr.desktop
--- old/kdegraphics/kfile-plugins/exr/kfile_exr.desktop 2007-03-06 14:56:40.000000000 +0100
+++ new/kdegraphics/kfile-plugins/exr/kfile_exr.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -37,7 +37,7 @@
Name[se]=EXR-dieđut
Name[sl]=Podatki o EXR
Name[sr]=EXR информације
-Name[sr@Latn]=EXR informacije
+Name[sr@latin]=EXR informacije
Name[sv]=EXR-information
Name[ta]=EXR தகவல்
Name[tg]=Иттилоот оиди EXR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/gif/kfile_gif.desktop new/kdegraphics/kfile-plugins/gif/kfile_gif.desktop
--- old/kdegraphics/kfile-plugins/gif/kfile_gif.desktop 2007-05-03 07:03:28.000000000 +0200
+++ new/kdegraphics/kfile-plugins/gif/kfile_gif.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -41,7 +41,7 @@
Name[se]=GIF-dieđut
Name[sl]=Podatki o GIF
Name[sr]=GIF информације
-Name[sr@Latn]=GIF informacije
+Name[sr@latin]=GIF informacije
Name[sv]=Gif-information
Name[ta]=GIF தகவல்
Name[tg]=Иттилоот оиди GIF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/pdf/CMakeLists.txt new/kdegraphics/kfile-plugins/pdf/CMakeLists.txt
--- old/kdegraphics/kfile-plugins/pdf/CMakeLists.txt 2007-05-02 13:16:48.000000000 +0200
+++ new/kdegraphics/kfile-plugins/pdf/CMakeLists.txt 2007-05-27 01:15:42.000000000 +0200
@@ -1,11 +1,11 @@
include_directories(${STRIGI_INCLUDE_DIR})
-include_directories(${POPPLER_QT4_INCLUDE_DIR} )
+include_directories(${POPPLER_INCLUDE_DIR})
# build the analyzer as a module
kde4_add_library(pdf MODULE pdfthroughanalyzer.cpp)
# link with the required libraries
-target_link_libraries(pdf ${POPPLER_QT4_LIBRARIES} ${STREAMANALYZER_LIBRARY} ${KDE4_KDECORE_LIBS})
+target_link_libraries(pdf ${POPPLER_LIBRARY} ${STREAMANALYZER_LIBRARY} ${KDE4_KDECORE_LIBS})
# adjust the name so the module is recognized as a strigi plugin
set_target_properties(pdf PROPERTIES
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/pnm/kfile_pnm.desktop new/kdegraphics/kfile-plugins/pnm/kfile_pnm.desktop
--- old/kdegraphics/kfile-plugins/pnm/kfile_pnm.desktop 2007-05-03 07:03:28.000000000 +0200
+++ new/kdegraphics/kfile-plugins/pnm/kfile_pnm.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -38,7 +38,7 @@
Name[se]=PNM-dieđut
Name[sl]=Podatki o PNM
Name[sr]=PNM информације
-Name[sr@Latn]=PNM informacije
+Name[sr@latin]=PNM informacije
Name[sv]=PNM-information
Name[ta]=PNM தகவல்
Name[tg]=Иттилоот оиди PNM
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/ps/gsthumbnail.desktop new/kdegraphics/kfile-plugins/ps/gsthumbnail.desktop
--- old/kdegraphics/kfile-plugins/ps/gsthumbnail.desktop 2007-04-07 06:57:03.000000000 +0200
+++ new/kdegraphics/kfile-plugins/ps/gsthumbnail.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -40,7 +40,7 @@
Name[se]=PostScript-, PDF- ja DVI-fiillat
Name[sl]=Datoteke PostScript, PDF in DVI
Name[sr]=PostScript, PDF и DVI фајлови
-Name[sr@Latn]=PostScript, PDF i DVI fajlovi
+Name[sr@latin]=PostScript, PDF i DVI fajlovi
Name[sv]=Postscript, PDF och DVI-filer
Name[ta]= போஸ்ட்கிரிப்ட், பிடிஃப் மற்றும் டிவிஐ கோப்புகள்
Name[tg]=Файлҳои PostScript, PDF ва DVI
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/raw/kfile_raw.desktop new/kdegraphics/kfile-plugins/raw/kfile_raw.desktop
--- old/kdegraphics/kfile-plugins/raw/kfile_raw.desktop 2007-04-07 06:57:03.000000000 +0200
+++ new/kdegraphics/kfile-plugins/raw/kfile_raw.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -35,7 +35,7 @@
Name[ru]=Необработанные Файлы с цифровой камеры (RAW)
Name[sl]=Surove datoteke s fotoaparata
Name[sr]=RAW фајлови слика
-Name[sr@Latn]=RAW fajlovi slika
+Name[sr@latin]=RAW fajlovi slika
Name[sv]=Obehandlade kamerafiler
Name[tr]=RAW Kamera Dosyaları
Name[uk]=Файли цифрової камери RAW
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/rgb/kfile_rgb.desktop new/kdegraphics/kfile-plugins/rgb/kfile_rgb.desktop
--- old/kdegraphics/kfile-plugins/rgb/kfile_rgb.desktop 2007-04-07 06:57:03.000000000 +0200
+++ new/kdegraphics/kfile-plugins/rgb/kfile_rgb.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -40,7 +40,7 @@
Name[se]=SGI-govva (RGB)
Name[sl]=Slika SGI (RGB)
Name[sr]=SGI слика (RGB)
-Name[sr@Latn]=SGI slika (RGB)
+Name[sr@latin]=SGI slika (RGB)
Name[sv]=SGI-bild (RGB)
Name[ta]=எஸ்ஜிஐ படிமம் (RGB)
Name[tg]=Тасвироти SGI (RGB)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kfile-plugins/tiff/kfile_tiff.desktop new/kdegraphics/kfile-plugins/tiff/kfile_tiff.desktop
--- old/kdegraphics/kfile-plugins/tiff/kfile_tiff.desktop 2007-05-03 07:03:28.000000000 +0200
+++ new/kdegraphics/kfile-plugins/tiff/kfile_tiff.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -42,7 +42,7 @@
Name[se]=TIFF-filla metadieđut
Name[sl]=Meta podatki o TIFF
Name[sr]=Мета информације TIFF фајла
-Name[sr@Latn]=Meta informacije TIFF fajla
+Name[sr@latin]=Meta informacije TIFF fajla
Name[sv]=Metainformation om TIFF-fil
Name[ta]=TIFF மீக்கோப்பு தகவல்
Name[tg]=Иттилоот оиди метафайли TIFF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kgamma/kcmkgamma/kgamma.desktop new/kdegraphics/kgamma/kcmkgamma/kgamma.desktop
--- old/kdegraphics/kgamma/kcmkgamma/kgamma.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kgamma/kcmkgamma/kgamma.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -32,7 +32,7 @@
Comment[ru]=Утилита для калибровки монитора
Comment[sl]=Kalibracijsko orodje za monitorje
Comment[sr]=Алат за калибрацију монитора
-Comment[sr@Latn]=Alat za kalibraciju monitora
+Comment[sr@latin]=Alat za kalibraciju monitora
Comment[sv]=Kalibreringsverktyg för skärmen
Comment[ta]=திரை நிலைக்கருவி
Comment[tg]=Утилита барои калибратсия кардани монитор
@@ -63,7 +63,7 @@
Name[ru]=Гамма
Name[sl]=Gama
Name[sr]=Гама
-Name[sr@Latn]=Gama
+Name[sr@latin]=Gama
Name[ta]=காமா
Name[tg]=Гамма
Name[uk]=Гама
@@ -97,7 +97,7 @@
Keywords[ru]=KGamma,kgamma,Gamma,gamma,гамма,монитор
Keywords[sl]=KGamma,kgamma,Gama,gama
Keywords[sr]=KGamma, kgamma, Gamma, gamma, гама
-Keywords[sr@Latn]=KGamma, kgamma, Gamma, gamma, gama
+Keywords[sr@latin]=KGamma, kgamma, Gamma, gamma, gama
Keywords[ta]=கேகாமா, கேகாமா, காமா, காமா
Keywords[tg]=KGamma,kgamma,Gamma,gamma,гамма,монитор
Keywords[uk]=KGamma, kgamma, Gamma, gamma, гама, яскравість
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kghostview/kghostview.desktop new/kdegraphics/kghostview/kghostview.desktop
--- old/kdegraphics/kghostview/kghostview.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kghostview/kghostview.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -61,7 +61,7 @@
GenericName[se]=PS/PDF-čájeheaddji
GenericName[sl]=Pregledovalnik datotek PS/PDF
GenericName[sr]=PS/PDF приказивач
-GenericName[sr@Latn]=PS/PDF prikazivač
+GenericName[sr@latin]=PS/PDF prikazivač
GenericName[sv]=PS/PDF-visare
GenericName[ta]=PS/PDF காட்சி
GenericName[tg]=Хондани PS/PDF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kiconedit/kiconedit.desktop new/kdegraphics/kiconedit/kiconedit.desktop
--- old/kdegraphics/kiconedit/kiconedit.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kiconedit/kiconedit.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -45,7 +45,7 @@
GenericName[se]=Govašdoaimmaheaddji
GenericName[sl]=Urejevalnik ikon
GenericName[sr]=Уређивач икона
-GenericName[sr@Latn]=Uređivač ikona
+GenericName[sr@latin]=Uređivač ikona
GenericName[sv]=Ikoneditor
GenericName[ta]= கேசின்னம் திருத்தி
GenericName[tg]=Муҳаррири ишорот
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kmrml/kmrml/kcontrol/kcmkmrml.desktop new/kdegraphics/kmrml/kmrml/kcontrol/kcmkmrml.desktop
--- old/kdegraphics/kmrml/kmrml/kcontrol/kcmkmrml.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kmrml/kmrml/kcontrol/kcmkmrml.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -45,7 +45,7 @@
Name[se]=Govvaindeaksa
Name[sl]=Seznam slik
Name[sr]=Индекс слика
-Name[sr@Latn]=Indeks slika
+Name[sr@latin]=Indeks slika
Name[sv]=Bildindex
Name[ta]=பிம்ப அட்டவணை
Name[tg]=Индексатсия кардани тасвирот
@@ -95,7 +95,7 @@
Comment[se]=Heivet GNU Image Finding Tool
Comment[sl]=Nastavitve za uporabo orodja GNU za iskanje slik
Comment[sr]=Подешавање коришћења GNU-овог алата за тражење слика
-Comment[sr@Latn]=Podešavanje korišćenja GNU-ovog alata za traženje slika
+Comment[sr@latin]=Podešavanje korišćenja GNU-ovog alata za traženje slika
Comment[sv]=Inställning för att använda GNU:s bildsökverktyg
Comment[ta]=GNU பிம்ப தேடுதல் கருவியை பயன்படுத்துவதற்கான அமைப்பு
Comment[tg]=Танзимоти истифодабарии барномаиҷустуҷӯи тасвироти GNU Image Finding Tool
@@ -139,7 +139,7 @@
Keywords[ru]=изображения,поиск,запрос,kmrml,mrml,CBIR
Keywords[sl]=slike,iskanje,povpraševanje,išči,najdi,gift,kmrml,mrml,CBIR
Keywords[sr]=Images,Search,Query,Find,Gift,kmrml,mrml,CBIR,слике,тражи,упит,нађи,поклон
-Keywords[sr@Latn]=Images,Search,Query,Find,Gift,kmrml,mrml,CBIR,slike,traži,upit,nađi,poklon
+Keywords[sr@latin]=Images,Search,Query,Find,Gift,kmrml,mrml,CBIR,slike,traži,upit,nađi,poklon
Keywords[sv]=Bilder,Sök,Förfrågan,Hitta,Gift,kmrml,mrml,CBIR
Keywords[ta]=பிம்பங்கள், தேடு, கேள்வி, கண்டுபிடி,பரிசு,kmrml,mrml,CBIR
Keywords[tg]=тасвирот,ҷустуҷӯӣ,дархост,kmrml,mrml,CBIR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kmrml/kmrml/mrml_part.desktop new/kdegraphics/kmrml/kmrml/mrml_part.desktop
--- old/kdegraphics/kmrml/kmrml/mrml_part.desktop 2007-03-06 14:56:40.000000000 +0100
+++ new/kdegraphics/kmrml/kmrml/mrml_part.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -38,7 +38,7 @@
Name[se]=MRML-čájeheapmi
Name[sl]=Pregledovalnik MRML
Name[sr]=MRML приказивач
-Name[sr@Latn]=MRML prikazivač
+Name[sr@latin]=MRML prikazivač
Name[ta]=MRML காட்சி
Name[tg]=Намоиши MRML
Name[tr]=MRML Görünümü
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kmrml/kmrml/mrml-servicemenu.desktop new/kdegraphics/kmrml/kmrml/mrml-servicemenu.desktop
--- old/kdegraphics/kmrml/kmrml/mrml-servicemenu.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kmrml/kmrml/mrml-servicemenu.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -41,7 +41,7 @@
Name[se]=Oza seammalágana govaid …
Name[sl]=Išči podobne slike ...
Name[sr]=Потражи сличне слике...
-Name[sr@Latn]=Potraži slične slike...
+Name[sr@latin]=Potraži slične slike...
Name[sv]=Sök efter liknande bilder...
Name[ta]=இதே போன்ற பிம்பங்களை தேடுக...
Name[tg]=Ҷустуҷӯи тасвироти якхела...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kmrml/kmrml/server/daemonwatcher.desktop new/kdegraphics/kmrml/kmrml/server/daemonwatcher.desktop
--- old/kdegraphics/kmrml/kmrml/server/daemonwatcher.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kmrml/kmrml/server/daemonwatcher.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -38,7 +38,7 @@
Name[se]=KDED KMRML-duogášprográmmagoziheaddji
Name[sl]=Opazovalnik demona KMRML za KDED
Name[sr]=KDED KMRML демон за праћење
-Name[sr@Latn]=KDED KMRML demon za praćenje
+Name[sr@latin]=KDED KMRML demon za praćenje
Name[sv]=KDED KMRML-demonbevakare
Name[ta]=KDED டிமென் வாட்சர்
Name[tg]=Мудири демони KDED KMRML
@@ -80,7 +80,7 @@
Comment[ru]=Поддержка протокола MRML
Comment[sl]=Na zahtevo zažene demone in jih ob napaki znova zažene
Comment[sr]=На захтев покреће демоне и поново их покреће ако се сруше
-Comment[sr@Latn]=Na zahtev pokreće demone i ponovo ih pokreće ako se sruše
+Comment[sr@latin]=Na zahtev pokreće demone i ponovo ih pokreće ako se sruše
Comment[sv]=Starta demoner vid behov och starta om dem vid fel
Comment[ta]=அவசிய நேரத்தில் டிமென்னை துவக்குகிறது. இயலாதபோது திரும்ப துவக்குகிறது
Comment[tg]=Оғози демон аз рӯи дархост ва ҳангоми нуқсони он аз сари нав оғоз намудан.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kolourpaint/CMakeLists.txt new/kdegraphics/kolourpaint/CMakeLists.txt
--- old/kdegraphics/kolourpaint/CMakeLists.txt 2007-05-14 20:47:19.000000000 +0200
+++ new/kdegraphics/kolourpaint/CMakeLists.txt 2007-05-29 20:31:38.000000000 +0200
@@ -56,7 +56,7 @@
endmacro(CREATE_VERSION)
-macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintversion.h )
+#macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintversion.h )
create_version(${CMAKE_CURRENT_SOURCE_DIR}/VERSION ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintversion.h)
@@ -69,7 +69,7 @@
FILE(APPEND ${_out_FILE} ";\n")
endmacro(CREATE_LICENSE)
-macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintlicense.h )
+#macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintlicense.h )
create_license(${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintlicense.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kolourpaint/kolourpaint.desktop new/kdegraphics/kolourpaint/kolourpaint.desktop
--- old/kdegraphics/kolourpaint/kolourpaint.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kolourpaint/kolourpaint.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -52,7 +52,7 @@
GenericName[se]=Málenprográmma
GenericName[sl]=Slikarski program
GenericName[sr]=Програм за сликање
-GenericName[sr@Latn]=Program za slikanje
+GenericName[sr@latin]=Program za slikanje
GenericName[sv]=Ritprogram
GenericName[ta]=பெயிண்ட் நிரலி
GenericName[tg]=Муҳаррири графикӣ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kooka/kooka.desktop new/kdegraphics/kooka/kooka.desktop
--- old/kdegraphics/kooka/kooka.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kooka/kooka.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -46,7 +46,7 @@
GenericName[ru]=Программа для сканирования и распознавания текста
GenericName[sl]=Program za skeniranje in prepoznavanje znakov
GenericName[sr]=Програм за скенирање и препознавање текста
-GenericName[sr@Latn]=Program za skeniranje i prepoznavanje teksta
+GenericName[sr@latin]=Program za skeniranje i prepoznavanje teksta
GenericName[sv]=Bildläsar- och OCR-program
GenericName[ta]=வருடு & OCR நிரலி
GenericName[tg]=Барномаи сканеронӣ ва шиносоии матн
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kpovmodeler/kpovmodeler.desktop new/kdegraphics/kpovmodeler/kpovmodeler.desktop
--- old/kdegraphics/kpovmodeler/kpovmodeler.desktop 2007-03-06 14:56:40.000000000 +0100
+++ new/kdegraphics/kpovmodeler/kpovmodeler.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -43,7 +43,7 @@
GenericName[ru]=Редактор Povray
GenericName[sl]=Modelirnik Povray
GenericName[sr]=Моделар за Povray
-GenericName[sr@Latn]=Modelar za Povray
+GenericName[sr@latin]=Modelar za Povray
GenericName[sv]=Modellering med Povray
GenericName[ta]=பாவ்ரே மாடுல்லர்
GenericName[tr]=Povray Modelleyici
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kruler/kruler.desktop new/kdegraphics/kruler/kruler.desktop
--- old/kdegraphics/kruler/kruler.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kruler/kruler.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -41,7 +41,7 @@
GenericName[se]=Šearpmalinjála
GenericName[sl]=Zaslonsko ravnilo
GenericName[sr]=Екрански лењир
-GenericName[sr@Latn]=Ekranski lenjir
+GenericName[sr@latin]=Ekranski lenjir
GenericName[sv]=Skärmlinjal
GenericName[ta]=திரை உருளை
GenericName[tg]=Ҷадвали экрании KDE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/ksnapshot/ksnapshot.desktop new/kdegraphics/ksnapshot/ksnapshot.desktop
--- old/kdegraphics/ksnapshot/ksnapshot.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/ksnapshot/ksnapshot.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -42,7 +42,7 @@
GenericName[se]=Šearbmagovvenprográmma
GenericName[sl]=Program za zajem zaslona
GenericName[sr]=Програм за снимање екрана
-GenericName[sr@Latn]=Program za snimanje ekrana
+GenericName[sr@latin]=Program za snimanje ekrana
GenericName[sv]=Ta en skärmdump
GenericName[ta]=திரை கைப்பற்றும் நிரலி
GenericName[tg]=Эҷоди суратҳои экран
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/kuickshow/src/kuickshow.desktop new/kdegraphics/kuickshow/src/kuickshow.desktop
--- old/kdegraphics/kuickshow/src/kuickshow.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/kuickshow/src/kuickshow.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -64,7 +64,7 @@
GenericName[se]=Govvačájeheaddji
GenericName[sl]=Pregledovalnik slik
GenericName[sr]=Приказивач слика
-GenericName[sr@Latn]=Prikazivač slika
+GenericName[sr@latin]=Prikazivač slika
GenericName[sv]=Bildvisare
GenericName[ta]=பிம்ப காட்சி
GenericName[tg]=Намоиши тасвирот
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/libkscan/scanservice.desktop new/kdegraphics/libkscan/scanservice.desktop
--- old/kdegraphics/libkscan/scanservice.desktop 2007-05-13 08:01:58.000000000 +0200
+++ new/kdegraphics/libkscan/scanservice.desktop 2007-05-29 07:16:09.000000000 +0200
@@ -44,7 +44,7 @@
Name[se]=KDE skánnenbálválus
Name[sl]=Storitev skeniranja za KDE
Name[sr]=KDE-ов сервис за скенирање
-Name[sr@Latn]=KDE-ov servis za skeniranje
+Name[sr@latin]=KDE-ov servis za skeniranje
Name[sv]=KDE:s bildläsartjänst
Name[ta]=கேடிஇ வருடு சேவை
Name[tg]=Сканеронӣ дар KDE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/ligature/plugins/CMakeLists.txt new/kdegraphics/ligature/plugins/CMakeLists.txt
--- old/kdegraphics/ligature/plugins/CMakeLists.txt 2007-05-12 12:56:25.000000000 +0200
+++ new/kdegraphics/ligature/plugins/CMakeLists.txt 2007-05-26 01:57:03.000000000 +0200
@@ -23,9 +23,9 @@
#macro_optional_find_package(PopplerQt4)
#macro_optional_find_package(Poppler)
-#if (POPPLER_FOUND AND POPPLER_QT4_FOUND AND HAVE_POPPLER_HEAD)
+#if (POPPLER_FOUND AND POPPLER_QT4_FOUND AND HAVE_POPPLER_0_6)
# add_subdirectory( pdf )
-#endif (POPPLER_FOUND AND POPPLER_QT4_FOUND AND HAVE_POPPLER_HEAD)
+#endif (POPPLER_FOUND AND POPPLER_QT4_FOUND AND HAVE_POPPLER_0_6)
add_subdirectory( ps )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/ligature/shell/CMakeLists.txt new/kdegraphics/ligature/shell/CMakeLists.txt
--- old/kdegraphics/ligature/shell/CMakeLists.txt 2007-04-02 17:24:14.000000000 +0200
+++ new/kdegraphics/ligature/shell/CMakeLists.txt 2007-05-27 13:31:02.000000000 +0200
@@ -116,6 +116,5 @@
install( FILES ligaturepart.rc DESTINATION ${DATA_INSTALL_DIR}/ligaturepart )
install( FILES ligature.rc DESTINATION ${DATA_INSTALL_DIR}/ligature )
install( FILES ligaturePluginGUI.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-install( FILES ligaturePluginGUIInterface.h DESTINATION ${INCLUDE_INSTALL_DIR})
install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/ligature )
install( FILES org.kde.ligature.MultiPage.xml DESTINATION ${DBUS_INTERFACES_DIR} )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/ligature/shell/ligaturePluginGUIInterface.h new/kdegraphics/ligature/shell/ligaturePluginGUIInterface.h
--- old/kdegraphics/ligature/shell/ligaturePluginGUIInterface.h 2006-11-29 19:32:55.000000000 +0100
+++ new/kdegraphics/ligature/shell/ligaturePluginGUIInterface.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; c-brace-offset: 0; -*-
-#ifndef ligaturePluginGUIINTERFACE_H
-#define ligaturePluginGUIINTERFACE_H
-
-#include "ligature_export.h"
-
-#include
-
-class LIGATURECORE_EXPORT ligaturePluginGUIInterface : virtual public DCOPObject
-{
- K_DCOP
-
- k_dcop:
- // virtual ASYNC jumpToReference(const QString& reference) = 0;
- virtual QString name_of_current_file() = 0;
- virtual bool is_file_loaded(const QString& filename) = 0;
-};
-
-#endif
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/Mainpage.dox new/kdegraphics/Mainpage.dox
--- old/kdegraphics/Mainpage.dox 2007-04-07 15:19:09.000000000 +0200
+++ new/kdegraphics/Mainpage.dox 2007-05-26 21:29:08.000000000 +0200
@@ -5,12 +5,16 @@
* development version of the KDE graphics package.
*
* - <a href="ligature/html/index.html"><b>ligature</b></a>
- * (<a href="ligature/html/classes.html">classes</a>)\n
+ * (<a href="ligature/html/classes.html">classes</a>)\n
* <i>API for the implementation of ligature plugins.</i>
+ * - <a href="okular/html/index.html"><b>okular</b></a>
+ * (<a href="okular/html/classes.html">classes</a>)\n
+ * <i>API for document plugins (aka backends) for okular.</i>
*
* More information about the KDE architecture in form of
* tutorials, HOWTOs,
* and FAQs can be found at
- * the <a href="http://developer.kde.org">KDE Developer's corner</a>.
+ * the <a href="http://techbase.kde.org">KDE TechBase</a>.
*/
-
+// DOXYGEN_VERSION=4.0
+// DOXYGEN_NAME=kdegraphics
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/config-okular.h.cmake new/kdegraphics/okular/config-okular.h.cmake
--- old/kdegraphics/okular/config-okular.h.cmake 2007-05-19 12:51:16.000000000 +0200
+++ new/kdegraphics/okular/config-okular.h.cmake 2007-05-26 01:57:03.000000000 +0200
@@ -1,5 +1,5 @@
/* Defines if force the use DRM in okular */
#define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
-/* Defined if we have the HEAD version of the Poppler library */
-#cmakedefine HAVE_POPPLER_HEAD 1
+/* Defined if we have the 0.6 version of the Poppler library */
+#cmakedefine HAVE_POPPLER_0_6 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/action.h new/kdegraphics/okular/core/action.h
--- old/kdegraphics/okular/core/action.h 2007-05-03 00:50:27.000000000 +0200
+++ new/kdegraphics/okular/core/action.h 2007-05-27 11:53:45.000000000 +0200
@@ -240,7 +240,7 @@
/**
* Creates a new document action.
*
- * @param actionType The type of document action.
+ * @param documentActionType The type of document action.
*/
explicit DocumentAction( enum DocumentActionType documentActionType );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/annotations.h new/kdegraphics/okular/core/annotations.h
--- old/kdegraphics/okular/core/annotations.h 2007-05-04 22:45:45.000000000 +0200
+++ new/kdegraphics/okular/core/annotations.h 2007-05-27 11:59:52.000000000 +0200
@@ -217,13 +217,13 @@
/**
* Sets the @p flags of the annotation.
- * @see @ref Flags
+ * @see @ref Flag
*/
void setFlags( int flags );
/**
* Returns the flags of the annotation.
- * @see @ref Flags
+ * @see @ref Flag
*/
int flags() const;
@@ -346,7 +346,7 @@
int spaces() const;
/**
- * Sets the line @effect of the style.
+ * Sets the line @p effect of the style.
*/
void setLineEffect( LineEffect effect );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/document.cpp new/kdegraphics/okular/core/document.cpp
--- old/kdegraphics/okular/core/document.cpp 2007-05-25 00:52:29.000000000 +0200
+++ new/kdegraphics/okular/core/document.cpp 2007-05-26 21:25:18.000000000 +0200
@@ -1474,7 +1474,7 @@
}
}
-void Document::removePageAnnotations( int page, QList< Annotation * > annotations )
+void Document::removePageAnnotations( int page, const QList< Annotation * > &annotations )
{
// find out the page
Page * kp = d->m_pagesVector[ page ];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/document.h new/kdegraphics/okular/core/document.h
--- old/kdegraphics/okular/core/document.h 2007-05-13 14:54:46.000000000 +0200
+++ new/kdegraphics/okular/core/document.h 2007-05-26 21:25:18.000000000 +0200
@@ -336,7 +336,7 @@
/**
* Removes the given @p annotations from the given @p page.
*/
- void removePageAnnotations( int page, QList annotations );
+ void removePageAnnotations( int page, const QList &annotations );
/**
* Sets the text selection for the given @p page.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/page.h new/kdegraphics/okular/core/page.h
--- old/kdegraphics/okular/core/page.h 2007-05-05 20:07:34.000000000 +0200
+++ new/kdegraphics/okular/core/page.h 2007-05-27 11:59:52.000000000 +0200
@@ -184,7 +184,7 @@
const QLinkedList< Annotation* > annotations() const;
/**
- * Returns the @ref Link object which is associated with the given page @p action
+ * Returns the @ref Action object which is associated with the given page @p action
* or 0 if no page action is set.
*/
const Action * pageAction( PageAction action ) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/core/sound.h new/kdegraphics/okular/core/sound.h
--- old/kdegraphics/okular/core/sound.h 2007-01-20 15:51:43.000000000 +0100
+++ new/kdegraphics/okular/core/sound.h 2007-05-27 11:59:52.000000000 +0200
@@ -96,7 +96,7 @@
int channels() const;
/**
- * Sets the bits per sample @rate.
+ * Sets the bits per sample @p rate.
*/
void setBitsPerSample( int rate );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/generators/poppler/CMakeLists.txt new/kdegraphics/okular/generators/poppler/CMakeLists.txt
--- old/kdegraphics/okular/generators/poppler/CMakeLists.txt 2007-04-06 23:47:06.000000000 +0200
+++ new/kdegraphics/okular/generators/poppler/CMakeLists.txt 2007-05-27 01:15:42.000000000 +0200
@@ -1,5 +1,5 @@
include_directories(
- ${POPPLER_INCLUDE_DIR}/poppler
+ ${POPPLER_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/okular
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
@@ -11,12 +11,12 @@
generator_pdf.cpp
)
-if (HAVE_POPPLER_HEAD)
+if (HAVE_POPPLER_0_6)
set(okularGenerator_poppler_PART_SRCS
${okularGenerator_poppler_PART_SRCS}
formfields.cpp
)
-endif (HAVE_POPPLER_HEAD)
+endif (HAVE_POPPLER_0_6)
kde4_automoc(${okularGenerator_poppler_PART_SRCS})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/generators/poppler/generator_pdf.cpp new/kdegraphics/okular/generators/poppler/generator_pdf.cpp
--- old/kdegraphics/okular/generators/poppler/generator_pdf.cpp 2007-05-24 23:58:50.000000000 +0200
+++ new/kdegraphics/okular/generators/poppler/generator_pdf.cpp 2007-05-26 10:50:40.000000000 +0200
@@ -41,7 +41,7 @@
#include
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
#include "formfields.h"
#endif
@@ -115,6 +115,9 @@
static void fillViewportFromLinkDestination( Okular::DocumentViewport &viewport, const Poppler::LinkDestination &destination, const Poppler::Document *pdfdoc )
{
+#ifdef HAVE_POPPLER_0_6
+ Q_UNUSED( pdfdoc )
+#endif
viewport.pageNumber = destination.pageNumber() - 1;
if (!viewport.isValid()) return;
@@ -126,16 +129,21 @@
// case destXYZ:
if (destination.isChangeLeft() || destination.isChangeTop())
{
- Poppler::Page *page = pdfdoc->page( viewport.pageNumber );
// TODO remember to change this if we implement DPI and/or rotation
double left, top;
left = destination.left();
top = destination.top();
+#ifndef HAVE_POPPLER_0_6
+ Poppler::Page *page = pdfdoc->page( viewport.pageNumber );
QSize pageSize = page->pageSize();
delete page;
viewport.rePos.normalizedX = (double)left / (double)pageSize.width();
viewport.rePos.normalizedY = (double)top / (double)pageSize.height();
+#else
+ viewport.rePos.normalizedX = left;
+ viewport.rePos.normalizedY = top;
+#endif
viewport.rePos.enabled = true;
viewport.rePos.pos = Okular::DocumentViewport::TopLeft;
}
@@ -157,7 +165,7 @@
const Poppler::LinkExecute *popplerLinkExecute;
const Poppler::LinkBrowse *popplerLinkBrowse;
const Poppler::LinkAction *popplerLinkAction;
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
const Poppler::LinkSound *popplerLinkSound;
#endif
Okular::DocumentViewport viewport;
@@ -188,7 +196,7 @@
link = new Okular::DocumentAction( (Okular::DocumentAction::DocumentActionType)popplerLinkAction->actionType() );
break;
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
case Poppler::Link::Sound:
{
popplerLinkSound = static_cast(popplerLink);
@@ -227,14 +235,25 @@
static QLinkedListOkular::ObjectRect* generateLinks( const QListPoppler::Link* &popplerLinks, int width, int height, const Poppler::Document *pdfdoc )
{
+#ifdef HAVE_POPPLER_0_6
+ Q_UNUSED( width )
+ Q_UNUSED( height )
+#endif
QLinkedListOkular::ObjectRect* links;
foreach(const Poppler::Link *popplerLink, popplerLinks)
{
QRectF linkArea = popplerLink->linkArea();
+#ifdef HAVE_POPPLER_0_6
+ double nl = linkArea.left(),
+ nt = linkArea.top(),
+ nr = linkArea.right(),
+ nb = linkArea.bottom();
+#else
double nl = linkArea.left() / (double)width,
nt = linkArea.top() / (double)height,
nr = linkArea.right() / (double)width,
nb = linkArea.bottom() / (double)height;
+#endif
// create the rect using normalized coords and attach the Okular::Link to it
Okular::ObjectRect * rect = new Okular::ObjectRect( nl, nt, nr, nb, false, Okular::ObjectRect::Action, createLinkFromPopplerLink(popplerLink, pdfdoc) );
// add the ObjectRect to the container
@@ -267,7 +286,7 @@
docFontsDirty( true ), docEmbeddedFilesDirty( true )
{
setFeature( TextExtraction );
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
setFeature( ReadRawData );
#endif
// update the configuration
@@ -309,7 +328,7 @@
bool PDFGenerator::loadDocumentFromData( const QByteArray & fileData, QVectorOkular::Page* & pagesVector )
{
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
#ifndef NDEBUG
if ( pdfdoc )
{
@@ -405,7 +424,7 @@
loadPages(pagesVector, 0, false);
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
pdfdoc->setRenderHint(Poppler::Document::Antialiasing);
pdfdoc->setRenderHint(Poppler::Document::TextAntialiasing);
#endif
@@ -459,7 +478,7 @@
addTransition( p, page );
if ( true ) //TODO real check
addAnnotations( p, page );
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
Poppler::Link * tmplink = p->action( Poppler::Page::Opening );
if ( tmplink )
{
@@ -476,9 +495,6 @@
page->setLabel( p->label() );
addFormFields( p, page );
-
- page->setObjectRects( generateLinks(p->links(), pSize.width(), pSize.height(), pdfdoc) );
- rectsGenerated[ page->number() ] = true;
#endif
// kWarning(PDFDebug) << page->width() << "x" << page->height() << endl;
@@ -711,7 +727,7 @@
Poppler::Page *p = pdfdoc->page(page->number());
// 2. Take data from outputdev and attach it to the Page
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
page->setPixmap( request->id(), new QPixmap( QPixmap::fromImage( p->renderToImage(fakeDpiX, fakeDpiY, -1, -1, -1, -1, Poppler::Page::Rotate0 ) ) ) );
#else
page->setPixmap( request->id(), p->splashRenderToPixmap(fakeDpiX, fakeDpiY, -1, -1, request->width(), request->height(), genObjectRects, Poppler::Page::Rotate0 ) );
@@ -814,7 +830,7 @@
docLock.lock();
// TODO rotation
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
double xScale = ((double)width - (double)marginLeft - (double)marginRight) / (double)width;
double yScale = ((double)height - (double)marginBottom - (double)marginTop) / (double)height;
bool strictMargins = false;
@@ -1263,7 +1279,7 @@
void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * page )
{
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
QListPoppler::FormField* popplerFormFields = popplerPage->formFields();
QLinkedListOkular::FormField* okularFormFields;
foreach( Poppler::FormField *f, popplerFormFields )
@@ -1303,7 +1319,7 @@
// THESE VALUES HAVE TO BE IN SYNC with the poppler font type enyum
int i = 0;
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
fontNames.resize(12);
fontNames[i++] = i18n("unknown");
fontNames[i++] = i18n("Type 1");
@@ -1464,7 +1480,7 @@
KPrintDialogPage* PDFGenerator::printConfigurationWidget() const
{
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
return new PDFOptionsPage();
#else
return 0;
@@ -1688,7 +1704,7 @@
if ( !d->m_textList.isEmpty() )
kDebug(PDFDebug) << "PDFPixmapGeneratorThread: previous text not taken" << endl;
#endif
-#ifdef HAVE_POPPLER_HEAD
+#ifdef HAVE_POPPLER_0_6
d->m_image = new QImage( pp->renderToImage( fakeDpiX, fakeDpiY, -1, -1, -1, -1, Poppler::Page::Rotate0 ) );
#else
d->m_image = new QImage( pp->splashRenderToImage( fakeDpiX, fakeDpiY, -1, -1, width, height, genObjectRects, Poppler::Page::Rotate0 ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/ui/minibar.cpp new/kdegraphics/okular/ui/minibar.cpp
--- old/kdegraphics/okular/ui/minibar.cpp 2007-04-19 20:30:20.000000000 +0200
+++ new/kdegraphics/okular/ui/minibar.cpp 2007-05-28 18:34:26.000000000 +0200
@@ -23,6 +23,8 @@
#include
#include
#include
+#include
+#include
#include
// local includes
@@ -55,6 +57,11 @@
public:
HoverButton( QWidget * parent );
+ void setWidthScaleFactor(double widthScale)
+ {
+ m_widthScale = widthScale;
+ }
+
protected:
QSize sizeHint() const;
QSize minimumSizeHint() const;
@@ -62,6 +69,9 @@
void paintEvent( QPaintEvent * e );
void enterEvent( QEvent * e );
void leaveEvent( QEvent * e );
+
+ private:
+ double m_widthScale;
};
@@ -74,49 +84,36 @@
setObjectName( "miniBar" );
QHBoxLayout * horLayout = new QHBoxLayout( this );
+
horLayout->setMargin( 0 );
- horLayout->setSpacing( 0 );
+ horLayout->setSpacing( 3 );
- QFrame * frame = 0;
- // left line
- frame = new QFrame( this );
- frame->setFrameStyle( QFrame::VLine | QFrame::Plain );
- frame->setLineWidth( 1 );
- horLayout->addWidget( frame );
// bottom: left prev_page button
m_prevButton = new HoverButton( this );
m_prevButton->setIcon( KIcon( layoutDirection() == Qt::RightToLeft ? "arrow-right" : "arrow-left" ) );
+ m_prevButton->setIconSize( QSize(K3Icon::SizeMedium,K3Icon::SizeMedium) );
horLayout->addWidget( m_prevButton );
// bottom: left lineEdit (current page box)
m_pagesEdit = new PagesEdit( this );
horLayout->addWidget( m_pagesEdit );
- // bottom: central '/' label
- horLayout->addWidget( new QLabel( "/", this ) );
+ // bottom: central 'of' label
+ horLayout->addSpacing(5);
+ horLayout->addWidget( new QLabel( i18n("of"), this ) );
// bottom: right button
m_pagesButton = new HoverButton( this );
+ m_pagesButton->setWidthScaleFactor(1.0);
horLayout->addWidget( m_pagesButton );
// bottom: right next_page button
m_nextButton = new HoverButton( this );
m_nextButton->setIcon( KIcon( layoutDirection() == Qt::RightToLeft ? "arrow-left" : "arrow-right" ) );
+ m_nextButton->setIconSize( QSize(K3Icon::SizeMedium,K3Icon::SizeMedium) );
horLayout->addWidget( m_nextButton );
- // right line
- frame = new QFrame( this );
- frame->setFrameStyle( QFrame::VLine | QFrame::Plain );
- frame->setLineWidth( 1 );
- horLayout->addWidget( frame );
-
+
QSizePolicy sp = sizePolicy();
sp.setHorizontalPolicy( QSizePolicy::Fixed );
sp.setVerticalPolicy( QSizePolicy::Fixed );
setSizePolicy( sp );
- // resize height of widgets
- int fixedHeight = fontMetrics().height();
- m_pagesEdit->setFixedHeight( fixedHeight );
- m_pagesButton->setFixedHeight( fixedHeight );
- m_prevButton->setFixedHeight( fixedHeight );
- m_nextButton->setFixedHeight( fixedHeight );
-
// resize width of widgets
resizeForPage( 0 );
@@ -402,6 +399,7 @@
HoverButton::HoverButton( QWidget * parent )
: QPushButton( parent )
+ , m_widthScale( 2.0 )
{
setMouseTracking( true );
KAcceleratorManager::setNoAccel( this );
@@ -411,14 +409,14 @@
QSize HoverButton::sizeHint() const
{
QSize base = QPushButton::sizeHint();
- base.setWidth( base.width() * 2 );
+ base.setWidth( (int)(base.width() * m_widthScale) );
return base;
}
QSize HoverButton::minimumSizeHint() const
{
QSize base = QPushButton::minimumSizeHint();
- base.setWidth( base.width() * 2 );
+ base.setWidth( (int)(base.width() * m_widthScale) );
return base;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/ui/pageview.cpp new/kdegraphics/okular/ui/pageview.cpp
--- old/kdegraphics/okular/ui/pageview.cpp 2007-05-23 23:59:12.000000000 +0200
+++ new/kdegraphics/okular/ui/pageview.cpp 2007-05-28 17:29:29.000000000 +0200
@@ -273,6 +273,8 @@
d->setting_viewMode = Okular::Settings::viewMode();
d->setting_viewCols = Okular::Settings::viewColumns();
+ setFrameStyle(QFrame::NoFrame);
+
setAttribute( Qt::WA_StaticContents );
setObjectName( QLatin1String( "okular::pageView" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics/okular/ui/thumbnaillist.cpp new/kdegraphics/okular/ui/thumbnaillist.cpp
--- old/kdegraphics/okular/ui/thumbnaillist.cpp 2007-05-23 23:59:12.000000000 +0200
+++ new/kdegraphics/okular/ui/thumbnaillist.cpp 2007-05-27 18:08:45.000000000 +0200
@@ -474,7 +474,7 @@
delete m_bookmarkOverlay;
int expectedWidth = viewport()->width() / 4;
if ( expectedWidth > 10 )
- m_bookmarkOverlay = new QPixmap( DesktopIcon( "attach", expectedWidth ) );
+ m_bookmarkOverlay = new QPixmap( DesktopIcon( "bookmark", expectedWidth ) );
else
m_bookmarkOverlay = 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org