Hello community,
here is the log from the commit of package kdegraphics4
checked in at Fri Nov 2 12:04:31 CET 2007.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2007-10-26 18:10:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-11-01 12:20:51.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 1 12:20:51 CET 2007 - dmueller@suse.de
+
+- update to 3.95.1
+
+-------------------------------------------------------------------
Old:
----
kdegraphics-3.95.0.tar.bz2
New:
----
kdegraphics-3.95.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.K13302/_old 2007-11-02 12:02:50.000000000 +0100
+++ /var/tmp/diff_new_pack.K13302/_new 2007-11-02 12:02:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 3.95.0)
+# spec file for package kdegraphics4 (Version 3.95.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -29,9 +29,9 @@
Group: Productivity/Graphics/Other
Summary: kdegraphics base package
Url: http://www.kde.org
-Version: 3.95.0
+Version: 3.95.1
Release: 1
-%define rversion 3.95.0
+%define rversion 3.95.1
Source0: kdegraphics-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -424,6 +424,8 @@
/usr/share/icons/oxygen/*/actions/palette_lineart.*
%_kde_share_dir/services/scanservice.desktop
%changelog
+* Thu Nov 01 2007 - dmueller@suse.de
+- update to 3.95.1
* Fri Oct 26 2007 - dmueller@suse.de
- update to KDE 4.0 beta4
* Thu Oct 18 2007 - dmueller@suse.de
++++++ kdegraphics-3.95.0.tar.bz2 -> kdegraphics-3.95.1.tar.bz2 ++++++
Files old/kdegraphics-3.95.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-3.95.1/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/kamera/index.cache.bz2 and new/kdegraphics-3.95.1/doc/kamera/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/kgamma/index.cache.bz2 and new/kdegraphics-3.95.1/doc/kgamma/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/kghostview/index.cache.bz2 and new/kdegraphics-3.95.1/doc/kghostview/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-3.95.1/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/kruler/index.cache.bz2 and new/kdegraphics-3.95.1/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-3.95.1/doc/ksnapshot/index.cache.bz2 differ
Files old/kdegraphics-3.95.0/doc/okular/index.cache.bz2 and new/kdegraphics-3.95.1/doc/okular/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/app/CMakeLists.txt new/kdegraphics-3.95.1/gwenview/app/CMakeLists.txt
--- old/kdegraphics-3.95.0/gwenview/app/CMakeLists.txt 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/app/CMakeLists.txt 2007-10-31 21:42:16.000000000 +0100
@@ -1,6 +1,7 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/..
+ ${EXIV2_INCLUDE_DIR}
)
set(gwenview_SRCS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/app/infocontextmanageritem.cpp new/kdegraphics-3.95.1/gwenview/app/infocontextmanageritem.cpp
--- old/kdegraphics-3.95.0/gwenview/app/infocontextmanageritem.cpp 2007-10-08 09:19:14.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/app/infocontextmanageritem.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -184,7 +184,10 @@
void InfoContextManagerItem::slotMetaDataLoaded() {
- Q_ASSERT(d->mDocument);
+ // We might not have a document anymore if we just selected two files
+ if (!d->mDocument) {
+ return;
+ }
d->mImageMetaInfo.setGeneralInfo(d->mFileItem, d->mDocument->size());
d->mImageMetaInfo.setExiv2Image(d->mDocument->exiv2Image());
updateOneFileInfo();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/app/mainwindow.cpp new/kdegraphics-3.95.1/gwenview/app/mainwindow.cpp
--- old/kdegraphics-3.95.0/gwenview/app/mainwindow.cpp 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/app/mainwindow.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -884,6 +884,7 @@
showFullScreen();
menuBar()->hide();
toolBar()->hide();
+ d->mSaveBar->setForceHide(true);
if (!d->mFullScreenBar) {
d->createFullScreenBar();
}
@@ -895,6 +896,7 @@
// Back to normal
d->mDocumentView->setViewBackgroundColor(GwenviewConfig::viewBackgroundColor());
d->mSlideShow->stop();
+ d->mSaveBar->setForceHide(false);
d->mFullScreenBar->setActivated(false);
showNormal();
menuBar()->show();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/app/savebar.cpp new/kdegraphics-3.95.1/gwenview/app/savebar.cpp
--- old/kdegraphics-3.95.0/gwenview/app/savebar.cpp 2007-10-08 09:19:14.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/app/savebar.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -44,6 +44,7 @@
QLabel* mMessage;
QLabel* mActions;
KUrl mCurrentUrl;
+ bool mForceHide;
};
@@ -59,6 +60,8 @@
d->mActions = new QLabel(this);
d->mActions->setAlignment(Qt::AlignRight);
d->mActions->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+ d->mForceHide = false;
+
QHBoxLayout* layout = new QHBoxLayout(this);
layout->addWidget(d->mMessage);
layout->addWidget(d->mActions);
@@ -79,7 +82,22 @@
}
+void SaveBar::setForceHide(bool value) {
+ d->mForceHide = value;
+ if (d->mForceHide) {
+ hide();
+ } else {
+ updateContent();
+ }
+}
+
+
void SaveBar::updateContent() {
+ if (d->mForceHide) {
+ hide();
+ return;
+ }
+
QList<KUrl> lst = DocumentFactory::instance()->modifiedDocumentList();
if (lst.size() == 0) {
hide();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/app/savebar.h new/kdegraphics-3.95.1/gwenview/app/savebar.h
--- old/kdegraphics-3.95.0/gwenview/app/savebar.h 2007-10-08 09:19:14.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/app/savebar.h 2007-10-31 21:42:16.000000000 +0100
@@ -42,6 +42,12 @@
void setCurrentUrl(const KUrl&);
+ /**
+ * Keep save bar hidden even if there are modifications.
+ * Useful for fullscreen mode.
+ */
+ void setForceHide(bool);
+
bool saveAll();
Q_SIGNALS:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/lib/CMakeLists.txt new/kdegraphics-3.95.1/gwenview/lib/CMakeLists.txt
--- old/kdegraphics-3.95.0/gwenview/lib/CMakeLists.txt 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/lib/CMakeLists.txt 2007-10-31 21:42:16.000000000 +0100
@@ -1,6 +1,7 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/..
+ ${EXIV2_INCLUDE_DIR}
)
set(gwenviewlib_SRCS
@@ -60,6 +61,11 @@
kde4_add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
set_target_properties(gwenviewlib PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-target_link_libraries(gwenviewlib ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} ${JPEG_LIBRARY} ${EXIV2_LIBRARIES})
+target_link_libraries(gwenviewlib
+ ${KDE4_KPARTS_LIBS}
+ ${KDE4_KFILE_LIBS}
+ ${JPEG_LIBRARY}
+ ${EXIV2_LIBRARIES}
+ )
install(TARGETS gwenviewlib DESTINATION ${LIB_INSTALL_DIR})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/lib/fullscreenbar.cpp new/kdegraphics-3.95.1/gwenview/lib/fullscreenbar.cpp
--- old/kdegraphics-3.95.0/gwenview/lib/fullscreenbar.cpp 2007-10-23 10:37:07.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/lib/fullscreenbar.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -123,6 +123,7 @@
qApp->installEventFilter(this);
// Make sure the widget is not partially visible on start
move(0, -150);
+ raise();
show();
d->hideCursor();
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/lib/print/printoptionspage.cpp new/kdegraphics-3.95.1/gwenview/lib/print/printoptionspage.cpp
--- old/kdegraphics-3.95.0/gwenview/lib/print/printoptionspage.cpp 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/lib/print/printoptionspage.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -23,6 +23,8 @@
// Qt
#include <QButtonGroup>
+#include <QGridLayout>
+#include <QToolButton>
// KDE
#include
@@ -49,7 +51,65 @@
struct PrintOptionsPagePrivate : public Ui_PrintOptionsPage {
QSize mImageSize;
QButtonGroup mScaleGroup;
+ QButtonGroup mPositionGroup;
KConfigDialogManager* mConfigDialogManager;
+
+ void initPositionFrame() {
+ mPositionFrame->setAutoFillBackground(true);
+ QPalette palette = mPositionFrame->palette();
+ QColor bgColor = palette.base().color();
+ QColor gridColor = palette.mid().color();
+ QColor borderColor = palette.dark().color();
+ QColor hoverColor = palette.alternateBase().color();
+ QColor selectedColor = palette.highlight().color();
+ mPositionFrame->setStyleSheet(
+ "QFrame {"
+ " background-color:" + gridColor.name() + ";"
+ " border: 1px solid " + borderColor.name() + ";"
+ "}"
+ "QToolButton {"
+ " border: none;"
+ " background: " + bgColor.name() + ";"
+ "}"
+ "QToolButton:hover {"
+ " background: " + hoverColor.name() + ";"
+ " border: 1px solid " + selectedColor.name() + ";"
+ "}"
+ "QToolButton:checked {"
+ " background-color: " + selectedColor.name() + ";"
+ "}"
+ );
+
+ QGridLayout* layout = new QGridLayout(mPositionFrame);
+ layout->setMargin(0);
+ layout->setSpacing(1);
+ for (int row = 0; row < 3; ++row) {
+ for (int col = 0; col < 3; ++col) {
+ QToolButton* button = new QToolButton(mPositionFrame);
+ button->setFixedSize(40, 40);
+ button->setCheckable(true);
+ layout->addWidget(button, row, col);
+
+ Qt::Alignment alignment;
+ if (row == 0) {
+ alignment = Qt::AlignTop;
+ } else if (row == 1) {
+ alignment = Qt::AlignVCenter;
+ } else {
+ alignment = Qt::AlignBottom;
+ }
+ if (col == 0) {
+ alignment |= Qt::AlignLeft;
+ } else if (col == 1) {
+ alignment |= Qt::AlignHCenter;
+ } else {
+ alignment |= Qt::AlignRight;
+ }
+
+ mPositionGroup.addButton(button, int(alignment));
+ }
+ }
+ }
};
@@ -60,15 +120,7 @@
d->mImageSize = imageSize;
d->mConfigDialogManager = new KConfigDialogManager(this, GwenviewConfig::self());
- d->mPosition->setItemData(0, int(Qt::AlignTop | Qt::AlignLeft));
- d->mPosition->setItemData(1, int(Qt::AlignTop | Qt::AlignHCenter));
- d->mPosition->setItemData(2, int(Qt::AlignTop | Qt::AlignRight));
- d->mPosition->setItemData(3, int(Qt::AlignVCenter | Qt::AlignLeft));
- d->mPosition->setItemData(4, int(Qt::AlignVCenter | Qt::AlignHCenter));
- d->mPosition->setItemData(5, int(Qt::AlignVCenter | Qt::AlignRight));
- d->mPosition->setItemData(6, int(Qt::AlignBottom | Qt::AlignLeft));
- d->mPosition->setItemData(7, int(Qt::AlignBottom | Qt::AlignHCenter));
- d->mPosition->setItemData(8, int(Qt::AlignBottom | Qt::AlignRight));
+ d->initPositionFrame();
d->mScaleGroup.addButton(d->mNoScale, NoScale);
d->mScaleGroup.addButton(d->mScaleToPage, ScaleToPage);
@@ -91,8 +143,9 @@
Qt::Alignment PrintOptionsPage::alignment() const {
- QVariant data = d->mPosition->itemData(d->mPosition->currentIndex());
- return Qt::Alignment(data.toInt());
+ int id = d->mPositionGroup.checkedId();
+ kWarning() << "alignment=" << id;
+ return Qt::Alignment(id);
}
@@ -144,15 +197,20 @@
void PrintOptionsPage::loadConfig() {
- int position = GwenviewConfig::printPosition();
- int index = d->mPosition->findData(position);
- if (index != -1) {
- d->mPosition->setCurrentIndex(index);
+ QAbstractButton* button;
+
+ button = d->mPositionGroup.button(GwenviewConfig::printPosition());
+ if (button) {
+ button->setChecked(true);
+ } else {
+ kWarning() << "Unknown button for position group";
}
- QAbstractButton* button = d->mScaleGroup.button(GwenviewConfig::printScaleMode());
+ button = d->mScaleGroup.button(GwenviewConfig::printScaleMode());
if (button) {
button->setChecked(true);
+ } else {
+ kWarning() << "Unknown button for scale group";
}
d->mConfigDialogManager->updateWidgets();
@@ -164,8 +222,8 @@
void PrintOptionsPage::saveConfig() {
- QVariant data = d->mPosition->itemData(d->mPosition->currentIndex());
- GwenviewConfig::setPrintPosition(data.toInt());
+ int position = d->mPositionGroup.checkedId();
+ GwenviewConfig::setPrintPosition(position);
ScaleMode scaleMode = ScaleMode( d->mScaleGroup.checkedId() );
GwenviewConfig::setPrintScaleMode(scaleMode);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/lib/print/printoptionspage.ui new/kdegraphics-3.95.1/gwenview/lib/print/printoptionspage.ui
--- old/kdegraphics-3.95.0/gwenview/lib/print/printoptionspage.ui 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/lib/print/printoptionspage.ui 2007-10-31 21:42:16.000000000 +0100
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>511</width>
- <height>266</height>
+ <height>398</height>
</rect>
</property>
<property name="windowTitle" >
@@ -20,89 +20,38 @@
<number>6</number>
</property>
<item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>Image Position</string>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="flat" >
+ <bool>true</bool>
</property>
- <item>
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Image position:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KComboBox" name="mPosition" >
- <item>
- <property name="text" >
- <string>Top-Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top-Central</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top-Right</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Central-Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Central</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Central-Right</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom-Left</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom-Central</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Bottom-Right</string>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QFrame" name="mPositionFrame" />
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </item>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>101</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox" >
@@ -318,8 +267,8 @@
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
- <height>40</height>
+ <width>493</width>
+ <height>16</height>
</size>
</property>
</spacer>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/lib/thumbnailview.cpp new/kdegraphics-3.95.1/gwenview/lib/thumbnailview.cpp
--- old/kdegraphics-3.95.0/gwenview/lib/thumbnailview.cpp 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/lib/thumbnailview.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -47,9 +47,27 @@
const int SPACING = 11;
+const int ROUND_RECT_RADIUS = 10;
+
const int THUMBNAIL_GENERATION_TIMEOUT = 1000;
+// Copied from KFileItemDelegate
+static QPainterPath roundedRectangle(const QRectF &rect, qreal radius) {
+ QPainterPath path(QPointF(rect.left(), rect.top() + radius));
+ path.quadTo(rect.left(), rect.top(), rect.left() + radius, rect.top()); // Top left corner
+ path.lineTo(rect.right() - radius, rect.top()); // Top side
+ path.quadTo(rect.right(), rect.top(), rect.right(), rect.top() + radius); // Top right corner
+ path.lineTo(rect.right(), rect.bottom() - radius); // Right side
+ path.quadTo(rect.right(), rect.bottom(), rect.right() - radius, rect.bottom()); // Bottom right corner
+ path.lineTo(rect.left() + radius, rect.bottom()); // Bottom side
+ path.quadTo(rect.left(), rect.bottom(), rect.left(), rect.bottom() - radius); // Bottom left corner
+ path.closeSubpath();
+
+ return path;
+}
+
+
static KFileItem fileItemForIndex(const QModelIndex& index) {
Q_ASSERT(index.isValid());
QVariant data = index.data(KDirModel::FileItemRole);
@@ -236,14 +254,10 @@
fgColor = viewport->palette().color(viewport->foregroundRole());
borderColor = fgColor;
}
- painter->setPen(borderColor);
// Draw background
if (option.state & QStyle::State_Selected) {
- painter->fillRect(rect, bgColor);
- QRect borderRect = rect;
- borderRect.adjust(0, 0, -1, -1);
- painter->drawRect(borderRect);
+ drawBackground(painter, rect, bgColor, borderColor);
}
// Draw thumbnail
@@ -254,13 +268,11 @@
thumbnail.height());
if (!thumbnail.hasAlphaChannel()) {
+ painter->setPen(borderColor);
QRect borderRect = thumbnailRect.adjusted(-1, -1, 0, 0);
painter->drawRect(borderRect);
}
- painter->drawPixmap(
- thumbnailRect.left() + (thumbnailRect.width() - thumbnail.width()) / 2,
- thumbnailRect.top() + (thumbnailRect.height() - thumbnail.height()) / 2,
- thumbnail);
+ painter->drawPixmap(thumbnailRect.left(), thumbnailRect.top(), thumbnail);
// Draw modified indicator
if (mView->isModified(index)) {
@@ -292,6 +304,18 @@
private:
+ void drawBackground(QPainter* painter, const QRect& rect, const QColor& bgColor, const QColor& borderColor) const {
+ painter->setRenderHint(QPainter::Antialiasing);
+
+ QRectF rectF = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5);
+
+ QPainterPath path = roundedRectangle(rectF, ROUND_RECT_RADIUS);
+ painter->fillPath(path, bgColor);
+ painter->setPen(borderColor);
+ painter->drawPath(path);
+ }
+
+
/**
* Show a tooltip only if the item has been elided.
* This function places the tooltip over the item text.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/gwenview/part/CMakeLists.txt new/kdegraphics-3.95.1/gwenview/part/CMakeLists.txt
--- old/kdegraphics-3.95.0/gwenview/part/CMakeLists.txt 2007-10-03 13:30:12.000000000 +0200
+++ new/kdegraphics-3.95.1/gwenview/part/CMakeLists.txt 2007-10-31 21:42:16.000000000 +0100
@@ -1,6 +1,7 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/..
+ ${EXIV2_INCLUDE_DIR}
)
set(gvpart_SRCS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/CMakeLists.txt new/kdegraphics-3.95.1/kolourpaint/CMakeLists.txt
--- old/kdegraphics-3.95.0/kolourpaint/CMakeLists.txt 2007-10-23 10:37:15.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/CMakeLists.txt 2007-10-31 21:42:18.000000000 +0100
@@ -99,10 +99,245 @@
create_license(${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${CMAKE_CURRENT_BINARY_DIR}/kolourpaintlicense.h)
-set(kolourpaint_SRCS
# GENERATED BY ./gen_cmake_srcs | fgrep -v /lgpl/
+if(MINGW)
+
+set(kolourpaint_lib1_SRCS
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBalanceCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectClearCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectCommandBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectEmbossCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectFlattenCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectGrayscaleCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectHSVCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectInvertCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/kpDocumentMetaInfoCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformFlipCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformRotateCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/transforms/kpTransformSkewCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistoryBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandHistory.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpCommandSize.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpMacroCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/kpNamedCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/flow/kpToolFlowCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolColorPickerCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/kpToolFloodFillCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/polygonal/kpToolPolygonalCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/rectangular/kpToolRectangularCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpAbstractSelectionContentCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolImageSelectionTransparencyCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionCreateCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionDestroyCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionMoveCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionPullFromDocumentCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextChangeStyleCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextEnterCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextGiveContentCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/commands/tools/selection/text/kpToolTextInsertCommand.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/compat/kpBug.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorLightCross.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/cursors/kpCursorProvider.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/effects/kpEffectsDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformFlipDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpColorSimilarityDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Open.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Save.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocumentSaveOptions.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/document/kpDocument_Selection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/commands/kpCommandEnvironment.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/dialogs/imagelib/transforms/kpTransformDialogEnvironment.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/document/kpDocumentEnvironment.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/kpEnvironmentBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/kpToolEnvironment.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/environments/tools/selection/kpToolSelectionEnvironment.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/kpAbstractScrollAreaUtils.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/kpSetOverrideCursorSaver.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/kpWidgetMapper.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpResizeSignallingLabel.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpSqueezedTextLabel.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/generic/widgets/kpSubWindow.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBalance.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectBlurSharpen.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectEmboss.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectFlatten.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectGrayscale.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectHSV.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectInvert.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectReduceColors.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/effects/kpEffectToneEnhance.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor_Constants.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpColor.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpDocumentMetaInfo.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpFloodFill.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpImage.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/kpPainter.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformAutoCrop.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_ImageSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/imagelib/transforms/kpTransformCrop_TextSelection.cpp
+) # kolourpaint_lib1_SRCS
+
+set(kolourpaint_lib2_SRCS
+${CMAKE_CURRENT_SOURCE_DIR}/kolourpaint.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/kpThumbnail.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/kpViewScrollableContainer.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpAbstractImageSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpEllipticalImageSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpFreeFormImageSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpImageSelectionTransparency.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpRectangularImageSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpAbstractSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionDrag.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionFactory.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Cursor.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Paint.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextStyle.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage/kpTempImage.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Colors.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Edit.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_File.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Help.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Image.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Settings.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_StatusBar.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Text.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Tools.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Thumbnail.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Zoom.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_AbstractDraw.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_DrawRasterOps.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_DrawShapes.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_Effects.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_FormatConversion.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_MaskOps.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_ScreenDepth.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_Transforms.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolBrush.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolColorEraser.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolEraser.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowPixmapBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolPen.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolSpraycan.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolAction.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolColorPicker.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Drawing.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolFloodFill.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_KeyboardEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_MouseEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_OtherEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_UserNotifications.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Utilities.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolZoom.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolCurve.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolLine.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygonalBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygon.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolyline.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolEllipse.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangle.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangularBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRoundedRectangle.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolEllipticalSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolFreeFormSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolRectSelection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Create.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Move.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Commands.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Create.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_CursorCalc.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_InputMethodEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Move.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_ResizeScale.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_SelectText.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_TextStyle.cpp
+) # kolourpaint_lib2_SRCS
+
+set(kolourpaint_SRCS
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpThumbnailView.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpUnzoomedThumbnailView.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpView.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Events.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Paint.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Selections.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedThumbnailView.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedView.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_TextCursor.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_ViewUpdates.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectHSVWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectInvertWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectWidgetBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorCells.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorPalette.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDefaultColorCollection.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDocumentSaveOptionsWidget.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDualColorButton.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpPrintDialogPage.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpTransparentColorCell.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpColorToolBar.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpToolToolBar.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBase.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBrush.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
+
+
+) # set(kolourpaint_SRCS
+kde4_add_library(kolourpaint_lib1 STATIC ${kolourpaint_lib1_SRCS})
+kde4_add_library(kolourpaint_lib2 STATIC ${kolourpaint_lib2_SRCS})
+# doubled for the linker
+set(mingw_libs kolourpaint_lib1 kolourpaint_lib2 kolourpaint_lib1 kolourpaint_lib2)
+
+else(MINGW)
+
+set(kolourpaint_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBalanceCommand.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp
@@ -323,6 +558,7 @@
) # set(kolourpaint_SRCS
+endif(MINGW)
set(kolourpaint_lgpl_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic/kpUrlFormatter.cpp
@@ -351,7 +587,8 @@
kde4_add_executable(kolourpaint4 ${kolourpaint_SRCS})
-target_link_libraries(kolourpaint4 ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS}
+message(status "$mingw_libs: ${mingw_libs}")
+target_link_libraries(kolourpaint4 ${mingw_libs} ${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS}
${QT_QT3SUPPORT_LIBRARY} ${BLITZ_LIBRARIES} kolourpaint4_lgpl)
install(TARGETS kolourpaint4 DESTINATION ${BIN_INSTALL_DIR})
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/commands/kpCommandHistoryBase.h new/kdegraphics-3.95.1/kolourpaint/commands/kpCommandHistoryBase.h
--- old/kdegraphics-3.95.0/kolourpaint/commands/kpCommandHistoryBase.h 2007-07-26 12:35:44.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/commands/kpCommandHistoryBase.h 2007-10-31 21:42:17.000000000 +0100
@@ -50,7 +50,8 @@
class kpViewManager;
-// Clone of KCommandHistory with features required by KolourPaint:
+// Clone of KCommandHistory with features required by KolourPaint but which
+// could also be useful for other apps:
// - nextUndoCommand()/nextRedoCommand()
// - undo/redo history limited by both number and size
//
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/commands/kpCommandHistory.h new/kdegraphics-3.95.1/kolourpaint/commands/kpCommandHistory.h
--- old/kdegraphics-3.95.0/kolourpaint/commands/kpCommandHistory.h 2007-10-03 13:30:23.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/commands/kpCommandHistory.h 2007-10-31 21:42:17.000000000 +0100
@@ -87,6 +87,9 @@
//
// If <cmd> creates a selection that is not just a border, this
// method has the same effect as addCommand().
+ //
+ // REFACTOR: Why not just override addCommand() and test if it was given a
+ // kpToolSelectionCreateCommand?
void addCreateSelectionCommand (kpToolSelectionCreateCommand *cmd,
bool execute = true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/imagelib/kpColor.h new/kdegraphics-3.95.1/kolourpaint/imagelib/kpColor.h
--- old/kdegraphics-3.95.0/kolourpaint/imagelib/kpColor.h 2007-08-29 11:51:41.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/imagelib/kpColor.h 2007-10-31 21:42:18.000000000 +0100
@@ -37,10 +37,10 @@
//
-// kpColor is an object-oriented abstraction of QRgb, with the additional
-// restriction of enforcing the KolourPaint convention of only supporting
-// totally transparent and totally opaque colors. Eventually, this
-// restriction will be dropped. In the future, other color models such as
+// kpColor is an object-oriented abstraction of QRgb, for document image data,
+// with the additional restriction of enforcing the KolourPaint convention of
+// only supporting totally transparent and totally opaque colors. Eventually,
+// this restriction will be dropped. In the future, other color models such as
// 8-bit indexed will be supported. It also provides better error handling,
// reporting (noisy kError()'s) and recovery compared to Qt. This abstraction
// will allow us to eventually dump the Qt paint routines.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/imagelib/kpPainter.h new/kdegraphics-3.95.1/kolourpaint/imagelib/kpPainter.h
--- old/kdegraphics-3.95.0/kolourpaint/imagelib/kpPainter.h 2007-07-26 12:35:51.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/imagelib/kpPainter.h 2007-10-31 21:42:18.000000000 +0100
@@ -43,13 +43,11 @@
// you should probably move it into kpPainter to avoid the overhead of
// passing around this state (e.g. color, line width) and for reuse.
//
-// Therefore, it should not be used as an on-screen replacement for
-// QPainter since kpImage is not supposed to have any relationship with
-// QPaintDevice in the future.
+// kpPainter is to kpImage as QPainter is to QPixmap.
//
// This encapsulates the set of functionality used by all of KolourPaint's
// document drawing functions and nothing more, permitting rewriting of
-// the graphics backend. Currently uses QPainter/kpPixmapFX as the backend.
+// the image library. Currently uses QPainter/kpPixmapFX as the image library.
//
struct kpPainterPrivate;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/kpViewScrollableContainer.h new/kdegraphics-3.95.1/kolourpaint/kpViewScrollableContainer.h
--- old/kdegraphics-3.95.0/kolourpaint/kpViewScrollableContainer.h 2007-10-08 09:19:22.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/kpViewScrollableContainer.h 2007-10-31 21:42:18.000000000 +0100
@@ -51,7 +51,7 @@
class kpMainWindow;
-// TODO: refactor by sharing iface's with kpTool
+// REFACTOR: refactor by sharing iface's with kpTool
class kpGrip : public QLabel
{
Q_OBJECT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_Edit.cpp new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_Edit.cpp
--- old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_Edit.cpp 2007-10-16 15:58:05.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_Edit.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -761,6 +761,9 @@
i18n ("Cannot Paste"));
// TODO: PROPAGATE: interprocess
+ // TODO: Is this loop safe since a KMainWindow later along in the list,
+ // could be closed as the code in the body almost certainly re-enters
+ // the event loop? Problem for KDE 3 as well, I think.
foreach (KMainWindow *kmw, KMainWindow::memberList ())
{
Q_ASSERT (dynamic_cast (kmw));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_File.cpp new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_File.cpp
--- old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_File.cpp 2007-10-23 10:37:10.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_File.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -215,6 +215,9 @@
// TODO: PROPAGATE: interprocess
+ // TODO: Is this loop safe since a KMainWindow later along in the list,
+ // could be closed as the code in the body almost certainly re-enters
+ // the event loop? Problem for KDE 3 as well, I think.
foreach (KMainWindow *kmw, KMainWindow::memberList ())
{
Q_ASSERT (dynamic_cast (kmw));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_Text.cpp new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_Text.cpp
--- old/kdegraphics-3.95.0/kolourpaint/mainWindow/kpMainWindow_Text.cpp 2007-10-16 15:58:05.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/mainWindow/kpMainWindow_Text.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -56,7 +56,6 @@
{
KActionCollection *ac = actionCollection ();
- // COMPAT: Changing font does not seem to work.
d->actionTextFontFamily = ac->add<KFontAction> ("text_font_family");
d->actionTextFontFamily->setText (i18n ("Font Family"));
connect (d->actionTextFontFamily, SIGNAL (triggered (const QString &)),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/pixmapfx/kpPixmapFX.h new/kdegraphics-3.95.1/kolourpaint/pixmapfx/kpPixmapFX.h
--- old/kdegraphics-3.95.0/kolourpaint/pixmapfx/kpPixmapFX.h 2007-10-23 10:37:08.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/pixmapfx/kpPixmapFX.h 2007-10-31 21:42:17.000000000 +0100
@@ -490,8 +490,13 @@
// Note that this method is slow so you should avoid calling it, if
// possible.
//
- // Generally, the only time you need to call it is when you get a pixmap
- // from a foreign source e.g. file or clipboard.
+ // Generally, the only time you need to call it is when you get a QImage
+ // from a foreign source (e.g. from a file or clipboard, not originally
+ // from a QPixmap) and need to convert it to a QPixmap. You don't need
+ // to call it anywhere else since internally, all KolourPaint code is
+ // supposed to maintain the QPixmap-has-no-alpha-channel invariant.
+ // However, convertToPixmap() and convertToPixmapAsLosslessAsPossible()
+ // call this method for you anyway.
//
// It is invalid to use a QPainter directly on a QPixmap, which
// usually introduces an alpha channel, and then to call this method to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/pixmapfx/kpPixmapFX_Transforms.cpp new/kdegraphics-3.95.1/kolourpaint/pixmapfx/kpPixmapFX_Transforms.cpp
--- old/kdegraphics-3.95.0/kolourpaint/pixmapfx/kpPixmapFX_Transforms.cpp 2007-10-23 10:37:08.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/pixmapfx/kpPixmapFX_Transforms.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -817,7 +817,7 @@
// (and therefore, <pm>) is only 8-bit. The name "ReduceColors"
// is a misnomer in this case.
newQImage = kpEffectReduceColors::convertImageDepth (
- newQImage, 24/*new depth*/, false/*no dither*/);
+ newQImage, 32/*new depth*/, false/*no dither*/);
// For depth>1, we could do the entire transform using ::TransformPixmap()
// but given the rounding error hacks in that method, we'd rather use
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/tools/kpTool_Drawing.cpp new/kdegraphics-3.95.1/kolourpaint/tools/kpTool_Drawing.cpp
--- old/kdegraphics-3.95.0/kolourpaint/tools/kpTool_Drawing.cpp 2007-10-16 15:58:05.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/tools/kpTool_Drawing.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -381,7 +381,7 @@
//
// Note that the invariant has usually already been inadvertently
// restored by kpPixmapFX::draw() (which does mask tricks), which
- // is called via most tools calling kpDocument::setPixmapAt() in
+ // is called via most tools calling kpDocument::setPixmapAt(), in
// draw() and/or endDraw(). So the below code is really just in
// case this has not happened.
kpImage *docImage = document ()->imagePointer ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/tools/kpTool.h new/kdegraphics-3.95.1/kolourpaint/tools/kpTool.h
--- old/kdegraphics-3.95.0/kolourpaint/tools/kpTool.h 2007-10-16 15:58:05.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/tools/kpTool.h 2007-10-31 21:42:17.000000000 +0100
@@ -267,6 +267,9 @@
virtual void endDraw (const QPoint &thisPoint, const QRect &normalizedRect);
+ // TODO: I think reimplementations of this should be calling this base
+ // implementation, so that endDraw() happens before the custom
+ // endShape() logic of the reimplementation.
virtual void endShape (const QPoint &thisPoint = QPoint (),
const QRect &normalizedRect = QRect ())
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kolourpaint/views/manager/kpViewManager.h new/kdegraphics-3.95.1/kolourpaint/views/manager/kpViewManager.h
--- old/kdegraphics-3.95.0/kolourpaint/views/manager/kpViewManager.h 2007-10-23 10:37:12.000000000 +0200
+++ new/kdegraphics-3.95.1/kolourpaint/views/manager/kpViewManager.h 2007-10-31 21:42:17.000000000 +0100
@@ -216,7 +216,9 @@
// Slow: Let Qt buffer paint events via QWidget::update().
// Results in less flicker. Paint events are probably merged
// so long-term efficiency is increased at the expense of
- // reduced responsiveness (default).
+ // reduced responsiveness (default). Generally, the paint
+ // event happens a while later -- when you return to the event
+ // loop.
// Fast: Force Qt to redraw immediately. No paint events
// are merged so there is great potential for flicker,
// if used inappropriately. Use this when the redraw
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/kruler/kruler.notifyrc new/kdegraphics-3.95.1/kruler/kruler.notifyrc
--- old/kdegraphics-3.95.0/kruler/kruler.notifyrc 2007-10-25 11:32:13.000000000 +0200
+++ new/kdegraphics-3.95.1/kruler/kruler.notifyrc 2007-10-31 21:42:17.000000000 +0100
@@ -41,6 +41,7 @@
Comment[uz]=KDE экран линейкаси
Comment[x-test]=xxKDE Screen Rulerxx
Comment[xh]=Umlawuli wekhusi le KDE
+Comment[zh_CN]=KDE 屏幕标尺
Comment[zh_HK]=KDE 螢幕尺規
Comment[zh_TW]=KDE 螢幕尺規
@@ -84,6 +85,7 @@
Name[uk]=Пересунуто клавішами курсора
Name[x-test]=xxMoved by Cursor Keysxx
Name[xh]=Ishukunyiswa zizitshixo zesalathisi
+Name[zh_CN]=用光标键移动
Name[zh_HK]=用游標鍵移動
Name[zh_TW]=以游標移動
Comment=The ruler has moved pixelwise using the cursor keys
@@ -125,6 +127,7 @@
Comment[uk]=Лінійка пересувається по пікселях за допомогою клавіш курсора
Comment[x-test]=xxThe ruler has moved pixelwise using the cursor keysxx
Comment[xh]=Umlawuli ushukume jikelele kwipixel esebenzisa izitshixi zesalathisi
+Comment[zh_CN]=标尺已经用光标键按像素移动
Comment[zh_HK]=使用游標鍵移動尺規單一個像素
Comment[zh_TW]=尺規已由游標移動數個像素
Sound=move.wav
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/libkscan/kscandevice.cpp new/kdegraphics-3.95.1/libkscan/kscandevice.cpp
--- old/kdegraphics-3.95.0/libkscan/kscandevice.cpp 2007-10-25 11:32:11.000000000 +0200
+++ new/kdegraphics-3.95.1/libkscan/kscandevice.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -229,6 +229,7 @@
if( storeOptions ) delete (storeOptions );
kDebug(29000) << "Calling sane_exit to finish sane!";
sane_exit();
+ delete d;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/core/bookmarkmanager.cpp new/kdegraphics-3.95.1/okular/core/bookmarkmanager.cpp
--- old/kdegraphics-3.95.0/okular/core/bookmarkmanager.cpp 2007-08-29 11:51:28.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/core/bookmarkmanager.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -19,10 +19,15 @@
#include
// local includes
-#include "document.h"
+#include "document_p.h"
+#include "observer.h"
using namespace Okular;
+#define foreachObserver( cmd ) {\
+ QMap< int, DocumentObserver * >::const_iterator it = d->document->m_observers.begin(), end = d->document->m_observers.end();\
+ for ( ; it != end ; ++ it ) { (*it)-> cmd ; } }
+
class OkularBookmarkAction : public KBookmarkAction
{
public:
@@ -57,14 +62,14 @@
BookmarkManager * q;
KUrl url;
QSet<int> urlBookmarks;
- Document * document;
+ DocumentPrivate * document;
QString file;
KBookmarkManager * manager;
QHash knownFiles;
};
-BookmarkManager::BookmarkManager( Document * document )
- : QObject( document ), d( new Private( this ) )
+BookmarkManager::BookmarkManager( DocumentPrivate * document )
+ : QObject( document->m_parent ), d( new Private( this ) )
{
setObjectName( "Okular::BookmarkManager" );
@@ -182,6 +187,15 @@
return it;
}
+void BookmarkManager::addBookmark( int n )
+{
+ if ( n >= 0 && n < (int)d->document->m_pagesVector.count() )
+ {
+ if ( setPageBookmark( n ) )
+ foreachObserver( notifyPageChanged( n, DocumentObserver::Bookmark ) );
+ }
+}
+
bool BookmarkManager::addBookmark( const KUrl& referurl, const Okular::DocumentViewport& vp, const QString& title )
{
if ( !referurl.isValid() || !vp.isValid() )
@@ -209,9 +223,19 @@
KUrl newurl = referurl;
newurl.setHTMLRef( vp.toString() );
it.value().addBookmark( newtitle, newurl, QString() );
+ foreachObserver( notifyPageChanged( vp.pageNumber, DocumentObserver::Bookmark ) );
return true;
}
+void BookmarkManager::removeBookmark( int n )
+{
+ if ( n >= 0 && n < (int)d->document->m_pagesVector.count() )
+ {
+ if ( removePageBookmark( n ) )
+ foreachObserver( notifyPageChanged( n, DocumentObserver::Bookmark ) );
+ }
+}
+
int BookmarkManager::removeBookmark( const KUrl& referurl, const KBookmark& bm )
{
if ( !referurl.isValid() || bm.isNull() || bm.isGroup() || bm.isSeparator() )
@@ -226,6 +250,9 @@
return -1;
it.value().deleteBookmark( bm );
+
+ foreachObserver( notifyPageChanged( vp.pageNumber, DocumentObserver::Bookmark ) );
+
return vp.pageNumber;
}
@@ -325,7 +352,7 @@
return found;
}
-bool BookmarkManager::isPageBookmarked( int page ) const
+bool BookmarkManager::isBookmarked( int page ) const
{
return d->urlBookmarks.contains( page );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/core/bookmarkmanager.h new/kdegraphics-3.95.1/okular/core/bookmarkmanager.h
--- old/kdegraphics-3.95.0/okular/core/bookmarkmanager.h 2007-05-03 10:36:37.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/core/bookmarkmanager.h 2007-10-31 21:42:16.000000000 +0100
@@ -20,6 +20,7 @@
namespace Okular {
class Document;
+class DocumentPrivate;
class DocumentViewport;
/**
@@ -50,6 +51,11 @@
void save() const;
/**
+ * Adds a bookmark for the given @p page.
+ */
+ void addBookmark( int page );
+
+ /**
* Adds a new bookmark for the @p referurl at the specified viewport @p vp,
* with an optional @p title.
*
@@ -58,11 +64,21 @@
bool addBookmark( const KUrl& referurl, const Okular::DocumentViewport& vp, const QString& title = QString() );
/**
+ * Remove a bookmark for the given @p page.
+ */
+ void removeBookmark( int page );
+
+ /**
* Removes the bookmark @p bm for the @p referurl specified.
*/
int removeBookmark( const KUrl& referurl, const KBookmark& bm );
/**
+ * Returns whether the given @p page is bookmarked.
+ */
+ bool isBookmarked( int page ) const;
+
+ /**
* Returns a list of actions for the bookmarks of the specified @p url.
*
* @note the actions will have no parents, so you have to delete them
@@ -83,13 +99,13 @@
// private interface used by the Document
friend class Document;
+ friend class DocumentPrivate;
- explicit BookmarkManager( Document * document );
+ BookmarkManager( DocumentPrivate * document );
void setUrl( const KUrl& url );
bool setPageBookmark( int page );
bool removePageBookmark( int page );
- bool isPageBookmarked( int page ) const;
Q_DISABLE_COPY( BookmarkManager )
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/core/document.cpp new/kdegraphics-3.95.1/okular/core/document.cpp
--- old/kdegraphics-3.95.0/okular/core/document.cpp 2007-10-16 15:58:08.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/core/document.cpp 2007-10-31 21:42:16.000000000 +0100
@@ -11,6 +11,11 @@
#include "document.h"
#include "document_p.h"
+#ifdef Q_OS_WIN
+#define _WIN32_WINNT 0x0500
+#include
+#endif
+
// qt/kde/system includes
#include
#include
@@ -60,10 +65,6 @@
#include
-#ifdef Q_OS_WIN
-#include
-#endif
-
using namespace Okular;
struct AllocatedPixmap
@@ -146,8 +147,8 @@
void DocumentPrivate::cleanupPixmapMemory( qulonglong /*sure? bytesOffset*/ )
{
// [MEM] choose memory parameters based on configuration profile
- qulonglong clipValue = -1;
- qulonglong memoryToFree = -1;
+ qulonglong clipValue = ~0U;
+ qulonglong memoryToFree = ~0U;
switch ( Settings::memoryLevel() )
{
case Settings::EnumMemoryLevel::Low:
@@ -1008,7 +1009,7 @@
Document::Document( QWidget *widget )
: QObject( widget ), d( new DocumentPrivate( this ) )
{
- d->m_bookmarkManager = new BookmarkManager( this );
+ d->m_bookmarkManager = new BookmarkManager( d );
d->m_viewportIterator = d->m_viewportHistory.insert( d->m_viewportHistory.end(), DocumentViewport() );
connect( PageController::self(), SIGNAL( rotationFinished( int ) ),
@@ -2153,46 +2154,7 @@
d->m_searchCancelled = true;
}
-void Document::addBookmark( int n )
-{
- if ( n >= 0 && n < (int)d->m_pagesVector.count() )
- {
- if ( d->m_bookmarkManager->setPageBookmark( n ) )
- foreachObserver( notifyPageChanged( n, DocumentObserver::Bookmark ) );
- }
-}
-
-void Document::addBookmark( const KUrl& referurl, const Okular::DocumentViewport& vp, const QString& title )
-{
- if ( !vp.isValid() )
- return;
-
- if ( d->m_bookmarkManager->addBookmark( referurl, vp, title ) )
- foreachObserver( notifyPageChanged( vp.pageNumber, DocumentObserver::Bookmark ) );
-}
-
-bool Document::isBookmarked( int page ) const
-{
- return d->m_bookmarkManager->isPageBookmarked( page );
-}
-
-void Document::removeBookmark( int n )
-{
- if ( n >= 0 && n < (int)d->m_pagesVector.count() )
- {
- if ( d->m_bookmarkManager->removePageBookmark( n ) )
- foreachObserver( notifyPageChanged( n, DocumentObserver::Bookmark ) );
- }
-}
-
-void Document::removeBookmark( const KUrl& referurl, const KBookmark& bm )
-{
- int changedpage = d->m_bookmarkManager->removeBookmark( referurl, bm );
- if ( changedpage != -1 )
- foreachObserver( notifyPageChanged( changedpage, DocumentObserver::Bookmark ) );
-}
-
-const BookmarkManager * Document::bookmarkManager() const
+BookmarkManager * Document::bookmarkManager() const
{
return d->m_bookmarkManager;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/core/document.h new/kdegraphics-3.95.1/okular/core/document.h
--- old/kdegraphics-3.95.0/okular/core/document.h 2007-10-16 15:58:08.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/core/document.h 2007-10-31 21:42:16.000000000 +0100
@@ -406,36 +406,9 @@
void resetSearch( int searchID );
/**
- * Adds a bookmark for the given @p page.
- */
- void addBookmark( int page );
-
- /**
- * Adds a bookmark for the given @p referUrl at @p viewport.
- *
- * @param title The title of the bookmark.
- */
- void addBookmark( const KUrl& referUrl, const Okular::DocumentViewport& viewport, const QString& title = QString() );
-
- /**
- * Returns whether the given @p page is bookmarked.
- */
- bool isBookmarked( int page ) const;
-
- /**
- * Remove a bookmark for the given @p page.
- */
- void removeBookmark( int page );
-
- /**
- * Removes the given @p bookmark with the given @p referUrl.
- */
- void removeBookmark( const KUrl& referUrl, const KBookmark& bookmark );
-
- /**
* Returns the bookmark manager of the document.
*/
- const BookmarkManager * bookmarkManager() const;
+ BookmarkManager * bookmarkManager() const;
/**
* Processes the given @p action.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/generators/chm/libokularGenerator_chmlib.desktop new/kdegraphics-3.95.1/okular/generators/chm/libokularGenerator_chmlib.desktop
--- old/kdegraphics-3.95.0/okular/generators/chm/libokularGenerator_chmlib.desktop 2007-10-16 15:58:08.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/generators/chm/libokularGenerator_chmlib.desktop 2007-10-31 21:42:16.000000000 +0100
@@ -25,7 +25,7 @@
Comment[zh_CN]=okular 的 Windows HTMLHelp 格式后端
Comment[zh_TW]=okular 的 Windows HTMLHelp 後端
ServiceTypes=okular/Generator
-MimeType=application/x-chm
+MimeType=application/x-chm;
X-KDE-Library=libokularGenerator_chmlib
X-KDE-Priority=2
X-KDE-okularAPIVersion=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/generators/dvi/libokularGenerator_dvi.desktop new/kdegraphics-3.95.1/okular/generators/dvi/libokularGenerator_dvi.desktop
--- old/kdegraphics-3.95.0/okular/generators/dvi/libokularGenerator_dvi.desktop 2007-10-25 11:32:12.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/generators/dvi/libokularGenerator_dvi.desktop 2007-10-31 21:42:16.000000000 +0100
@@ -25,7 +25,7 @@
Comment[zh_CN]=okular 的 DVI 格式后端
Comment[zh_TW]=okular 的 DVI 後端
ServiceTypes=okular/Generator
-MimeType=application/x-dvi
+MimeType=application/x-dvi;
X-KDE-Library=libokularGenerator_dvi
X-KDE-Priority=2
X-KDE-okularAPIVersion=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/generators/ooo/libokularGenerator_ooo.desktop new/kdegraphics-3.95.1/okular/generators/ooo/libokularGenerator_ooo.desktop
--- old/kdegraphics-3.95.0/okular/generators/ooo/libokularGenerator_ooo.desktop 2007-10-25 11:32:13.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/generators/ooo/libokularGenerator_ooo.desktop 2007-10-31 21:42:17.000000000 +0100
@@ -43,7 +43,7 @@
Comment[zh_CN]=okular 的开放文档格式后端
Comment[zh_TW]=okular 的 OpenDocument 後端
ServiceTypes=okular/Generator
-MimeType=application/vnd.oasis.opendocument.text
+MimeType=application/vnd.oasis.opendocument.text;
X-KDE-Library=libokularGenerator_ooo
X-KDE-Priority=1
X-KDE-okularAPIVersion=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/generators/ooo/okularOoo.desktop new/kdegraphics-3.95.1/okular/generators/ooo/okularOoo.desktop
--- old/kdegraphics-3.95.0/okular/generators/ooo/okularOoo.desktop 2007-10-24 14:17:29.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/generators/ooo/okularOoo.desktop 2007-10-31 21:42:17.000000000 +0100
@@ -13,4 +13,4 @@
ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=libokularpart
Type=Service
-MimeType=application/vnd.oasis.opendocument.text
+MimeType=application/vnd.oasis.opendocument.text;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/generators/poppler/okularPoppler.desktop new/kdegraphics-3.95.1/okular/generators/poppler/okularPoppler.desktop
--- old/kdegraphics-3.95.0/okular/generators/poppler/okularPoppler.desktop 2007-10-24 14:17:27.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/generators/poppler/okularPoppler.desktop 2007-10-31 21:42:16.000000000 +0100
@@ -13,4 +13,4 @@
ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=libokularpart
Type=Service
-MimeType=application/x-pdf;application/pdf;application/x-gzpdf;application/x-bzpdf
+MimeType=application/x-pdf;application/pdf;application/x-gzpdf;application/x-bzpdf;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/part.cpp new/kdegraphics-3.95.1/okular/part.cpp
--- old/kdegraphics-3.95.0/okular/part.cpp 2007-10-25 11:32:13.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/part.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -983,7 +983,7 @@
if ( opened )
{
m_addBookmark->setEnabled( true );
- if ( m_document->isBookmarked( m_document->currentPage() ) )
+ if ( m_document->bookmarkManager()->isBookmarked( m_document->currentPage() ) )
{
m_addBookmark->setText( i18n( "Remove Bookmark" ) );
m_addBookmark->setIcon( KIcon( "bookmark" ) ); // ### 'bookmark-remove' or similar
@@ -1112,13 +1112,13 @@
void Part::slotAddBookmark()
{
uint current = m_document->currentPage();
- if ( m_document->isBookmarked( current ) )
+ if ( m_document->bookmarkManager()->isBookmarked( current ) )
{
- m_document->removeBookmark( current );
+ m_document->bookmarkManager()->removeBookmark( current );
}
else
{
- m_document->addBookmark( current );
+ m_document->bookmarkManager()->addBookmark( current );
}
}
@@ -1132,7 +1132,7 @@
for ( int i = current - 1; i >= 0; --i )
{
- if ( m_document->isBookmarked( i ) )
+ if ( m_document->bookmarkManager()->isBookmarked( i ) )
{
m_document->setViewportPage( i );
break;
@@ -1151,7 +1151,7 @@
for ( uint i = current + 1; i < pages; ++i )
{
- if ( m_document->isBookmarked( i ) )
+ if ( m_document->bookmarkManager()->isBookmarked( i ) )
{
m_document->setViewportPage( i );
break;
@@ -1358,7 +1358,7 @@
if (page)
{
popup->addTitle( i18n( "Page %1", page->number() + 1 ) );
- if ( m_document->isBookmarked( page->number() ) )
+ if ( m_document->bookmarkManager()->isBookmarked( page->number() ) )
removeBookmark = popup->addAction( KIcon("bookmark"), i18n("Remove Bookmark") );
else
addBookmark = popup->addAction( KIcon("bookmark-new"), i18n("Add Bookmark") );
@@ -1390,8 +1390,8 @@
QAction *res = popup->exec(point);
if (res)
{
- if (res == addBookmark) m_document->addBookmark( page->number() );
- else if (res == removeBookmark) m_document->removeBookmark( page->number() );
+ if (res == addBookmark) m_document->bookmarkManager()->addBookmark( page->number() );
+ else if (res == removeBookmark) m_document->bookmarkManager()->removeBookmark( page->number() );
else if (res == fitPageWidth) m_pageView->fitPageWidth( page->number() );
}
}
@@ -1524,7 +1524,7 @@
for ( uint i = 0; i < pages; ++i )
{
- if ( m_document->isBookmarked( i ) )
+ if ( m_document->bookmarkManager()->isBookmarked( i ) )
{
if ( startId < 0 )
startId = i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/ui/bookmarklist.cpp new/kdegraphics-3.95.1/okular/ui/bookmarklist.cpp
--- old/kdegraphics-3.95.0/okular/ui/bookmarklist.cpp 2007-10-03 13:30:17.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/ui/bookmarklist.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -187,7 +187,7 @@
else if ( res == editbm )
m_tree->editItem( item, 0 );
else if ( res == removebm )
- m_document->removeBookmark( bmItem->url(), bmItem->bookmark() );
+ m_document->bookmarkManager()->removeBookmark( bmItem->url(), bmItem->bookmark() );
}
QList createItems( const KUrl& baseurl, const KBookmark::List& bmlist )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/ui/pageviewannotator.cpp new/kdegraphics-3.95.1/okular/ui/pageviewannotator.cpp
--- old/kdegraphics-3.95.0/okular/ui/pageviewannotator.cpp 2007-10-08 09:19:18.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/ui/pageviewannotator.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -787,7 +787,10 @@
}
// go on creating annotations of the same type
- slotToolSelected( m_lastToolID );
+ // for now, disable the "construct again the same annotation"
+ //slotToolSelected( m_lastToolID );
+ slotToolSelected( -1 );
+ m_toolBar->selectButton( -1 );
}
return modifiedRect;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdegraphics-3.95.0/okular/ui/thumbnaillist.cpp new/kdegraphics-3.95.1/okular/ui/thumbnaillist.cpp
--- old/kdegraphics-3.95.0/okular/ui/thumbnaillist.cpp 2007-10-03 13:30:16.000000000 +0200
+++ new/kdegraphics-3.95.1/okular/ui/thumbnaillist.cpp 2007-10-31 21:42:17.000000000 +0100
@@ -26,6 +26,7 @@
// local includes
#include "pagepainter.h"
#include "core/area.h"
+#include "core/bookmarkmanager.h"
#include "core/document.h"
#include "core/generator.h"
#include "core/page.h"
@@ -677,7 +678,7 @@
if ( clipRect.top() < m_pixmapHeight + m_margin )
{
// if page is bookmarked draw a colored border
- bool isBookmarked = m_document->isBookmarked( pageNumber() );
+ bool isBookmarked = m_document->bookmarkManager()->isBookmarked( pageNumber() );
// draw the inner rect
p.setPen( isBookmarked ? QColor( 0xFF8000 ) : Qt::black );
p.drawRect( m_margin/2 - 1, m_margin/2 - 1, m_pixmapWidth + 1, m_pixmapHeight + 1 );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org