Hello community,
here is the log from the commit of package kdegraphics4
checked in at Sat Apr 26 11:31:58 CEST 2008.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2008-04-14 14:17:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2008-04-25 17:26:31.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 25 17:26:24 CEST 2008 - dmueller@suse.de
+
+- branch diff update
+- fix file lists
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.dw7310/_old 2008-04-26 11:31:41.000000000 +0200
+++ /var/tmp/diff_new_pack.dw7310/_new 2008-04-26 11:31:41.000000000 +0200
@@ -27,7 +27,7 @@
Summary: kdegraphics base package
Url: http://www.kde.org
Version: 4.0.3
-Release: 7
+Release: 14
%define rversion 4.0.3
Source0: kdegraphics-%rversion.tar.bz2
Source1: _upstream
@@ -196,7 +196,20 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%dir /usr/share/doc/kde/HTML/en/kolourpaint4
-/usr/share/kde4/apps/kolourpaint4
+%dir /usr/share/kde4/apps/kolourpaint4
+%dir /usr/share/kde4/apps/kolourpaint4/icons
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/16x16
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/16x16/actions
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/22x22
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/22x22/actions
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/32x32
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/32x32/actions
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/48x48
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/48x48/actions
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/scalable
+%dir /usr/share/kde4/apps/kolourpaint4/icons/hicolor/scalable/actions
+%dir /usr/share/kde4/apps/kolourpaint4/pics
%package -n kde4-kruler
License: GPL v2 or later
@@ -343,7 +356,6 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%dir /usr/share/kde4/apps/gvpart
-/usr/share/icons/hicolor/*/apps/gwenview.*
%files -f filelists/exclude
%defattr(-,root,root)
@@ -358,6 +370,9 @@
%_kde_share_dir/services/svgpart.desktop
%changelog
+* Fri Apr 25 2008 dmueller@suse.de
+- branch diff update
+- fix file lists
* Mon Apr 14 2008 dmueller@suse.de
- fix postscript support (bnc#366514)
* Tue Apr 08 2008 dmueller@suse.de
++++++ 4_0_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.dw7310/_old 2008-04-26 11:31:41.000000000 +0200
+++ /var/tmp/diff_new_pack.dw7310/_new 2008-04-26 11:31:41.000000000 +0200
@@ -3,8 +3,500 @@
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 790947
++current HEAD: 799322
+svn di between //tags/KDE/4.0.3/kdegraphics and //branches/KDE/4.0/kdegraphics
+--- strigi-analyzer/raw/kfile_raw.desktop
++++ strigi-analyzer/raw/kfile_raw.desktop
+@@ -26,7 +26,7 @@
+ Name[km]=ឯកសារចេញពីម៉ាស៊ីនថតរូប
+ Name[ko]=RAW 카메라 파일
+ Name[lt]=RAW camera failas
+-Name[lv]=RAW kameras faili
++Name[lv]=RAW fotogrāfiju faili
+ Name[nb]=RAW-kamerafiler
+ Name[nds]=RAW-Kameradateien
+ Name[ne]=RAW क्यामेरा फाइल
+--- gwenview/lib/mimetypeutils.cpp
++++ gwenview/lib/mimetypeutils.cpp
+@@ -25,6 +25,7 @@
+
+ // KDE
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -84,12 +85,14 @@
+
+
+ QString urlMimeType(const KUrl& url) {
+- QString mimeType;
+- if (url.isLocalFile()) {
+- return KMimeType::findByUrl(url)->name();
+- } else {
+- return KIO::NetAccess::mimetype(url, KApplication::kApplication()->activeWindow());
++ // Try a simple guess, using extension for remote urls
++ QString mimeType = KMimeType::findByUrl(url)->name();
++ if (mimeType == "application/octet-stream") {
++ // No luck, look deeper. This can happens with http urls if the filename
++ // does not provide any extension.
++ mimeType = KIO::NetAccess::mimetype(url, KApplication::kApplication()->activeWindow());
+ }
++ return mimeType;
+ }
+
+
+--- okular/part.cpp
++++ okular/part.cpp
+@@ -760,6 +760,7 @@
+ m_find->setEnabled( ok && canSearch );
+ m_findNext->setEnabled( ok && canSearch );
+ m_saveAs->setEnabled( ok );
++ emit enablePrintAction( ok && m_document->printingSupport() != Okular::Document::NoPrinting );
+ m_printPreview->setEnabled( ok && m_document->printingSupport() != Okular::Document::NoPrinting );
+ m_showProperties->setEnabled( ok );
+ bool hasEmbeddedFiles = ok && m_document->embeddedFiles() && m_document->embeddedFiles()->count() > 0;
+@@ -833,7 +834,6 @@
+ setWindowTitleFromDocument();
+ }
+
+- emit enablePrintAction(openOk && m_document->printingSupport() != Okular::Document::NoPrinting);
+ return openOk;
+ }
+
+--- okular/core/bookmarkmanager.cpp
++++ okular/core/bookmarkmanager.cpp
+@@ -224,6 +224,7 @@
+ KUrl newurl = referurl;
+ newurl.setHTMLRef( vp.toString() );
+ it.value().addBookmark( newtitle, newurl, QString() );
++ d->urlBookmarks.insert( vp.pageNumber );
+ foreachObserver( notifyPageChanged( vp.pageNumber, DocumentObserver::Bookmark ) );
+ return true;
+ }
+@@ -251,6 +252,7 @@
+ return -1;
+
+ it.value().deleteBookmark( bm );
++ d->urlBookmarks.remove( vp.pageNumber );
+
+ foreachObserver( notifyPageChanged( vp.pageNumber, DocumentObserver::Bookmark ) );
+
+--- okular/core/textdocumentgenerator.cpp
++++ okular/core/textdocumentgenerator.cpp
+@@ -221,7 +221,22 @@
+ d->mDocument = d->mConverter->convert( fileName );
+
+ if ( !d->mDocument )
++ {
++ // loading failed, cleanup all the stuff eventually gathered from the converter
++ d->mTitlePositions.clear();
++ Q_FOREACH ( const TextDocumentGeneratorPrivate::LinkPosition &linkPos, d->mLinkPositions )
++ {
++ delete linkPos.link;
++ }
++ d->mLinkPositions.clear();
++ Q_FOREACH ( const TextDocumentGeneratorPrivate::AnnotationPosition &annPos, d->mAnnotationPositions )
++ {
++ delete annPos.annotation;
++ }
++ d->mAnnotationPositions.clear();
++
+ return false;
++ }
+
+ d->generateTitleInfos();
+ d->generateLinkInfos();
+@@ -274,7 +289,11 @@
+ d->mTitlePositions.clear();
+ d->mLinkPositions.clear();
+ d->mLinkInfos.clear();
++ d->mAnnotationPositions.clear();
+ d->mAnnotationInfos.clear();
++ // do not use clear() for the following two, otherwise they change type
++ d->mDocumentInfo = Okular::DocumentInfo();
++ d->mDocumentSynopsis = Okular::DocumentSynopsis();
+
+ return true;
+ }
+--- okular/generators/comicbook/document.cpp
++++ okular/generators/comicbook/document.cpp
+@@ -25,15 +25,11 @@
+
+ Document::~Document()
+ {
+- delete mUnrar;
+- delete mZip;
+ }
+
+ bool Document::open( const QString &fileName )
+ {
+- delete mZip;
+- delete mUnrar;
+- mPageMap.clear();
++ close();
+
+ /**
+ * We have a zip archive
+@@ -93,6 +89,18 @@
+ return true;
+ }
+
++void Document::close()
++{
++ if ( !( mZip || mUnrar ) )
++ return;
++
++ delete mZip;
++ mZip = 0;
++ delete mUnrar;
++ mUnrar = 0;
++ mPageMap.clear();
++}
++
+ void Document::extractImageFiles( const QStringList &list )
+ {
+ QStringList files( list );
+--- okular/generators/comicbook/document.h
++++ okular/generators/comicbook/document.h
+@@ -26,6 +26,7 @@
+ ~Document();
+
+ bool open( const QString &fileName );
++ void close();
+
+ int pages() const;
+ QStringList pageTitles() const;
+--- okular/generators/comicbook/generator_comicbook.cpp
++++ okular/generators/comicbook/generator_comicbook.cpp
+@@ -57,6 +57,8 @@
+
+ bool ComicBookGenerator::doCloseDocument()
+ {
++ mDocument.close();
++
+ return true;
+ }
+
+--- okular/generators/plucker/generator_plucker.cpp
++++ okular/generators/plucker/generator_plucker.cpp
+@@ -119,6 +119,9 @@
+ qDeleteAll( mPages );
+ mPages.clear();
+
++ // do not use clear() for the following, otherwise its type is changed
++ mDocumentInfo = Okular::DocumentInfo();
++
+ return true;
+ }
+
+--- okular/generators/ooo/converter.cpp
++++ okular/generators/ooo/converter.cpp
+@@ -62,14 +62,12 @@
+
+ Converter::Converter()
+ : mTextDocument( 0 ), mCursor( 0 ),
+- mStyleInformation( new StyleInformation )
++ mStyleInformation( 0 )
+ {
+ }
+
+ Converter::~Converter()
+ {
+- delete mStyleInformation;
+- mStyleInformation = 0;
+ }
+
+ QTextDocument* Converter::convert( const QString &fileName )
+@@ -99,6 +97,8 @@
+ return false;
+ }
+
++ mStyleInformation = new StyleInformation();
++
+ /**
+ * Read the style properties, so the are available when
+ * parsing the content.
+@@ -160,6 +160,8 @@
+ }
+
+ delete mCursor;
++ delete mStyleInformation;
++ mStyleInformation = 0;
+
+ return mTextDocument;
+ }
+--- okular/ui/pageview.cpp
++++ okular/ui/pageview.cpp
+@@ -333,8 +333,8 @@
+ setWidgetResizable(true);
+
+ // conntect the padding of the viewport to pixmaps requests
+- connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps()));
+- connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps()));
++ connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps(int)));
++ connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRequestVisiblePixmaps(int)));
+ connect( &d->dragScrollTimer, SIGNAL(timeout()), this, SLOT(slotDragScroll()) );
+
+ // set a corner button to resize the view to the page size
+@@ -2647,6 +2647,14 @@
+ else
+ fullHeight = rowHeight[ pageRowIdx ];
+
++ if (!horizontalScrollBar()->isVisible() && !verticalScrollBar()->isVisible() && fullWidth == viewportWidth &&
++ fullHeight - viewportHeight == 1 && d->zoomMode == ZoomFitWidth)
++ {
++ // this saves us from infinite resizing loop because of scrollbars appearing and disappearing
++ // see bug 160628
++ fullHeight = viewportHeight;
++ }
++
+ // 3) arrange widgets inside cells (and refine fullHeight if needed)
+ int insertX = 0,
+ insertY = fullHeight < viewportHeight ? ( viewportHeight - fullHeight ) / 2 : 0;
+@@ -2741,7 +2749,7 @@
+ widget()->update();
+ }
+
+-void PageView::slotRequestVisiblePixmaps()
++void PageView::slotRequestVisiblePixmaps( int newValue )
+ {
+ // if requests are blocked (because raised by an unwanted event), exit
+ if ( d->blockPixmapsRequest || d->viewportMoveActive ||
+@@ -2749,7 +2757,7 @@
+ return;
+
+ // precalc view limits for intersecting with page coords inside the lOOp
+- bool isEvent = !d->blockViewport;
++ bool isEvent = newValue != -1 && !d->blockViewport;
+ QRect viewportRect( horizontalScrollBar()->value(),
+ verticalScrollBar()->value(),
+ viewport()->width(), viewport()->height() );
+--- okular/ui/guiutils.cpp
++++ okular/ui/guiutils.cpp
+@@ -10,6 +10,7 @@
+ #include "guiutils.h"
+
+ // qt/kde includes
++#include
+ #include
+ #include
+ #include
+@@ -100,7 +101,9 @@
+
+ QString contentsHtml( const Okular::Annotation * ann )
+ {
+- return contents( ann ).replace( "\n", "<br>" );
++ QString text = Qt::escape( contents( ann ) );
++ text.replace( "\n", "<br>" );
++ return text;
+ }
+
+ QString prettyToolTip( const Okular::Annotation * ann )
+--- okular/ui/pageviewannotator.cpp
++++ okular/ui/pageviewannotator.cpp
+@@ -460,19 +460,27 @@
+ {
+ QPoint start( (int)( lastPoint.x * item()->width() ), (int)( lastPoint.y * item()->height() ) );
+ QPoint end( (int)( nX * item()->width() ), (int)( nY * item()->height() ) );
++ delete selection;
++ selection = 0;
+ Okular::RegularAreaRect * newselection = m_pageView->textSelectionForItem( item(), start, end );
+- QList<QRect> geom = newselection->geometry( (int)xScale, (int)yScale );
+- QRect newrect;
+- foreach( const QRect& r, geom )
++ if ( !newselection->isEmpty() )
+ {
+- if ( newrect.isNull() )
+- newrect = r;
+- else
+- newrect |= r;
++ QList<QRect> geom = newselection->geometry( (int)xScale, (int)yScale );
++ QRect newrect;
++ Q_FOREACH ( const QRect& r, geom )
++ {
++ if ( newrect.isNull() )
++ newrect = r;
++ else
++ newrect |= r;
++ }
++ rect |= newrect;
++ selection = newselection;
++ }
++ else
++ {
++ delete newselection;
+ }
+- rect |= newrect;
+- delete selection;
+- selection = newselection;
+ }
+ }
+ else if ( type == Release && selection )
+--- okular/ui/annotationwidgets.cpp
++++ okular/ui/annotationwidgets.cpp
+@@ -301,12 +301,12 @@
+ gb->setTitle( i18n( "Line Extensions" ) );
+ QGridLayout * gridlay = new QGridLayout( gb );
+ QLabel * tmplabel = new QLabel( i18n( "Leader Line Length:" ), gb );
+- gridlay->addWidget( tmplabel, 0, 0 );
++ gridlay->addWidget( tmplabel, 0, 0, Qt::AlignRight );
+ m_spinLL = new QDoubleSpinBox( gb );
+ gridlay->addWidget( m_spinLL, 0, 1 );
+ tmplabel->setBuddy( m_spinLL );
+ tmplabel = new QLabel( i18n( "Leader Line Extensions Length:" ), gb );
+- gridlay->addWidget( tmplabel, 1, 0 );
++ gridlay->addWidget( tmplabel, 1, 0, Qt::AlignRight );
+ m_spinLLE = new QDoubleSpinBox( gb );
+ gridlay->addWidget( m_spinLLE, 1, 1 );
+ tmplabel->setBuddy( m_spinLLE );
+@@ -317,7 +317,7 @@
+ gb2->setTitle( i18n( "Style" ) );
+ QGridLayout * gridlay2 = new QGridLayout( gb2 );
+ QLabel * tmplabel2 = new QLabel( i18n( "&Size:" ), gb2 );
+- gridlay2->addWidget( tmplabel2, 0, 0 );
++ gridlay2->addWidget( tmplabel2, 0, 0, Qt::AlignRight );
+ m_spinSize = new QDoubleSpinBox( gb2 );
+ gridlay2->addWidget( m_spinSize, 0, 1 );
+ tmplabel2->setBuddy( m_spinSize );
+@@ -371,7 +371,7 @@
+ QHBoxLayout * typelay = new QHBoxLayout();
+ lay->addLayout( typelay );
+ QLabel * tmplabel = new QLabel( i18n( "Type:" ), m_widget );
+- typelay->addWidget( tmplabel );
++ typelay->addWidget( tmplabel, 0, Qt::AlignRight );
+ m_typeCombo = new QComboBox( m_widget );
+ tmplabel->setBuddy( m_typeCombo );
+ typelay->addWidget( m_typeCombo );
+@@ -409,7 +409,7 @@
+ QGridLayout * lay = new QGridLayout( m_widget );
+ lay->setMargin( 0 );
+ QLabel * tmplabel = new QLabel( i18n( "Type:" ), m_widget );
+- lay->addWidget( tmplabel, 0, 0 );
++ lay->addWidget( tmplabel, 0, 0, Qt::AlignRight );
+ m_typeCombo = new QComboBox( m_widget );
+ tmplabel->setBuddy( m_typeCombo );
+ lay->addWidget( m_typeCombo, 0, 1 );
+--- okular/ui/annotationpropertiesdialog.cpp
++++ okular/ui/annotationpropertiesdialog.cpp
+@@ -59,8 +59,7 @@
+ QGridLayout * gridlayout = new QGridLayout( page );
+
+ tmplabel = new QLabel( i18n( "&Color:" ), page );
+- tmplabel->setAlignment( ( tmplabel->alignment() & ~Qt::AlignHorizontal_Mask ) | Qt::AlignRight );
+- gridlayout->addWidget( tmplabel, 0, 0 );
++ gridlayout->addWidget( tmplabel, 0, 0, Qt::AlignRight );
+ colorBn = new KColorButton( page );
+ colorBn->setColor( ann->style().color() );
+ colorBn->setEnabled( canEditAnnotations );
+@@ -68,8 +67,7 @@
+ gridlayout->addWidget( colorBn, 0, 1 );
+
+ tmplabel = new QLabel( i18n( "&Opacity:" ), page );
+- tmplabel->setAlignment( ( tmplabel->alignment() & ~Qt::AlignHorizontal_Mask ) | Qt::AlignRight );
+- gridlayout->addWidget( tmplabel, 1, 0 );
++ gridlayout->addWidget( tmplabel, 1, 0, Qt::AlignRight );
+ m_opacity = new KIntNumInput( page );
+ m_opacity->setRange( 0, 100 );
+ m_opacity->setValue( (int)( ann->style().opacity() * 100 ) );
+@@ -94,19 +92,20 @@
+ // m_tabitem[1]->setIcon( KIcon( "fonts" ) );
+ gridlayout = new QGridLayout( page );
+ tmplabel = new QLabel( i18n( "&Author:" ), page );
+- tmplabel->setAlignment( ( tmplabel->alignment() & ~Qt::AlignHorizontal_Mask ) | Qt::AlignRight );
+ AuthorEdit = new QLineEdit( ann->author(), page );
+ AuthorEdit->setEnabled( canEditAnnotations );
+ tmplabel->setBuddy( AuthorEdit );
+- gridlayout->addWidget( tmplabel, 0, 0 );
++ gridlayout->addWidget( tmplabel, 0, 0, Qt::AlignRight );
+ gridlayout->addWidget( AuthorEdit, 0, 1 );
+
+ tmplabel = new QLabel( page );
+ tmplabel->setText( i18n( "Created: %1", KGlobal::locale()->formatDateTime( ann->creationDate(), KLocale::LongDate, true ) ) );
++ tmplabel->setTextInteractionFlags( Qt::TextSelectableByMouse );
+ gridlayout->addWidget( tmplabel, 1, 0, 1, 2 );
+
+ m_modifyDateLabel = new QLabel( page );
+ m_modifyDateLabel->setText( i18n( "Modified: %1", KGlobal::locale()->formatDateTime( ann->modificationDate(), KLocale::LongDate, true ) ) );
++ m_modifyDateLabel->setTextInteractionFlags( Qt::TextSelectableByMouse );
+ gridlayout->addWidget( m_modifyDateLabel, 2, 0, 1, 2 );
+
+ gridlayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Fixed, QSizePolicy::MinimumExpanding ), 3, 0 );
+--- okular/ui/bookmarklist.cpp
++++ okular/ui/bookmarklist.cpp
+@@ -42,11 +42,20 @@
+ m_viewport = Okular::DocumentViewport( m_url.htmlRef() );
+ m_url.setHTMLRef( QString() );
+ setText( 0, m_bookmark.fullText() );
+- setToolTip( 0, m_bookmark.fullText() );
+ if ( m_viewport.isValid() )
+ setData( 0, PageItemDelegate::PageRole, QString::number( m_viewport.pageNumber + 1 ) );
+ }
+
++ virtual QVariant data( int column, int role ) const
++ {
++ switch ( role )
++ {
++ case Qt::ToolTipRole:
++ return m_bookmark.fullText();
++ }
++ return QTreeWidgetItem::data( column, role );
++ }
++
+ KBookmark& bookmark()
+ {
+ return m_bookmark;
+--- okular/ui/pageview.h
++++ okular/ui/pageview.h
+@@ -164,7 +164,7 @@
+ // activated either directly or via QTimer on the viewportResizeEvent
+ void slotRelayoutPages();
+ // activated either directly or via the contentsMoving(int,int) signal
+- void slotRequestVisiblePixmaps();
++ void slotRequestVisiblePixmaps( int newValue = -1 );
+ // activated by the viewport move timer
+ void slotMoveViewport();
+ // activated by the autoscroll timer (Shift+Up/Down keys)
+--- okular/ui/presentationwidget.cpp
++++ okular/ui/presentationwidget.cpp
+@@ -479,9 +479,16 @@
+
+ // check painting rect consistancy
+ QRect r = pe->rect().intersect( geometry() );
+- if ( r.isNull() || m_lastRenderedPixmap.isNull() )
++ if ( r.isNull() )
+ return;
+
++ if ( m_lastRenderedPixmap.isNull() )
++ {
++ QPainter painter( this );
++ painter.fillRect( pe->rect(), Okular::Settings::slidesBackgroundColor() );
++ return;
++ }
++
+ // blit the pixmap to the screen
+ QVector<QRect> allRects = pe->region().rects();
+ uint numRects = allRects.count();
+--- kamera/kcontrol/kamera.desktop
++++ kamera/kcontrol/kamera.desktop
+@@ -29,7 +29,7 @@
+ Comment[km]=កំណត់រចនាសម្ព័ន្ធ Kamera
+ Comment[ko]=Kamera 설정
+ Comment[lt]=Konfigūruoti Kamera
+-Comment[lv]=Konfigurēt kameru
++Comment[lv]=Konfigurēt fotoaparātu
+ Comment[mk]=Конфигурирајте ја Kamera
+ Comment[ms]=Konfigurasi Kamera
+ Comment[nb]=Tilpass Kamera
+@@ -138,7 +138,7 @@
+ Name[km]=ម៉ាស៊ីនថតរូបឌីជីថល
+ Name[ko]=디지털 카메라
+ Name[lt]=Skaitmeninė kamera
+-Name[lv]=Digitālā kamera
++Name[lv]=Digitālais fotoaparāts
+ Name[mk]=Дигитална камера
+ Name[ms]=Kamera Digital
+ Name[nb]=Digitalkamera
Property changes on: .
___________________________________________________________________
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org