Hello community,
here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-01-27 11:14:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old)
and /work/SRC/openSUSE:Factory/.kdebase4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2013-12-19 13:15:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-01-27 11:14:24.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Jan 11 15:33:31 UTC 2014 - tittiatcoke@gmail.com
+
+- Update to 4.12.1
+ * KDE 4.12.1 release
+ * See http://www.kde.org/announcements/announce-4.12.1.php
+
+-------------------------------------------------------------------
Old:
----
kde-baseapps-4.12.0.tar.xz
New:
----
kde-baseapps-4.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.qxx1kE/_old 2014-01-27 11:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.qxx1kE/_new 2014-01-27 11:14:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kdebase4
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: kdebase4
-Version: 4.12.0
+Version: 4.12.1
Release: 0
Summary: The Base KDE Apps
License: GPL-2.0+
++++++ kde-baseapps-4.12.0.tar.xz -> kde-baseapps-4.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/doc/dolphin/index.docbook new/kde-baseapps-4.12.1/doc/dolphin/index.docbook
--- old/kde-baseapps-4.12.0/doc/dolphin/index.docbook 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/doc/dolphin/index.docbook 2014-01-09 14:28:46.000000000 +0100
@@ -580,7 +580,7 @@
<para>
When in bread crumb mode, clicking in the gray area to the right of the path
-with the &LMB; switches the location bar to the <quote>editable</quote> mode,
+with the &LMB; switches the location bar to <quote>editable</quote> mode,
in which the path can be edited using the keyboard. To switch back to bread
crumb mode, click the check mark at the right of the location bar with the &LMB;.
</para>
@@ -597,10 +597,39 @@
<caption><para>Location bar in editable mode.</para></caption>
</mediaobject>
</screenshot>
+
+<sect3 id="location-bar-editable-kioslaves">
+<title>Using Kioslaves</title>
+
<para>If the location bar is empty in editable mode, a drop down box appears in
-front of the bar with all available kioslaves on your system. Using these ioslaves
-you can ⪚ launch a &systemsettings; module or <application>KFontview</application> from &dolphin;.
+front of the bar listing all available kioslaves on your system. Kioslaves are
+programs built into &kde; which add support for many different protocols to
+&dolphin; and other &kde; applications.</para>
+
+<para>For example with the <quote>fish</quote> kioslave &dolphin; can be
+used to manage files and folders on a remote host that is accessible
+via <acronym>SSH</acronym>. To do this you would type <userinput>fish://username@remotehost</userinput>
+into the location bar. Similar remote file management can be done on
+remote hosts accessible via the &FTP;, NFS, SFTP, SMB (CIFS) or webdav protocols.</para>
+
+<para>It is also possible to use the kioslaves drop down list to access
+&systemsettings;, fonts, trash, other programs and devices attached to your computer.
+See the drop down list for the full list of capabilities available from kioslaves on your system.
</para>
+<screenshot>
+<screeninfo>Screenshot of the list of kioslaves</screeninfo>
+<mediaobject>
+<imageobject>
+<imagedata fileref="locationbar-kioslaves-menu.png" format="PNG"/>
+</imageobject>
+<textobject>
+<phrase>Location bar showing list of available kioslaves.</phrase>
+</textobject>
+<caption><para>List of available kioslaves.</para></caption>
+</mediaobject>
+</screenshot>
+
+</sect3>
</sect2>
<sect2 id="location-place-context">
Files old/kde-baseapps-4.12.0/doc/dolphin/locationbar-kioslaves-menu.png and new/kde-baseapps-4.12.1/doc/dolphin/locationbar-kioslaves-menu.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemmodel.cpp new/kde-baseapps-4.12.1/dolphin/src/kitemviews/kfileitemmodel.cpp
--- old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemmodel.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/kitemviews/kfileitemmodel.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -413,6 +413,15 @@
kWarning() << "TODO: Emitting itemsChanged() with no information what has changed!";
emit itemsChanged(KItemRangeList() << KItemRange(0, count()), QSet<QByteArray>());
}
+
+ // Clear the 'values' of all filtered items. They will be re-populated with the
+ // correct roles the next time 'values' will be accessed via data(int).
+ QHash::iterator filteredIt = m_filteredItems.begin();
+ const QHash::iterator filteredEnd = m_filteredItems.end();
+ while (filteredIt != filteredEnd) {
+ (*filteredIt)->values.clear();
+ ++filteredIt;
+ }
}
QSet<QByteArray> KFileItemModel::roles() const
@@ -958,6 +967,20 @@
m_items.remove(oldItem.url());
m_items.insert(newItem.url(), index);
indexes.append(index);
+ } else {
+ // Check if 'oldItem' is one of the filtered items.
+ QHash::iterator it = m_filteredItems.find(oldItem);
+ if (it != m_filteredItems.end()) {
+ ItemData* itemData = it.value();
+ itemData->item = newItem;
+
+ // The data stored in 'values' might have changed. Therefore, we clear
+ // 'values' and re-populate it the next time it is requested via data(int).
+ itemData->values.clear();
+
+ m_filteredItems.erase(it);
+ m_filteredItems.insert(newItem, itemData);
+ }
}
}
@@ -1033,6 +1056,7 @@
#endif
m_groups.clear();
+ prepareItemsForSorting(newItems);
if (m_sortRole == NameRole && m_naturalSorting) {
// Natural sorting of items can be very slow. However, it becomes much
@@ -1196,6 +1220,11 @@
itemDataList.append(itemData);
}
+ return itemDataList;
+}
+
+void KFileItemModel::prepareItemsForSorting(QList& itemDataList)
+{
switch (m_sortRole) {
case PermissionsRole:
case OwnerRole:
@@ -1205,16 +1234,20 @@
// These roles can be determined with retrieveData, and they have to be stored
// in the QHash "values" for the sorting.
foreach (ItemData* itemData, itemDataList) {
- itemData->values = retrieveData(itemData->item, parentItem);
+ if (itemData->values.isEmpty()) {
+ itemData->values = retrieveData(itemData->item, itemData->parent);
+ }
}
break;
case TypeRole:
// At least store the data including the file type for items with known MIME type.
foreach (ItemData* itemData, itemDataList) {
- const KFileItem item = itemData->item;
- if (item.isDir() || item.isMimeTypeKnown()) {
- itemData->values = retrieveData(itemData->item, parentItem);
+ if (itemData->values.isEmpty()) {
+ const KFileItem item = itemData->item;
+ if (item.isDir() || item.isMimeTypeKnown()) {
+ itemData->values = retrieveData(itemData->item, itemData->parent);
+ }
}
}
break;
@@ -1223,12 +1256,10 @@
// The other roles are either resolved by KFileItemModelRolesUpdater
// (this includes the SizeRole for directories), or they do not need
// to be stored in the QHash "values" for sorting because the data can
- // be retrieved directly from the KFileItem (NameRole, SiezRole for files,
+ // be retrieved directly from the KFileItem (NameRole, SizeRole for files,
// DateRole).
break;
}
-
- return itemDataList;
}
int KFileItemModel::expandedParentsCount(const ItemData* data)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemmodel.h new/kde-baseapps-4.12.1/dolphin/src/kitemviews/kfileitemmodel.h
--- old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemmodel.h 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/kitemviews/kfileitemmodel.h 2014-01-09 14:28:46.000000000 +0100
@@ -320,6 +320,13 @@
*/
QList createItemDataList(const KUrl& parentUrl, const KFileItemList& items) const;
+ /**
+ * Prepares the items for sorting. Normally, the hash 'values' in ItemData is filled
+ * lazily to save time and memory, but for some sort roles, it is expected that the
+ * sort role data is stored in 'values'.
+ */
+ void prepareItemsForSorting(QList& itemDataList);
+
static int expandedParentsCount(const ItemData* data);
void removeExpandedItems();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelcontent.cpp new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelcontent.cpp
--- old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelcontent.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelcontent.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -64,7 +64,7 @@
InformationPanelContent::InformationPanelContent(QWidget* parent) :
QWidget(parent),
m_item(),
- m_pendingPreview(false),
+ m_previewJob(0),
m_outdatedPreviewTimer(0),
m_preview(0),
m_phononWidget(0),
@@ -159,7 +159,11 @@
void InformationPanelContent::showItem(const KFileItem& item)
{
- m_pendingPreview = false;
+ // If there is a preview job, kill it to prevent that we have jobs for
+ // multiple items running, and thus a race condition (bug 250787).
+ if (m_previewJob) {
+ m_previewJob->kill();
+ }
const KUrl itemUrl = item.url();
const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();
@@ -175,7 +179,6 @@
m_preview->setPixmap(icon);
} else {
// try to get a preview pixmap from the item...
- m_pendingPreview = true;
// Mark the currently shown preview as outdated. This is done
// with a small delay to prevent a flickering when the next preview
@@ -186,16 +189,16 @@
m_outdatedPreviewTimer->start();
}
- KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
- job->setScaleType(KIO::PreviewJob::Unscaled);
- job->setIgnoreMaximumSize(item.isLocalFile());
- if (job->ui()) {
- job->ui()->setWindow(this);
+ m_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+ m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
+ m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
+ if (m_previewJob->ui()) {
+ m_previewJob->ui()->setWindow(this);
}
- connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
+ connect(m_previewJob, SIGNAL(gotPreview(KFileItem,QPixmap)),
this, SLOT(showPreview(KFileItem,QPixmap)));
- connect(job, SIGNAL(failed(KFileItem)),
+ connect(m_previewJob, SIGNAL(failed(KFileItem)),
this, SLOT(showIcon(KFileItem)));
}
}
@@ -227,7 +230,11 @@
void InformationPanelContent::showItems(const KFileItemList& items)
{
- m_pendingPreview = false;
+ // If there is a preview job, kill it to prevent that we have jobs for
+ // multiple items running, and thus a race condition (bug 250787).
+ if (m_previewJob) {
+ m_previewJob->kill();
+ }
KIconLoader iconLoader;
QPixmap icon = iconLoader.loadIcon("dialog-information",
@@ -315,7 +322,6 @@
void InformationPanelContent::showIcon(const KFileItem& item)
{
m_outdatedPreviewTimer->stop();
- m_pendingPreview = false;
if (!applyPlace(item.targetUrl())) {
KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
@@ -327,12 +333,10 @@
{
m_outdatedPreviewTimer->stop();
Q_UNUSED(item);
- if (m_pendingPreview) {
- QPixmap p = pixmap;
- KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
- m_preview->setPixmap(p);
- m_pendingPreview = false;
- }
+
+ QPixmap p = pixmap;
+ KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+ m_preview->setPixmap(p);
}
void InformationPanelContent::markOutdatedPreview()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelcontent.h new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelcontent.h
--- old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelcontent.h 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelcontent.h 2014-01-09 14:28:46.000000000 +0100
@@ -26,6 +26,8 @@
#include <KUrl>
#include <KVBox>
+#include <QPointer>
+
class KFileItemList;
class PhononWidget;
class PixmapViewer;
@@ -35,6 +37,10 @@
class QLabel;
class QScrollArea;
+namespace KIO {
+ class PreviewJob;
+}
+
#ifndef HAVE_NEPOMUK
class KFileMetaDataWidget;
#else
@@ -135,7 +141,7 @@
private:
KFileItem m_item;
- bool m_pendingPreview;
+ QPointerKIO::PreviewJob m_previewJob;
QTimer* m_outdatedPreviewTimer;
PixmapViewer* m_preview;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/tests/CMakeLists.txt new/kde-baseapps-4.12.1/dolphin/src/tests/CMakeLists.txt
--- old/kde-baseapps-4.12.0/dolphin/src/tests/CMakeLists.txt 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/tests/CMakeLists.txt 2014-01-09 14:28:46.000000000 +0100
@@ -65,6 +65,7 @@
testdir.cpp
../kitemviews/kfileitemmodel.cpp
../kitemviews/kitemmodelbase.cpp
+ ../kitemviews/kitemset.cpp
)
kde4_add_unit_test(kfileitemmodeltest TEST ${kfileitemmodeltest_SRCS})
target_link_libraries(kfileitemmodeltest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/tests/kfileitemmodeltest.cpp new/kde-baseapps-4.12.1/dolphin/src/tests/kfileitemmodeltest.cpp
--- old/kde-baseapps-4.12.0/dolphin/src/tests/kfileitemmodeltest.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/tests/kfileitemmodeltest.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -90,6 +90,10 @@
void testNameRoleGroups();
void testNameRoleGroupsWithExpandedItems();
void testInconsistentModel();
+ void testChangeRolesForFilteredItems();
+ void testChangeSortRoleWhileFiltering();
+ void testRefreshFilteredItems();
+ void testCreateMimeData();
private:
QStringList itemsInModel() const;
@@ -1462,6 +1466,159 @@
}
+void KFileItemModelTest::testChangeRolesForFilteredItems()
+{
+ QSet<QByteArray> modelRoles = m_model->roles();
+ modelRoles << "owner";
+ m_model->setRoles(modelRoles);
+
+ QStringList files;
+ files << "a.txt" << "aa.txt" << "aaa.txt";
+ m_testDir->createFiles(files);
+
+ m_model->loadDirectory(m_testDir->url());
+ QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "aa.txt" << "aaa.txt");
+
+ for (int index = 0; index < m_model->count(); ++index) {
+ // All items should have the "text" and "owner" roles, but not "group".
+ QVERIFY(m_model->data(index).contains("text"));
+ QVERIFY(m_model->data(index).contains("owner"));
+ QVERIFY(!m_model->data(index).contains("group"));
+ }
+
+ // Add a filter, such that only "aaa.txt" remains in the model.
+ m_model->setNameFilter("aaa");
+ QCOMPARE(itemsInModel(), QStringList() << "aaa.txt");
+
+ // Add the "group" role.
+ modelRoles << "group";
+ m_model->setRoles(modelRoles);
+
+ // Modify the filter, such that "aa.txt" reappears, and verify that all items have the expected roles.
+ m_model->setNameFilter("aa");
+ QCOMPARE(itemsInModel(), QStringList() << "aa.txt" << "aaa.txt");
+
+ for (int index = 0; index < m_model->count(); ++index) {
+ // All items should have the "text", "owner", and "group" roles.
+ QVERIFY(m_model->data(index).contains("text"));
+ QVERIFY(m_model->data(index).contains("owner"));
+ QVERIFY(m_model->data(index).contains("group"));
+ }
+
+ // Remove the "owner" role.
+ modelRoles.remove("owner");
+ m_model->setRoles(modelRoles);
+
+ // Clear the filter, and verify that all items have the expected roles
+ m_model->setNameFilter(QString());
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "aa.txt" << "aaa.txt");
+
+ for (int index = 0; index < m_model->count(); ++index) {
+ // All items should have the "text" and "group" roles, but now "owner".
+ QVERIFY(m_model->data(index).contains("text"));
+ QVERIFY(!m_model->data(index).contains("owner"));
+ QVERIFY(m_model->data(index).contains("group"));
+ }
+}
+
+void KFileItemModelTest::testChangeSortRoleWhileFiltering()
+{
+ KFileItemList items;
+
+ KIO::UDSEntry entry;
+ entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000); // S_IFREG might not be defined on non-Unix platforms.
+ entry.insert(KIO::UDSEntry::UDS_ACCESS, 07777);
+ entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
+ entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0);
+ entry.insert(KIO::UDSEntry::UDS_GROUP, "group");
+ entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
+
+ entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt");
+ entry.insert(KIO::UDSEntry::UDS_USER, "user-b");
+ items.append(KFileItem(entry, m_testDir->url(), false, true));
+
+ entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt");
+ entry.insert(KIO::UDSEntry::UDS_USER, "user-c");
+ items.append(KFileItem(entry, m_testDir->url(), false, true));
+
+ entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt");
+ entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
+ items.append(KFileItem(entry, m_testDir->url(), false, true));
+
+ m_model->slotItemsAdded(m_testDir->url(), items);
+ m_model->slotCompleted();
+
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt");
+
+ // Add a filter.
+ m_model->setNameFilter("a");
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt");
+
+ // Sort by "owner".
+ m_model->setSortRole("owner");
+
+ // Clear the filter, and verify that the items are sorted correctly.
+ m_model->setNameFilter(QString());
+ QCOMPARE(itemsInModel(), QStringList() << "c.txt" << "a.txt" << "b.txt");
+}
+
+void KFileItemModelTest::testRefreshFilteredItems()
+{
+ QStringList files;
+ files << "a.txt" << "b.txt" << "c.jpg" << "d.jpg";
+ m_testDir->createFiles(files);
+
+ m_model->loadDirectory(m_testDir->url());
+ QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.jpg" << "d.jpg");
+
+ const KFileItem fileItemC = m_model->fileItem(2);
+
+ // Show only the .txt files.
+ m_model->setNameFilter(".txt");
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt");
+
+ // Rename one of the .jpg files.
+ KFileItem fileItemE = fileItemC;
+ KUrl urlE = fileItemE.url();
+ urlE.setFileName("e.jpg");
+ fileItemE.setUrl(urlE);
+
+ m_model->slotRefreshItems(QList >() << qMakePair(fileItemC, fileItemE));
+
+ // Show all files again, and verify that the model has updated the file name.
+ m_model->setNameFilter(QString());
+ QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "d.jpg" << "e.jpg");
+}
+
+void KFileItemModelTest::testCreateMimeData()
+{
+ QSet<QByteArray> modelRoles = m_model->roles();
+ modelRoles << "isExpanded" << "isExpandable" << "expandedParentsCount";
+ m_model->setRoles(modelRoles);
+
+ QStringList files;
+ files << "a/1";
+ m_testDir->createFiles(files);
+
+ m_model->loadDirectory(m_testDir->url());
+ QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+ QCOMPARE(itemsInModel(), QStringList() << "a");
+
+ // Expand "a/".
+ m_model->setExpanded(0, true);
+ QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+ QCOMPARE(itemsInModel(), QStringList() << "a" << "1");
+
+ // Verify that creating the MIME data for a child of an expanded folder does
+ // not cause a crash, see https://bugs.kde.org/show_bug.cgi?id=329119
+ KItemSet selection;
+ selection.insert(1);
+ QMimeData* mimeData = m_model->createMimeData(selection);
+ delete mimeData;
+}
+
QStringList KFileItemModelTest::itemsInModel() const
{
QStringList items;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewactionhandler.cpp new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandler.cpp
--- old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewactionhandler.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandler.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -84,6 +84,8 @@
this, SLOT(slotSortRoleChanged(QByteArray)));
connect(view, SIGNAL(zoomLevelChanged(int,int)),
this, SLOT(slotZoomLevelChanged(int,int)));
+ connect(view, SIGNAL(writeStateChanged(bool)),
+ this, SLOT(slotWriteStateChanged(bool)));
}
DolphinView* DolphinViewActionHandler::currentView()
@@ -99,6 +101,7 @@
newDirAction->setText(i18nc("@action", "Create Folder..."));
newDirAction->setShortcut(Qt::Key_F10);
newDirAction->setIcon(KIcon("folder-new"));
+ newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory()));
// File menu
@@ -482,6 +485,11 @@
showHiddenFilesAction->setChecked(shown);
}
+void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
+{
+ m_actionCollection->action("create_dir")->setEnabled(isFolderWritable);
+}
+
KToggleAction* DolphinViewActionHandler::iconsModeAction()
{
KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewactionhandler.h new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandler.h
--- old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewactionhandler.h 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandler.h 2014-01-09 14:28:46.000000000 +0100
@@ -197,6 +197,11 @@
void slotHiddenFilesShownChanged(bool shown);
/**
+ * Updates the state of the 'Create Folder...' action.
+ */
+ void slotWriteStateChanged(bool isFolderWritable);
+
+ /**
* Opens the view properties dialog, which allows to modify the properties
* of the currently active view.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ada-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ada-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ada-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ada-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c++-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c++-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c++h-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++h-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c++h-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++h-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ch-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ch-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ch-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ch-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-css-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-css-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-css-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-css-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-diff-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-diff-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-diff-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-diff-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-html-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-html-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-html-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-html-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-java-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-java-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-java-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-java-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-log-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-log-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-log-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-log-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-makefile-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-makefile-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-makefile-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-makefile-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-pas-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-pas-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-pas-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-pas-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-perl-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-perl-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-perl-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-perl-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-python-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-python-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-python-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-python-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-tcl-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tcl-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-tcl-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tcl-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-tex-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tex-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-tex-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tex-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-xml-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xml-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-xml-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xml-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-xslt-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xslt-print.desktop
--- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-xslt-print.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xslt-print.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -30,7 +30,7 @@
Name[et]=Trüki...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta...
+Name[fi]=Tulosta…
Name[fr]=Imprimer...
Name[fy]=Printsje...
Name[ga]=Priontáil...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konqueror/settings/ebrowsing/ebrowsing.desktop new/kde-baseapps-4.12.1/konqueror/settings/ebrowsing/ebrowsing.desktop
--- old/kde-baseapps-4.12.0/konqueror/settings/ebrowsing/ebrowsing.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konqueror/settings/ebrowsing/ebrowsing.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -28,7 +28,7 @@
Name[csb]=Sécowé skrodzënë
Name[cy]=Byr-lwybrau Gwe
Name[da]=Webgenveje
-Name[de]=Web-Kürzel
+Name[de]=Webkürzel
Name[el]=Συντομεύσεις ιστού
Name[en_GB]=Web Shortcuts
Name[eo]=TTT klavokombinoj
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konqueror/sidebar/default_entries/places.desktop new/kde-baseapps-4.12.1/konqueror/sidebar/default_entries/places.desktop
--- old/kde-baseapps-4.12.0/konqueror/sidebar/default_entries/places.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konqueror/sidebar/default_entries/places.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -95,7 +95,7 @@
Comment[fi]=Tämä on luettelo sijainneista.
Comment[fr]=Ceci est la liste des emplacements.
Comment[ga]=Seo é an liosta d'áiteanna.
-Comment[gl]=Esta é a lista de lugares.
+Comment[gl]=Esta é a lista de lugares.
Comment[gu]=આ જગ્યાઓની યાદી છે
Comment[he]=זוהי רשימת המקומות.
Comment[hi]=यह स्थानों की सूची है
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konqueror/src/konqmainwindow.cpp new/kde-baseapps-4.12.1/konqueror/src/konqmainwindow.cpp
--- old/kde-baseapps-4.12.0/konqueror/src/konqmainwindow.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konqueror/src/konqmainwindow.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -5024,7 +5024,7 @@
// Create a KToggleAction for each view mode, and plug it into the menu
KToggleAction* action = new KToggleAction(KIcon(serviceAction.icon()), serviceAction.text(), this);
//actionCollection()->addAction(desktopEntryName /*not unique!*/, action);
- action->setObjectName(desktopEntryName);
+ action->setObjectName(desktopEntryName + QLatin1String("-viewmode"));
action->setData(QVariant(serviceAction.name()));
action->setActionGroup(m_viewModesGroup);
m_viewModeMenu->menu()->addAction(action);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/konqueror/src/konqundomanager.cpp new/kde-baseapps-4.12.1/konqueror/src/konqundomanager.cpp
--- old/kde-baseapps-4.12.0/konqueror/src/konqundomanager.cpp 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/konqueror/src/konqundomanager.cpp 2014-01-09 14:28:46.000000000 +0100
@@ -130,7 +130,7 @@
KonqClosedItem* closedItem = m_closedItemList.first();
// Check what to undo
- if (!m_supportsFileUndo || !KIO::FileUndoManager::self()->undoAvailable() || closedItem->serialNumber() > fileUndoManager->currentCommandSerialNumber()) {
+ if (!m_supportsFileUndo || !fileUndoManager->undoAvailable() || closedItem->serialNumber() > fileUndoManager->currentCommandSerialNumber()) {
undoClosedItem(0);
return;
}
@@ -209,13 +209,13 @@
if(closedTabItem)
emit openClosedTab(*closedTabItem);
else if(closedRemoteWindowItem) {
- emit openClosedWindow(*closedRemoteWindowItem);
KonqClosedWindowsManager::self()->removeClosedWindowItem(this, closedRemoteWindowItem);
+ emit openClosedWindow(*closedRemoteWindowItem);
} else if(closedWindowItem) {
- emit openClosedWindow(*closedWindowItem);
KonqClosedWindowsManager::self()->removeClosedWindowItem(this, closedWindowItem);
+ emit openClosedWindow(*closedWindowItem);
closedWindowItem->configGroup().deleteGroup();
-
+
// Save config so that this window won't appear in new konqueror processes
KonqClosedWindowsManager::self()->saveConfig();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/Directory.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/Directory.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/Directory.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/Directory.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Carpeta...
Name[et]=Kataloog...
Name[eu]=Karpeta...
-Name[fi]=Kansio...
+Name[fi]=Kansio…
Name[fr]=Dossier...
Name[fy]=Map...
Name[ga]=Fillteán...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/HTMLFile.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/HTMLFile.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/HTMLFile.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/HTMLFile.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Archivo HTML...
Name[et]=HTML-fail...
Name[eu]=HTML fitxategia...
-Name[fi]=HTML-tiedosto...
+Name[fi]=HTML-tiedosto…
Name[fr]=Fichier HTML...
Name[fy]=HTML-triem.......
Name[ga]=Comhad HTML...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/TextFile.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/TextFile.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/TextFile.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/TextFile.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Archivo de texto...
Name[et]=Tekstifail...
Name[eu]=Testu fitxategia...
-Name[fi]=Tekstitiedosto...
+Name[fi]=Tekstitiedosto…
Name[fr]=Fichier texte...
Name[fy]=Teksttriem......
Name[ga]=Téacschomhad...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCAMERA.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkCAMERA.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkCAMERA.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkCAMERA.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Cámara...
Name[et]=Kaameraseade
Name[eu]=Kamera...
-Name[fi]=Kamera...
+Name[fi]=Kamera…
Name[fr]=Appareil photo...
Name[fy]=Kamera...
Name[ga]=Gléas Ceamara...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDROM.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDROM.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDROM.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDROM.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=CD-ROM...
Name[et]=CD-ROM seade...
Name[eu]=CD-ROM gailua...
-Name[fi]=CD-ROM-laite...
+Name[fi]=CD-ROM-laite…
Name[fr]=Lecteur de CD-ROM...
Name[fy]=kompaktskiifstasjon ...
Name[ga]=Gléas CD-ROM...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDWRITER.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDWRITER.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDWRITER.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDWRITER.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Grabador de CD...
Name[et]=CD-kirjutaja...
Name[eu]=CDWRITER gailua...
-Name[fi]=CDWRITER-laite...
+Name[fi]=CDWRITER-laite…
Name[fr]=Graveur de CD...
Name[fy]=kompaktskiifstasjon...
Name[ga]=Gléas CDWRITER...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkFloppy.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkFloppy.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkFloppy.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkFloppy.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Disquetera...
Name[et]=Flopiseade...
Name[eu]=Diskete gailua...
-Name[fi]=Levykeasema...
+Name[fi]=Levykeasema…
Name[fr]=Lecteur de disquettes...
Name[fy]=Slappe skiifstasjon...
Name[ga]=Gléas Diosca Flapach...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkHD.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkHD.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkHD.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkHD.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Disco duro...
Name[et]=Kõvaketas...
Name[eu]=Disko gogorra...
-Name[fi]=Kiintolevy...
+Name[fi]=Kiintolevy…
Name[fr]=Disque dur...
Name[fy]=Fêste skiif...
Name[ga]=Gléas Diosca Crua...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkMO.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkMO.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkMO.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkMO.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Dispositivo MO...
Name[et]=MO seade...
Name[eu]=MO gailua...
-Name[fi]=MO-laite...
+Name[fi]=MO-laite…
Name[fr]=Périphérique MO...
Name[fy]=Magnetyske skiif stasjon...
Name[ga]=Gléas MO...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkNFS.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkNFS.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkNFS.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkNFS.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=NFS...
Name[et]=NFS...
Name[eu]=NFS...
-Name[fi]=NFS...
+Name[fi]=NFS…
Name[fr]=NFS...
Name[fy]=NFS...
Name[ga]=NFS...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkPath.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkPath.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkPath.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkPath.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -16,7 +16,7 @@
Name[es]=Enlace básico a archivo o carpeta...
Name[et]=Lihtlink failile või kataloogile...
Name[eu]=Oinarrizko esteka fitxategi edo karpetara...
-Name[fi]=Peruslinkki tiedostoon tai kansioon...
+Name[fi]=Peruslinkki tiedostoon tai kansioon…
Name[fr]=Lien standard vers un fichier ou un dossier...
Name[fy]=Basis keppeling nei triem of triemtafel
Name[ga]=Nasc bunúsach le comhad nó comhadlann...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkProgram.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkProgram.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkProgram.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkProgram.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -22,7 +22,7 @@
Name[es]=Enlace a aplicación...
Name[et]=Viit rakendusele...
Name[eu]=Estekatu aplikazioa...
-Name[fi]=Linkki sovellukseen...
+Name[fi]=Linkki sovellukseen…
Name[fr]=Lien vers une application...
Name[fy]=Keppeling nei applikaasje...
Name[ga]=Nasc le Feidhmchlár...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkURL.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkURL.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkURL.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkURL.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Enlace a ubicación (URL)...
Name[et]=Viit asukohale (URL)...
Name[eu]=Estekatu kokapena (URLa)...
-Name[fi]=Linkki sijaintiin (URL)...
+Name[fi]=Linkki sijaintiin (URL)…
Name[fr]=Lien vers un emplacement (URL)...
Name[fy]=Keppeling nei lokaasje (URL-adres)...
Name[ga]=Nasc le Suíomh (URL)...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkZIP.desktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkZIP.desktop
--- old/kde-baseapps-4.12.0/lib/konq/Templates/linkZIP.desktop 2013-12-06 00:56:34.000000000 +0100
+++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkZIP.desktop 2014-01-09 14:28:46.000000000 +0100
@@ -24,7 +24,7 @@
Name[es]=Unidad ZIP...
Name[et]=ZIP seade...
Name[eu]=ZIP gailua...
-Name[fi]=ZIP-laite...
+Name[fi]=ZIP-laite…
Name[fr]=Lecteur ZIP...
Name[fy]=ZIP-apparaat...
Name[ga]=Gléas ZIP...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org