Hello community,
here is the log from the commit of package kdesdk4 for openSUSE:Factory
checked in at Tue Sep 1 22:19:52 CEST 2009.
--------
--- KDE/kdesdk4/kdesdk4.changes 2009-08-23 17:01:37.000000000 +0200
+++ kdesdk4/kdesdk4.changes 2009-08-28 14:01:31.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 28 14:01:24 CEST 2009 - dmueller@suse.de
+
+- update to 4.3.1
+ * see http://kde.org/announcements/changelogs/changelog4_3_0to4_3_1.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-fix.diff
kdesdk-4.3.0.tar.bz2
New:
----
kdesdk-4.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.XqSeir/_old 2009-09-01 22:19:09.000000000 +0200
+++ /var/tmp/diff_new_pack.XqSeir/_new 2009-09-01 22:19:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdesdk4 (Version 4.3.0)
+# spec file for package kdesdk4 (Version 4.3.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,13 +24,12 @@
Group: System/GUI/KDE
Summary: KDE SDK Package
Url: http://www.kde.org/
-Version: 4.3.0
-Release: 3
+Version: 4.3.1
+Release: 1
Source0: kdesdk-%version.tar.bz2
Patch: 4_3_BRANCH.diff
Patch2: desktop-files.diff
Patch3: libkstartperf-no-lib.diff
-Patch4: build-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
Suggests: kdesdk4-scripts
@@ -64,7 +63,6 @@
%patch
%patch2
%patch3
-%patch4
%build
%ifarch ppc64
@@ -224,7 +222,7 @@
%files -n cervisia -f filelists/cervisia
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir /usr/share/kde4/apps/cervisiapart
+%dir %_kde4_appsdir/cervisiapart
%package -n kbugbuster
License: GPL v2 or later
@@ -299,7 +297,7 @@
%files -n kate -f filelists/kate
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kate-plugins
+%doc %lang(en) %_kde4_htmldir/en/kate-plugins
%config %_kde_config_dir/katefiletemplates.knsrc
%package -n kuiviewer
@@ -326,7 +324,7 @@
%files -n kuiviewer -f filelists/kuiviewer
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir /usr/share/kde4/apps/kuiviewerpart
+%dir %_kde4_appsdir/kuiviewerpart
%package -n kcachegrind
License: GPL v2 or later
@@ -376,9 +374,9 @@
%files -n kde4-kapptemplate -f filelists/kapptemplate
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir /usr/share/kde4/apps/kdevappwizard
-%dir /usr/share/kde4/apps/kdevappwizard/templates
-%dir /usr/share/kde4/apps/kdevappwizard/template_previews
+%dir %_kde4_appsdir/kdevappwizard
+%dir %_kde4_appsdir/kdevappwizard/templates
+%dir %_kde4_appsdir/kdevappwizard/template_previews
%package -n kio_svn
License: GPL v2 or later
@@ -404,7 +402,7 @@
%files -n kio_svn -f filelists/kioslave
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir /usr/share/kde4/apps/kio_perldoc
+%dir %_kde4_appsdir/kio_perldoc
%package -n kmtrace
License: GPL v2 or later
@@ -557,10 +555,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-/usr/%_lib/strigi/strigila_diff.so
+%_kde4_libdir/strigi/strigila_diff.so
/usr/include/kprofilemethod.h
-/usr/%_lib/strigi/strigila_po.so
-/usr/%_lib/strigi/strigita_ts.so
+%_kde4_libdir/strigi/strigila_po.so
+%_kde4_libdir/strigi/strigita_ts.so
/usr/share/strigi/fieldproperties/strigi_translation.fieldproperties
%changelog
++++++ kdesdk-4.3.0.tar.bz2 -> kdesdk-4.3.1.tar.bz2 ++++++
Files old/kdesdk-4.3.0/doc/cervisia/index.cache.bz2 and new/kdesdk-4.3.1/doc/cervisia/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.3.1/doc/kapptemplate/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kate/index.cache.bz2 and new/kdesdk-4.3.1/doc/kate/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kate-plugins/index.cache.bz2 and new/kdesdk-4.3.1/doc/kate-plugins/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.3.1/doc/kbugbuster/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.3.1/doc/kcachegrind/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/kompare/index.cache.bz2 and new/kdesdk-4.3.1/doc/kompare/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.3.1/doc/scripts/kdesvn-build/index.cache.bz2 differ
Files old/kdesdk-4.3.0/doc/umbrello/index.cache.bz2 and new/kdesdk-4.3.1/doc/umbrello/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop new/kdesdk-4.3.1/kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop
--- old/kdesdk-4.3.0/kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop 2009-07-21 17:22:51.000000000 +0200
+++ new/kdesdk-4.3.1/kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop 2009-08-27 10:17:57.000000000 +0200
@@ -48,6 +48,7 @@
Comment[sr]=Прикључак Аконадијевог серијализатора за %{APPNAMELC}
Comment[sr@latin]=Priključak Akonadijevog serijalizatora za %{APPNAMELC}
Comment[sv]=Ett Akonadi insticksprogram för serialisering av %{APPNAMELC}
+Comment[tr]=%{APPNAMELC} için Akonadi sıralandırıcı eklentisi
Comment[uk]=Додаток перетворення у послідовну форму Akonadi для %{APPNAMELC}
Comment[x-test]=xxAn Akonadi serializer plugin for %{APPNAMELC}xx
Comment[zh_CN]=%{APPNAMELC} 的 Akonadi 转换器插件
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kate/app/katemainwindow.cpp new/kdesdk-4.3.1/kate/app/katemainwindow.cpp
--- old/kdesdk-4.3.0/kate/app/katemainwindow.cpp 2009-05-06 12:14:05.000000000 +0200
+++ new/kdesdk-4.3.1/kate/app/katemainwindow.cpp 2009-08-27 10:17:56.000000000 +0200
@@ -200,6 +200,9 @@
int id = KateApp::self()->mainWindowID (this);
m_documentModel->readSessionConfig( sconfig,
QString("DocumentModel:MainWindow:%1").arg(id) );
+ // sync session config - or do we need an extra
+ // KateFileList::readSessionConfig() here too?
+ m_fileList->setSortRole(m_documentModel->sortRole());
m_viewManager->restoreViewConfiguration (KConfigGroup(sconfig, sgroup) );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kate/plugins/katebuild-plugin/plugin_katebuild.cpp new/kdesdk-4.3.1/kate/plugins/katebuild-plugin/plugin_katebuild.cpp
--- old/kdesdk-4.3.0/kate/plugins/katebuild-plugin/plugin_katebuild.cpp 2009-05-14 19:26:53.000000000 +0200
+++ new/kdesdk-4.3.1/kate/plugins/katebuild-plugin/plugin_katebuild.cpp 2009-08-27 10:17:57.000000000 +0200
@@ -308,7 +308,15 @@
/******************************************************************/
bool KateBuildView::slotQuickCompile()
{
- return startProcess(buildUi.quickComp->text());
+ KTextEditor::View *kv = mainWindow()->activeView();
+ if (!kv) {
+ KMessageBox::sorry(0, i18n("There is no file or directory specified for building."));
+ return false;
+ }
+ if (kv->document()->isModified()) kv->document()->save();
+ KUrl url(kv->document()->url());
+
+ return startProcess(buildUi.quickComp->text() + " " + url.toLocalFile());
}
/******************************************************************/
@@ -337,7 +345,7 @@
// where should we run make?
if (buildUi.buildDir->text().isEmpty()) {
- if (url.path().isEmpty()) {
+ if (url.toLocalFile().isEmpty()) {
KMessageBox::sorry(0, i18n("There is no file or directory specified for building."));
return false;
}
@@ -348,7 +356,8 @@
url.path()));
return false;
}
- m_make_dir = url;
+ // url is a file -> remove the file with upUrl().
+ m_make_dir = url.upUrl();
}
else {
m_make_dir = KUrl(buildUi.buildDir->text());
@@ -388,12 +397,12 @@
}
/******************************************************************/
-void KateBuildView::slotProcExited(int /*exitCode*/, QProcess::ExitStatus)
+void KateBuildView::slotProcExited(int exitCode, QProcess::ExitStatus)
{
QApplication::restoreOverrideCursor();
// did we get any errors?
- if (m_found_error) {
+ if (m_found_error || (exitCode != 0)) {
buildUi.ktabwidget->setCurrentIndex(0);
buildUi.errTreeWidget->resizeColumnToContents(0);
buildUi.errTreeWidget->resizeColumnToContents(1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kate/plugins/symbolviewer/katesymbolviewer.desktop new/kdesdk-4.3.1/kate/plugins/symbolviewer/katesymbolviewer.desktop
--- old/kdesdk-4.3.0/kate/plugins/symbolviewer/katesymbolviewer.desktop 2009-07-29 13:12:36.000000000 +0200
+++ new/kdesdk-4.3.1/kate/plugins/symbolviewer/katesymbolviewer.desktop 2009-08-27 10:17:56.000000000 +0200
@@ -52,6 +52,7 @@
Comment[sr]=Извлачи и приказује симболе из извора
Comment[sr@latin]=Izvlači i prikazuje simbole iz izvora
Comment[sv]=Hämta och visa referenssymboler från källkod
+Comment[tr]=Referans sembollerini kaynaktan çıkar ve göster
Comment[uk]=Добування і показ символів з джерельного коду
Comment[x-test]=xxExtract and show reference symbols from sourcexx
Comment[zh_CN]=从源代码中提取并显示相关的符号
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp new/kdesdk-4.3.1/kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp
--- old/kdesdk-4.3.0/kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp 2009-05-06 12:14:05.000000000 +0200
+++ new/kdesdk-4.3.1/kate/plugins/symbolviewer/plugin_katesymbolviewer.cpp 2009-08-27 10:17:56.000000000 +0200
@@ -168,7 +168,7 @@
m_Active = true;
//symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width());
- titles << tr("Symbols") << tr("Position");
+ titles << i18nc("@title:column", "Symbols") << i18nc("@title:column", "Position");
symbols->setColumnCount(2);
symbols->setHeaderLabels(titles);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/interfaces/kompareinterface.h new/kdesdk-4.3.1/kompare/interfaces/kompareinterface.h
--- old/kdesdk-4.3.0/kompare/interfaces/kompareinterface.h 2008-04-30 15:59:50.000000000 +0200
+++ new/kdesdk-4.3.1/kompare/interfaces/kompareinterface.h 2009-08-27 10:17:58.000000000 +0200
@@ -67,6 +67,16 @@
* appropriate method(s)
*/
virtual void compare( const KUrl& sourceFile, const KUrl& destinationFile ) = 0;
+
+ /**
+ * Compare a Source file to a custom Destination string
+ */
+ virtual void compareFileString( const KUrl & sourceFile, const QString & destination) = 0;
+
+ /**
+ * Compare a custom Source string to a Destination file
+ */
+ virtual void compareStringFile( const QString & source, const KUrl & destinationFile) = 0;
/**
* Compare, with diff, source with destination files
@@ -118,4 +128,6 @@
QString m_encoding;
};
+Q_DECLARE_INTERFACE(KompareInterface, "com.kde.Kompare.KompareInterface/4.0")
+
#endif /* _KOMPARE_INTERFACE_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/komparepart/kompare_part.cpp new/kdesdk-4.3.1/kompare/komparepart/kompare_part.cpp
--- old/kdesdk-4.3.0/kompare/komparepart/kompare_part.cpp 2009-04-28 15:46:40.000000000 +0200
+++ new/kdesdk-4.3.1/kompare/komparepart/kompare_part.cpp 2009-08-27 10:17:58.000000000 +0200
@@ -402,13 +402,37 @@
emit kompareInfo( &m_info );
- if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
- {
- m_modelList->compare();
- updateCaption();
- updateStatus();
- }
- updateActions();
+ compareAndUpdateAll();
+}
+
+void KomparePart::compareFileString( const KUrl & sourceFile, const QString & destination)
+{
+ //Set the modeto specify that the source is a file, and the destination is a string
+ m_info.mode = Kompare::ComparingFileString;
+
+ m_info.source = sourceFile;
+ m_info.localDestination = destination;
+
+ fetchURL(sourceFile, true);
+
+ emit kompareInfo( &m_info );
+
+ compareAndUpdateAll();
+}
+
+void KomparePart::compareStringFile( const QString & source, const KUrl & destinationFile)
+{
+ //Set the modeto specify that the source is a file, and the destination is a string
+ m_info.mode = Kompare::ComparingStringFile;
+
+ m_info.localSource = source;
+ m_info.destination = destinationFile;
+
+ fetchURL(destinationFile, false);
+
+ emit kompareInfo( &m_info );
+
+ compareAndUpdateAll();
}
void KomparePart::compareFiles( const KUrl& sourceFile, const KUrl& destinationFile )
@@ -425,13 +449,7 @@
emit kompareInfo( &m_info );
- if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
- {
- m_modelList->compareFiles();
- updateCaption();
- updateStatus();
- }
- updateActions();
+ compareAndUpdateAll();
}
void KomparePart::compareDirs( const KUrl& sourceDirectory, const KUrl& destinationDirectory )
@@ -446,13 +464,7 @@
emit kompareInfo( &m_info );
- if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
- {
- m_modelList->compareDirs();
- updateCaption();
- updateStatus();
- }
- updateActions();
+ compareAndUpdateAll();
}
void KomparePart::compare3Files( const KUrl& /*originalFile*/, const KUrl& /*changedFile1*/, const KUrl& /*changedFile2*/ )
@@ -474,13 +486,7 @@
emit kompareInfo( &m_info );
- if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
- {
- m_modelList->openFileAndDiff();
- updateCaption();
- updateStatus();
- }
- updateActions();
+ compareAndUpdateAll();
}
void KomparePart::openDirAndDiff ( const KUrl& dir, const KUrl& diffFile )
@@ -497,6 +503,7 @@
if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
{
m_modelList->openDirAndDiff();
+ //Must this be in here? couldn't we use compareAndUpdateAll as well?
updateActions();
updateCaption();
updateStatus();
@@ -720,6 +727,34 @@
emit setStatusBarText( text );
}
+void KomparePart::compareAndUpdateAll()
+{
+ if ( !m_info.localSource.isEmpty() && !m_info.localDestination.isEmpty() )
+ {
+ switch(m_info.mode)
+ {
+ default:
+ case Kompare::UnknownMode:
+ m_modelList->compare();
+ break;
+
+ case Kompare::ComparingStringFile:
+ case Kompare::ComparingFileString:
+ case Kompare::ComparingFiles:
+ case Kompare::ComparingDirs:
+ m_modelList->compare(m_info.mode);
+ break;
+
+ case Kompare::BlendingFile:
+ m_modelList->openFileAndDiff();
+ break;
+ }
+ updateCaption();
+ updateStatus();
+ }
+ updateActions();
+}
+
void KomparePart::slotShowError( QString error )
{
KMessageBox::error( widget(), error );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/komparepart/kompare_part.h new/kdesdk-4.3.1/kompare/komparepart/kompare_part.h
--- old/kdesdk-4.3.0/kompare/komparepart/kompare_part.h 2009-03-18 10:59:39.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/komparepart/kompare_part.h 2009-08-27 10:17:58.000000000 +0200
@@ -31,7 +31,6 @@
class QWidget;
class KTemporaryFile;
-class KToggleAction;
class KUrl;
class KAboutData;
class KAction;
@@ -45,7 +44,6 @@
class DiffSettings;
class ViewSettings;
class KompareSplitter;
-class KompareProcess;
/**
* This is a "Part". It does all the real work in a KPart
@@ -60,6 +58,7 @@
public KompareInterface
{
Q_OBJECT
+ Q_INTERFACES(KompareInterface)
public:
/**
* Default constructor
@@ -104,6 +103,12 @@
/** Compare, with diff, source with destination */
virtual void compare( const KUrl& sourceFile, const KUrl& destinationFile );
+
+ /** Compare a Source file to a custom Destination string */
+ virtual void compareFileString( const KUrl & sourceFile, const QString & destination);
+
+ /** Compare a custom Source string to a Destination file */
+ virtual void compareStringFile( const QString & source, const KUrl & destinationFile);
/** Compare, with diff, source with destination */
virtual void compareFiles( const KUrl& sourceFile, const KUrl& destinationFile );
@@ -194,6 +199,7 @@
void updateActions();
void updateCaption();
void updateStatus();
+ void compareAndUpdateAll();
void slotPaintRequested( QPrinter* );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/kompareurldialog.cpp new/kdesdk-4.3.1/kompare/kompareurldialog.cpp
--- old/kdesdk-4.3.0/kompare/kompareurldialog.cpp 2009-03-10 13:24:55.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/kompareurldialog.cpp 2009-08-27 10:17:58.000000000 +0200
@@ -16,6 +16,7 @@
**
***************************************************************************/
#include "kompareurldialog.h"
+#include <QShowEvent>
#include
@@ -72,13 +73,20 @@
connect( m_filesPage->secondURLRequester(), SIGNAL( textChanged( const QString& ) ),
this, SLOT( slotEnableOk() ) );
- slotEnableOk();
}
KompareURLDialog::~KompareURLDialog()
{
}
+void KompareURLDialog::showEvent ( QShowEvent * event )
+{
+ if ( !event->spontaneous () )
+ {
+ slotEnableOk();
+ }
+}
+
void KompareURLDialog::slotButtonClicked( int button )
{
if ( button == KDialog::Cancel )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/kompareurldialog.h new/kdesdk-4.3.1/kompare/kompareurldialog.h
--- old/kdesdk-4.3.0/kompare/kompareurldialog.h 2009-02-18 17:28:59.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/kompareurldialog.h 2009-08-27 10:17:58.000000000 +0200
@@ -66,7 +66,8 @@
private slots:
void slotEnableOk();
-
+protected:
+ void showEvent ( QShowEvent * event );
private:
FilesPage* m_filesPage;
FilesSettings* m_filesSettings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdialogpages/diffpage.cpp new/kdesdk-4.3.1/kompare/libdialogpages/diffpage.cpp
--- old/kdesdk-4.3.0/kompare/libdialogpages/diffpage.cpp 2009-03-18 10:59:39.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/libdialogpages/diffpage.cpp 2009-08-27 10:17:58.000000000 +0200
@@ -27,6 +27,8 @@
#include
#include
#include
+#include <QButtonGroup>
+#include <QDebug>
#include
#include
@@ -86,7 +88,7 @@
m_locSpinBox->setValue( m_settings->m_linesOfContext );
- m_modeButtonGroup->setSelected( m_settings->m_format );
+ m_modeButtonGroup->button( m_settings->m_format )->setChecked( true );
m_excludeFilePatternCheckBox->setChecked ( m_settings->m_excludeFilePattern );
slotExcludeFilePatternToggled ( m_settings->m_excludeFilePattern );
@@ -128,7 +130,7 @@
m_settings->m_linesOfContext = m_locSpinBox->value();
- m_settings->m_format = static_castKompare::Format( m_modeButtonGroup->selected() );
+ m_settings->m_format = static_castKompare::Format( m_modeButtonGroup->checkedId() );
m_settings->m_excludeFilePattern = m_excludeFilePatternCheckBox->isChecked();
m_settings->m_excludeFilePatternList = m_excludeFilePatternEditListBox->items();
@@ -158,7 +160,7 @@
m_locSpinBox->setValue( 3 );
- m_modeButtonGroup->setSelected( Kompare::Unified );
+ m_modeButtonGroup->button( Kompare::Unified )->setChecked( true );
m_excludeFilePatternCheckBox->setChecked( false );
@@ -226,16 +228,23 @@
layout->setMargin( KDialog::marginHint() );
// add diff modes
- m_modeButtonGroup = new KButtonGroup( page );
- m_modeButtonGroup->setWhatsThis( i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
- layout->addWidget( m_modeButtonGroup );
- QVBoxLayout* bgLayout = new QVBoxLayout( m_modeButtonGroup );
- m_modeButtonGroup->setTitle( i18n( "Output Format" ) );
+ m_modeButtonGroup = new QButtonGroup( page );
+ QGroupBox *box = new QGroupBox( page );
+ box->setWhatsThis( i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
+ layout->addWidget( box );
+ QVBoxLayout* bgLayout = new QVBoxLayout( box );
+ box->setTitle( i18n( "Output Format" ) );
//m_modeButtonGroup->setMargin( KDialog::marginHint() );
- bgLayout->addWidget( new QRadioButton( i18n( "Context" ), m_modeButtonGroup ) );
- bgLayout->addWidget( new QRadioButton( i18n( "Normal" ), m_modeButtonGroup ) );
- bgLayout->addWidget( new QRadioButton( i18n( "Unified" ), m_modeButtonGroup ) );
+ QRadioButton *radioButton = new QRadioButton( i18n( "Context" ), box );
+ m_modeButtonGroup->addButton( radioButton, Kompare::Context);
+ bgLayout->addWidget( radioButton );
+ radioButton = new QRadioButton( i18n( "Normal" ), box );
+ m_modeButtonGroup->addButton( radioButton, Kompare::Normal);
+ bgLayout->addWidget( radioButton );
+ radioButton = new QRadioButton( i18n( "Unified" ), box );
+ m_modeButtonGroup->addButton( radioButton, Kompare::Unified);
+ bgLayout->addWidget( radioButton );
// #lines of context (loc)
Q3HGroupBox* groupBox = new Q3HGroupBox( page );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdialogpages/diffpage.h new/kdesdk-4.3.1/kompare/libdialogpages/diffpage.h
--- old/kdesdk-4.3.0/kompare/libdialogpages/diffpage.h 2009-03-18 10:59:39.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/libdialogpages/diffpage.h 2009-08-27 10:17:58.000000000 +0200
@@ -26,7 +26,7 @@
class QDialog;
class QSpinBox;
class QStringList;
-class KButtonGroup;
+class QButtonGroup;
class QWidget;
class QGroupBox;
@@ -88,7 +88,7 @@
QCheckBox* m_excludeFilePatternCheckBox;
KEditListBox* m_excludeFilePatternEditListBox;
-
+
QCheckBox* m_excludeFileCheckBox;
KUrlComboBox* m_excludeFileURLComboBox;
KUrlRequester* m_excludeFileURLRequester;
@@ -96,7 +96,7 @@
// loc == lines of context
QSpinBox* m_locSpinBox;
- KButtonGroup* m_modeButtonGroup;
+ QButtonGroup* m_modeButtonGroup;
QGroupBox* m_diffProgramGroup;
KTabWidget* m_tabWidget;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdiff2/kompare.h new/kdesdk-4.3.1/kompare/libdiff2/kompare.h
--- old/kdesdk-4.3.0/kompare/libdiff2/kompare.h 2009-02-26 10:13:03.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/libdiff2/kompare.h 2009-08-27 10:17:57.000000000 +0200
@@ -52,12 +52,14 @@
};
enum Mode {
- ComparingFiles, // compareFiles
- ComparingDirs, // compareDirs
- ShowingDiff, // openDiff
- BlendingDir, // openDirAnfDiff
- BlendingFile, // openFileAndDiff
- UnknownMode // Used to initialize the Infoi struct
+ ComparingFiles, // compareFiles
+ ComparingFileString, // Compare a source file with a destination string
+ ComparingStringFile, // Compare a source string with a destination file
+ ComparingDirs, // compareDirs
+ ShowingDiff, // openDiff
+ BlendingDir, // openDirAnfDiff
+ BlendingFile, // openFileAndDiff
+ UnknownMode // Used to initialize the Infoi struct
};
enum DiffMode {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdiff2/komparemodellist.cpp new/kdesdk-4.3.1/kompare/libdiff2/komparemodellist.cpp
--- old/kdesdk-4.3.0/kompare/libdiff2/komparemodellist.cpp 2009-03-18 10:59:39.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/libdiff2/komparemodellist.cpp 2009-08-27 10:17:57.000000000 +0200
@@ -136,7 +136,7 @@
if ( sourceIsDirectory && destinationIsDirectory )
{
m_info->mode = Kompare::ComparingDirs;
- result = compareDirs();
+ result = compare(m_info->mode);
}
else if ( !sourceIsDirectory && !destinationIsDirectory )
{
@@ -173,7 +173,7 @@
{
kDebug(8101) << "Comparing source with destination" << endl;
m_info->mode = Kompare::ComparingFiles;
- result = compareFiles();
+ result = compare(m_info->mode);
}
}
else if ( sourceIsDirectory && !destinationIsDirectory )
@@ -194,46 +194,11 @@
return result;
}
-bool KompareModelList::compareFiles()
+bool KompareModelList::compare(Kompare::Mode mode)
{
clear(); // Destroy the old models...
-// m_fileWatch = new KDirWatch( this, "filewatch" );
-// m_fileWatch->addFile( m_source );
-// m_fileWatch->addFile( m_destination );
-
-// connect( m_fileWatch, SIGNAL( dirty( const QString& ) ), this, SLOT( slotFileChanged( const QString& ) ) );
-// connect( m_fileWatch, SIGNAL( created( const QString& ) ), this, SLOT( slotFileChanged( const QString& ) ) );
-// connect( m_fileWatch, SIGNAL( deleted( const QString& ) ), this, SLOT( slotFileChanged( const QString& ) ) );
-
-// m_fileWatch->startScan();
- m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_info->localSource, m_info->localDestination );
- m_diffProcess->setEncoding( m_encoding );
-
- connect( m_diffProcess, SIGNAL(diffHasFinished( bool )),
- this, SLOT(slotDiffProcessFinished( bool )) );
-
- emit status( Kompare::RunningDiff );
- m_diffProcess->start();
-
- return true;
-}
-
-bool KompareModelList::compareDirs()
-{
- clear(); // Destroy the old models...
-
-// m_dirWatch = new KDirWatch( this, "dirwatch" );
- // Watch files in the dirs and watch the dirs recursively
-// m_dirWatch->addDir( m_source, true, true );
-// m_dirWatch->addDir( m_destination, true, true );
-
-// connect( m_dirWatch, SIGNAL( dirty ( const QString& ) ), this, SLOT( slotDirectoryChanged( const QString& ) ) );
-// connect( m_dirWatch, SIGNAL( created( const QString& ) ), this, SLOT( slotDirectoryChanged( const QString& ) ) );
-// connect( m_dirWatch, SIGNAL( deleted( const QString& ) ), this, SLOT( slotDirectoryChanged( const QString& ) ) );
-
-// m_dirWatch->startScan();
- m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_info->localSource, m_info->localDestination );
+ m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_info->localSource, m_info->localDestination, QString(), mode );
m_diffProcess->setEncoding( m_encoding );
connect( m_diffProcess, SIGNAL(diffHasFinished( bool )),
@@ -324,15 +289,15 @@
QTextStream stream( &temp );
QStringList list;
- DiffHunkListConstIterator hunkIt = model->hunks()->begin();
- DiffHunkListConstIterator hEnd = model->hunks()->end();
+ DiffHunkListConstIterator hunkIt = model->hunks()->constBegin();
+ DiffHunkListConstIterator hEnd = model->hunks()->constEnd();
for( ; hunkIt != hEnd; ++hunkIt )
{
DiffHunk* hunk = *hunkIt;
- DifferenceListConstIterator diffIt = hunk->differences().begin();
- DifferenceListConstIterator dEnd = hunk->differences().end();
+ DifferenceListConstIterator diffIt = hunk->differences().constBegin();
+ DifferenceListConstIterator dEnd = hunk->differences().constEnd();
Difference* diff;
for( ; diffIt != dEnd; ++diffIt )
@@ -423,15 +388,15 @@
// If saving was fine set all differences to saved so we can start again with a clean slate
if ( result )
{
- DifferenceListConstIterator diffIt = model->differences()->begin();
- DifferenceListConstIterator endIt = model->differences()->end();
+ DifferenceListConstIterator diffIt = model->differences()->constBegin();
+ DifferenceListConstIterator endIt = model->differences()->constEnd();
for (; diffIt != endIt; ++diffIt )
{
(*diffIt)->setUnsaved( false );
}
}
-
+
return true;
}
@@ -1029,7 +994,7 @@
{
newHunk = new DiffHunk( srcLineNo, destLineNo, "", DiffHunk::AddedByBlend );
- hunks->insert( hunkIt, newHunk );
+ hunkIt = ++hunks->insert( hunkIt, newHunk );
newDiff = new Difference( srcLineNo, destLineNo,
Difference::Unchanged );
@@ -1055,7 +1020,7 @@
}
srcLineNo += size;
- destLineNo += (*hunkIt)->destinationLineCount();
+ destLineNo += hunk->destinationLineCount();
}
if ( linesIt != lEnd )
@@ -1243,18 +1208,16 @@
void KompareModelList::refresh()
{
// FIXME: I can imagine blending also wants to be refreshed so make a switch case here
- if ( m_info->mode == Kompare::ComparingFiles )
- compareFiles();
- else if ( m_info->mode == Kompare::ComparingDirs )
- compareDirs();
+ compare(m_info->mode);
}
void KompareModelList::swap()
{
+ //FIXME Not sure if any mode could be swapped
if ( m_info->mode == Kompare::ComparingFiles )
- compareFiles();
+ compare(m_info->mode);
else if ( m_info->mode == Kompare::ComparingDirs )
- compareDirs();
+ compare(m_info->mode);
}
bool KompareModelList::hasUnsavedChanges() const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdiff2/komparemodellist.h new/kdesdk-4.3.1/kompare/libdiff2/komparemodellist.h
--- old/kdesdk-4.3.0/kompare/libdiff2/komparemodellist.h 2009-03-18 10:59:39.000000000 +0100
+++ new/kdesdk-4.3.1/kompare/libdiff2/komparemodellist.h 2009-08-27 10:17:57.000000000 +0200
@@ -26,10 +26,8 @@
#include "kompare.h"
#include "diff2export.h"
-class QFile;
class KAction;
-class KDirWatch;
class KTemporaryFile;
class DiffSettings;
@@ -53,8 +51,7 @@
/* Comparing methods */
bool compare();
- bool compareFiles();
- bool compareDirs();
+ bool compare(Kompare::Mode);
bool openDiff( const QString& diff );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdiff2/kompareprocess.cpp new/kdesdk-4.3.1/kompare/libdiff2/kompareprocess.cpp
--- old/kdesdk-4.3.0/kompare/libdiff2/kompareprocess.cpp 2009-05-27 21:53:58.000000000 +0200
+++ new/kdesdk-4.3.1/kompare/libdiff2/kompareprocess.cpp 2009-08-27 10:17:57.000000000 +0200
@@ -21,8 +21,6 @@
#include
#include
#include
-#include <Q3ValueList>
-#include <Q3CString>
#include
#include
@@ -30,10 +28,11 @@
#include "diffsettings.h"
-KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, QString source, QString destination, QString dir )
+KompareProcess::KompareProcess( DiffSettings* diffSettings, Kompare::DiffMode diffMode, const QString & source, const QString & destination, const QString &dir, Kompare::Mode mode )
: KProcess(),
m_diffSettings( diffSettings ),
- m_mode( mode ),
+ m_mode( diffMode ),
+ m_customString(0),
m_textDecoder( 0 )
{
// connect the signal that indicates that the proces has exited
@@ -58,8 +57,27 @@
// Write file names
*this << "--";
- *this << constructRelativePath( dir, source );
- *this << constructRelativePath( dir, destination );
+
+ //Add the option for diff to read from stdin(QIODevice::write), and save a pointer to the string
+ if(mode == Kompare::ComparingStringFile)
+ {
+ *this << "-";
+ m_customString = &source;
+ }
+ else
+ {
+ *this << constructRelativePath( dir, source );
+ }
+
+ if(mode == Kompare::ComparingFileString)
+ {
+ *this << "-";
+ m_customString = &destination;
+ }
+ else
+ {
+ *this << constructRelativePath( dir, destination );
+ }
}
void KompareProcess::writeDefaultCommandLine()
@@ -211,14 +229,14 @@
}
else
{
- QTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
- if ( textCodec )
- m_textDecoder = textCodec->makeDecoder();
+ m_codec = KGlobal::charsets()->codecForName( encoding.latin1() );
+ if ( m_codec )
+ m_textDecoder = m_codec->makeDecoder();
else
{
kDebug(8101) << "Using locale codec as backup..." << endl;
- textCodec = QTextCodec::codecForLocale();
- m_textDecoder = textCodec->makeDecoder();
+ m_codec = QTextCodec::codecForLocale();
+ m_textDecoder = m_codec->makeDecoder();
}
}
}
@@ -234,8 +252,13 @@
kDebug(8101) << cmdLine << endl;
#endif
setOutputChannelMode( SeparateChannels );
- setNextOpenMode( ReadOnly );
+ setNextOpenMode(QIODevice::ReadWrite);
KProcess::start();
+
+ //If we have a string to compare against input it now
+ if(m_customString)
+ write(m_codec->fromUnicode(*m_customString));
+ closeWriteChannel();
}
void KompareProcess::slotFinished( int exitCode, QProcess::ExitStatus exitStatus )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/kompare/libdiff2/kompareprocess.h new/kdesdk-4.3.1/kompare/libdiff2/kompareprocess.h
--- old/kdesdk-4.3.0/kompare/libdiff2/kompareprocess.h 2008-05-15 20:37:20.000000000 +0200
+++ new/kdesdk-4.3.1/kompare/libdiff2/kompareprocess.h 2009-08-27 10:17:57.000000000 +0200
@@ -32,7 +32,8 @@
Q_OBJECT
public:
- KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, QString source, QString destination, QString directory = QString() );
+ KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, const QString & source,
+ const QString & destination, const QString& directory = QString(), enum Kompare::Mode = Kompare::UnknownMode );
~KompareProcess();
void start();
@@ -56,9 +57,11 @@
private:
DiffSettings* m_diffSettings;
enum Kompare::DiffMode m_mode;
+ const QString * m_customString; // Used when a comparison between a file and a string is requested
QString m_stdout;
QString m_stderr;
QTextDecoder* m_textDecoder;
+ QTextCodec * m_codec;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/catalog/catalog.cpp new/kdesdk-4.3.1/lokalize/src/catalog/catalog.cpp
--- old/kdesdk-4.3.0/lokalize/src/catalog/catalog.cpp 2009-07-21 17:22:53.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/catalog/catalog.cpp 2009-08-27 10:17:59.000000000 +0200
@@ -416,7 +416,7 @@
QString Catalog::mimetype()
{
if (KDE_ISUNLIKELY( !m_storage ))
- return false;
+ return QString();
return m_storage->mimetype();
}
@@ -566,6 +566,9 @@
if (KDE_ISUNLIKELY( !m_storage ))
return true;
+ if (d->_modifiedEntries.isEmpty())
+ return true; // nothing changed to save
+
bool nameChanged=false;
if (KDE_ISLIKELY( url.isEmpty() ))
url = d->_url;
@@ -726,9 +729,9 @@
d->_lastModifiedPos=pos;
}
-bool CatalogPrivate::addToEmptyIndexIfAppropriate(CatalogStorage* storage, const DocPosition& pos)
+bool CatalogPrivate::addToEmptyIndexIfAppropriate(CatalogStorage* storage, const DocPosition& pos, bool alreadyEmpty)
{
- if ((!pos.offset)&&(storage->target(pos).isEmpty())&&(!storage->isEmpty(pos)))
+ if ((!pos.offset)&&(storage->target(pos).isEmpty())&&(!alreadyEmpty))
{
insertInList(_emptyIndex,pos.entry);
return true;
@@ -741,9 +744,10 @@
if (KDE_ISUNLIKELY( !m_storage ))
return;
+ bool alreadyEmpty = m_storage->isEmpty(pos);
m_storage->targetDelete(pos,count);
- if (d->addToEmptyIndexIfAppropriate(m_storage,pos))
+ if (d->addToEmptyIndexIfAppropriate(m_storage,pos,alreadyEmpty))
emit signalNumberOfEmptyChanged();
emit signalEntryModified(pos);
}
@@ -787,9 +791,10 @@
if (KDE_ISUNLIKELY( !m_storage ))
return InlineTag();
+ bool alreadyEmpty = m_storage->isEmpty(pos);
InlineTag tag=m_storage->targetDeleteTag(pos);
- if (d->addToEmptyIndexIfAppropriate(m_storage,pos))
+ if (d->addToEmptyIndexIfAppropriate(m_storage,pos,alreadyEmpty))
emit signalNumberOfEmptyChanged();
emit signalEntryModified(pos);
return tag;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/catalog/catalog_private.h new/kdesdk-4.3.1/lokalize/src/catalog/catalog_private.h
--- old/kdesdk-4.3.0/lokalize/src/catalog/catalog_private.h 2009-05-27 21:54:02.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/catalog/catalog_private.h 2009-08-27 10:17:59.000000000 +0200
@@ -121,7 +121,7 @@
_statesIndex.resize(StateCount);
}
- bool addToEmptyIndexIfAppropriate(CatalogStorage*, const DocPosition& pos);
+ bool addToEmptyIndexIfAppropriate(CatalogStorage*, const DocPosition& pos, bool alreadyEmpty);
bool removeFromUntransIndexIfAppropriate(CatalogStorage*, const DocPosition& pos);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/editortab.cpp new/kdesdk-4.3.1/lokalize/src/editortab.cpp
--- old/kdesdk-4.3.0/lokalize/src/editortab.cpp 2009-07-29 13:12:38.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/editortab.cpp 2009-08-27 10:17:59.000000000 +0200
@@ -296,6 +296,7 @@
tm->addAction( QLatin1String("showtmqueryview_action"), _tmView->toggleViewAction() );
connect (this,SIGNAL(signalNewEntryDisplayed(DocPosition)),_tmView,SLOT(slotNewEntryDisplayed(DocPosition)));
connect (_tmView,SIGNAL(refreshRequested()),m_view,SLOT(gotoEntry()),Qt::QueuedConnection);
+ connect (_tmView,SIGNAL(refreshRequested()),this,SLOT(msgStrChanged()),Qt::QueuedConnection);
connect (_tmView,SIGNAL(textInsertRequested(QString)),m_view,SLOT(insertTerm(QString)));
connect (_tmView,SIGNAL(fileOpenRequested(KUrl,QString,QString)),this,SIGNAL(fileOpenRequested(KUrl,QString,QString)));
connect (this,SIGNAL(fileAboutToBeClosed()),m_catalog,SLOT(flushUpdateDBBuffer()));
@@ -893,11 +894,13 @@
void EditorTab::undo()
{
gotoEntry(m_catalog->undo(),0);
+ msgStrChanged();
}
void EditorTab::redo()
{
gotoEntry(m_catalog->redo(),0);
+ msgStrChanged();
}
void EditorTab::gotoEntry()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/lokalize.desktop new/kdesdk-4.3.1/lokalize/src/lokalize.desktop
--- old/kdesdk-4.3.0/lokalize/src/lokalize.desktop 2009-07-29 13:12:38.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/lokalize.desktop 2009-08-27 10:17:59.000000000 +0200
@@ -15,6 +15,7 @@
GenericName[cs]=Systém pro překlad pomocí počítače
GenericName[da]=Computerassisteret oversættelsessystem (CAT)
GenericName[de]=Computergestütztes Übersetzungssystem
+GenericName[el]=Σύστημα μετάφρασης υποβοηθούμενο από τον υπολογιστή
GenericName[es]=Sistema de traducción asistida por computadora
GenericName[et]=Tõlkemäluga tõlkimisrakendus
GenericName[fr]=Système de traduction assistée par ordinateur
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/lokalizemainwindow.cpp new/kdesdk-4.3.1/lokalize/src/lokalizemainwindow.cpp
--- old/kdesdk-4.3.0/lokalize/src/lokalizemainwindow.cpp 2009-07-21 17:22:53.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/lokalizemainwindow.cpp 2009-08-27 10:17:59.000000000 +0200
@@ -518,6 +518,9 @@
}
//if (activeSWIndex==-1 && activeSW==m_projectSubWindow)
+ if (files.size() == 0 && !m_lastEditorState.isEmpty())
+ dockWidgets.append(m_lastEditorState); // save last state if no editor open
+
if (stateGroup.isValid())
stateGroup.writeEntry("Project",Project::instance()->path());
@@ -591,6 +594,8 @@
if (!fileOpen(files.at(i), entries.at(i)/*, offsets.at(i)*//*,&activeSW11*/,activeSWIndex==i,mergeFiles.at(i)))
continue;
}
+ if (files.size() == 0 && dockWidgets.size() > 0)
+ m_lastEditorState=dockWidgets.first(); // restore last state if no editor open
if (activeSWIndex==-1)
{
m_toBeActiveSubWindow=m_projectSubWindow;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/lokalize/src/syntaxhighlighter.cpp new/kdesdk-4.3.1/lokalize/src/syntaxhighlighter.cpp
--- old/kdesdk-4.3.0/lokalize/src/syntaxhighlighter.cpp 2009-07-21 17:22:53.000000000 +0200
+++ new/kdesdk-4.3.1/lokalize/src/syntaxhighlighter.cpp 2009-08-27 10:17:59.000000000 +0200
@@ -130,6 +130,7 @@
void SyntaxHighlighter::highlightBlock(const QString &text)
{
+ int currentBlockState = STATE_NORMAL;
QTextCharFormat f;
f.setFontItalic(!m_approved);
setFormat(0, text.length(), f);
@@ -137,8 +138,6 @@
tagFormat.setFontItalic(!m_approved);
//if (fromDocbook)
{
- setCurrentBlockState(STATE_NORMAL);
-
int startIndex = STATE_NORMAL;
if (previousBlockState() != STATE_TAG)
startIndex = text.indexOf('<');
@@ -149,7 +148,7 @@
int commentLength;
if (endIndex == -1)
{
- setCurrentBlockState(STATE_TAG);
+ currentBlockState = STATE_TAG;
commentLength = text.length() - startIndex;
}
else
@@ -177,7 +176,9 @@
}
if (spellCheckerFound())
- Sonnet::Highlighter::highlightBlock(text);
+ Sonnet::Highlighter::highlightBlock(text); // Resets current block state
+
+ setCurrentBlockState(currentBlockState);
}
#if 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-4.3.0/strigi-analyzer/diff/difflineanalyzer.cpp new/kdesdk-4.3.1/strigi-analyzer/diff/difflineanalyzer.cpp
--- old/kdesdk-4.3.0/strigi-analyzer/diff/difflineanalyzer.cpp 2009-04-05 22:00:36.000000000 +0200
+++ new/kdesdk-4.3.1/strigi-analyzer/diff/difflineanalyzer.cpp 2009-08-27 10:17:57.000000000 +0200
@@ -392,6 +392,7 @@
case DiffLineAnalyzer::SubVersion: return i18n( "Subversion" );
case DiffLineAnalyzer::Undeterminable:return i18n( "Unknown" );
}
+ return i18n( "Unknown" );
}
@@ -408,6 +409,7 @@
case DiffLineAnalyzer::Unknown: return i18n( "Unknown" );
case DiffLineAnalyzer::SideBySide: return i18n( "Side by Side" );
}
+ return i18n( "Unknown" );
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org