Hello community,
here is the log from the commit of package kdeutils4
checked in at Mon Jun 30 18:09:01 CEST 2008.
--------
--- KDE/kdeutils4/kdeutils4.changes 2008-06-23 23:35:56.000000000 +0200
+++ kdeutils4/kdeutils4.changes 2008-06-26 17:51:00.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 26 17:50:49 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.84
+
+-------------------------------------------------------------------
Old:
----
kdeutils-4.0.83.tar.bz2
New:
----
kdeutils-4.0.84.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.N15410/_old 2008-06-30 18:08:06.000000000 +0200
+++ /var/tmp/diff_new_pack.N15410/_new 2008-06-30 18:08:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 4.0.83)
+# spec file for package kdeutils4 (Version 4.0.84)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,7 +23,7 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 4.0.83
+Version: 4.0.84
Release: 1
Source0: kdeutils-%version.tar.bz2
Source1: _upstream
@@ -429,6 +429,8 @@
%doc AUTHORS COPYING COPYING.DOC README
%changelog
+* Thu Jun 26 2008 dmueller@suse.de
+- update to 4.0.84
* Wed Jun 18 2008 dmueller@suse.de
- update to 4.0.83
* Tue Jun 10 2008 dmueller@suse.de
++++++ kdeutils-4.0.83.tar.bz2 -> kdeutils-4.0.84.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/ark/plugins/rarplugin/kerfuffle_rar.desktop new/kdeutils-4.0.84/ark/plugins/rarplugin/kerfuffle_rar.desktop
--- old/kdeutils-4.0.83/ark/plugins/rarplugin/kerfuffle_rar.desktop 2008-06-11 10:33:12.000000000 +0200
+++ new/kdeutils-4.0.84/ark/plugins/rarplugin/kerfuffle_rar.desktop 2008-06-25 09:59:12.000000000 +0200
@@ -15,6 +15,7 @@
Name[sv]=Kerfuffle Rar
Name[x-test]=xxkerfuffle_rarxx
Comment=rar plugin for Kerfuffle
+Comment[ca]=Connector del rar pel Kerfuffle
Comment[da]=rar-plugin til Kerfuffle
Comment[de]=RAR-Modul für Kerfuffle
Comment[el]=πρόσθετο rar για τη Kerfuffle
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/CMakeLists.txt new/kdeutils-4.0.84/CMakeLists.txt
--- old/kdeutils-4.0.83/CMakeLists.txt 2008-05-15 20:37:10.000000000 +0200
+++ new/kdeutils-4.0.84/CMakeLists.txt 2008-06-25 09:59:12.000000000 +0200
@@ -47,7 +47,6 @@
macro_optional_add_subdirectory( kfloppy )
endif( NOT WIN32 )
macro_optional_add_subdirectory( kgpg )
-macro_optional_add_subdirectory( kjots )
macro_optional_add_subdirectory( ktimer )
macro_optional_add_subdirectory( kwallet )
macro_optional_add_subdirectory( okteta )
Files old/kdeutils-4.0.83/doc/ark/index.cache.bz2 and new/kdeutils-4.0.84/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kcalc/index.cache.bz2 and new/kdeutils-4.0.84/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.0.84/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kdf/index.cache.bz2 and new/kdeutils-4.0.84/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.0.84/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kgpg/index.cache.bz2 and new/kdeutils-4.0.84/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/ktimer/index.cache.bz2 and new/kdeutils-4.0.84/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/kwallet/index.cache.bz2 and new/kdeutils-4.0.84/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/okteta/index.cache.bz2 and new/kdeutils-4.0.84/doc/okteta/index.cache.bz2 differ
Files old/kdeutils-4.0.83/doc/superkaramba/index.cache.bz2 and new/kdeutils-4.0.84/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kcalc/kcalc_core.cpp new/kdeutils-4.0.84/kcalc/kcalc_core.cpp
--- old/kdeutils-4.0.83/kcalc/kcalc_core.cpp 2008-02-07 14:18:56.000000000 +0100
+++ new/kdeutils-4.0.84/kcalc/kcalc_core.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -240,7 +240,7 @@
// handler to trap the errors that the code can/has not been
// written to trap.
//
-
+#ifndef Q_OS_WIN
struct sigaction fpe_trap;
sigemptyset(&fpe_trap.sa_mask);
@@ -249,7 +249,7 @@
fpe_trap.sa_flags = SA_RESTART;
#endif
sigaction(SIGFPE, &fpe_trap, NULL);
-
+#endif
_last_number = KNumber::Zero;
_error = false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kcalc/knumber/knumber_priv.cpp new/kdeutils-4.0.84/kcalc/knumber/knumber_priv.cpp
--- old/kdeutils-4.0.83/kcalc/knumber/knumber_priv.cpp 2008-02-07 14:18:56.000000000 +0100
+++ new/kdeutils-4.0.84/kcalc/knumber/knumber_priv.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -341,7 +341,11 @@
#endif
static void _cbrt(mpf_t &num)
{
+#ifdef Q_CC_MSVC
+ double tmp_num = pow(mpf_get_d(num), 1./3.);
+#else
double tmp_num = cbrt(mpf_get_d(num));
+#endif
mpf_init_set_d(num, tmp_num);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kdf/kdfwidget.cpp new/kdeutils-4.0.84/kdf/kdfwidget.cpp
--- old/kdeutils-4.0.83/kdf/kdfwidget.cpp 2008-02-14 15:36:01.000000000 +0100
+++ new/kdeutils-4.0.84/kdf/kdfwidget.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -169,6 +169,8 @@
// for( int i=0; iremoveColumn(i++) );
// mList->clear();
+ int columns = mList->columns();
+ for (int i=0; iremoveColumn(0);
for( int i=0; islotFileDec(droppedUrls.first(), swapname, custdecr);
- connect(lib,SIGNAL(importOver(QStringList)),this,SIGNAL(importedKeys(QStringList)));
- connect(lib,SIGNAL(systemMessage(QString,bool)),this,SLOT(busyMessage(QString,bool)));
-// if (isFolder)
- connect(lib,SIGNAL(decryptionOver()),this,SLOT(decryptNextFile()));
-}
-
-void MyView::decryptNextFile()
-{
- if (droppedUrls.count() > 1)
- {
- droppedUrls.pop_front();
- decryptDroppedFile();
- }
+ lib->slotFileDec(droppedUrls.first(), swapname, custdecr);
+ connect(lib, SIGNAL(importOver(QStringList)), this, SIGNAL(importedKeys(QStringList)));
+ connect(lib, SIGNAL(systemMessage(QString, bool)), this, SLOT(busyMessage(QString, bool)));
+ connect(lib, SIGNAL(decryptionOver(KgpgLibrary *, KUrl)), this, SLOT(decryptNextFile(KgpgLibrary *, KUrl)));
+}
+
+void MyView::decryptNextFile(KgpgLibrary *lib, const KUrl &failed)
+{
+ if (!failed.isEmpty())
+ m_decryptionFailed << failed;
+
+ if (droppedUrls.count() > 1) {
+ droppedUrls.pop_front();
+ decryptFile(lib);
+ } else if ((droppedUrls.count() <= 1) && (m_decryptionFailed.count() > 0)) {
+ delete lib;
+ // FIXME: introduce better error message when string freeze is lifted
+ KMessageBox::errorList(NULL, i18n("Decryption failed."), m_decryptionFailed.toStringList(), i18n("Decryption failed."));
+ } else {
+ delete lib;
+ }
}
void MyView::unArchive()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpg.desktop new/kdeutils-4.0.84/kgpg/kgpg.desktop
--- old/kdeutils-4.0.83/kgpg/kgpg.desktop 2008-06-03 11:34:14.000000000 +0200
+++ new/kdeutils-4.0.84/kgpg/kgpg.desktop 2008-06-25 09:59:12.000000000 +0200
@@ -32,7 +32,7 @@
GenericName[km]=ឧបករណ៍អ៊ីនគ្រិប
GenericName[ko]=암호화 도구
GenericName[lt]=Šifravimo įrankis
-GenericName[lv]=Šifrēšana rīks
+GenericName[lv]=Šifrēšanas rīks
GenericName[mk]=Алатка за криптирање
GenericName[nb]=Krypteringsverktøy
GenericName[nds]=Verslötel-Warktüüch
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpg.h new/kdeutils-4.0.84/kgpg/kgpg.h
--- old/kdeutils-4.0.83/kgpg/kgpg.h 2008-02-07 14:18:54.000000000 +0100
+++ new/kdeutils-4.0.84/kgpg/kgpg.h 2008-06-25 09:59:12.000000000 +0200
@@ -40,6 +40,7 @@
class KgpgSelectPublicKeyDlg;
class KGpgTextInterface;
class KeysManager;
+class KgpgLibrary;
class KgpgWizard : public Q3Wizard, public Ui::KgpgWizard
{
@@ -119,6 +120,8 @@
int startWizard();
int firstRun();
+ KUrl::List m_decryptionFailed;
+
private slots:
void slotWizardClose();
void slotWizardChange();
@@ -135,7 +138,8 @@
void droppedtext(const QString &inputText, bool allowEncrypt = true);
void unArchive();
void slotSetCompression(int cp);
- void decryptNextFile();
+ void decryptNextFile(KgpgLibrary *lib, const KUrl &failed);
+ void decryptFile(KgpgLibrary *lib);
};
class kgpgapplet : public KSystemTrayIcon
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpginterface.cpp new/kdeutils-4.0.84/kgpg/kgpginterface.cpp
--- old/kdeutils-4.0.83/kgpg/kgpginterface.cpp 2008-06-10 13:40:56.000000000 +0200
+++ new/kdeutils-4.0.84/kgpg/kgpginterface.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -1109,7 +1109,7 @@
KgpgDetailedConsole *q = new KgpgDetailedConsole(0, i18n("<qt><b>Changing expiration failed.</b><br />"
"Do you want to try changing the key expiration in console mode?</qt>"),output);
if (q->exec() == QDialog::Accepted)
- KMessageBox::sorry(0, "work in progress...");
+ KMessageBox::sorry(0, i18n("work in progress..."));
else
emit keyExpireFinished(3, this);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpglibrary.cpp new/kdeutils-4.0.84/kgpg/kgpglibrary.cpp
--- old/kdeutils-4.0.83/kgpg/kgpglibrary.cpp 2008-05-29 13:18:38.000000000 +0200
+++ new/kdeutils-4.0.84/kgpg/kgpglibrary.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -181,7 +181,10 @@
emit systemMessage(QString());
delete m_pop;
delete iface;
- emit decryptionOver();
+ if (ret != 0)
+ emit decryptionOver(this, m_urlselected);
+ else
+ emit decryptionOver(this, KUrl());
}
void KgpgLibrary::processDecError(const QString &mssge)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpglibrary.h new/kdeutils-4.0.84/kgpg/kgpglibrary.h
--- old/kdeutils-4.0.83/kgpg/kgpglibrary.h 2008-05-29 13:18:38.000000000 +0200
+++ new/kdeutils-4.0.84/kgpg/kgpglibrary.h 2008-06-25 09:59:12.000000000 +0200
@@ -42,7 +42,7 @@
signals:
void encryptionOver();
- void decryptionOver();
+ void decryptionOver(KgpgLibrary *, KUrl);
void importOver(QStringList);
void systemMessage(QString, bool reset = false);
void photoAdded();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpgtextinterface.cpp new/kdeutils-4.0.84/kgpg/kgpgtextinterface.cpp
--- old/kdeutils-4.0.83/kgpg/kgpgtextinterface.cpp 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/kgpg/kgpgtextinterface.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -46,6 +46,7 @@
QByteArray m_tmpmessage;
QByteArray m_readin;
KUrl m_file;
+ KUrl m_dest;
KUrl::List m_files;
KUrl::List m_errfiles;
@@ -475,6 +476,7 @@
*d->m_process << options;
+ d->m_dest = dest;
if (!dest.fileName().isEmpty())
*d->m_process << "-o" << dest.path();
*d->m_process << "-d" << src.path();
@@ -520,11 +522,19 @@
void
KGpgTextInterface::decryptFileFin(int res, QProcess::ExitStatus status)
{
- if (status == QProcess::CrashExit)
+ if (status == QProcess::CrashExit) {
+ if (d->m_dest.isLocalFile())
+ QFile(d->m_dest.toLocalFile()).remove();
emit decryptFileFinished(2, this);
+ return;
+ }
- if (res != 0)
+ if (res != 0) {
+ if (d->m_dest.isLocalFile())
+ QFile(d->m_dest.toLocalFile()).remove();
emit decryptFileFinished(3, this);
+ return;
+ }
if (d->m_message.contains("DECRYPTION_OKAY") && d->m_message.contains("END_DECRYPTION"))
emit decryptFileFinished(0, this);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.cpp new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.cpp
--- old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.cpp 2008-06-03 11:34:14.000000000 +0200
+++ new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -43,7 +43,8 @@
KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList& args)
-: KCModule(KWalletFactory::componentData(), parent, args) {
+: KCModule(KWalletFactory::componentData(), parent, args),
+ _cfg(KSharedConfig::openConfig("kwalletrc", KConfig::NoGlobals)) {
KAboutData *about =
new KAboutData(I18N_NOOP("kcmkwallet"), 0,
@@ -53,8 +54,6 @@
about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "staikos@kde.org");
setAboutData( about );
- _cfg = new KConfig("kwalletrc", KConfig::NoGlobals);
-
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setSpacing(KDialog::spacingHint());
vbox->setMargin(0);
@@ -89,8 +88,6 @@
KWalletConfig::~KWalletConfig() {
- delete _cfg;
- _cfg = 0L;
}
@@ -282,8 +279,12 @@
}
_cfg->sync();
- QDBusInterface kwalletd("org.kde.kded", "/modules/kwalletd", KWALLETMANAGERINTERFACE);
- kwalletd.call( "reconfigure" );
+
+ // this restarts kwalletd if neccessary
+ if (KWallet::Wallet::isEnabled()) {
+ QDBusInterface kwalletd("org.kde.kwalletd", "/modules/kwalletd", KWALLETMANAGERINTERFACE);
+ kwalletd.call( "reconfigure" );
+ }
emit changed(false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.h new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.h
--- old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.h 2008-01-05 00:53:26.000000000 +0100
+++ new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.h 2008-06-25 09:59:12.000000000 +0200
@@ -20,8 +20,8 @@
#ifndef _KWALLETKONFIGURATOR_H
#define _KWALLETKONFIGURATOR_H
#include
+#include
#include "ui_walletconfigwidget.h"
-class KConfig;
class Q3ListViewItem;
class WalletConfigWidget : public QWidget, public Ui::WalletConfigWidget
@@ -57,7 +57,7 @@
private:
WalletConfigWidget *_wcw;
- KConfig *_cfg;
+ KSharedConfig::Ptr _cfg;
};
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/kwalletmanager.cpp new/kdeutils-4.0.84/kwallet/kwalletmanager.cpp
--- old/kdeutils-4.0.83/kwallet/kwalletmanager.cpp 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/kwallet/kwalletmanager.cpp 2008-06-25 09:59:12.000000000 +0200
@@ -93,7 +93,7 @@
setCentralWidget(_iconView);
_iconView->setMinimumSize(320, 200);
- m_kwalletdModule = new org::kde::KWallet("org.kde.kded", "/modules/kwalletd", QDBusConnection::sessionBus());
+ m_kwalletdModule = new org::kde::KWallet("org.kde.kwalletd", "/modules/kwalletd", QDBusConnection::sessionBus());
connect(QDBusConnection::sessionBus().interface(),
SIGNAL(serviceOwnerChanged(QString,QString,QString)),
this,
@@ -353,7 +353,7 @@
void KWalletManager::possiblyRescan(const QString& app, const QString& oldOwner, const QString& newOwner) {
Q_UNUSED( oldOwner );
Q_UNUSED( newOwner );
- if (app == "org.kde.kded") {
+ if (app == "org.kde.kwalletd") {
updateWalletDisplay();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/kwalletmanager.desktop new/kdeutils-4.0.84/kwallet/kwalletmanager.desktop
--- old/kdeutils-4.0.83/kwallet/kwalletmanager.desktop 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/kwallet/kwalletmanager.desktop 2008-06-26 03:33:04.000000000 +0200
@@ -8,7 +8,9 @@
Name[x-test]=xxKWalletManagerxx
Name[zh_TW]=KDE 錢包管理員
GenericName=Wallet Management Tool
+GenericName[ca]=Eina de gestió de carteres
GenericName[cs]=Nástroj pro správu úschovny
+GenericName[da]=Værktøj til håndtering af tegnebog
GenericName[de]=Verwaltung für digitale Brieftasche
GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
GenericName[es]=Herramienta de gestión de carteras
@@ -19,6 +21,7 @@
GenericName[ja]=ウォレット管理ツール
GenericName[km]=ឧបករណ៍គ្រប់គ្រងកាបូប
GenericName[ko]=지갑 관리 도구
+GenericName[lv]=Maka pārvaldības rīks
GenericName[nds]=Knippenpleger
GenericName[pt]=Ferramenta de Gestão da Carteira
GenericName[pt_BR]=Ferramenta de Gerenciamento de Carteira
@@ -26,6 +29,7 @@
GenericName[tr]=KWallet Yönetim Aracı
GenericName[uk]=Засіб керування торбинками
GenericName[x-test]=xxWallet Management Toolxx
+GenericName[zh_CN]=钱包管理工具
GenericName[zh_TW]=錢包管理工具
Exec=kwalletmanager %u
MimeType=application/x-kde-wallet;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/walletwidget.ui new/kdeutils-4.0.84/kwallet/walletwidget.ui
--- old/kdeutils-4.0.83/kwallet/walletwidget.ui 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/kwallet/walletwidget.ui 2008-06-25 09:59:12.000000000 +0200
@@ -157,7 +157,7 @@
</sizepolicy>
</property>
<property name="currentIndex" >
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="page" >
<property name="geometry" >
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.cpp new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.cpp
--- old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.cpp 2008-04-18 09:21:22.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -1,7 +1,7 @@
/*
This file is part of the Okteta Core library, part of the KDE project.
- Copyright 2003 Friedrich W. H. Kossebau
+ Copyright 2003,2008 Friedrich W. H. Kossebau
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,11 +22,11 @@
#include "kabstractbytearraymodel.h"
-// C
-#include
+namespace KHECore
+{
-namespace KHECore {
+static const int SearchedByteCountSignalLimit = 10000;
KAbstractByteArrayModel::KAbstractByteArrayModel() {}
@@ -67,13 +67,22 @@
int result = -1;
const int lastFrom = size() - patternLength;
+ int searchedBytesCount = 0;
for( int i=fromOffset; i<=lastFrom ; ++i )
{
+ ++searchedBytesCount;
int c = 0;
for( ; c= SearchedByteCountSignalLimit )
+ {
+ searchedBytesCount = 0;
+ emit searchedBytes( i-fromOffset+1 );
+ }
+
if( c == patternLength )
{
result = i;
@@ -89,6 +98,7 @@
int result = -1;
const int lastFrom = size() - patternLength;
+ int searchedBytesCount = 0;
if( fromOffset < 0 )
fromOffset = lastFrom + 1 + fromOffset;
@@ -97,10 +107,18 @@
for( int i=fromOffset; i>=0 ; --i )
{
+ ++searchedBytesCount;
int c = 0;
for( ; c= SearchedByteCountSignalLimit )
+ {
+ searchedBytesCount = 0;
+ emit searchedBytes( i-fromOffset+1 );
+ }
+
if( c == patternLength )
{
result = i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.h new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.h
--- old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.h 2008-05-15 20:37:10.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.h 2008-06-25 09:59:11.000000000 +0200
@@ -260,6 +260,8 @@
void readOnlyChanged( bool isReadOnly );
void modificationChanged( bool isModified );
+
+ void searchedBytes( int bytes ) const;
};
inline int KAbstractByteArrayModel::insert( int Pos, const QByteArray &Source )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/okteta.desktop new/kdeutils-4.0.84/okteta/program/okteta.desktop
--- old/kdeutils-4.0.83/okteta/program/okteta.desktop 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/okteta.desktop 2008-06-26 03:33:03.000000000 +0200
@@ -2,55 +2,22 @@
Name=Okteta
Name[x-test]=xxOktetaxx
GenericName=Hex Editor
-GenericName[af]=Binêre Redigeerder
-GenericName[ar]=محرر ثنائى
-GenericName[br]=Aozer binarel
-GenericName[ca]=Editor binari
-GenericName[cs]=Binární editor
-GenericName[cy]=Golygydd Deuaidd
-GenericName[de]=Binäreditor
-GenericName[el]=Δυαδικός επεξεργαστής
-GenericName[eo]=Deksesuma redaktilo
-GenericName[es]=Editor binario
+GenericName[ca]=Editor hexadecimal
+GenericName[da]=Hex-editor
+GenericName[es]=Editor hexadecimal
GenericName[et]=Binaarfailide redaktor
-GenericName[eu]=Editore Binarioa
-GenericName[fa]=ویرایشگر دوگانی
-GenericName[fr]=Éditeur binaire
-GenericName[ga]=Eagarthóir Dénártha
-GenericName[gl]=Editor binario
-GenericName[he]=עורך בינרי
-GenericName[hr]=Binarni uređivač
-GenericName[is]=Tvíunda-ritill
-GenericName[it]=Editor binario
+GenericName[fr]=Éditeur hexadécimal
+GenericName[ga]=Eagarthóir Heicsidheachúlach
+GenericName[gl]=Editor de hexadecimal
GenericName[ja]=バイナリエディタ
-GenericName[kk]=Бинарлық редактор
-GenericName[km]=កម្មវិធីកែសម្រួលប្រព័ន្ធគោលពីរ
-GenericName[ko]=바이너리 편집기
-GenericName[lt]=Dvejetainio kodo redaktorius
-GenericName[lv]=Binārais redaktors
-GenericName[mk]=Бинарен уредувач
-GenericName[ms]=Penyunting Binari
+GenericName[km]=កម្មវិធីកែសម្រួលប្រព័ន្ធគោលដប់ប្រាំមួយ
+GenericName[lv]=Heksadecimālais redaktors
GenericName[nds]=Hexeditor
-GenericName[ne]=बाइनरी सम्पादक
-GenericName[nl]=Binaire bestanden bewerken
-GenericName[nn]=Program for binærredingerig
-GenericName[pl]=Editor Binarny
-GenericName[pt]=Editor Binário
-GenericName[pt_BR]=Editor Binário
-GenericName[ro]=Editor date binare
-GenericName[ru]=Двоичный редактор
-GenericName[sk]=Binárny editor
-GenericName[sv]=Binäreditor
-GenericName[ta]=இருநிலை தொகுப்பான்
-GenericName[tg]=Муҳаррири Дуӣ
-GenericName[tr]=İkili Dosya Düzenleyici
-GenericName[uk]=Двійковий редактор
-GenericName[vi]=Trình biên tập nhị phân
-GenericName[wa]=Aspougneu binaire
-GenericName[x-test]=xxBinary Editorxx
-GenericName[xh]=Umphathi Webhetri
-GenericName[zh_CN]=二进制编辑器
-GenericName[zh_TW]=二進位資料編輯器
+GenericName[pt]=Editor Hexadecimal
+GenericName[pt_BR]=Editor hexadecimal
+GenericName[uk]=Шістнадцятковий редактор
+GenericName[zh_CN]=十六进制编辑器
+GenericName[zh_TW]=十六進位資料編輯器
Icon=okteta
Exec=okteta -caption "%c" %U
Type=Application
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/CMakeLists.txt new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/CMakeLists.txt
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/CMakeLists.txt 2008-05-07 11:05:17.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/CMakeLists.txt 2008-06-25 09:59:11.000000000 +0200
@@ -55,6 +55,7 @@
)
set( SEARCHCONTROLLER_SRCS
view/search/ksearchdialog.cpp
+ view/search/searchjob.cpp
view/search/searchcontroller.cpp
)
set( REPLACECONTROLLER_SRCS
@@ -88,6 +89,7 @@
view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.cpp
)
set( FILTERCONTROLLER_SRCS
+ view/filter/filterjob.cpp
view/filter/filtertool.cpp
view/filter/filterview.cpp
view/filter/filtercontroller.cpp
@@ -107,6 +109,7 @@
set( PRINTCONTROLLER_SRCS
view/print/printcontroller.cpp
view/print/printtool.cpp
+ view/print/printjob.cpp
view/print/abstractcolumnrenderer.cpp
view/print/abstractcolumnframerenderer.cpp
view/print/offsetcolumnrenderer.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,47 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "filterjob.h"
+
+// filter
+#include
+// Qt
+#include
+
+static const int MaxEventProcessTimeInMS = 100;
+
+bool FilterJob::exec()
+{
+ //TODO: what kind of signal could a filter send?
+ connect( mByteArrayFilter, SIGNAL(filteredBytes(int)), SLOT(onFilteredBytes()) );
+
+ const bool result = mByteArrayFilter->filter( mResult, mModel, mSection );
+
+ deleteLater();
+
+ return result;
+}
+
+void FilterJob::onFilteredBytes()
+{
+ QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS );
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.h
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.h 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef FILTERJOB_H
+#define FILTERJOB_H
+
+// Okteta core
+#include
+// Qt
+#include
+
+class AbstractByteArrayFilter;
+namespace KHECore {
+class KAbstractByteArrayModel;
+}
+
+class FilterJob : public QObject // not yet: KJob
+{
+ Q_OBJECT
+
+ public:
+ FilterJob( AbstractByteArrayFilter *byteArrayFilter,
+ char *result, KHECore::KAbstractByteArrayModel *model, const KHE::KSection §ion );
+
+ public:
+ bool exec();
+
+ protected Q_SLOTS:
+ void onFilteredBytes();
+
+ protected:
+ AbstractByteArrayFilter *mByteArrayFilter;
+
+ char *mResult;
+ KHECore::KAbstractByteArrayModel *mModel;
+ const KHE::KSection mSection;
+};
+
+inline FilterJob::FilterJob( AbstractByteArrayFilter *byteArrayFilter,
+ char *result, KHECore::KAbstractByteArrayModel *model, const KHE::KSection §ion )
+ : mByteArrayFilter( byteArrayFilter ), mResult( result ), mModel( model ), mSection( section )
+{}
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp 2008-05-21 10:32:38.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -22,6 +22,8 @@
#include "filtertool.h"
+// tool
+#include "filterjob.h"
// filter
#include
// lib
@@ -34,6 +36,7 @@
#include
#include
// Qt
+#include
#include
@@ -99,7 +102,12 @@
QByteArray filterResult;
filterResult.resize( filteredSection.width() );
- const bool success = byteArrayFilter->filter( filterResult.data(), mByteArrayModel, filteredSection );
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+
+ FilterJob *filterJob = new FilterJob( byteArrayFilter, filterResult.data(), mByteArrayModel, filteredSection );
+ const bool success = filterJob->exec();
+
+ QApplication::restoreOverrideCursor();
if( success )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h 2008-04-18 09:21:18.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h 2008-06-25 09:59:11.000000000 +0200
@@ -23,6 +23,9 @@
#ifndef ABSTRACTBYTEARRAYFILTER_H
#define ABSTRACTBYTEARRAYFILTER_H
+// Qt
+#include
+
class AbstractByteArrayFilterParameterSet;
namespace KHECore {
class KAbstractByteArrayModel;
@@ -33,8 +36,12 @@
class QString;
-class AbstractByteArrayFilter
+class AbstractByteArrayFilter : public QObject
{
+ Q_OBJECT
+
+ protected:
+ static const int FilteredByteCountSignalLimit = 10000;
protected:
explicit AbstractByteArrayFilter( const QString &name );
public:
@@ -48,6 +55,9 @@
public:
QString name() const;
+ Q_SIGNALS: // TODO: add check for signal to tests
+ void filteredBytes( int bytes ) const;
+
protected:
class Private;
Private * const d;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -41,6 +41,7 @@
{
const QByteArray operand = mParameterSet.operand();
const int operandSize = operand.size();
+ int filteredBytesCount = 0;
if( mParameterSet.alignAtEnd() )
{
@@ -52,6 +53,13 @@
int o = operandSize;
while( m > 0 && o > 0 )
result[(r--)-1] = model->datum( (m--)-1 ) & operand[(o--)-1];
+
+ filteredBytesCount += (operandSize-o);
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( section.end()-m );
+ }
}
}
else
@@ -64,6 +72,13 @@
int o = 0;
while( m <= section.end() && o < operandSize )
result[r++] = model->datum( m++ ) & operand[o++];
+
+ filteredBytesCount += o;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp 2008-04-23 17:51:17.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -41,9 +41,17 @@
{
int r = 0;
int m = section.start();
+ int filteredBytesCount = 0;
while( m <= section.end() )
+ {
result[r++] = ~model->datum( m++ );
-
+ ++filteredBytesCount;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
+ }
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -41,6 +41,7 @@
{
const QByteArray operand = mParameterSet.operand();
const int operandSize = operand.size();
+ int filteredBytesCount = 0;
if( mParameterSet.alignAtEnd() )
{
@@ -52,6 +53,13 @@
int o = operandSize;
while( m > 0 && o > 0 )
result[(r--)-1] = model->datum( (m--)-1 ) | operand[(o--)-1];
+
+ filteredBytesCount += (operandSize-o);
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( section.end()-m );
+ }
}
}
else
@@ -64,6 +72,13 @@
int o = 0;
while( m <= section.end() && o < operandSize )
result[r++] = model->datum( m++ ) | operand[o++];
+
+ filteredBytesCount += o;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp 2008-04-23 17:51:17.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -41,6 +41,7 @@
{
int r = section.width()-1;
int m = section.start();
+ int filteredBytesCount = 0;
while( m <= section.end() )
{
unsigned char byte = (unsigned char)model->datum( m++ );
@@ -57,6 +58,13 @@
else
reverseByte = byte;
result[r--] = reverseByte;
+
+ ++filteredBytesCount;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp 2008-06-10 13:40:56.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -49,6 +49,7 @@
const int shiftByteWidth = groupShiftBitWidth / RotateBitsPerByte;
const int shiftBitWidth = groupShiftBitWidth - shiftByteWidth * RotateBitsPerByte;
const int otherShiftBitWidth = RotateBitsPerByte - shiftBitWidth;
+ int filteredBytesCount = 0;
const bool toRight = ( mParameterSet.moveBitWidth() > 0 );
if( toRight )
@@ -81,6 +82,13 @@
else if( g == groupSize )
result[r-b] |= last<= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
else
@@ -113,6 +121,13 @@
else if( g == groupSize )
result[r-b] |= first >> otherShiftBitWidth;
}
+
+ filteredBytesCount += g;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp 2008-06-10 13:40:56.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -49,6 +49,7 @@
const int shiftByteWidth = groupShiftBitWidth / ShiftBitsPerByte;
const int shiftBitWidth = groupShiftBitWidth - shiftByteWidth * ShiftBitsPerByte;
const int otherShiftBitWidth = ShiftBitsPerByte - shiftBitWidth;
+ int filteredBytesCount = 0;
const bool toRight = ( mParameterSet.moveBitWidth() > 0 );
if( toRight )
@@ -78,6 +79,13 @@
if( b < g )
result[r-b] |= (unsigned char)result[r-b-1] << otherShiftBitWidth;
}
+
+ filteredBytesCount += g;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
else
@@ -108,6 +116,13 @@
if( b>1 )
result[r-b] |= (unsigned char)result[r-b+1] >> otherShiftBitWidth;
}
+
+ filteredBytesCount += g;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -41,6 +41,7 @@
{
const QByteArray operand = mParameterSet.operand();
const int operandSize = operand.size();
+ int filteredBytesCount = 0;
if( mParameterSet.alignAtEnd() )
{
@@ -52,6 +53,13 @@
int o = operandSize;
while( m > 0 && o > 0 )
result[(r--)-1] = model->datum( (m--)-1 ) ^ operand[(o--)-1];
+
+ filteredBytesCount += (operandSize-o);
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( section.end()-m );
+ }
}
}
else
@@ -64,6 +72,13 @@
int o = 0;
while( m <= section.end() && o < operandSize )
result[r++] = model->datum( m++ ) ^ operand[o++];
+
+ filteredBytesCount += o;
+ if( filteredBytesCount >= FilteredByteCountSignalLimit )
+ {
+ filteredBytesCount = 0;
+ emit filteredBytes( m-section.start() );
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp 2008-04-18 09:21:17.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -1,7 +1,7 @@
/*
This file is part of the Okteta Kakao module, part of the KDE project.
- Copyright 2007 Friedrich W. H. Kossebau
+ Copyright 2007-2008 Friedrich W. H. Kossebau
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -62,6 +62,7 @@
frameRenderer->renderFrame( &painter, pageIndex );
painter.translate( -x, -y );
}
+ emit printedPage( pageIndex );
if( pageIndex < lastPageIndex )
{
printer->newPage();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h 2008-04-18 09:21:17.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h 2008-06-25 09:59:11.000000000 +0200
@@ -1,7 +1,7 @@
/*
This file is part of the Okteta Kakao module, part of the KDE project.
- Copyright 2007 Friedrich W. H. Kossebau
+ Copyright 2007-2008 Friedrich W. H. Kossebau
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -24,14 +24,17 @@
#define FRAMESTOPAPERPRINTER_H
// Qt
+#include
#include
#include
class QPrinter;
class AbstractFrameRenderer;
-class FramesToPaperPrinter
+class FramesToPaperPrinter : public QObject
{
+ Q_OBJECT
+
public:
FramesToPaperPrinter();
~FramesToPaperPrinter();
@@ -47,6 +50,9 @@
public:
QRect pageRect() const;
+ Q_SIGNALS:
+ void printedPage( int pageIndex );
+
protected:
QList mFrameRendererList;
QRect mPaperRect;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,70 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "printjob.h"
+
+// controller
+#include "framestopaperprinter.h"
+// #include "printthread.h"
+// Qt
+#include
+// #include
+
+
+static const int MaxEventProcessTimeInMS = 100;
+
+#if 0
+PrintJob::PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer )
+ : mPrintThread( new PrintThread(this,framesPrinter, firstPage, lastPage, printer) )
+{
+ connect( mPrintThread, SIGNAL(finished()), SLOT(onFinished()) );
+}
+
+void PrintJob::start()
+{
+ if( QFontDatabase::supportsThreadedFontRendering() )
+ mPrintThread->start();
+}
+#endif
+
+bool PrintJob::exec()
+{
+ connect( mFramesPrinter, SIGNAL(printedPage(int)), SLOT(onPagePrinted()) );
+
+ const bool result = mFramesPrinter->print( mPrinter, mFirstPage, mLastPage );
+
+ deleteLater();
+
+ return result;
+}
+
+void PrintJob::onPagePrinted()
+{
+ QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS );
+}
+
+#if 0
+void PrintJob::onFinished()
+{
+ emitResult();
+}
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.h
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.h 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,65 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef PRINTJOB_H
+#define PRINTJOB_H
+
+// KDE
+// #include <KJob>
+// Qt
+#include
+
+class PrintThread;
+class FramesToPaperPrinter;
+class QPrinter;
+
+class PrintJob : public QObject // not yet: KJob
+{
+ Q_OBJECT
+
+ public:
+ PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer );
+
+ public: // KJob API
+// virtual void start();
+
+ public:
+ bool exec();
+
+ protected Q_SLOTS:
+// void onFinished();
+ void onPagePrinted();
+
+ protected:
+// PrintThread *mPrintThread;
+ FramesToPaperPrinter *mFramesPrinter;
+ const int mFirstPage;
+ const int mLastPage;
+
+ QPrinter *mPrinter;
+};
+
+inline PrintJob::PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer )
+ : mFramesPrinter( framesPrinter ), mFirstPage( firstPage ), mLastPage( lastPage ), mPrinter( printer )
+{}
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printtool.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printtool.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printtool.cpp 2008-05-21 10:32:39.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printtool.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -23,6 +23,7 @@
#include "printtool.h"
// controller
+#include "printjob.h"
#include "framestopaperprinter.h"
#include "headerfooterframerenderer.h"
#include "bytearrayframerenderer.h"
@@ -40,6 +41,7 @@
#include
#include
// Qt
+#include
#include
#include
#include
@@ -155,7 +157,12 @@
info.setNoOfPages( byteArrayFrameRenderer->framesCount() );
info.setUrl( mDocument->title() ); //TODO: get the url from synchronizer!!!
- const bool success = framesPrinter.print( &printer, 0, byteArrayFrameRenderer->framesCount()-1 );
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+
+ PrintJob *printJob = new PrintJob( &framesPrinter, 0, byteArrayFrameRenderer->framesCount()-1, &printer );
+ const bool success = printJob->exec();
+
+ QApplication::restoreOverrideCursor();
if( !success )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp 2008-04-18 09:21:18.000000000 +0200
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -24,6 +24,7 @@
// controller
#include "ksearchdialog.h"
+#include "searchjob.h"
// lib
#include
// Kakao gui
@@ -40,6 +41,8 @@
#include <KActionCollection>
#include <KStandardAction>
#include <KMessageBox>
+// Qt
+#include
// TODO: for docked widgets signal widgets if embedded or floating, if horizontal/vertical
@@ -157,10 +160,14 @@
while( true )
{
- // TODO: support ignorecase
- int Pos = ( Direction == FindForward ) ?
- ByteArray->indexOf( SearchData, StartIndex ) :
- ByteArray->lastIndexOf( SearchData, StartIndex-SearchData.size()+1 );
+
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+
+ SearchJob *searchJob = new SearchJob( ByteArray, SearchData, StartIndex, (Direction==FindForward) );
+ const int Pos = searchJob->exec();
+
+ QApplication::restoreOverrideCursor();
+
if( Pos != -1 )
{
PreviousFound = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,52 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include "searchjob.h"
+
+// filter
+#include
+// Okteta core
+#include
+// Qt
+#include
+
+static const int MaxEventProcessTimeInMS = 100;
+
+int SearchJob::exec()
+{
+ //TODO: what kind of signal could a filter send?
+ connect( mByteArrayModel, SIGNAL(searchedBytes(int)), SLOT(onBytesSearched()) );
+
+ // TODO: support ignorecase
+ const int result = mFindForward ?
+ mByteArrayModel->indexOf( mSearchData, mStartIndex ) :
+ mByteArrayModel->lastIndexOf( mSearchData, mStartIndex-mSearchData.size()+1 );
+
+ deleteLater(); // TODO: could be reused on next search
+
+ return result;
+}
+
+void SearchJob::onBytesSearched()
+{
+ QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS );
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.h
--- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.h 2008-06-25 09:59:11.000000000 +0200
@@ -0,0 +1,61 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see http://www.gnu.org/licenses/.
+*/
+
+#ifndef SEARCHJOB_H
+#define SEARCHJOB_H
+
+// Qt
+#include
+#include
+
+namespace KHECore {
+class KAbstractByteArrayModel;
+}
+
+class SearchJob : public QObject // not yet: KJob
+{
+ Q_OBJECT
+
+ public:
+ SearchJob( const KHECore::KAbstractByteArrayModel *model,
+ const QByteArray &searchData, int startIndex, bool findForward );
+
+ public:
+ int exec();
+
+ protected Q_SLOTS:
+ void onBytesSearched();
+
+ protected:
+ const KHECore::KAbstractByteArrayModel *mByteArrayModel;
+
+ const QByteArray mSearchData;
+ int mStartIndex;
+ bool mFindForward;
+};
+
+inline SearchJob::SearchJob( const KHECore::KAbstractByteArrayModel *model,
+ const QByteArray &searchData, int startIndex, bool findForward )
+ : mByteArrayModel( model ), mSearchData( searchData ), mStartIndex( startIndex), mFindForward( findForward )
+{}
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/printer-applet/CMakeLists.txt new/kdeutils-4.0.84/printer-applet/CMakeLists.txt
--- old/kdeutils-4.0.83/printer-applet/CMakeLists.txt 2008-06-03 11:34:14.000000000 +0200
+++ new/kdeutils-4.0.84/printer-applet/CMakeLists.txt 2008-06-25 09:59:12.000000000 +0200
@@ -18,9 +18,9 @@
ENDIF(NOT PYKDE_FOUND)
find_package(PyCups)
-IF(NOT PYQT4_FOUND)
+IF(NOT PYCUPS_FOUND)
macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found. It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE)
-ENDIF(NOT PYQT4_FOUND)
+ENDIF(NOT PYCUPS_FOUND)
IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND)
SET(INSTALL_PRINTER_APPLET TRUE)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/printer-applet/printer-applet.desktop new/kdeutils-4.0.84/printer-applet/printer-applet.desktop
--- old/kdeutils-4.0.83/printer-applet/printer-applet.desktop 2008-06-18 14:41:09.000000000 +0200
+++ new/kdeutils-4.0.84/printer-applet/printer-applet.desktop 2008-06-25 09:59:12.000000000 +0200
@@ -1,7 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Printer Applet
+Name[ca]=Miniaplicació d'impressió
Name[cs]=Tiskový applet
+Name[da]=Printerapplet
Name[de]=Drucker-Miniprogramm
Name[el]=Μικροεφαρμογή εκτυπωτή
Name[es]=Applet para la impresora
@@ -23,6 +25,8 @@
Name[zh_CN]=打印机小程序
Name[zh_TW]=印表機小程式
Comment=System tray icon for managing print jobs
+Comment[ca]=Icona de la safata del sistema per gestionar els treballs d'impressió
+Comment[da]=statusikon til håndtering af udskriftsjob
Comment[de]=Symbol für die Druckerverwaltung, dargestellt im Systemabschnitt der Kontrollleiste
Comment[el]=Εικονίδιο πλαισίου συστήματος για διαχείριση εργασιών εκτύπωσης
Comment[es]=Icono de la bandeja del sistema para la gestión de trabajos de impresión
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/superkaramba/plasma/plasma-package-superkaramba.desktop new/kdeutils-4.0.84/superkaramba/plasma/plasma-package-superkaramba.desktop
--- old/kdeutils-4.0.83/superkaramba/plasma/plasma-package-superkaramba.desktop 2008-06-11 10:33:12.000000000 +0200
+++ new/kdeutils-4.0.84/superkaramba/plasma/plasma-package-superkaramba.desktop 2008-06-25 09:59:12.000000000 +0200
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=SuperKaramba Theme Files
+Name[ca]=Fitxers de temes del SuperKaramba
Name[da]=SuperKaramba temafiler
Name[de]=SuperKaramba Design-Dateien
Name[el]=Αρχεία θεμάτων του SuperKaramba
@@ -23,6 +24,7 @@
Name[zh_CN]=SuperKaramba 主题文件
Name[zh_TW]=SuperKaramba 主題檔案
Comment=Karamba Desktop Themes
+Comment[ca]=Temes d'escriptori del Karamba
Comment[da]=Karamba desktoptemaer
Comment[de]=Karamba Arbeitsflächendesigns
Comment[el]=Θέματα επιφάνειας εργασίας του Karamba
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop new/kdeutils-4.0.84/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop
--- old/kdeutils-4.0.83/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2008-06-11 10:33:12.000000000 +0200
+++ new/kdeutils-4.0.84/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2008-06-25 09:59:12.000000000 +0200
@@ -7,6 +7,7 @@
Name[ta]=சூப்பர் கரம்பா
Name[x-test]=xxSuperKarambaxx
Comment=Karamba Desktop Theme
+Comment[ca]=Tema d'escriptori del Karamba
Comment[da]=Karamba desktoptema
Comment[de]=Karamba Arbeitsflächendesign
Comment[el]=Θέμα επιφάνειας εργασίας του Karamba
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org