Hello community,
here is the log from the commit of package kdepim4
checked in at Fri May 23 01:46:35 CEST 2008.
--------
--- KDE/kdepim4/kdepim4.changes 2008-05-17 18:29:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2008-05-23 01:46:02.286762000 +0200
@@ -1,0 +2,6 @@
+Thu May 22 16:56:29 CEST 2008 - wstephenson@suse.de
+
+- Update to kdepim 4.1beta1
+ * Fix kontact view switch sidepane fills entire window (bnc#389141)
+
+-------------------------------------------------------------------
@@ -6,0 +13,10 @@
+Fri May 16 17:31:51 CEST 2008 - wstephenson@suse.de
+
+- weather plugin is disabled upstream now, remove our patch
+
+-------------------------------------------------------------------
+Thu May 15 20:58:04 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.74
+
+-------------------------------------------------------------------
Old:
----
4_1_BRANCH.diff
disable-kontact-weather-plugin.diff
kdelibs41.diff
kdepim-4.0.73.tar.bz2
New:
----
disable-kjots.diff
disable-korganizer-richtexteditwidget-r808952+808798.diff
disable-new-kkeyseqwidget-api-r809986.diff
kdelibs40.diff
kdepim-4.0.80.tar.bz2
kmail_revert_krichtext-r809981.diff
kmail_revert_krichtext-r810400.diff
use-old-signatureconfigurator-location-r806301.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.S31772/_old 2008-05-23 01:46:25.000000000 +0200
+++ /var/tmp/diff_new_pack.S31772/_new 2008-05-23 01:46:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepim4 (Version 4.0.73)
+# spec file for package kdepim4 (Version 4.0.80)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,18 +28,23 @@
Group: System/GUI/KDE
Summary: Base package of kdepim
Url: http://www.kde.org
-Version: 4.0.73
-Release: 8
+Version: 4.0.80
+Release: 1
Source0: kdepim-%version.tar.bz2
-Patch: 4_1_BRANCH.diff
+#Patch: 4_1_BRANCH.diff
Patch1: akregator-useragent.diff
Patch4: desktop-files.diff
Patch5: disable-nepomuk-agents.diff
Patch6: disable-knut.diff
Patch7: disable-plasma-dependencies.diff
-Patch8: disable-kontact-weather-plugin.diff
-Patch9: kdelibs41.diff
-Patch10: disable-akonadi-kresources.diff
+Patch8: kmail_revert_krichtext-r810400.diff
+Patch9: kmail_revert_krichtext-r809981.diff
+Patch10: kdelibs40.diff
+Patch11: disable-kjots.diff
+Patch12: disable-new-kkeyseqwidget-api-r809986.diff
+Patch13: use-old-signatureconfigurator-location-r806301.diff
+Patch14: disable-korganizer-richtexteditwidget-r808952+808798.diff
+Patch15: disable-akonadi-kresources.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Suggests: kde4-ktnef
@@ -72,7 +77,7 @@
%prep
%setup -q -n kdepim-%version
-%patch
+#%patch
#%patch1
%patch4
%patch5
@@ -81,6 +86,11 @@
%patch8
%patch9
%patch10
+%patch11
+%patch12
+%patch13
+%patch14
+%patch15
%build
%if ! %with_kitchensync
@@ -118,6 +128,7 @@
%create_subdir_filelist -d knode -v devel
%create_subdir_filelist -d kpilot -v devel
%create_subdir_filelist -d kontact -v devel
+ %create_subdir_filelist -d kontactinterfaces -f kontact -v devel
%create_subdir_filelist -d wizards
%create_subdir_filelist -d kmobiletools -v devel
%if %with_kitchensync
@@ -129,6 +140,7 @@
%create_subdir_filelist -d korn
%create_subdir_filelist -d kaddressbook -v devel
%create_subdir_filelist -d libkdepim -v libkdepim.devel
+ %create_subdir_filelist -d kleopatra/libkleopatraclient -f libkdepim -v libkdepim.devel
%if 0
%create_subdir_filelist -d akonadi -v akonadi.devel
cat filelists/akonadi.devel | while read line; do echo "%exclude $line";done >>filelists/devel
@@ -692,8 +704,15 @@
/usr/share/icons/hicolor/*/apps/office-address-book.*
%changelog
+* Thu May 22 2008 wstephenson@suse.de
+- Update to kdepim 4.1beta1
+ * Fix kontact view switch sidepane fills entire window (bnc#389141)
* Sat May 17 2008 wstephenson@suse.de
- Exclude akonadi resources, not yet production ready
+* Fri May 16 2008 wstephenson@suse.de
+- weather plugin is disabled upstream now, remove our patch
+* Thu May 15 2008 dmueller@suse.de
+- update to 4.0.74
* Fri May 09 2008 llunak@suse.cz
- use the backported kdelibs4.1 functionality for spellchecking
* Fri May 09 2008 wstephenson@suse.de
++++++ disable-akonadi-kresources.diff ++++++
--- /var/tmp/diff_new_pack.S31772/_old 2008-05-23 01:46:25.000000000 +0200
+++ /var/tmp/diff_new_pack.S31772/_new 2008-05-23 01:46:25.000000000 +0200
@@ -3,6 +3,6 @@
@@ -32,4 +32,4 @@
add_subdirectory( birthdays )
add_subdirectory( blog )
- #add_subdirectory( groupwise )
+ add_subdirectory( groupwise )
-add_subdirectory( akonadi )
+#add_subdirectory( akonadi )
++++++ disable-kjots.diff ++++++
Index: doc/CMakeLists.txt
===================================================================
--- doc/CMakeLists.txt (revision 810647)
+++ doc/CMakeLists.txt (working copy)
@@ -17,7 +17,6 @@ if(NOT WIN32)
endif(NOT WIN32)
add_subdirectory(knode)
-add_subdirectory(kjots)
add_subdirectory(knotes)
add_subdirectory(konsolekalendar)
add_subdirectory(kontact)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 810647)
+++ CMakeLists.txt (working copy)
@@ -162,7 +162,6 @@ else ( ONLY_KLEO )
macro_optional_add_subdirectory(akregator)
macro_optional_add_subdirectory(doc)
macro_optional_add_subdirectory(knode)
- macro_optional_add_subdirectory(kjots)
if(QGPGME_FOUND)
set(KMAIL_SUPPORTED TRUE)
Index: kontact/plugins/CMakeLists.txt
===================================================================
--- kontact/plugins/CMakeLists.txt (revision 810647)
+++ kontact/plugins/CMakeLists.txt (working copy)
@@ -16,7 +16,6 @@ if(QGPGME_FOUND)
endif(QGPGME_FOUND)
add_subdirectory( knotes )
add_subdirectory( knode )
-add_subdirectory( kjots )
add_subdirectory( newsticker )
add_subdirectory( akregator )
if(KTIMETRACKER_SUPPORTED)
++++++ disable-korganizer-richtexteditwidget-r808952+808798.diff ++++++
Index: korganizer/koeditorgeneraljournal.cpp
===================================================================
--- korganizer/koeditorgeneraljournal.cpp (revision 808952)
+++ korganizer/koeditorgeneraljournal.cpp (revision 808797)
@@ -41,7 +41,6 @@
#include
#include
#include <KSqueezedTextLabel>
-#include <KRichTextWidget>
#include
#include <QDateTime>
Index: korganizer/koeditorgeneraltodo.cpp
===================================================================
--- korganizer/koeditorgeneraltodo.cpp (revision 808952)
+++ korganizer/koeditorgeneraltodo.cpp (revision 808797)
@@ -39,7 +39,6 @@
#include
#include
#include <KComboBox>
-#include <KRichTextWidget>
#include <QLayout>
#include <QDateTime>
Index: korganizer/koeditorgeneralevent.cpp
===================================================================
--- korganizer/koeditorgeneralevent.cpp (revision 808952)
+++ korganizer/koeditorgeneralevent.cpp (revision 808797)
@@ -41,7 +41,6 @@
#include
#include
#include <KComboBox>
-#include <KRichTextWidget>
#include <QLayout>
#include <QSpinBox>
Index: korganizer/koeditorgeneral.cpp
===================================================================
--- korganizer/koeditorgeneral.cpp (revision 808952)
+++ korganizer/koeditorgeneral.cpp (revision 808797)
@@ -42,8 +42,7 @@
#include
#include
#include
-#include <KRichTextWidget>
-#include <KActionCollection>
+#include
#include
#include
#include <KLineEdit>
@@ -64,7 +63,6 @@
#include <QBoxLayout>
#include <QTextCharFormat>
#include <QTextList>
-#include <QToolButton>
#include "koeditorattachments.h"
#include "koeditorgeneral.moc"
@@ -186,55 +184,73 @@ void KOEditorGeneral::initDescription( Q
mRichDescription->setToolTip( i18n( "Toggle Rich Text" ) );
connect( mRichDescription, SIGNAL(toggled(bool)),
this, SLOT(setDescriptionRich(bool)) );
+ mDescriptionBoldButton = new QPushButton( parent );
+ mDescriptionBoldButton->setIcon( KIcon( "format-text-bold" ) );
+ mDescriptionBoldButton->setToolTip( i18n( "Bold text" ) );
+ connect( mDescriptionBoldButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionBold()) );
+
+ mDescriptionItalicButton = new QPushButton( parent );
+ mDescriptionItalicButton->setIcon( KIcon( "format-text-italic" ) );
+ mDescriptionItalicButton->setToolTip( i18n( "Italicize text" ) );
+ connect( mDescriptionItalicButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionItalic()) );
+
+ mDescriptionUnderlineButton = new QPushButton( parent );
+ mDescriptionUnderlineButton->setIcon( KIcon( "format-text-underline" ) );
+ mDescriptionUnderlineButton->setToolTip( i18n( "Underline text" ) );
+ connect( mDescriptionUnderlineButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionUnderline()) );
+
+ mDescriptionStrikethroughButton = new QPushButton( parent );
+ mDescriptionStrikethroughButton->setIcon( KIcon( "format-text-strikethrough" ) );
+ mDescriptionStrikethroughButton->setToolTip( i18n( "Strike-through text" ) );
+ connect( mDescriptionStrikethroughButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionStrikethrough()) );
+
+ mDescriptionLeftAlignButton = new QPushButton( parent );
+ mDescriptionLeftAlignButton->setIcon( KIcon( "format-justify-left" ) );
+ mDescriptionLeftAlignButton->setToolTip( i18n( "Left-justify text" ) );
+ connect( mDescriptionLeftAlignButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionLeftAlign()) );
+
+ mDescriptionCentreAlignButton = new QPushButton( parent );
+ mDescriptionCentreAlignButton->setIcon( KIcon( "format-justify-center" ) );
+ mDescriptionCentreAlignButton->setToolTip( i18n( "Center text" ) );
+ connect( mDescriptionCentreAlignButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionCentreAlign()) );
+
+ mDescriptionRightAlignButton = new QPushButton( parent );
+ mDescriptionRightAlignButton->setIcon( KIcon( "format-justify-right" ) );
+ mDescriptionRightAlignButton->setToolTip( i18n( "Right-justify text" ) );
+ connect( mDescriptionRightAlignButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionRightAlign()) );
+
+ mDescriptionUnorderedListButton = new QPushButton( parent );
+ mDescriptionUnorderedListButton->setIcon( KIcon( "format-list-unordered" ) );
+ mDescriptionUnorderedListButton->setToolTip( i18n( "Unordered-list item" ) );
+ connect( mDescriptionUnorderedListButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionUnorderedList()) );
+
+ mDescriptionOrderedListButton = new QPushButton( parent );
+ mDescriptionOrderedListButton->setIcon( KIcon( "format-list-ordered" ) );
+ mDescriptionOrderedListButton->setToolTip( i18n( "Ordered-list item" ) );
+ connect( mDescriptionOrderedListButton, SIGNAL(clicked()),
+ this, SLOT(toggleDescriptionOrderedList()) );
- KActionCollection *collection = new KActionCollection( this );
- mDescriptionEdit = new KRichTextWidget( parent );
- mDescriptionEdit->setRichTextSupport(
- KRichTextWidget::SupportBold |
- KRichTextWidget::SupportItalic |
- KRichTextWidget::SupportUnderline |
- KRichTextWidget::SupportStrikeOut |
- KRichTextWidget::SupportAlignment |
- KRichTextWidget::SupportChangeListStyle );
-
- mDescriptionEdit->createActions( collection );
-
- mDescriptionBoldButton = new QToolButton( parent );
- mDescriptionBoldButton->setDefaultAction( collection->action( "format_text_bold" ) );
-
- mDescriptionItalicButton = new QToolButton( parent );
- mDescriptionItalicButton->setDefaultAction( collection->action( "format_text_italic" ) );
-
- mDescriptionUnderlineButton = new QToolButton( parent );
- mDescriptionUnderlineButton->setDefaultAction( collection->action( "format_text_underline" ) );
-
- mDescriptionStrikeoutButton = new QToolButton( parent );
- mDescriptionStrikeoutButton->setDefaultAction( collection->action( "format_text_strikeout" ) );
-
- mDescriptionLeftAlignButton = new QToolButton( parent );
- mDescriptionLeftAlignButton->setDefaultAction( collection->action( "format_align_left" ) );
-
- mDescriptionCentreAlignButton = new QToolButton( parent );
- mDescriptionCentreAlignButton->setDefaultAction( collection->action( "format_align_center" ) );
-
- mDescriptionRightAlignButton = new QToolButton( parent );
- mDescriptionRightAlignButton->setDefaultAction( collection->action( "format_align_right" ) );
-
- mDescriptionListButton = new QToolButton( parent );
- mDescriptionListButton->setDefaultAction( collection->action( "format_list_style" ) );
-
- htmlLayout->setSpacing(5);
htmlLayout->addWidget( mRichDescription );
htmlLayout->addWidget( mDescriptionBoldButton );
htmlLayout->addWidget( mDescriptionItalicButton );
htmlLayout->addWidget( mDescriptionUnderlineButton );
- htmlLayout->addWidget( mDescriptionStrikeoutButton );
+ htmlLayout->addWidget( mDescriptionStrikethroughButton );
htmlLayout->addWidget( mDescriptionLeftAlignButton );
htmlLayout->addWidget( mDescriptionCentreAlignButton );
htmlLayout->addWidget( mDescriptionRightAlignButton );
- htmlLayout->addWidget( mDescriptionListButton );
+ htmlLayout->addWidget( mDescriptionUnorderedListButton );
+ htmlLayout->addWidget( mDescriptionOrderedListButton );
htmlLayout->addStretch();
+ mDescriptionEdit = new KTextEdit( parent );
mDescriptionEdit->setWhatsThis(
i18n( "Sets the description for this event, to-do or journal. "
"This will be displayed in a reminder if one is set, "
@@ -363,6 +379,7 @@ void KOEditorGeneral::enableAlarm( bool
mAlarmEditButton->setEnabled( enable );
}
+
void KOEditorGeneral::toggleAlarm( bool on )
{
mAlarmButton->setChecked( on );
@@ -564,28 +581,126 @@ QObject *KOEditorGeneral::typeAheadRecei
return mSummaryEdit;
}
+void KOEditorGeneral::toggleDescriptionBold()
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+ cursor.select( QTextCursor::WordUnderCursor );
+ }
+ QTextCharFormat text;
+ if ( cursor.charFormat().fontWeight() == QFont::Bold ) {
+ text.setFontWeight( QFont::Normal );
+ } else {
+ text.setFontWeight( QFont::Bold );
+ }
+ cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionItalic()
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+ cursor.select( QTextCursor::WordUnderCursor );
+ }
+ QTextCharFormat text;
+ text.setFontItalic( !cursor.charFormat().fontItalic() );
+ cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionUnderline()
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+ cursor.select( QTextCursor::WordUnderCursor );
+ }
+ QTextCharFormat text;
+ text.setFontUnderline( !cursor.charFormat().fontUnderline() );
+ cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionStrikethrough()
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+ cursor.select( QTextCursor::WordUnderCursor );
+ }
+ QTextCharFormat text;
+ text.setFontStrikeOut( !cursor.charFormat().fontStrikeOut() );
+ cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionLeftAlign()
+{
+ setAlignment( Qt::AlignLeft );
+}
+
+void KOEditorGeneral::toggleDescriptionCentreAlign()
+{
+ setAlignment( Qt::AlignHCenter );
+}
+
+void KOEditorGeneral::toggleDescriptionRightAlign()
+{
+ setAlignment( Qt::AlignRight );
+}
+
+void KOEditorGeneral::setAlignment( Qt::Alignment alignment )
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ cursor.select( QTextCursor::LineUnderCursor );
+ QTextBlockFormat text;
+ if ( alignment != cursor.blockFormat().alignment() ) {
+ text.setAlignment( alignment );
+ cursor.mergeBlockFormat( text );
+ }
+}
+
+void KOEditorGeneral::toggleDescriptionOrderedList()
+{
+ createList( QTextListFormat::ListDecimal );
+}
+
+void KOEditorGeneral::toggleDescriptionUnorderedList()
+{
+ createList( QTextListFormat::ListDisc );
+}
+
void KOEditorGeneral::toggleDescriptionRichButtons( bool rich )
{
mDescriptionBoldButton->setEnabled( rich );
mDescriptionItalicButton->setEnabled( rich );
mDescriptionUnderlineButton->setEnabled( rich );
- mDescriptionStrikeoutButton->setEnabled( rich );
+ mDescriptionStrikethroughButton->setEnabled( rich );
mDescriptionLeftAlignButton->setEnabled( rich );
mDescriptionCentreAlignButton->setEnabled( rich );
mDescriptionRightAlignButton->setEnabled( rich );
- mDescriptionListButton->setEnabled( rich );
+ mDescriptionUnorderedListButton->setEnabled( rich );
+ mDescriptionOrderedListButton->setEnabled( rich );
}
void KOEditorGeneral::setDescriptionRich( bool rich )
{
toggleDescriptionRichButtons( rich );
if ( !rich ) {
- mDescriptionEdit->switchToPlainText();
- } else {
- mDescriptionEdit->enableRichTextMode();
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ cursor.select( QTextCursor::Document );
+ cursor.setCharFormat( QTextCharFormat() );
+ mDescriptionEdit->setPlainText( mDescriptionEdit->toPlainText() );
}
}
+QTextList *KOEditorGeneral::createList( QTextListFormat::Style style )
+{
+ mRichDescription->setChecked( true );
+ QTextCursor cursor( mDescriptionEdit->textCursor() );
+ return cursor.createList( style );
+}
+
void KOEditorGeneral::updateAttendeeSummary( int count )
{
if ( count <= 0 ) {
Index: korganizer/koeditorgeneral.h
===================================================================
--- korganizer/koeditorgeneral.h (revision 808952)
+++ korganizer/koeditorgeneral.h (revision 808797)
@@ -40,10 +40,9 @@ class QCheckBox;
class QStackedWidget;
class QSpinBox;
class QPushButton;
-class QToolButton;
class KComboBox;
class KLineEdit;
-class KRichTextWidget;
+class KTextEdit;
class KSqueezedTextLabel;
class KUrl;
class KOEditorAttachments;
@@ -114,6 +113,15 @@ class KOEditorGeneral : public QObject
void updateAlarmWidgets();
void updateDefaultAlarmTime();
void updateAttendeeSummary( int count );
+ void toggleDescriptionBold();
+ void toggleDescriptionItalic();
+ void toggleDescriptionUnderline();
+ void toggleDescriptionStrikethrough();
+ void toggleDescriptionLeftAlign();
+ void toggleDescriptionCentreAlign();
+ void toggleDescriptionRightAlign();
+ void toggleDescriptionOrderedList();
+ void toggleDescriptionUnorderedList();
void setDescriptionRich( bool rich );
signals:
@@ -121,9 +129,10 @@ class KOEditorGeneral : public QObject
void updateCategoryConfig();
void focusReceivedSignal();
void openURL( const KUrl & );
-
protected:
Alarm *alarmFromSimplePage() const;
+ void setAlignment( Qt::Alignment alignment );
+ QTextList *createList( QTextListFormat::Style style );
KLineEdit *mSummaryEdit;
KLineEdit *mLocationEdit;
@@ -135,19 +144,20 @@ class KOEditorGeneral : public QObject
QSpinBox *mAlarmTimeEdit;
KComboBox *mAlarmIncrCombo;
QPushButton *mAlarmEditButton;
- KRichTextWidget *mDescriptionEdit;
+ KTextEdit *mDescriptionEdit;
QLabel *mOwnerLabel;
KComboBox *mSecrecyCombo;
QPushButton *mCategoriesButton;
KSqueezedTextLabel *mCategoriesLabel;
- QToolButton *mDescriptionBoldButton;
- QToolButton *mDescriptionItalicButton;
- QToolButton *mDescriptionUnderlineButton;
- QToolButton *mDescriptionStrikeoutButton;
- QToolButton *mDescriptionLeftAlignButton;
- QToolButton *mDescriptionCentreAlignButton;
- QToolButton *mDescriptionRightAlignButton;
- QToolButton *mDescriptionListButton;
+ QPushButton *mDescriptionBoldButton;
+ QPushButton *mDescriptionItalicButton;
+ QPushButton *mDescriptionUnderlineButton;
+ QPushButton *mDescriptionStrikethroughButton;
+ QPushButton *mDescriptionLeftAlignButton;
+ QPushButton *mDescriptionCentreAlignButton;
+ QPushButton *mDescriptionRightAlignButton;
+ QPushButton *mDescriptionUnorderedListButton;
+ QPushButton *mDescriptionOrderedListButton;
QCheckBox *mRichDescription;
KOEditorAttachments *mAttachments;
QLabel *mResourceLabel;
++++++ disable-new-kkeyseqwidget-api-r809986.diff ++++++
Index: kmail/kmfilterdlg.cpp
===================================================================
--- kmail/kmfilterdlg.cpp (revision 809986)
+++ kmail/kmfilterdlg.cpp (revision 809985)
@@ -257,8 +257,13 @@ KMFilterDlg::KMFilterDlg(QWidget* parent
mKeySeqWidget->setObjectName( "FilterShortcutSelector" );
gl->addWidget( mKeySeqWidget, 7, 3, 1, 1);
mKeySeqWidget->setEnabled( false );
+#if KDE_IS_VERSION(4,0,60)
mKeySeqWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
+#else
+ mKeySeqWidget->setCheckActionList(
+ kmkernel->getKMMainWidget()->actionList() );
+#endif
mConfigureToolbar = new QCheckBox( i18n("Additionally add this filter to the toolbar"), mAdvOptsGroup );
gl->addWidget( mConfigureToolbar, 8, 0, 1, 4 );
mConfigureToolbar->setEnabled( false );
Index: kmail/snippetdlg.cpp
===================================================================
--- kmail/snippetdlg.cpp (revision 809986)
+++ kmail/snippetdlg.cpp (revision 809985)
@@ -38,7 +38,11 @@ SnippetDlg::SnippetDlg( KActionCollectio
setupUi( this );
setModal( modal );
+#if KDE_IS_VERSION(4,0,60)
keyWidget->setCheckActionCollections( QList() << ac );
+#else
+ keyWidget->setCheckActionList( ac->actions() );
+#endif
//TODO tab order in designer!
setTabOrder( snippetText, keyWidget );
Index: kmail/kmmessage.cpp
===================================================================
--- kmail/kmmessage.cpp (revision 809986)
+++ kmail/kmmessage.cpp (revision 809985)
@@ -1700,6 +1700,7 @@ void KMMessage::initHeader( uint id )
setSubject("");
setDateToday();
+#if KDE_IS_VERSION(4,0,60)
// user agent, e.g. KMail/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; 2008-01-15)
QStringList extraInfo;
# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
@@ -1708,6 +1709,18 @@ void KMMessage::initHeader( uint id )
setHeaderField("User-Agent",
KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo )
);
+#else
+ //
+ // user agent, e.g. KMail/1.9.50 (KDE/3.97.1; svn-762186; 2008-01-15)
+ setHeaderField("User-Agent", QString::fromLatin1("KMail/" KMAIL_VERSION " (KDE/%1.%2.%3")
+ .arg( KDE::versionMajor() ).arg( KDE::versionMinor() ).arg( KDE::versionRelease() )
+# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
+ + "; " KMAIL_SVN_REVISION_STRING "; " KMAIL_SVN_LAST_CHANGE
+# endif
+ + ")"
+ );
+ // </FIXME>
+#endif
// This will allow to change Content-Type:
setHeaderField("Content-Type","text/plain");
Index: kmail/foldershortcutdialog.cpp
===================================================================
--- kmail/foldershortcutdialog.cpp (revision 809986)
+++ kmail/foldershortcutdialog.cpp (revision 809985)
@@ -81,7 +81,11 @@ FolderShortcutDialog::FolderShortcutDial
connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
mKeySeqWidget->setKeySequence( folder->shortcut().primary(),
KKeySequenceWidget::NoValidate );
+#if KDE_IS_VERSION(4,0,60)
mKeySeqWidget->setCheckActionCollections( mMainWidget->actionCollections() );
+#else
+ mKeySeqWidget->setCheckActionList( mMainWidget->actionList() );
+#endif
}
FolderShortcutDialog::~FolderShortcutDialog()
Index: kmail/configuredialog.cpp
===================================================================
--- kmail/configuredialog.cpp (revision 809986)
+++ kmail/configuredialog.cpp (revision 809985)
@@ -2441,8 +2441,13 @@ AppearancePageMessageTagTab::AppearanceP
QLabel *sclabel = new QLabel( i18n("Shortc&ut:") , mTagSettingGroupBox );
sclabel->setBuddy( mKeySequenceWidget );
settings->addWidget( sclabel, 6, 0 );
+#if KDE_IS_VERSION(4,0,60)
mKeySequenceWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
+#else
+ mKeySequenceWidget->setCheckActionList(
+ kmkernel->getKMMainWidget()->actionList() );
+#endif
connect( mKeySequenceWidget, SIGNAL( keySequenceChanged( const QKeySequence & ) ),
this, SLOT( slotEmitChangeCheck() ) );
Index: kmail/customtemplates.cpp
===================================================================
--- kmail/customtemplates.cpp (revision 809986)
+++ kmail/customtemplates.cpp (revision 809985)
@@ -84,8 +84,13 @@ CustomTemplates::CustomTemplates( QWidge
connect( mKeySequenceWidget, SIGNAL( keySequenceChanged( const QKeySequence& ) ),
this, SLOT( slotShortcutChanged( const QKeySequence& ) ) );
+#if KDE_IS_VERSION(4,0,60)
mKeySequenceWidget->setCheckActionCollections(
kmkernel->getKMMainWidget()->actionCollections() );
+#else
+ mKeySequenceWidget->setCheckActionList(
+ kmkernel->getKMMainWidget()->actionList() );
+#endif
mReplyPix = KIconLoader().loadIcon( "mail-reply-sender", KIconLoader::Small );
mReplyAllPix = KIconLoader().loadIcon( "mail-reply-all", KIconLoader::Small );
Index: libkdepim/kmeditor.cpp
===================================================================
--- libkdepim/kmeditor.cpp (revision 809986)
+++ libkdepim/kmeditor.cpp (revision 809985)
@@ -359,8 +359,10 @@ void KMeditorPrivate::init()
QShortcut * insertMode = new QShortcut( QKeySequence( Qt::Key_Insert ), q );
q->connect( insertMode, SIGNAL( activated() ),
q, SLOT( slotChangeInsertMode() ) );
+#if KDE_IS_VERSION(4,0,67)
q->connect( q, SIGNAL( languageChanged(const QString &) ),
q, SLOT( setSpellCheckLanguage(const QString &) ) );
+#endif
}
void KMeditor::slotChangeInsertMode()
@@ -448,6 +450,7 @@ void KMeditor::disableWordWrap()
void KMeditor::contextMenuEvent( QContextMenuEvent *event )
{
+#if KDE_IS_VERSION(4,0,73)
// Obtain the cursor at the mouse position and the current cursor
QTextCursor cursorAtMouse = cursorForPosition( event->pos() );
int mousePos = cursorAtMouse.position();
@@ -542,6 +545,10 @@ void KMeditor::contextMenuEvent( QContex
}
}
}
+#else
+ KTextEdit::contextMenuEvent( event );
+ kWarning() << "spell check menu not compiled in, kdelibs too old.";
+#endif
}
void KMeditor::slotPasteAsQuotation()
@@ -943,7 +950,9 @@ void KMeditor::setSpellCheckLanguage( co
KTextEdit::highlighter()->setCurrentLanguage( language );
KTextEdit::highlighter()->rehighlight();
}
+#if KDE_IS_VERSION(4,0,60)
KTextEdit::setSpellCheckingLanguage( language );
+#endif
if ( language != d->language )
emit spellcheckLanguageChanged( language );
@@ -974,10 +983,12 @@ void KMeditor::showSpellConfigDialog( co
{
KConfig config( configFileName );
Sonnet::ConfigDialog dialog( &config, this );
+#if KDE_IS_VERSION(4,0,67)
if ( !d->language.isEmpty() )
dialog.setLanguage( d->language );
connect( &dialog, SIGNAL( languageChanged(const QString &) ),
this, SLOT( setSpellCheckLanguage(const QString &) ) );
+#endif
dialog.setWindowIcon( KIcon( "internet-mail" ) );
dialog.exec();
}
++++++ kdelibs41.diff -> kdelibs40.diff ++++++
--- KDE/kdepim4/kdelibs41.diff 2008-05-09 17:54:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4/kdelibs40.diff 2008-05-21 18:58:42.000000000 +0200
@@ -1,93 +1,28 @@
-Subject: Use backported kdelibs4.1 functionality
-From: Lubos Lunak
-Patch-upstream: never
-Relates: kdelibs4/kdelibs4pim.diff
-
-Use backported support for spellchecking in kdepim4.1.
-
---- kmail/kmmessage.cpp.sav 2008-05-09 14:45:17.000000000 +0200
-+++ kmail/kmmessage.cpp 2008-05-09 14:45:59.000000000 +0200
-@@ -1699,7 +1699,6 @@ void KMMessage::initHeader( uint id )
- setSubject("");
- setDateToday();
+Index: akonadi/tray/main.cpp
+===================================================================
+--- akonadi/tray/main.cpp (revision 810647)
++++ akonadi/tray/main.cpp (working copy)
+@@ -58,7 +58,9 @@ int main( int argc, char *argv[] )
+ KLocalizedString() );
+ aboutData.addAuthor( ki18n( "Tom Albers" ), ki18n( "Maintainer and Author" ),
+ "tomalbers@kde.nl", "http://www.omat.nl" );
++#if KDE_IS_VERSION( 4,0,80 )
+ aboutData.setProgramIconName( "akonadi" );
++#endif
+
+ KCmdLineArgs::init( argc, argv, &aboutData );
+
+Index: akonadi/clients/akonadiconsole/main.cpp
+===================================================================
+--- akonadi/clients/akonadiconsole/main.cpp (revision 810647)
++++ akonadi/clients/akonadiconsole/main.cpp (working copy)
+@@ -35,7 +35,9 @@ int main( int argc, char **argv )
+ ki18n( "(c) 2006-2008 the Akonadi developer" ),
+ KLocalizedString(),
+ "http://pim.kde.org/akonadi/" );
++#if KDE_IS_VERSION( 4,0,80 )
+ aboutData.setProgramIconName( "akonadi" );
++#endif
+ aboutData.addAuthor( ki18n( "Tobias König" ), ki18n( "Author" ), "tokoe@kde.org" );
+ aboutData.addAuthor( ki18n( "Volker Krause" ), ki18n( "Author" ), "vkrause@kde.org" );
--#if KDE_IS_VERSION(4,0,60)
- // user agent, e.g. KMail/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; 2008-01-15)
- QStringList extraInfo;
- # if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
-@@ -1708,18 +1707,6 @@ void KMMessage::initHeader( uint id )
- setHeaderField("User-Agent",
- KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo )
- );
--#else
-- //
-- // user agent, e.g. KMail/1.9.50 (KDE/3.97.1; svn-762186; 2008-01-15)
-- setHeaderField("User-Agent", QString::fromLatin1("KMail/" KMAIL_VERSION " (KDE/%1.%2.%3")
-- .arg( KDE::versionMajor() ).arg( KDE::versionMinor() ).arg( KDE::versionRelease() )
--# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
-- + "; " KMAIL_SVN_REVISION_STRING "; " KMAIL_SVN_LAST_CHANGE
--# endif
-- + ")"
-- );
-- // </FIXME>
--#endif
-
- // This will allow to change Content-Type:
- setHeaderField("Content-Type","text/plain");
---- libkdepim/kmeditor.cpp.sav 2008-05-09 14:36:23.000000000 +0200
-+++ libkdepim/kmeditor.cpp 2008-05-09 16:05:08.000000000 +0200
-@@ -404,10 +404,8 @@ void KMeditorPrivate::init()
- QShortcut * insertMode = new QShortcut( QKeySequence( Qt::Key_Insert ), q );
- q->connect( insertMode, SIGNAL( activated() ),
- q, SLOT( slotChangeInsertMode() ) );
--#if KDE_IS_VERSION(4,0,67)
- q->connect( q, SIGNAL( languageChanged(const QString &) ),
- q, SLOT( setSpellCheckLanguage(const QString &) ) );
--#endif
- }
-
- void KMeditor::slotChangeInsertMode()
-@@ -629,7 +627,6 @@ void KMeditor::disableWordWrap()
-
- void KMeditor::contextMenuEvent( QContextMenuEvent *event )
- {
--#if KDE_IS_VERSION(4,0,73)
- // Obtain the cursor at the mouse position and the current cursor
- QTextCursor cursorAtMouse = cursorForPosition( event->pos() );
- int mousePos = cursorAtMouse.position();
-@@ -724,10 +721,8 @@ void KMeditor::contextMenuEvent( QContex
- }
- }
- }
--#else
-- KTextEdit::contextMenuEvent( event );
-- kWarning() << "spell check menu not compiled in, kdelibs too old.";
--#endif
-+// KTextEdit::contextMenuEvent( event );
-+//kWarning() << "spell check menu not compiled in, kdelibs too old.";
- }
-
- void KMeditor::slotPasteAsQuotation()
-@@ -1159,9 +1154,7 @@ void KMeditor::setSpellCheckLanguage( co
- KTextEdit::highlighter()->setCurrentLanguage( language );
- KTextEdit::highlighter()->rehighlight();
- }
--#if KDE_IS_VERSION(4,0,60)
- KTextEdit::setSpellCheckingLanguage( language );
--#endif
-
- if ( language != d->language )
- emit spellcheckLanguageChanged( language );
-@@ -1192,12 +1185,10 @@ void KMeditor::showSpellConfigDialog( co
- {
- KConfig config( configFileName );
- Sonnet::ConfigDialog dialog( &config, this );
--#if KDE_IS_VERSION(4,0,67)
- if ( !d->language.isEmpty() )
- dialog.setLanguage( d->language );
- connect( &dialog, SIGNAL( languageChanged(const QString &) ),
- this, SLOT( setSpellCheckLanguage(const QString &) ) );
--#endif
- dialog.setWindowIcon( KIcon( "internet-mail" ) );
- dialog.exec();
- }
++++++ kdepim-4.0.73.tar.bz2 -> kdepim-4.0.80.tar.bz2 ++++++
KDE/kdepim4/kdepim-4.0.73.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-4.0.80.tar.bz2 differ: byte 11, line 1
++++++ kmail_revert_krichtext-r809981.diff ++++++
++++ 1429 lines (skipped)
++++++ kmail_revert_krichtext-r810400.diff ++++++
Index: kmail/kmcomposewin.cpp
===================================================================
--- kmail/kmcomposewin.cpp (revision 810400)
+++ kmail/kmcomposewin.cpp (revision 810399)
@@ -3807,7 +3807,7 @@ void KMComposeWin::enableHtml()
//-----------------------------------------------------------------------------
void KMComposeWin::disableHtml()
{
- mEditor->switchToPlainText();
+ mEditor->toPlainText();
slotUpdateFont();
if ( toolBar( "htmlToolBar" )->isVisible() )
toolBar( "htmlToolBar" )->hide();
Index: knode/kncomposerview.cpp
===================================================================
--- knode/kncomposerview.cpp (revision 810400)
+++ knode/kncomposerview.cpp (revision 810399)
@@ -91,7 +91,7 @@ KNComposer::ComposerView::ComposerView(
//Editor
e_dit=new KNComposerEditor(this);
- e_dit->switchToPlainText();
+ e_dit->toPlainText();
e_dit->setMinimumHeight(50);
QVBoxLayout *notL=new QVBoxLayout(e_dit);
++++++ use-old-signatureconfigurator-location-r806301.diff ++++++
++++ 606 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org