[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/komo/kdelibs (merge)
From: Volker Krause <vkrause () kde ! org>
Date: 2010-04-19 9:24:55
Message-ID: 20100419092455.B50EEAC89D () svn ! kde ! org
[Download RAW message or body]
SVN commit 1116354 by vkrause:
SVN_MERGE
Merged revisions 1111659,1112337,1112340,1112748,1113361,1113806,1114118,1114124,1114514,1114745,1114848,1114958,1115598 \
via svnmerge from https://vkrause@svn.kde.org/home/kde/branches/KDE/4.4/kdelibs
........
r1111659 | gokcen | 2010-04-06 13:28:01 +0200 (Tue, 06 Apr 2010) | 1 line
set POLKITQT_POLICY_FILES_INSTALL_DIR variable before message using this variable.
........
r1112337 | aseigo | 2010-04-07 23:43:51 +0200 (Wed, 07 Apr 2010) | 2 lines
pass on the resize event
........
r1112340 | aseigo | 2010-04-07 23:46:30 +0200 (Wed, 07 Apr 2010) | 2 lines
do the proxy widget resize first, so that the edit rect is correct
........
r1112748 | scripty | 2010-04-09 03:49:38 +0200 (Fri, 09 Apr 2010) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1113361 | adawit | 2010-04-10 17:41:04 +0200 (Sat, 10 Apr 2010) | 1 line
Backport the fix for a very sublte bug that incorrectly triggers the emission of \
the saveFormDataRequested signal.
........
r1113806 | pletourn | 2010-04-11 22:40:54 +0200 (Sun, 11 Apr 2010) | 4 lines
Don't draw marks if not asked to
CCBUG:168493
........
r1114118 | dfaure | 2010-04-12 21:36:40 +0200 (Mon, 12 Apr 2010) | 2 lines
backport 1114117: repair test
........
r1114124 | pletourn | 2010-04-12 21:53:18 +0200 (Mon, 12 Apr 2010) | 2 lines
Init var
........
r1114514 | pletourn | 2010-04-13 21:48:59 +0200 (Tue, 13 Apr 2010) | 4 lines
Fix deleting block selection containing tabs
CCBUG:232320
........
r1114745 | dafre | 2010-04-14 13:45:42 +0200 (Wed, 14 Apr 2010) | 5 lines
CCBUG: 227117
Backporting r1114744
........
r1114848 | pletourn | 2010-04-14 20:37:31 +0200 (Wed, 14 Apr 2010) | 4 lines
Unbreaking compilation
Sorry
........
r1114958 | scripty | 2010-04-15 03:41:34 +0200 (Thu, 15 Apr 2010) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1115598 | scripty | 2010-04-17 03:42:07 +0200 (Sat, 17 Apr 2010) | 1 line
SVN_SILENT made messages (.desktop file)
........
_M . (directory)
M +2 -1 cmake/modules/FindPolkitQt.cmake
_M cmake/modules/FindPulseAudio.cmake
_M doc/kioslave/data/index.docbook
_M doc/kioslave/file/index.docbook
_M doc/kioslave/ftp/index.docbook
_M doc/kioslave/help/index.docbook
_M doc/kioslave/http/index.docbook
_M doc/kioslave/mailto/index.docbook
_M doc/kioslave/rlogin/index.docbook
_M doc/kioslave/telnet/index.docbook
_M doc/kioslave/webdav/index.docbook
_M includes/Plasma/ConfigLoader
_M includes/Plasma/FlashingLabel
_M includes/Plasma/FrameSvg
_M includes/Plasma/IconWidget
M +6 -2 kate/document/katedocument.cpp
M +2 -0 kate/plugins/autobrace/ktexteditor_autobrace.desktop
M +2 -0 kate/plugins/exporter/ktexteditor_exporter.desktop
M +3 -0 kate/view/kateviewhelpers.cpp
M +2 -1 kate/view/kateviewinternal.cpp
M +3 -0 kdecore/all_languages.desktop
M +2 -1 kdecore/auth/BackendsManager.cpp
M +1 -0 kdecore/auth/BackendsManager.h
M +28 -22 kdecore/auth/backends/dbus/DBusHelperProxy.cpp
M +35 -2 kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
M +22 -4 kdecore/auth/backends/polkit-1/Polkit1Backend.h
M +5 -0 kdecore/tests/kdebug_unittest.cpp
M +1 -1 kdewebkit/kwebwallet.cpp
_M kfile/kfilepreviewgenerator.cpp
_M kfile/kfilepreviewgenerator.h
_M kio/kio/kabstractviewadapter_p.h
_M plasma/configloader.cpp
_M plasma/configloader.h
M +1 -0 plasma/data/servicetypes/plasma-applet-popupapplet.desktop
M +1 -0 plasma/data/servicetypes/plasma-containmentactions.desktop
_M plasma/framesvg.cpp
_M plasma/framesvg.h
M +2 -0 plasma/kcm_remotewidgets.actions
_M plasma/widgets/flashinglabel.cpp
_M plasma/widgets/flashinglabel.h
_M plasma/widgets/iconwidget.cpp
_M plasma/widgets/iconwidget.h
_M plasma/widgets/iconwidget_p.h
M +2 -1 plasma/widgets/spinbox.cpp
--- branches/work/komo/kdelibs/cmake/modules/FindPolkitQt.cmake #1116353:1116354
@@ -90,6 +90,8 @@
mark_as_advanced(POLKITQT_INCLUDE_DIR POLKITQT_CORE_LIBRARY POLKITQT_GUI_LIBRARY \
POLKITQT_LIBRARIES POLKITQT_VERSION_OK)
+set(POLKITQT_POLICY_FILES_INSTALL_DIR share/PolicyKit/policy/)
+
if(POLKITQT_FOUND)
get_filename_component(_POLKITQT_INSTALL_PREFIX "${POLKITQT_CORE_LIBRARY}" \
PATH)
get_filename_component(_POLKITQT_INSTALL_PREFIX "${_POLKITQT_INSTALL_PREFIX}" \
PATH) @@ -99,4 +101,3 @@
endif (NOT _POLKITQT_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
endif(POLKITQT_FOUND)
-set(POLKITQT_POLICY_FILES_INSTALL_DIR share/PolicyKit/policy/)
--- branches/work/komo/kdelibs/kate/document/katedocument.cpp #1116353:1116354
@@ -812,9 +812,13 @@
else
{
int startLine = qMax(0, range.start().line());
+ int vc1 = toVirtualColumn(range.start());
+ int vc2 = toVirtualColumn(range.end());
for (int line = qMin(range.end().line(), lastLine()); line >= startLine; --line) \
{
- KTextEditor::Range subRange = rangeOnLine(range, line);
- editRemoveText(line, subRange.start().column(), subRange.end().column() - \
subRange.start().column()); + KateTextLine::Ptr tl = \
const_cast<KateDocument*>(this)->kateTextLine(line); + int col1 = \
tl->fromVirtualColumn(vc1, config()->tabWidth()); + int col2 = \
tl->fromVirtualColumn(vc2, config()->tabWidth()); + editRemoveText(line, \
qMin(col1, col2), qAbs(col2 - col1)); }
}
--- branches/work/komo/kdelibs/kate/plugins/autobrace/ktexteditor_autobrace.desktop \
#1116353:1116354 @@ -39,6 +39,7 @@
Name[is]=SjálfvirkirSvigar
Name[it]=Graffe automatiche
Name[ja]=自動括弧生成
+Name[kk]=АвтоЖақшаЖабу
Name[km]=AutoBrace
Name[ko]=괄호 닫기
Name[lt]=Automatinis kabučių uždarymas
@@ -87,6 +88,7 @@
Comment[is]=Setur lokunarsviga þegar ýtt er á Enter
Comment[it]=Inserisce parentesi graffe quando premi Invio
Comment[ja]=Enter キーを押すことで閉じる括弧を挿入します
+Comment[kk]=Enter пернесін басқанда жабатын жақшаны \
енгізу Comment[km]=បញ្ចូលរង្វង់ក្រចកប \
ិទនៅពេលចុចគ្រាប់ចុចបញ្ចូល \
(Enter) Comment[ko]=Enter 키를 누를 때 닫는 괄호 삽입하기
Comment[lt]=Įterpti užveriančias kabutes nuspaudžiant Įvesti (Enter)
--- branches/work/komo/kdelibs/kate/plugins/exporter/ktexteditor_exporter.desktop \
#1116353:1116354 @@ -40,6 +40,7 @@
Name[is]=Útflytjari
Name[it]=Esportatore
Name[ja]=エクスポート
+Name[kk]=Экспортер
Name[km]=កម្មវិធីនាំចេញ
Name[ko]=내보내기
Name[lt]=Eksportas
@@ -88,6 +89,7 @@
Comment[is]=Flytur ljómaða skjalið í HTML
Comment[it]=Esporta in HTML il documento evidenziato
Comment[ja]=選択した文書を HTML にエクスポートします
+Comment[kk]=Белгіленген құжатты HTML-ге экспорттау
Comment[km]=នាំចេញឯកសារដែលបានបន្លិចទៅ \
HTML Comment[ko]=강조한 문서를 HTML로 내보내기
Comment[lt]=Eksportuoti pažymėtą dokumentą į HTML
--- branches/work/komo/kdelibs/kate/view/kateviewhelpers.cpp #1116353:1116354
@@ -120,6 +120,9 @@
void KateScrollBar::paintEvent(QPaintEvent *e)
{
QScrollBar::paintEvent(e);
+
+ if (!m_showMarks)
+ return;
QPainter painter(this);
--- branches/work/komo/kdelibs/kate/view/kateviewinternal.cpp #1116353:1116354
@@ -82,7 +82,8 @@
, m_madeVisible(false)
, m_shiftKeyPressed (false)
- , m_autoCenterLines (false)
+ , m_autoCenterLines(0)
+ , m_minLinesVisible(0)
, m_selChangedByUser (false)
, m_selectAnchor (-1, -1)
, m_selectionMode( Default )
--- branches/work/komo/kdelibs/kdecore/all_languages.desktop #1116353:1116354
@@ -674,6 +674,7 @@
Name[is]=Astúríska
Name[it]=Asturiano
Name[ja]=アストゥリアス語
+Name[kk]=Астуриянша
Name[km]=អូស្តូរៀន
Name[ko]=아스투리아스어
Name[lv]=Astūriešu
@@ -13494,6 +13495,7 @@
Name[is]=Serbneska Ijekavian
Name[it]=Serbo ijekavo
Name[ja]=セルビア語イェ方言
+Name[kk]=Иекав сербше
Name[km]=សែប៊ីយេកាវៀន
Name[nb]=Serbisk ljekavisk
Name[nds]= tokavisch
@@ -13536,6 +13538,7 @@
Name[is]=Serbneska Ijekavian latneskt
Name[it]=Serbo ijekavo latino
Name[ja]=セルビア語イェ方言 (ラテン文字)
+Name[kk]=Иекав сербше (Латын)
Name[km]=សែប៊ីយេកាវៀន (ឡាតាំង)
Name[nb]=Serbisk ljekavisk latinsk
Name[nds]= tokavisch (latiensch Schrift)
--- branches/work/komo/kdelibs/kdecore/auth/BackendsManager.cpp #1116353:1116354
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2008 Nicola Gigante <nicola.gigante@gmail.com>
+* Copyright (C) 2009 Dario Freddi <drf@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -27,6 +27,7 @@
#include <QPluginLoader>
#include <QDir>
+
#include <kdebug.h>
namespace KAuth
--- branches/work/komo/kdelibs/kdecore/auth/BackendsManager.h #1116353:1116354
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2008 Nicola Gigante <nicola.gigante@gmail.com>
+* Copyright (C) 2009 Dario Freddi <drf@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
--- branches/work/komo/kdelibs/kdecore/auth/backends/dbus/DBusHelperProxy.cpp \
#1116353:1116354 @@ -1,6 +1,6 @@
/*
* Copyright (C) 2008 Nicola Gigante <nicola.gigante@gmail.com>
-* Copyright (C) 2009 Dario Freddi <drf@kde.org>
+* Copyright (C) 2009-2010 Dario Freddi <drf@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -213,18 +213,18 @@
void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID)
{
QDataStream stream(&blob, QIODevice::ReadOnly);
- QList<QPair<QString, QVariantMap> > actions;
+ QList< QPair< QString, QVariantMap > > actions;
stream >> actions;
- QList<QPair<QString, QVariantMap> >::const_iterator i = actions.constBegin();
+ QList< QPair< QString, QVariantMap > >::const_iterator i = actions.constBegin();
while (i != actions.constEnd()) {
QByteArray blob;
QDataStream stream(&blob, QIODevice::WriteOnly);
stream << i->second;
- emit remoteSignal(ActionPerformed, i->first, performAction(i->first, \
callerID, blob)); + performAction(i->first, callerID, blob);
i++;
}
@@ -244,10 +244,17 @@
QDataStream s(&arguments, QIODevice::ReadOnly);
s >> args;
+ m_currentAction = action;
+ emit remoteSignal(ActionStarted, action, QByteArray());
+ QEventLoop e;
+ e.processEvents(QEventLoop::AllEvents);
+
+ ActionReply retVal;
+
+ QTimer *timer = \
responder->property("__KAuth_Helper_Shutdown_Timer").value<QTimer*>(); + \
timer->stop(); +
if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) {
- QTimer *timer = \
responder->property("__KAuth_Helper_Shutdown_Timer").value<QTimer*>();
- timer->stop();
-
QString slotname = action;
if (slotname.startsWith(m_name + '.')) {
slotname = slotname.right(slotname.length() - m_name.length() - 1);
@@ -255,26 +262,25 @@
slotname.replace('.', '_');
- ActionReply retVal;
+ bool success = QMetaObject::invokeMethod(responder, slotname.toAscii(), \
Qt::DirectConnection, + \
Q_RETURN_ARG(ActionReply, retVal), Q_ARG(QVariantMap, args));
- m_currentAction = action;
- emit remoteSignal(ActionStarted, action, QByteArray());
- bool success = QMetaObject::invokeMethod(responder, slotname.toAscii(), \
Qt::DirectConnection, Q_RETURN_ARG(ActionReply, retVal), \
Q_ARG(QVariantMap, args));
- emit remoteSignal(ActionPerformed, action, retVal.serialized());
- m_currentAction = "";
- m_stopRequest = false;
-
- timer->start();
-
- if (success) {
- return retVal.serialized();
- } else {
- return ActionReply::NoSuchActionReply.serialized();
+ if (!success) {
+ retVal = ActionReply::NoSuchActionReply;
}
} else {
- return ActionReply::AuthorizationDeniedReply.serialized();
+ retVal = ActionReply::AuthorizationDeniedReply;
}
+
+ timer->start();
+
+ emit remoteSignal(ActionPerformed, action, retVal.serialized());
+ e.processEvents(QEventLoop::AllEvents);
+ m_currentAction = "";
+ m_stopRequest = false;
+
+ return retVal.serialized();
}
void DBusHelperProxy::sendDebugMessage(int level, const char *msg)
--- branches/work/komo/kdelibs/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp \
#1116353:1116354 @@ -1,7 +1,7 @@
/*
* Copyright (C) 2008 Nicola Gigante <nicola.gigante@gmail.com>
-* Copyright (C) 2009 Dario Freddi <drf@kde.org>
* Copyright (C) 2009 Radek Novacek <rnovacek@redhat.com>
+* Copyright (C) 2009-2010 Dario Freddi <drf@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -30,11 +30,38 @@
namespace KAuth
{
+PolkitResultEventLoop::PolkitResultEventLoop(QObject* parent)
+ : QEventLoop(parent)
+{
+
+}
+
+PolkitResultEventLoop::~PolkitResultEventLoop()
+{
+
+}
+
+void PolkitResultEventLoop::requestQuit(const PolkitQt1::Authority::Result& result)
+{
+ m_result = result;
+ quit();
+}
+
+PolkitQt1::Authority::Result PolkitResultEventLoop::result() const
+{
+ return m_result;
+}
+
Polkit1Backend::Polkit1Backend()
{
// Nothing to do here...
}
+Polkit1Backend::~Polkit1Backend()
+{
+
+}
+
Action::AuthStatus Polkit1Backend::authorizeAction(const QString &action)
{
Q_UNUSED(action)
@@ -87,7 +114,13 @@
PolkitQt1::UnixProcessSubject subject(pid);
PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
- switch (authority->checkAuthorizationSync(action, &subject, \
PolkitQt1::Authority::AllowUserInteraction)) { + PolkitResultEventLoop e;
+ connect(authority, \
SIGNAL(checkAuthorizationFinished(PolkitQt1::Authority::Result)), + &e, \
SLOT(requestQuit(PolkitQt1::Authority::Result))); + \
authority->checkAuthorization(action, &subject, \
PolkitQt1::Authority::AllowUserInteraction); + e.exec();
+
+ switch (e.result()) {
case PolkitQt1::Authority::Yes:
return true;
default:
--- branches/work/komo/kdelibs/kdecore/auth/backends/polkit-1/Polkit1Backend.h \
#1116353:1116354 @@ -1,7 +1,7 @@
/*
* Copyright (C) 2008 Nicola Gigante <nicola.gigante@gmail.com>
-* Copyright (C) 2009 Dario Freddi <drf@kde.org>
* Copyright (C) 2009 Radek Novacek <rnovacek@redhat.com>
+* Copyright (C) 2009-2010 Dario Freddi <drf@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -23,8 +23,12 @@
#define POLKIT1BACKEND_H
#include "AuthBackend.h"
+
#include <QHash>
+#include <QEventLoop>
+#include <PolkitQt1/Authority>
+
class QByteArray;
namespace KAuth
@@ -37,15 +41,13 @@
public:
Polkit1Backend();
+ virtual ~Polkit1Backend();
virtual void setupAction(const QString&);
virtual Action::AuthStatus authorizeAction(const QString&);
virtual Action::AuthStatus actionStatus(const QString&);
virtual QByteArray callerID() const;
virtual bool isCallerAuthorized(const QString &action, QByteArray callerID);
-Q_SIGNALS:
- void actionStatusChanged(const QString &action, Action::AuthStatus status);
-
private Q_SLOTS:
void checkForResultChanged();
@@ -53,6 +55,22 @@
QHash<QString, Action::AuthStatus> m_cachedResults;
};
+class PolkitResultEventLoop : public QEventLoop
+{
+ Q_OBJECT
+public:
+ PolkitResultEventLoop(QObject* parent = 0);
+ virtual ~PolkitResultEventLoop();
+
+ PolkitQt1::Authority::Result result() const;
+
+public Q_SLOTS:
+ void requestQuit(const PolkitQt1::Authority::Result &result);
+
+private:
+ PolkitQt1::Authority::Result m_result;
+};
+
} // namespace Auth
#endif
--- branches/work/komo/kdelibs/kdecore/tests/kdebug_unittest.cpp #1116353:1116354
@@ -199,6 +199,11 @@
QCOMPARE(KDebug::hasNullOutput(QtDebugMsg, true, 0, false), true);
QCOMPARE(KDebug::hasNullOutput(QtDebugMsg, true, 293, false), true);
QCOMPARE(KDebug::hasNullOutput(QtDebugMsg, true, 4242, false), true);
+
+ // Restore to normal for future tests
+ config.group("qttest").writeEntry("InfoOutput", 0 /*FileOutput*/);
+ config.sync();
+ kClearDebugConfig();
}
#include <QThreadPool>
--- branches/work/komo/kdelibs/kdewebkit/kwebwallet.cpp #1116353:1116354
@@ -71,7 +71,7 @@
fields << qMakePair(element.attribute(QL1S("name")), value);
}
- return count;
+ return fields.count();
}
class KWebWallet::KWebWalletPrivate
--- branches/work/komo/kdelibs/plasma/data/servicetypes/plasma-applet-popupapplet.desktop \
#1116353:1116354 @@ -29,6 +29,7 @@
Comment[is]=Plasma smáforrit fyrir skriftun
Comment[it]=Applet Plasma scripting a comparsa
Comment[ja]=Plasma スクリプティング・ポップアップアプレット
+Comment[kk]=Plasma қалқымалы скрипт апплеті
Comment[km]=អាប់ភ្លេតលេចឡើងរបស់ស្គ្រីបប្លាស្មា
Comment[kn]=ಪ್ಲಾಸ್ಮಾ ವಿಧಿಗುಚ್ಛ \
(ಸ್ಕ್ರಿಪ್ಟ್) ವಿಕಸನ ಪುಟಿಕೆ (ಪಾಪಪ್) \
ಅನ್ವಯಾಂಶ (ಆಪ್ಲೆಟ್) Comment[ko]=Plasma 스크립팅 \
팝업 플릿
--- branches/work/komo/kdelibs/plasma/data/servicetypes/plasma-containmentactions.desktop \
#1116353:1116354 @@ -23,6 +23,7 @@
Comment[id]=Plasma Aksi Berisi
Comment[is]=Plasma ContainmentActions
Comment[it]=ContainmentActions di Plasma
+Comment[kk]=Plasma контейнер әрекеті
Comment[km]=ប្លាស្មា ContainmentActions
Comment[ko]=Plasma ContainmentActions
Comment[lt]=Plasma konteinerių veiksmai
--- branches/work/komo/kdelibs/plasma/kcm_remotewidgets.actions #1116353:1116354
@@ -20,6 +20,7 @@
Name[id]=Simpan kebijakan widget jarak jauh
Name[is]=Vistar meðhöndlunarstefnu fyrir fjarlægar græjur
Name[it]=Salva regole elementi remoti
+Name[kk]=Қашық виджет ережелерін сақтау
Name[km]=រក្សាទុកគោលនយោបាយធាតុក្រា \
្វិកពីចម្ងាយ Name[ko]=원격 위 책 장
Name[lt]=Įrašyti nutolusių valdiklių politiką
@@ -67,6 +68,7 @@
Description[id]=Cegah sistem dari menyimpan kebijakan widget jarak jauh plasma
Description[is]=Kemur í veg fyrir að kerfið visti meðhöndlunarstefnu fyrir \
fjarlægar græjur Description[it]=Impedisce al sistema di salvare le regole degli \
elementi plasma remoti +Description[kk]=Бұл жүйеде қашық виджет \
ережелерін сақтауын болдырмау \
Description[km]=ការពារប្រព័ន្ធកុំ \
្យរក្សាទុកគោលការណ៍ធាតុក្រា \
្វិកប្លាស្មាពីចម្ងាយ \
Description[ko]=Plasma 원격 위 책을 장하지 못하도록 합니다 \
Description[lt]=Apsaugo sistemą nuo plazmos nutolusių valdiklių politikos \
įrašymo
--- branches/work/komo/kdelibs/plasma/widgets/spinbox.cpp #1116353:1116354
@@ -179,8 +179,9 @@
update();
}
-void SpinBox::resizeEvent(QGraphicsSceneResizeEvent *)
+void SpinBox::resizeEvent(QGraphicsSceneResizeEvent *event)
{
+ QGraphicsProxyWidget::resizeEvent(event);
QStyleOptionSpinBox spinOpt;
spinOpt.initFrom(nativeWidget());
QRect controlrect = nativeWidget()->style()->subControlRect(QStyle::CC_SpinBox, \
&spinOpt, QStyle::SC_SpinBoxFrame, nativeWidget());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic