SVN commit 1101852 by fdekruijf:

update

M +660 -569 docmessages/kdebase-apps/kwrite.po
M +66 -52 docmessages/kdebase-workspace/kcontrol_autostart.po
M +133 -46 docmessages/kdebase-workspace/kdm.po
M +421 -289 docs/kdebase-apps/kwrite/index.docbook
M +3 -3 messages/kdebase/kcmkonqhtml.po
M +9 -9 messages/kdebase/kdmconfig.po
M +4 -3 messages/kdebase/kdmgreet.po
M +8 -8 messages/kdebase/konqueror.po
M +3 -3 messages/kdebase/plasma_runner_webshortcuts.po
M +4 -4 messages/kdeedu/cantor.po
M +3 -3 messages/kdeedu/desktop_kdeedu.po
M +4 -3 messages/kdeedu/kalgebra.po
M +49 -97 messages/kdeedu/kalzium.po
M +8 -8 messages/kdeedu/khangman.po
M +1 -1 messages/kdeedu/ktouch.po
M +2 -2 messages/kdeedu/kwordquiz.po
M +2 -2 messages/kdeedu/parley.po
M +3 -3 messages/kdeedu/plasma_applet_concentrationCalculator.po
M +4 -3 messages/kdeedu/plasma_applet_nuclearCalculator.po
M +11 -10 messages/kdeedu/rocs.po


http://websvn.kde.org/?view=rev&revision=1101852

SVN commit 1101851 by lpapp:

Add Hungarian translation for kdesdk/kcachegrind_qt.po

A kcachegrind_qt.po

SVN commit 1101850 by frasche:

Reverted sorting in profile function arguments - this don't make sense

M +0 -1 model.cpp


--- branches/work/kdelirc/kcmremotecontrol/model.cpp #1101849:1101850
@@ -259,7 +259,6 @@
itemList.append(new ArgumentsModelItem(arg));
appendRow(itemList);
}
- sort(0);
}

QVariant ArgumentsModel::headerData(int section, Qt::Orientation orientation, int role) const {

SVN commit 1101849 by mleupold:

Backport of r1101847:
Fix pamOpen hash size: it's 20, 40 or 56 depending on the password length.


M +2 -1 kwalletbackend.cc


--- branches/KDE/4.4/kdebase/runtime/kwalletd/backend/kwalletbackend.cc #1101848:1101849
@@ -325,7 +325,8 @@
}

// check the password hash for correct size (currently fixed)
- if (passwordHash.size() != 20) {
+ if (passwordHash.size() != 20 && passwordHash.size() != passwordHash.size() != 40 &&
+ passwordHash.size() != 56) {
return -42; // unsupported encryption scheme
}

SVN commit 1101848 by lpapp:

Add Hungarian translation for kdepim/kres-migrator.po

A kres-migrator.po

SVN commit 1101847 by mleupold:

Fix pamOpen hash size: it's 20, 40 or 56 depending on the password length.

M +2 -1 kwalletbackend.cc


--- trunk/KDE/kdebase/runtime/kwalletd/backend/kwalletbackend.cc #1101846:1101847
@@ -325,7 +325,8 @@
}

// check the password hash for correct size (currently fixed)
- if (passwordHash.size() != 20) {
+ if (passwordHash.size() != 20 && passwordHash.size() != passwordHash.size() != 40 &&
+ passwordHash.size() != 56) {
return -42; // unsupported encryption scheme
}

SVN commit 1101846 by janlepper:

ListPanelFunc: if refresh has failed, don't focus the origin bar if the panel is not active

M +2 -1 panelfunc.cpp


--- trunk/extragear/utils/krusader/krusader/Panel/panelfunc.cpp #1101845:1101846
@@ -248,7 +248,8 @@
// put the attempted url in the origin bar and let the user change it
if (refreshFailed) {
panel->origin->setUrl(urlIn.prettyUrl());
- panel->origin->setFocus();
+ if(panel == ACTIVE_PANEL)
+ panel->origin->setFocus();
}

refreshActions();

SVN commit 1101845 by janlepper:

CHANGED: when open/refresh of a dir fails, don't annoy the user with a message box, but display the error in the status bar

M +2 -0 ChangeLog
M +20 -1 krusader/Panel/listpanel.cpp
M +2 -0 krusader/Panel/listpanel.h
M +6 -0 krusader/Panel/panelfunc.cpp
M +7 -2 krusader/VFS/ftp_vfs.cpp
M +9 -3 krusader/VFS/normal_vfs.cpp
M +1 -0 krusader/VFS/vfs.h


--- trunk/extragear/utils/krusader/ChangeLog #1101844:1101845
@@ -15,6 +15,8 @@
ADDED: buttons "(un)mount" and "eject" in mountman gui
ADDED: KMountMan::removable(), KMountMan::networkFilesystem()

+ CHANGED: when open/refresh of a dir fails, don't annoy the user with a message box,
+ but display the error in the status bar
CHANGED: icon size, icons/previews on/off are set seperately per view type
CHANGED: dim icons in unfocused panel (if dim colors is activated)
CHANGED: mountman gui: retrieve icons from Solid
--- trunk/extragear/utils/krusader/krusader/Panel/listpanel.cpp #1101844:1101845
@@ -112,7 +112,7 @@
ListPanel::ListPanel(int typeIn, QWidget *parent, bool &left) :
QWidget(parent), panelType(typeIn), colorMask(255), compareMode(false), statsAgent(0),
quickSearch(0), cdRootButton(0), cdUpButton(0), popupBtn(0), popup(0), inlineRefreshJob(0), _left(left),
- _locked(false), previewJob(0)
+ _locked(false), previewJob(0), vfsError(0)
{
gui = this;

@@ -1192,4 +1192,23 @@
_jumpBackURL = url;
}

+void ListPanel::slotVfsError(QString msg)
+{
+ status->hide();
+
+ if(!vfsError) {
+ vfsError = new QLabel(this);
+ vfsError->setWordWrap(true);
+ QPalette p(vfsError->palette());
+ p.setColor(QPalette::Window, QColor(240,150,150));
+ p.setColor(QPalette::WindowText, Qt::black);
+ vfsError->setPalette(p);
+ vfsError->setAutoFillBackground(true);
+ layout->addWidget(vfsError, 1, 1, 1, 1);
+ }
+ vfsError->setText(i18n("Error: %1", msg));
+ vfsError->show();
+}
+
+
#include "listpanel.moc"
--- trunk/extragear/utils/krusader/krusader/Panel/listpanel.h #1101844:1101845
@@ -178,6 +178,7 @@
void inlineRefreshInfoMessage(KJob* job, const QString &msg);
void inlineRefreshListResult(KJob* job);
void inlineRefreshPercent(KJob*, unsigned long);
+ void slotVfsError(QString msg);


signals:
@@ -215,6 +216,7 @@
KIO::Job *inlineRefreshJob;
QSplitter *splt;
KJob *previewJob;
+ QLabel *vfsError;


protected:
--- trunk/extragear/utils/krusader/krusader/Panel/panelfunc.cpp #1101844:1101845
@@ -166,6 +166,10 @@
}
}

+ if(panel->vfsError)
+ panel->vfsError->hide();
+ panel->status->show();
+
vfs* v = 0;
if (urlStack.count() == 0 || !urlStack.last().equals(url))
urlStack.push_back(url);
@@ -198,6 +202,8 @@
}
connect(files(), SIGNAL(startJob(KIO::Job*)),
panel, SLOT(slotJobStarted(KIO::Job*)));
+ connect(files(), SIGNAL(error(QString)),
+ panel, SLOT(slotVfsError(QString)));
if (vfsP->vfs_refresh(u)) {
break; // we have a valid refreshed URL now
}
--- trunk/extragear/utils/krusader/krusader/VFS/ftp_vfs.cpp #1101844:1101845
@@ -153,7 +153,9 @@
// we failed to refresh
listError = true;
// display error message
- if (!quietMode) job->uiDelegate()->showErrorMessage();
+ if (!quietMode)
+// job->uiDelegate()->showErrorMessage();
+ emit error(job->errorString());
}
busy = false;
}
@@ -171,7 +173,10 @@
}

if (!errorMsg.isEmpty()) {
- if (!quietMode) KMessageBox::sorry(krMainWindow, errorMsg);
+ printf("error\n");
+ if (!quietMode)
+// KMessageBox::sorry(krMainWindow, errorMsg);
+ emit error(errorMsg);
return false;
}

--- trunk/extragear/utils/krusader/krusader/VFS/normal_vfs.cpp #1101844:1101845
@@ -96,7 +96,9 @@

// check that the new origin exists
if (!QDir(path).exists()) {
- if (!quietMode) KMessageBox::error(krMainWindow, i18n("Directory %1 does not exist!", path), i18n("Error"));
+ if (!quietMode)
+// KMessageBox::error(krMainWindow, i18n("Directory %1 does not exist!", path), i18n("Error"));
+ emit error(i18n("Directory %1 does not exist!", path));
return false;
}

@@ -105,14 +107,18 @@

DIR* dir = opendir(path.toLocal8Bit());
if (!dir) {
- if (!quietMode) KMessageBox::error(krMainWindow, i18n("Can't open the %1 directory!", path), i18n("Error"));
+ if (!quietMode)
+// KMessageBox::error(krMainWindow, i18n("Can't open the %1 directory!", path), i18n("Error"));
+ emit error(i18n("Can't open the %1 directory!", path));
return false;
}

// change directory to the new directory
QString save = QDir::currentPath();
if (! QDir::setCurrent(path)) {
- if (!quietMode) KMessageBox::error(krMainWindow, i18n("Access denied to") + path, i18n("Error"));
+ if (!quietMode)
+// KMessageBox::error(krMainWindow, i18n("Access denied to") + path, i18n("Error"));
+ emit error(i18n("Access denied to %1", path));
closedir(dir);
return false;
}
--- trunk/extragear/utils/krusader/krusader/VFS/vfs.h #1101844:1101845
@@ -160,6 +160,7 @@
void updatedVfile(vfile* vf);
void cleared();
void deleteAllowed();
+ void error(QString msg);

protected:
/// Feel the vfs dictionary with vfiles, must be implemented for each vfs

SVN commit 1101844 by tpearson:

Fixed CMake build


A cmake_uninstall.cmake.in

SVN commit 1101843 by clicea:

SVN_SILENT
Add my copyright to the files I've been working on.



M +3 -0 kchart/shape/DataSet.cpp
M +3 -0 kchart/shape/DataSet.h
M +3 -0 kchart/shape/KDChartModel.cpp
M +3 -0 kchart/shape/KDChartModel.h
M +3 -0 kspread/functions/math.cpp
M +3 -0 plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp
M +3 -0 plugins/pathshapes/enhancedpath/EnhancedPathShape.h


--- trunk/koffice/kchart/shape/DataSet.cpp #1101842:1101843
@@ -2,6 +2,9 @@

Copyright 2007-2008 Johannes Simon <johannes.simon@gmail.com>
Copyright 2008-2009 Inge Wallin <inge@lysator.liu.se>
+ Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Suresh Chande suresh.chande@nokia.com

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/koffice/kchart/shape/DataSet.h #1101842:1101843
@@ -1,6 +1,9 @@
/* This file is part of the KDE project

Copyright 2007-2008 Johannes Simon <johannes.simon@gmail.com>
+ Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Suresh Chande suresh.chande@nokia.com

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/koffice/kchart/shape/KDChartModel.cpp #1101842:1101843
@@ -2,6 +2,9 @@

Copyright 2008 Johannes Simon <johannes.simon@gmail.com>
Copyright 2009 Inge Wallin <inge@lysator.liu.se>
+ Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Suresh Chande suresh.chande@nokia.com

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/koffice/kchart/shape/KDChartModel.h #1101842:1101843
@@ -1,6 +1,9 @@
/* This file is part of the KDE project

Copyright 2008 Johannes Simon <johannes.simon@gmail.com>
+ Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Suresh Chande suresh.chande@nokia.com

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/koffice/kspread/functions/math.cpp #1101842:1101843
@@ -2,6 +2,9 @@
Copyright (C) 1998-2002 The KSpread Team <koffice-devel@kde.org>
Copyright (C) 2005 Tomas Mecir <mecirt@gmail.com>
Copyright 2007 Sascha Pfau <MrPeacock@gmail.com>
+ Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: Suresh Chande suresh.chande@nokia.com

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/koffice/plugins/pathshapes/enhancedpath/EnhancedPathShape.cpp #1101842:1101843
@@ -1,6 +1,9 @@
/* This file is part of the KDE project
* Copyright (C) 2007,2010 Jan Hambrecht <jaham@gmx.net>
* Copyright (C) 2009-2010 Thomas Zander <zander@kde.org>
+ * Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Contact: Suresh Chande suresh.chande@nokia.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
--- trunk/koffice/plugins/pathshapes/enhancedpath/EnhancedPathShape.h #1101842:1101843
@@ -1,5 +1,8 @@
/* This file is part of the KDE project
* Copyright (C) 2007,2010 Jan Hambrecht <jaham@gmx.net>
+ * Copyright (C) 2010 Carlos Licea <carlos@kdab.com>
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Contact: Suresh Chande suresh.chande@nokia.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public