From 009fafecb04caec9c1134d9d04caeb1712dac6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burkhard=20L=C3=BCck?= Date: Fri, 21 Mar 2014 11:05:58 +0100 Subject: [PATCH 1/4] change obsolete url to qt-project.org/doc --- konqueror/profile_kde_devel.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index 1c97387fad..bd4fa5ce58 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -107,7 +107,7 @@ ViewT1_PassiveMode=false ViewT1_ServiceName=khtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false -ViewT1_URL=http://doc.trolltech.com/ +ViewT1_URL=http://qt-project.org/doc/ ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false From 4f8755f64635ef41a3717fe7a216b0d7cb5e6574 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Mar 2014 08:14:25 +0000 Subject: [PATCH 2/4] SVN_SILENT made messages (.desktop file) --- konqueror/settings/kio/proxy.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/konqueror/settings/kio/proxy.desktop b/konqueror/settings/kio/proxy.desktop index e39cbf9c96..72263c301e 100644 --- a/konqueror/settings/kio/proxy.desktop +++ b/konqueror/settings/kio/proxy.desktop @@ -76,7 +76,7 @@ Name[nn]=Mellomtenar Name[oc]=Proxy Name[or]=ପ୍ରକ୍ସି Name[pa]=ਪਰਾਕਸੀ -Name[pl]=Pośrednik (Proxy) +Name[pl]=Pośrednik Name[pt]=Proxy Name[pt_BR]=Proxy Name[ro]=Proxy From 9e81972b0ec50fb3162d1106a6ce5d1ad655e914 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 31 Mar 2014 07:28:16 +0000 Subject: [PATCH 3/4] SVN_SILENT made messages (.desktop file) --- konq-plugins/imagerotation/jpegorient.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/konq-plugins/imagerotation/jpegorient.desktop b/konq-plugins/imagerotation/jpegorient.desktop index e8e5c384e6..67ee0f83e2 100644 --- a/konq-plugins/imagerotation/jpegorient.desktop +++ b/konq-plugins/imagerotation/jpegorient.desktop @@ -80,7 +80,7 @@ Name[ca]=Gira en sentit horari Name[ca@valencia]=Gira en sentit horari Name[cs]=Rotovat po směru hodin Name[da]=Rotér med uret -Name[de]=Rechts drehen +Name[de]=Mit dem Uhrzeigersinn drehen Name[el]=Περιστροφή με τη Φορά του Ρολογιού Name[en_GB]=Rotate Clockwise Name[es]=Girar en el sentido de las agujas del reloj @@ -147,7 +147,7 @@ Name[ca]=Gira en sentit antihorari Name[ca@valencia]=Gira en sentit antihorari Name[cs]=Rotovat proti směru hodin Name[da]=Rotér mod uret -Name[de]=Links drehen +Name[de]=Gegen den Uhrzeigersinn drehen Name[el]=Περιστροφή αριστερόστροφα Name[en_GB]=Rotate Anti-Clockwise Name[es]=Girar en sentido contrario a las agujas del reloj From 80833d2c0b92c14552b142bd64c1cadce43d26a8 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 14 Apr 2014 22:46:38 +0200 Subject: [PATCH 4/4] Update the "is cut" state of items if necessary The icons of items which are "cut" are shown faded in the view. The "is cut" state of the widget representing an item is updated if the clipboard contents change. Before this commit, if the sort order was changed however, then each widget kept the "is cut" state of the item which had been shown previously at its position. The solution is to update the "is cut" state also if any of the widget's data change. BUG: 332792 REVIEW: 117451 FIXED-IN: 4.12.5 --- dolphin/src/kitemviews/kstandarditemlistwidget.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp index acdf839aca..54546b4407 100644 --- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp +++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp @@ -589,6 +589,12 @@ void KStandardItemListWidget::dataChanged(const QHash& cur dirtyRoles = roles; } + // The URL might have changed (i.e., if the sort order of the items has + // been changed). Therefore, the "is cut" state must be updated. + KFileItemClipboard* clipboard = KFileItemClipboard::instance(); + const KUrl itemUrl = data().value("url").value(); + m_isCut = clipboard->isCut(itemUrl); + // The icon-state might depend from other roles and hence is // marked as dirty whenever a role has been changed dirtyRoles.insert("iconPixmap");