Mailinglist Archive: opensuse-commit (1945 mails)

< Previous Next >
commit kdegraphics4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 03 Nov 2008 18:12:47 +0100
  • Message-id: <20081103171248.4E0C06780AA@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdegraphics4
checked in at Mon Nov 3 18:12:47 CET 2008.


--------
--- KDE/kdegraphics4/kdegraphics4.changes 2008-10-21 10:40:19.000000000
+0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes
2008-10-31 11:26:23.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Oct 31 11:26:24 CET 2008 - dmueller@xxxxxxx
+
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
kdegraphics-4.1.2.tar.bz2

New:
----
kdegraphics-4.1.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.u13710/_old 2008-11-03 18:12:36.000000000 +0100
+++ /var/tmp/diff_new_pack.u13710/_new 2008-11-03 18:12:36.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.1.2)
+# spec file for package kdegraphics4 (Version 4.1.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -33,8 +33,8 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 4.1.2
-Release: 3
+Version: 4.1.3
+Release: 1
Source0: kdegraphics-%version.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -527,6 +527,9 @@
/usr/bin/xf86gammacfg

%changelog
+* Fri Oct 31 2008 dmueller@xxxxxxx
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
* Tue Oct 21 2008 stbinner@xxxxxxx
- branch diff update: gwenview and okular bug fix backports
* Wed Oct 01 2008 dmueller@xxxxxxx
@@ -576,7 +579,7 @@
- fix postscript support (bnc#366514)
* Tue Apr 08 2008 dmueller@xxxxxxx
- add qca2 to buildrequires
-* Fri Mar 28 2008 dmueller@xxxxxxx
+* Thu Mar 27 2008 dmueller@xxxxxxx
- update to 4.0.3
* Wed Feb 27 2008 dmueller@xxxxxxx
- update to 4.0.2
@@ -612,7 +615,7 @@
- update to 3.94.1
* Thu Oct 11 2007 sbrabec@xxxxxxx
- poppler devel package names prepended by "lib".
-* Wed Oct 10 2007 dmueller@xxxxxxx
+* Tue Oct 09 2007 dmueller@xxxxxxx
- update to KDE 4.0 Beta3
* Tue Oct 09 2007 sbrabec@xxxxxxx
- Fixed typo in SuSE version check in previous change.
@@ -634,7 +637,7 @@
- update to 3.92.0.svn700760
* Thu Aug 09 2007 stbinner@xxxxxxx
- update to 3.92.0.svn697375
-* Sun Jul 29 2007 stbinner@xxxxxxx
+* Sat Jul 28 2007 stbinner@xxxxxxx
- update to KDE 4.0 Beta 1
* Thu Jul 12 2007 stbinner@xxxxxxx
- update to 3.91.0.svn685968

++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.u13710/_old 2008-11-03 18:12:36.000000000 +0100
+++ /var/tmp/diff_new_pack.u13710/_new 2008-11-03 18:12:36.000000000 +0100
@@ -1,478 +1,30 @@
-package: kdegraphics-4.1.2.tar.bz2
+package: kdegraphics-4.1.3.tar.bz2
kdemod: kdegraphics
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 874289
-+svn di between //tags/KDE/4.1.2/kdegraphics and //branches/KDE/4.1/kdegraphics
---- gwenview/app/main.cpp
-+++ gwenview/app/main.cpp
-@@ -36,7 +36,7 @@
- "gwenview", /* appname */
- 0, /* catalogName */
- ki18n("Gwenview"), /* programName */
-- "2.1.2"); /* version */
-+ "2.1.3"); /* version */
- aboutData.setShortDescription(ki18n("An Image Viewer"));
- aboutData.setLicense(KAboutData::License_GPL);
- aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien
Gâteau"));
---- gwenview/app/slideshow.desktop
-+++ gwenview/app/slideshow.desktop
-@@ -28,6 +28,7 @@
- Name[pl]=Uruchom pokaz slajdów
- Name[pt]=Iniciar uma Apresentação
- Name[pt_BR]=Iniciar uma apresentação
-+Name[ru]=Запустить слайд-шоу
- Name[sl]=Začni predstavitev
- Name[sv]=Starta ett bildspel
- Name[th]=เริ่มการนำเสนอ
---- gwenview/lib/croptool.cpp
-+++ gwenview/lib/croptool.cpp
-@@ -189,8 +189,6 @@
++current HEAD: 878038
++svn di between //tags/KDE/4.1.3/kdegraphics and //branches/KDE/4.1/kdegraphics
+--- okular/VERSION
++++ okular/VERSION
+@@ -1 +1 @@
+-Okular v0.7.2
++Okular v0.7.3
+--- okular/core/version.h
++++ okular/core/version.h
+@@ -10,10 +10,10 @@
+ #ifndef _OKULAR_VERSION_H_
+ #define _OKULAR_VERSION_H_
+
+-#define OKULAR_VERSION_STRING "0.7.2"
++#define OKULAR_VERSION_STRING "0.7.3"
+ #define OKULAR_VERSION_MAJOR 0
+ #define OKULAR_VERSION_MINOR 7
+-#define OKULAR_VERSION_RELEASE 2
++#define OKULAR_VERSION_RELEASE 3
+ #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))

-
- void CropTool::mousePressEvent(QMouseEvent* event) {
-- Q_ASSERT(d->mMovingHandle == CH_None);
--
- if (d->mRect.x() == UNINITIALIZED_X) {
- // Nothing selected, user is creating the crop rect
- QPoint pos = imageView()->mapToImage(event->pos());
---- gwenview/lib/thumbnailview/thumbnailview.cpp
-+++ gwenview/lib/thumbnailview/thumbnailview.cpp
-@@ -221,6 +221,7 @@
- void ThumbnailView::rowsAboutToBeRemoved(const QModelIndex& parent, int
start, int end) {
- QListView::rowsAboutToBeRemoved(parent, start, end);
-
-+ // Remove references to removed items
- KFileItemList itemList;
- for (int pos=start; pos<=end; ++pos) {
- QModelIndex index = model()->index(pos, 0, parent);
-@@ -244,6 +245,18 @@
- if (d->mThumbnailLoadJob) {
- d->mThumbnailLoadJob->removeItems(itemList);
- }
-+
-+ // Update current index if it is among the deleted rows
-+ const int row = currentIndex().row();
-+ if (start <= row && row <= end) {
-+ QModelIndex index;
-+ if (end < model()->rowCount() - 1) {
-+ index = model()->index(end + 1, 0);
-+ } else if (start > 0) {
-+ index = model()->index(start - 1, 0);
-+ }
-+ setCurrentIndex(index);
-+ }
- }
-
-
---- gwenview/lib/jpegcontent.cpp
-+++ gwenview/lib/jpegcontent.cpp
-@@ -500,10 +500,12 @@
-
- QImage JpegContent::thumbnail() const {
- QImage image;
-+#ifndef Q_OS_WIN32
- if (!d->mExifData.empty()) {
- Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
- image.loadFromData(thumbnail.pData_, thumbnail.size_);
- }
-+#endif
- return image;
- }
-
-@@ -521,8 +523,9 @@
- kError() << "Could not write thumbnail\n";
- return;
- }
--
-+#ifndef Q_OS_WIN32
- d->mExifData.setJpegThumbnail((unsigned char*)array.data(),
array.size());
-+#endif
- }
-
-
---- gwenview/lib/CMakeLists.txt
-+++ gwenview/lib/CMakeLists.txt
-@@ -101,6 +101,10 @@
-
- kde4_add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
- set_target_properties(gwenviewlib PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} )
-+if( WIN32 )
-+set_target_properties(gwenviewlib PROPERTIES COMPILE_FLAGS -DJPEG_STATIC )
-+endif( WIN32 )
-+
- target_link_libraries(gwenviewlib
- ${KDE4_KPARTS_LIBS}
- ${KDE4_KFILE_LIBS}
---- gwenview/lib/document/loadingdocumentimpl.cpp
-+++ gwenview/lib/document/loadingdocumentimpl.cpp
-@@ -21,6 +21,9 @@
- // Self
- #include "loadingdocumentimpl.moc"
-
-+// STL
-+#include <memory>
-+
- // Qt
- #include <QBuffer>
- #include <QByteArray>
-@@ -78,7 +81,7 @@
- QByteArray mFormat;
- QSize mImageSize;
- Exiv2::Image::AutoPtr mExiv2Image;
-- JpegContent* mJpegContent;
-+ std::auto_ptr<JpegContent> mJpegContent;
- QImage mImage;
-
- void startLoading() {
-@@ -112,7 +115,7 @@
- }
-
- if (mFormat == "jpeg" && mExiv2Image.get()) {
-- mJpegContent = new JpegContent();
-+ mJpegContent.reset(new JpegContent());
- if (!mJpegContent->loadFromData(mData,
mExiv2Image.get())) {
- return false;
- }
-@@ -151,7 +154,7 @@
- return;
- }
-
-- if (mJpegContent) {
-+ if (mJpegContent.get()) {
- Gwenview::Orientation orientation =
mJpegContent->orientation();
- QMatrix matrix =
ImageUtils::transformMatrix(orientation);
- mImage = mImage.transformed(matrix);
-@@ -165,7 +168,6 @@
- , d(new LoadingDocumentImplPrivate) {
- d->mImpl = this;
- d->mMetaDataLoaded = false;
-- d->mJpegContent = 0;
- d->mImageDataInvertedZoom = 0;
-
- connect(&d->mMetaDataFutureWatcher, SIGNAL(finished()),
-@@ -305,10 +307,10 @@
- imageRectUpdated(d->mImage.rect());
- emit loaded();
- DocumentLoadedImpl* impl;
-- if (d->mJpegContent) {
-+ if (d->mJpegContent.get()) {
- impl = new JpegDocumentLoadedImpl(
- document(),
-- d->mJpegContent);
-+ d->mJpegContent.release());
- } else {
- impl = new DocumentLoadedImpl(
- document(),
---- gwenview/part/gvpart.cpp
-+++ gwenview/part/gvpart.cpp
-@@ -290,6 +290,9 @@
- mStatusBarWidgetContainer->show();
- }
- mDocument = DocumentFactory::instance()->load(url);
-+ if (arguments().reload()) {
-+ mDocument->reload();
-+ }
- if (!mGwenviewHost && !UrlUtils::urlIsFastLocalFile(url)) {
- // Keep raw data of remote files to avoid downloading them
again in
- // saveAs()
---- kgamma/kcmkgamma/kgamma.desktop
-+++ kgamma/kcmkgamma/kgamma.desktop
-@@ -19,7 +19,7 @@
- Comment[hi]=मॉनीटर केलिब्रेशन औज़ार
- Comment[hr]=Alat za kalibriranje monitora
- Comment[hu]=Monitorbeállító program
--Comment[is]=Tól til að stilla skjáinn
-+Comment[is]=Áhald til að stilla skjáinn
- Comment[it]=Calibrazione del monitor
- Comment[ja]=モニタ測定ツール
- Comment[kk]=Мониторды калибрлеу құралы
---- okular/core/document_p.h
-+++ okular/core/document_p.h
-@@ -71,6 +71,7 @@
- m_tempFile( 0 ),
- m_docSize( -1 ),
- m_allocatedPixmapsTotalMemory( 0 ),
-+ m_maxAllocatedTextPages( 0 ),
- m_warnedOutOfMemory( false ),
- m_rotation( Rotation0 ),
- m_exportCached( false ),
---- okular/core/textpage.cpp
-+++ okular/core/textpage.cpp
-@@ -381,7 +381,6 @@
- int j=0, len=0, queryLeft=query.length();
- int offset = 0;
- bool haveMatch=false;
-- bool dontIncrement=false;
- bool offsetMoved = false;
- TextList::ConstIterator it = start;
- TextList::ConstIterator it_begin;
-@@ -397,22 +396,7 @@
- }
- offsetMoved = true;
- }
-- if ( query.at(j).isSpace() )
- {
-- // lets match newline as a space
--#ifdef DEBUG_TEXTPAGE
-- kDebug(OkularDebug) << "newline or space";
--#endif
-- j++;
-- queryLeft--;
-- // since we do not really need to increment this after this
-- // run of the loop finishes because we are not comparing it
-- // to any entity, rather we are deducing a situation in a document
-- dontIncrement=true;
-- }
-- else
-- {
-- dontIncrement=false;
- len=str.length();
- int min=qMin(queryLeft,len);
- #ifdef DEBUG_TEXTPAGE
---- okular/core/document.cpp
-+++ okular/core/document.cpp
-@@ -227,7 +227,7 @@
- QString entry = readStream.readLine();
- if ( entry.isNull() ) break;
- if ( entry.startsWith( "MemTotal:" ) )
-- return (cachedValue = (1024 * entry.section( ' ', -2, -2
).toInt()));
-+ return (cachedValue = (Q_UINT64_C(1024) * entry.section( ' ', -2,
-2 ).toULongLong()));
- }
- #elif defined(Q_OS_WIN)
- MEMORYSTATUSEX stat;
-@@ -266,15 +266,15 @@
- entry.startsWith( "Buffers:" ) ||
- entry.startsWith( "Cached:" ) ||
- entry.startsWith( "SwapFree:" ) )
-- memoryFree += entry.section( ' ', -2, -2 ).toInt();
-+ memoryFree += entry.section( ' ', -2, -2 ).toULongLong();
- if ( entry.startsWith( "SwapTotal:" ) )
-- memoryFree -= entry.section( ' ', -2, -2 ).toInt();
-+ memoryFree -= entry.section( ' ', -2, -2 ).toULongLong();
- }
- memFile.close();
-
- lastUpdate = QTime::currentTime();
-
-- return ( cachedValue = (1024 * memoryFree) );
-+ return ( cachedValue = (Q_UINT64_C(1024) * memoryFree) );
- #elif defined(Q_OS_WIN)
- MEMORYSTATUSEX stat;
-
---- okular/shell/shell.cpp
-+++ okular/shell/shell.cpp
-@@ -24,7 +24,6 @@
- #include <kaction.h>
- #include <kapplication.h>
- #include <kcmdlineargs.h>
--#include <kedittoolbar.h>
- #include <kfiledialog.h>
- #include <kpluginloader.h>
- #include <kmessagebox.h>
-@@ -76,7 +75,7 @@
- // tell the KParts::MainWindow that this is indeed the main widget
- setCentralWidget(m_part->widget());
- // and integrate the part's GUI with the shell's
-- setupGUI(Keys | Save);
-+ setupGUI(Keys | ToolBar | Save);
- createGUI(m_part);
- m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction());
- m_doc = qobject_cast<KDocumentViewer*>(m_part);
-@@ -171,7 +170,6 @@
- setStandardToolBarMenuEnabled(true);
-
- m_showMenuBarAction = KStandardAction::showMenubar( this, SLOT(
slotShowMenubar() ), actionCollection());
-- KStandardAction::configureToolbars(this, SLOT(optionsConfigureToolbars()),
actionCollection());
- m_fullScreenAction = KStandardAction::fullScreen( this, SLOT(
slotUpdateFullScreen() ), this,actionCollection() );
- }
-
-@@ -248,20 +246,6 @@
- openUrl( url );
- }
-
-- void
--Shell::optionsConfigureToolbars()
--{
-- KEditToolBar dlg(factory(), this);
-- connect(&dlg, SIGNAL(newToolBarConfig()), this,
SLOT(applyNewToolbarConfig()));
-- dlg.exec();
--}
--
-- void
--Shell::applyNewToolbarConfig()
--{
-- applyMainWindowSettings(KGlobal::config()->group("MainWindow"));
--}
--
- void Shell::slotQuit()
- {
- kapp->closeAllWindows();
---- okular/shell/shell.h
-+++ okular/shell/shell.h
-@@ -70,8 +70,6 @@
- private slots:
- void fileOpen();
-
-- void optionsConfigureToolbars();
-- void applyNewToolbarConfig();
- void slotUpdateFullScreen();
- void slotShowMenubar();
-
---- okular/generators/kimgio/libokularGenerator_kimgio.desktop
-+++ okular/generators/kimgio/libokularGenerator_kimgio.desktop
-@@ -33,6 +33,7 @@
- Name[pl]=Biblioteki KDE do obsługi obrazków
- Name[pt]=Bibliotecas de imagens do KDE
- Name[pt_BR]=Biblioteca de imagens do KDE
-+Name[ru]=Библиотеки поддержки форматов изображений
- Name[sl]=KDE-jeve knjižnice za slike
- Name[sv]=KDE-bildbibliotek
- Name[th]=ไลบรารีจัดการภาพสำหรับ KDE
-@@ -65,6 +66,7 @@
- Comment[pl]=Obsługa obrazków dla Okulara
- Comment[pt]=Infra-estrutura de imagens para o Okular
- Comment[pt_BR]=Infra-estrutura de imagens para o Okular
-+Comment[ru]=Модуль поддержки изображений для Okular
- Comment[sl]=Hrbtenica za slike za Okular
- Comment[sv]=Bildgränssnitt för Okular
- Comment[th]=แบ็คเอนต์จัดการภาพสำหรับ Okular
---- okular/generators/comicbook/libokularGenerator_comicbook.desktop
-+++ okular/generators/comicbook/libokularGenerator_comicbook.desktop
-@@ -51,6 +51,7 @@
- Comment[pl]=Silnik komiksu dla Okulara
- Comment[pt]=Infra-estrutura de banda desenhada para o Okular
- Comment[pt_BR]=Infra-estrutura Comic book para o Okular
-+Comment[ru]=Модуль поддержки формата Comic book для Okular
- Comment[sl]=Hrbtenica za stripe za Okular
- Comment[sv]=Seriebokgränssnitt för Okular
- Comment[th]=แบ็คเอนต์หนังสือการ์ตูนสำหรับ Okular
---- okular/generators/chm/libokularGenerator_chmlib.desktop
-+++ okular/generators/chm/libokularGenerator_chmlib.desktop
-@@ -28,6 +28,7 @@
- Comment[pl]=Obsługa Windows HTMLHelp dla Okulara
- Comment[pt]=Infra-estrutura de HTMLHelp do Windows para o Okular
- Comment[pt_BR]=Infra-estrutura do Windows HTMLHelp para o Okular
-+Comment[ru]=Модуль поддержки формата Windows HTMLHelp для Okular
- Comment[sl]=Hrbtenica za Windows pomoč v obliki HTML za Okular
- Comment[sv]=Windows HTMLHelp-gränssnitt för Okular
- Comment[th]=แบ็คเอนต์แฟ้มช่วยเหลือแบบ HTML ของวินโดว์ส สำหรับ Okular
---- okular/ui/pagepainter.cpp
-+++ okular/ui/pagepainter.cpp
-@@ -536,7 +536,7 @@
- acolor.setAlpha( opacity );
-
- // get annotation boundary and drawn rect
-- QRect annotBoundary = a->transformedBoundingRectangle().geometry(
scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() ).intersect(
limits );
-+ QRect annotBoundary = a->transformedBoundingRectangle().geometry(
scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() );
- QRect annotRect = annotBoundary.intersect( limits );
- QRect innerRect( annotRect.left() - annotBoundary.left(),
annotRect.top() -
- annotBoundary.top(), annotRect.width(),
annotRect.height() );
---- okular/ui/findbar.cpp
-+++ okular/ui/findbar.cpp
-@@ -91,6 +91,7 @@
- void FindBar::focusAndSetCursor()
- {
- setFocus();
-+ m_text->selectAll();
- m_text->setFocus();
- }
-
---- okular/ui/pageview.cpp
-+++ okular/ui/pageview.cpp
-@@ -31,6 +31,7 @@
- #include <qclipboard.h>
-
- #include <kaction.h>
-+#include <kactionmenu.h>
- #include <kstandardaction.h>
- #include <kactioncollection.h>
- #include <kmenu.h>
-@@ -149,7 +150,7 @@
- KToggleAction * aZoomFitWidth;
- KToggleAction * aZoomFitPage;
- KToggleAction * aZoomFitText;
-- KSelectAction * aViewMode;
-+ KActionMenu * aViewMode;
- KToggleAction * aViewContinuous;
- QAction * aPrevAction;
- KAction * aToggleForms;
-@@ -459,16 +460,25 @@
- */
-
- // View-Layout actions
-- QStringList viewModes;
-- viewModes.append( i18n( "Single Page" ) );
-- viewModes.append( i18n( "Facing Pages" ) );
-- viewModes.append( i18n( "Overview" ) );
--
-- d->aViewMode = new KSelectAction(KIcon( "view-split-left-right" ),
i18n("&View Mode"), this);
-+ d->aViewMode = new KActionMenu( KIcon( "view-split-left-right" ), i18n(
"&View Mode" ), this );
-+ d->aViewMode->setDelayed( false );
-+#define ADD_VIEWMODE_ACTION( text, name, id ) \
-+do { \
-+ KAction *vm = new KAction( text, d->aViewMode->menu() ); \
-+ vm->setCheckable( true ); \
-+ vm->setData( qVariantFromValue( id ) ); \
-+ d->aViewMode->addAction( vm ); \
-+ ac->addAction( name, vm ); \
-+ vmGroup->addAction( vm ); \
-+} while( 0 )
- ac->addAction("view_render_mode", d->aViewMode );
-- connect( d->aViewMode, SIGNAL( triggered( int ) ), SLOT( slotViewMode(
int ) ) );
-- d->aViewMode->setItems( viewModes );
-- d->aViewMode->setCurrentItem( Okular::Settings::viewMode() );
-+ QActionGroup *vmGroup = new QActionGroup( d->aViewMode->menu() );
-+ ADD_VIEWMODE_ACTION( i18n( "Single Page" ), "view_render_mode_single", 0
);
-+ ADD_VIEWMODE_ACTION( i18n( "Facing Pages" ), "view_render_mode_facing", 1
);
-+ ADD_VIEWMODE_ACTION( i18n( "Overview" ), "view_render_mode_overview", 2 );
-+ d->aViewMode->menu()->actions().at( Okular::Settings::viewMode()
)->setChecked( true );
-+ connect( vmGroup, SIGNAL( triggered( QAction* ) ), this, SLOT(
slotViewMode( QAction* ) ) );
-+#undef ADD_VIEWMODE_ACTION
-
- d->aViewContinuous = new KToggleAction(KIcon( "view-list-text" ),
i18n("&Continuous"), this);
- ac->addAction("view_continuous", d->aViewContinuous );
-@@ -571,7 +581,7 @@
- d->aZoomFitWidth->setChecked( true );
- d->aZoomFitPage->setChecked( false );
- // d->aZoomFitText->setChecked( false );
-- d->aViewMode->setCurrentItem( 0 );
-+ d->aViewMode->menu()->actions().at( 0 )->setChecked( true );
- viewport()->setUpdatesEnabled( false );
- slotRelayoutPages();
- viewport()->setUpdatesEnabled( true );
-@@ -2001,7 +2011,7 @@
- {
- KMimeType::Ptr mime = KMimeType::findByUrl( fileName
);
- QString type;
-- if ( !mime )
-+ if ( !mime || mime == KMimeType::defaultMimeTypePtr()
)
- type = "PNG";
- else
- type = mime->name().section( '/', -1 ).toUpper();
-@@ -3178,8 +3188,9 @@
- if ( on ) updateZoom( ZoomFitText );
- }
-
--void PageView::slotViewMode( int nr )
-+void PageView::slotViewMode( QAction *action )
- {
-+ const int nr = action->data().toInt();
- if ( (int)Okular::Settings::viewMode() != nr )
- {
- Okular::Settings::setViewMode( nr );
---- okular/ui/pageview.h
-+++ okular/ui/pageview.h
-@@ -190,7 +190,7 @@
- void slotFitToWidthToggled( bool );
- void slotFitToPageToggled( bool );
- void slotFitToTextToggled( bool );
-- void slotViewMode( int );
-+ void slotViewMode( QAction *action );
- void slotContinuousToggled( bool );
- void slotSetMouseNormal();
- void slotSetMouseZoom();
+ #define OKULAR_VERSION \

Property changes on: .
___________________________________________________________________

++++++ kdegraphics-4.1.2.tar.bz2 -> kdegraphics-4.1.3.tar.bz2 ++++++
Files old/kdegraphics-4.1.2/doc/gwenview/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/kamera/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/kgamma/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/kolourpaint/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/kruler/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/ksnapshot/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-4.1.2/doc/okular/index.cache.bz2 and
new/kdegraphics-4.1.3/doc/okular/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/app/main.cpp
new/kdegraphics-4.1.3/gwenview/app/main.cpp
--- old/kdegraphics-4.1.2/gwenview/app/main.cpp 2008-09-25 14:01:43.000000000
+0200
+++ new/kdegraphics-4.1.3/gwenview/app/main.cpp 2008-10-30 14:22:49.000000000
+0100
@@ -36,7 +36,7 @@
"gwenview", /* appname */
0, /* catalogName */
ki18n("Gwenview"), /* programName */
- "2.1.2"); /* version */
+ "2.1.3"); /* version */
aboutData.setShortDescription(ki18n("An Image Viewer"));
aboutData.setLicense(KAboutData::License_GPL);
aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien
Gâteau"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/app/slideshow.desktop
new/kdegraphics-4.1.3/gwenview/app/slideshow.desktop
--- old/kdegraphics-4.1.2/gwenview/app/slideshow.desktop 2008-09-25
14:01:43.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/app/slideshow.desktop 2008-10-30
14:22:49.000000000 +0100
@@ -28,6 +28,7 @@
Name[pl]=Uruchom pokaz slajdów
Name[pt]=Iniciar uma Apresentação
Name[pt_BR]=Iniciar uma apresentação
+Name[ru]=Запустить слайд-шоу
Name[sl]=Začni predstavitev
Name[sv]=Starta ett bildspel
Name[th]=เริ่มการนำเสนอ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/lib/CMakeLists.txt
new/kdegraphics-4.1.3/gwenview/lib/CMakeLists.txt
--- old/kdegraphics-4.1.2/gwenview/lib/CMakeLists.txt 2008-06-25
09:54:21.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/CMakeLists.txt 2008-10-30
14:22:49.000000000 +0100
@@ -101,6 +101,10 @@

kde4_add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
set_target_properties(gwenviewlib PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} )
+if( WIN32 )
+set_target_properties(gwenviewlib PROPERTIES COMPILE_FLAGS -DJPEG_STATIC )
+endif( WIN32 )
+
target_link_libraries(gwenviewlib
${KDE4_KPARTS_LIBS}
${KDE4_KFILE_LIBS}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/lib/croptool.cpp
new/kdegraphics-4.1.3/gwenview/lib/croptool.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/croptool.cpp 2008-05-07
11:05:18.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/croptool.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -189,8 +189,6 @@


void CropTool::mousePressEvent(QMouseEvent* event) {
- Q_ASSERT(d->mMovingHandle == CH_None);
-
if (d->mRect.x() == UNINITIALIZED_X) {
// Nothing selected, user is creating the crop rect
QPoint pos = imageView()->mapToImage(event->pos());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/gwenview/lib/document/loadingdocumentimpl.cpp
new/kdegraphics-4.1.3/gwenview/lib/document/loadingdocumentimpl.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/document/loadingdocumentimpl.cpp
2008-06-25 09:54:21.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/document/loadingdocumentimpl.cpp
2008-10-30 14:22:49.000000000 +0100
@@ -21,6 +21,9 @@
// Self
#include "loadingdocumentimpl.moc"

+// STL
+#include <memory>
+
// Qt
#include <QBuffer>
#include <QByteArray>
@@ -78,7 +81,7 @@
QByteArray mFormat;
QSize mImageSize;
Exiv2::Image::AutoPtr mExiv2Image;
- JpegContent* mJpegContent;
+ std::auto_ptr<JpegContent> mJpegContent;
QImage mImage;

void startLoading() {
@@ -112,7 +115,7 @@
}

if (mFormat == "jpeg" && mExiv2Image.get()) {
- mJpegContent = new JpegContent();
+ mJpegContent.reset(new JpegContent());
if (!mJpegContent->loadFromData(mData,
mExiv2Image.get())) {
return false;
}
@@ -151,7 +154,7 @@
return;
}

- if (mJpegContent) {
+ if (mJpegContent.get()) {
Gwenview::Orientation orientation =
mJpegContent->orientation();
QMatrix matrix =
ImageUtils::transformMatrix(orientation);
mImage = mImage.transformed(matrix);
@@ -165,7 +168,6 @@
, d(new LoadingDocumentImplPrivate) {
d->mImpl = this;
d->mMetaDataLoaded = false;
- d->mJpegContent = 0;
d->mImageDataInvertedZoom = 0;

connect(&d->mMetaDataFutureWatcher, SIGNAL(finished()),
@@ -305,10 +307,10 @@
imageRectUpdated(d->mImage.rect());
emit loaded();
DocumentLoadedImpl* impl;
- if (d->mJpegContent) {
+ if (d->mJpegContent.get()) {
impl = new JpegDocumentLoadedImpl(
document(),
- d->mJpegContent);
+ d->mJpegContent.release());
} else {
impl = new DocumentLoadedImpl(
document(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/lib/imageview.cpp
new/kdegraphics-4.1.3/gwenview/lib/imageview.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/imageview.cpp 2008-07-23
10:25:16.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/imageview.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -621,7 +621,7 @@
}

if (!d->mEnlargeSmallerImages) {
- zoom = qMin(zoom, 1.0);
+ zoom = qMin(zoom, qreal(1.0));
}

return zoom;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/lib/jpegcontent.cpp
new/kdegraphics-4.1.3/gwenview/lib/jpegcontent.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/jpegcontent.cpp 2008-06-10
13:40:55.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/jpegcontent.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -501,7 +501,12 @@
QImage JpegContent::thumbnail() const {
QImage image;
if (!d->mExifData.empty()) {
+#if (EXIV2_TEST_VERSION(0,17,91))
+ Exiv2::ExifThumbC thumb(d->mExifData);
+ Exiv2::DataBuf thumbnail = thumb.copy();
+#else
Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
+#endif
image.loadFromData(thumbnail.pData_, thumbnail.size_);
}
return image;
@@ -521,8 +526,12 @@
kError() << "Could not write thumbnail\n";
return;
}
-
+#if (EXIV2_TEST_VERSION(0,17,91))
+ Exiv2::ExifThumb thumb(d->mExifData);
+ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
+#else
d->mExifData.setJpegThumbnail((unsigned char*)array.data(),
array.size());
+#endif
}


diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/lib/thumbnailloadjob.cpp
new/kdegraphics-4.1.3/gwenview/lib/thumbnailloadjob.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/thumbnailloadjob.cpp 2008-09-25
14:01:43.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/thumbnailloadjob.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -183,9 +183,11 @@
loaded = true;
needCaching = false;
}
+#ifndef Q_OS_WIN32
if(!loaded) {
loaded = loadJpeg();
}
+#endif
if (loaded) {
// Rotate if necessary
Orientation orientation = content.orientation();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/gwenview/lib/thumbnailview/thumbnailview.cpp
new/kdegraphics-4.1.3/gwenview/lib/thumbnailview/thumbnailview.cpp
--- old/kdegraphics-4.1.2/gwenview/lib/thumbnailview/thumbnailview.cpp
2008-09-25 14:01:43.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/lib/thumbnailview/thumbnailview.cpp
2008-10-30 14:22:49.000000000 +0100
@@ -221,6 +221,7 @@
void ThumbnailView::rowsAboutToBeRemoved(const QModelIndex& parent, int start,
int end) {
QListView::rowsAboutToBeRemoved(parent, start, end);

+ // Remove references to removed items
KFileItemList itemList;
for (int pos=start; pos<=end; ++pos) {
QModelIndex index = model()->index(pos, 0, parent);
@@ -244,6 +245,18 @@
if (d->mThumbnailLoadJob) {
d->mThumbnailLoadJob->removeItems(itemList);
}
+
+ // Update current index if it is among the deleted rows
+ const int row = currentIndex().row();
+ if (start <= row && row <= end) {
+ QModelIndex index;
+ if (end < model()->rowCount() - 1) {
+ index = model()->index(end + 1, 0);
+ } else if (start > 0) {
+ index = model()->index(start - 1, 0);
+ }
+ setCurrentIndex(index);
+ }
}


diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/gwenview/part/gvpart.cpp
new/kdegraphics-4.1.3/gwenview/part/gvpart.cpp
--- old/kdegraphics-4.1.2/gwenview/part/gvpart.cpp 2008-07-23
10:25:16.000000000 +0200
+++ new/kdegraphics-4.1.3/gwenview/part/gvpart.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -290,6 +290,9 @@
mStatusBarWidgetContainer->show();
}
mDocument = DocumentFactory::instance()->load(url);
+ if (arguments().reload()) {
+ mDocument->reload();
+ }
if (!mGwenviewHost && !UrlUtils::urlIsFastLocalFile(url)) {
// Keep raw data of remote files to avoid downloading them
again in
// saveAs()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/kgamma/kcmkgamma/kgamma.desktop
new/kdegraphics-4.1.3/kgamma/kcmkgamma/kgamma.desktop
--- old/kdegraphics-4.1.2/kgamma/kcmkgamma/kgamma.desktop 2008-09-25
14:01:43.000000000 +0200
+++ new/kdegraphics-4.1.3/kgamma/kcmkgamma/kgamma.desktop 2008-10-30
14:22:49.000000000 +0100
@@ -19,7 +19,7 @@
Comment[hi]=मॉनीटर केलिब्रेशन औज़ार
Comment[hr]=Alat za kalibriranje monitora
Comment[hu]=Monitorbeállító program
-Comment[is]=Tól til að stilla skjáinn
+Comment[is]=Áhald til að stilla skjáinn
Comment[it]=Calibrazione del monitor
Comment[ja]=モニタ測定ツール
Comment[kk]=Мониторды калибрлеу құралы
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents.cpp

new/kdegraphics-4.1.3/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents.cpp
---
old/kdegraphics-4.1.2/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents.cpp
2008-01-05 00:53:47.000000000 +0100
+++
new/kdegraphics-4.1.3/kolourpaint/tools/selection/text/kpToolText_KeyboardEvents.cpp
2008-10-30 14:22:50.000000000 +0100
@@ -89,7 +89,7 @@
// TODO: don't like this check
else if ((ke->modifiers () &
(Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) ==
0 &&
- ke->key () < 0x100 /*QChar (ke->key ()).isPrint () - unfortunately
F1 is printable too...*/)
+ !( ke->text ().isEmpty ()))
{
#if DEBUG_KP_TOOL_TEXT
kDebug () << "\tis text - grab";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/core/document.cpp
new/kdegraphics-4.1.3/okular/core/document.cpp
--- old/kdegraphics-4.1.2/okular/core/document.cpp 2008-09-25
14:01:44.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/core/document.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -227,7 +227,7 @@
QString entry = readStream.readLine();
if ( entry.isNull() ) break;
if ( entry.startsWith( "MemTotal:" ) )
- return (cachedValue = (1024 * entry.section( ' ', -2, -2
).toInt()));
+ return (cachedValue = (Q_UINT64_C(1024) * entry.section( ' ', -2,
-2 ).toULongLong()));
}
#elif defined(Q_OS_WIN)
MEMORYSTATUSEX stat;
@@ -266,15 +266,15 @@
entry.startsWith( "Buffers:" ) ||
entry.startsWith( "Cached:" ) ||
entry.startsWith( "SwapFree:" ) )
- memoryFree += entry.section( ' ', -2, -2 ).toInt();
+ memoryFree += entry.section( ' ', -2, -2 ).toULongLong();
if ( entry.startsWith( "SwapTotal:" ) )
- memoryFree -= entry.section( ' ', -2, -2 ).toInt();
+ memoryFree -= entry.section( ' ', -2, -2 ).toULongLong();
}
memFile.close();

lastUpdate = QTime::currentTime();

- return ( cachedValue = (1024 * memoryFree) );
+ return ( cachedValue = (Q_UINT64_C(1024) * memoryFree) );
#elif defined(Q_OS_WIN)
MEMORYSTATUSEX stat;

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/core/document_p.h
new/kdegraphics-4.1.3/okular/core/document_p.h
--- old/kdegraphics-4.1.2/okular/core/document_p.h 2008-09-25
14:01:44.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/core/document_p.h 2008-10-30
14:22:49.000000000 +0100
@@ -71,6 +71,7 @@
m_tempFile( 0 ),
m_docSize( -1 ),
m_allocatedPixmapsTotalMemory( 0 ),
+ m_maxAllocatedTextPages( 0 ),
m_warnedOutOfMemory( false ),
m_rotation( Rotation0 ),
m_exportCached( false ),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/core/textpage.cpp
new/kdegraphics-4.1.3/okular/core/textpage.cpp
--- old/kdegraphics-4.1.2/okular/core/textpage.cpp 2008-05-07
11:05:18.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/core/textpage.cpp 2008-10-30
14:22:49.000000000 +0100
@@ -381,7 +381,6 @@
int j=0, len=0, queryLeft=query.length();
int offset = 0;
bool haveMatch=false;
- bool dontIncrement=false;
bool offsetMoved = false;
TextList::ConstIterator it = start;
TextList::ConstIterator it_begin;
@@ -397,22 +396,7 @@
}
offsetMoved = true;
}
- if ( query.at(j).isSpace() )
{
- // lets match newline as a space
-#ifdef DEBUG_TEXTPAGE
- kDebug(OkularDebug) << "newline or space";
-#endif
- j++;
- queryLeft--;
- // since we do not really need to increment this after this
- // run of the loop finishes because we are not comparing it
- // to any entity, rather we are deducing a situation in a document
- dontIncrement=true;
- }
- else
- {
- dontIncrement=false;
len=str.length();
int min=qMin(queryLeft,len);
#ifdef DEBUG_TEXTPAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/okular/generators/chm/libokularGenerator_chmlib.desktop
new/kdegraphics-4.1.3/okular/generators/chm/libokularGenerator_chmlib.desktop
---
old/kdegraphics-4.1.2/okular/generators/chm/libokularGenerator_chmlib.desktop
2008-09-25 14:01:44.000000000 +0200
+++
new/kdegraphics-4.1.3/okular/generators/chm/libokularGenerator_chmlib.desktop
2008-10-30 14:22:50.000000000 +0100
@@ -28,6 +28,7 @@
Comment[pl]=Obsługa Windows HTMLHelp dla Okulara
Comment[pt]=Infra-estrutura de HTMLHelp do Windows para o Okular
Comment[pt_BR]=Infra-estrutura do Windows HTMLHelp para o Okular
+Comment[ru]=Модуль поддержки формата Windows HTMLHelp для Okular
Comment[sl]=Hrbtenica za Windows pomoč v obliki HTML za Okular
Comment[sv]=Windows HTMLHelp-gränssnitt för Okular
Comment[th]=แบ็คเอนต์แฟ้มช่วยเหลือแบบ HTML ของวินโดว์ส สำหรับ Okular
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/okular/generators/comicbook/libokularGenerator_comicbook.desktop

new/kdegraphics-4.1.3/okular/generators/comicbook/libokularGenerator_comicbook.desktop
---
old/kdegraphics-4.1.2/okular/generators/comicbook/libokularGenerator_comicbook.desktop
2008-09-25 14:01:44.000000000 +0200
+++
new/kdegraphics-4.1.3/okular/generators/comicbook/libokularGenerator_comicbook.desktop
2008-10-30 14:22:50.000000000 +0100
@@ -51,6 +51,7 @@
Comment[pl]=Silnik komiksu dla Okulara
Comment[pt]=Infra-estrutura de banda desenhada para o Okular
Comment[pt_BR]=Infra-estrutura Comic book para o Okular
+Comment[ru]=Модуль поддержки формата Comic book для Okular
Comment[sl]=Hrbtenica za stripe za Okular
Comment[sv]=Seriebokgränssnitt för Okular
Comment[th]=แบ็คเอนต์หนังสือการ์ตูนสำหรับ Okular
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/okular/generators/djvu/generator_djvu.cpp
new/kdegraphics-4.1.3/okular/generators/djvu/generator_djvu.cpp
--- old/kdegraphics-4.1.2/okular/generators/djvu/generator_djvu.cpp
2008-08-28 10:06:52.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/generators/djvu/generator_djvu.cpp
2008-10-30 14:22:50.000000000 +0100
@@ -205,15 +205,15 @@
if ( m_djvu->exportAsPostScript( &tf, pageList ) )
{
tf.setAutoRemove( false );
- int ret = Okular::FilePrinter::printFile( printer, tf.fileName(),
+ const QString fileName = tf.fileName();
+ tf.close();
+ int ret = Okular::FilePrinter::printFile( printer, fileName,

Okular::FilePrinter::SystemDeletesFiles,

Okular::FilePrinter::ApplicationSelectsPages,

document()->bookmarkedPageRange() );
result = ( ret >=0 );
}

- tf.close();
-
return result;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdegraphics-4.1.2/okular/generators/kimgio/libokularGenerator_kimgio.desktop

new/kdegraphics-4.1.3/okular/generators/kimgio/libokularGenerator_kimgio.desktop
---
old/kdegraphics-4.1.2/okular/generators/kimgio/libokularGenerator_kimgio.desktop
2008-09-25 14:01:44.000000000 +0200
+++
new/kdegraphics-4.1.3/okular/generators/kimgio/libokularGenerator_kimgio.desktop
2008-10-30 14:22:50.000000000 +0100
@@ -33,6 +33,7 @@
Name[pl]=Biblioteki KDE do obsługi obrazków
Name[pt]=Bibliotecas de imagens do KDE
Name[pt_BR]=Biblioteca de imagens do KDE
+Name[ru]=Библиотеки поддержки форматов изображений
Name[sl]=KDE-jeve knjižnice za slike
Name[sv]=KDE-bildbibliotek
Name[th]=ไลบรารีจัดการภาพสำหรับ KDE
@@ -65,6 +66,7 @@
Comment[pl]=Obsługa obrazków dla Okulara
Comment[pt]=Infra-estrutura de imagens para o Okular
Comment[pt_BR]=Infra-estrutura de imagens para o Okular
+Comment[ru]=Модуль поддержки изображений для Okular
Comment[sl]=Hrbtenica za slike za Okular
Comment[sv]=Bildgränssnitt för Okular
Comment[th]=แบ็คเอนต์จัดการภาพสำหรับ Okular
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/shell/shell.cpp
new/kdegraphics-4.1.3/okular/shell/shell.cpp
--- old/kdegraphics-4.1.2/okular/shell/shell.cpp 2008-09-25
14:01:44.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/shell/shell.cpp 2008-10-30
14:22:50.000000000 +0100
@@ -24,7 +24,6 @@
#include <kaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
-#include <kedittoolbar.h>
#include <kfiledialog.h>
#include <kpluginloader.h>
#include <kmessagebox.h>
@@ -76,7 +75,7 @@
// tell the KParts::MainWindow that this is indeed the main widget
setCentralWidget(m_part->widget());
// and integrate the part's GUI with the shell's
- setupGUI(Keys | Save);
+ setupGUI(Keys | ToolBar | Save);
createGUI(m_part);
m_showToolBarAction = static_cast<KToggleAction*>(toolBarMenuAction());
m_doc = qobject_cast<KDocumentViewer*>(m_part);
@@ -171,7 +170,6 @@
setStandardToolBarMenuEnabled(true);

m_showMenuBarAction = KStandardAction::showMenubar( this, SLOT(
slotShowMenubar() ), actionCollection());
- KStandardAction::configureToolbars(this, SLOT(optionsConfigureToolbars()),
actionCollection());
m_fullScreenAction = KStandardAction::fullScreen( this, SLOT(
slotUpdateFullScreen() ), this,actionCollection() );
}

@@ -248,20 +246,6 @@
openUrl( url );
}

- void
-Shell::optionsConfigureToolbars()
-{
- KEditToolBar dlg(factory(), this);
- connect(&dlg, SIGNAL(newToolBarConfig()), this,
SLOT(applyNewToolbarConfig()));
- dlg.exec();
-}
-
- void
-Shell::applyNewToolbarConfig()
-{
- applyMainWindowSettings(KGlobal::config()->group("MainWindow"));
-}
-
void Shell::slotQuit()
{
kapp->closeAllWindows();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/shell/shell.h
new/kdegraphics-4.1.3/okular/shell/shell.h
--- old/kdegraphics-4.1.2/okular/shell/shell.h 2008-01-05 00:53:45.000000000
+0100
+++ new/kdegraphics-4.1.3/okular/shell/shell.h 2008-10-30 14:22:50.000000000
+0100
@@ -70,8 +70,6 @@
private slots:
void fileOpen();

- void optionsConfigureToolbars();
- void applyNewToolbarConfig();
void slotUpdateFullScreen();
void slotShowMenubar();

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/ui/findbar.cpp
new/kdegraphics-4.1.3/okular/ui/findbar.cpp
--- old/kdegraphics-4.1.2/okular/ui/findbar.cpp 2008-04-18 09:21:29.000000000
+0200
+++ new/kdegraphics-4.1.3/okular/ui/findbar.cpp 2008-10-30 14:22:50.000000000
+0100
@@ -91,6 +91,7 @@
void FindBar::focusAndSetCursor()
{
setFocus();
+ m_text->selectAll();
m_text->setFocus();
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/ui/pagepainter.cpp
new/kdegraphics-4.1.3/okular/ui/pagepainter.cpp
--- old/kdegraphics-4.1.2/okular/ui/pagepainter.cpp 2008-06-18
14:41:08.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/ui/pagepainter.cpp 2008-10-30
14:22:50.000000000 +0100
@@ -536,7 +536,7 @@
acolor.setAlpha( opacity );

// get annotation boundary and drawn rect
- QRect annotBoundary = a->transformedBoundingRectangle().geometry(
scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() ).intersect(
limits );
+ QRect annotBoundary = a->transformedBoundingRectangle().geometry(
scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() );
QRect annotRect = annotBoundary.intersect( limits );
QRect innerRect( annotRect.left() - annotBoundary.left(),
annotRect.top() -
annotBoundary.top(), annotRect.width(), annotRect.height()
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/ui/pageview.cpp
new/kdegraphics-4.1.3/okular/ui/pageview.cpp
--- old/kdegraphics-4.1.2/okular/ui/pageview.cpp 2008-09-25
14:01:44.000000000 +0200
+++ new/kdegraphics-4.1.3/okular/ui/pageview.cpp 2008-10-30
14:22:50.000000000 +0100
@@ -31,6 +31,7 @@
#include <qclipboard.h>

#include <kaction.h>
+#include <kactionmenu.h>
#include <kstandardaction.h>
#include <kactioncollection.h>
#include <kmenu.h>
@@ -149,7 +150,7 @@
KToggleAction * aZoomFitWidth;
KToggleAction * aZoomFitPage;
KToggleAction * aZoomFitText;
- KSelectAction * aViewMode;
+ KActionMenu * aViewMode;
KToggleAction * aViewContinuous;
QAction * aPrevAction;
KAction * aToggleForms;
@@ -459,16 +460,25 @@
*/

// View-Layout actions
- QStringList viewModes;
- viewModes.append( i18n( "Single Page" ) );
- viewModes.append( i18n( "Facing Pages" ) );
- viewModes.append( i18n( "Overview" ) );
-
- d->aViewMode = new KSelectAction(KIcon( "view-split-left-right" ),
i18n("&View Mode"), this);
+ d->aViewMode = new KActionMenu( KIcon( "view-split-left-right" ), i18n(
"&View Mode" ), this );
+ d->aViewMode->setDelayed( false );
+#define ADD_VIEWMODE_ACTION( text, name, id ) \
+do { \
+ KAction *vm = new KAction( text, d->aViewMode->menu() ); \
+ vm->setCheckable( true ); \
+ vm->setData( qVariantFromValue( id ) ); \
+ d->aViewMode->addAction( vm ); \
+ ac->addAction( name, vm ); \
+ vmGroup->addAction( vm ); \
+} while( 0 )
ac->addAction("view_render_mode", d->aViewMode );
- connect( d->aViewMode, SIGNAL( triggered( int ) ), SLOT( slotViewMode( int
) ) );
- d->aViewMode->setItems( viewModes );
- d->aViewMode->setCurrentItem( Okular::Settings::viewMode() );
+ QActionGroup *vmGroup = new QActionGroup( d->aViewMode->menu() );
+ ADD_VIEWMODE_ACTION( i18n( "Single Page" ), "view_render_mode_single", 0 );
+ ADD_VIEWMODE_ACTION( i18n( "Facing Pages" ), "view_render_mode_facing", 1
);
+ ADD_VIEWMODE_ACTION( i18n( "Overview" ), "view_render_mode_overview", 2 );
+ d->aViewMode->menu()->actions().at( Okular::Settings::viewMode()
)->setChecked( true );
+ connect( vmGroup, SIGNAL( triggered( QAction* ) ), this, SLOT(
slotViewMode( QAction* ) ) );
+#undef ADD_VIEWMODE_ACTION

d->aViewContinuous = new KToggleAction(KIcon( "view-list-text" ),
i18n("&Continuous"), this);
ac->addAction("view_continuous", d->aViewContinuous );
@@ -571,7 +581,7 @@
d->aZoomFitWidth->setChecked( true );
d->aZoomFitPage->setChecked( false );
// d->aZoomFitText->setChecked( false );
- d->aViewMode->setCurrentItem( 0 );
+ d->aViewMode->menu()->actions().at( 0 )->setChecked( true );
viewport()->setUpdatesEnabled( false );
slotRelayoutPages();
viewport()->setUpdatesEnabled( true );
@@ -2001,7 +2011,7 @@
{
KMimeType::Ptr mime = KMimeType::findByUrl( fileName );
QString type;
- if ( !mime )
+ if ( !mime || mime == KMimeType::defaultMimeTypePtr() )
type = "PNG";
else
type = mime->name().section( '/', -1 ).toUpper();
@@ -3178,8 +3188,9 @@
if ( on ) updateZoom( ZoomFitText );
}

-void PageView::slotViewMode( int nr )
+void PageView::slotViewMode( QAction *action )
{
+ const int nr = action->data().toInt();
if ( (int)Okular::Settings::viewMode() != nr )
{
Okular::Settings::setViewMode( nr );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdegraphics-4.1.2/okular/ui/pageview.h
new/kdegraphics-4.1.3/okular/ui/pageview.h
--- old/kdegraphics-4.1.2/okular/ui/pageview.h 2008-05-29 13:18:37.000000000
+0200
+++ new/kdegraphics-4.1.3/okular/ui/pageview.h 2008-10-30 14:22:50.000000000
+0100
@@ -190,7 +190,7 @@
void slotFitToWidthToggled( bool );
void slotFitToPageToggled( bool );
void slotFitToTextToggled( bool );
- void slotViewMode( int );
+ void slotViewMode( QAction *action );
void slotContinuousToggled( bool );
void slotSetMouseNormal();
void slotSetMouseZoom();


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread