From root@hilbert.suse.de Mon Jan 27 10:14:27 2014 From: root@hilbert.suse.de To: commit@lists.opensuse.org Subject: commit kdebase4 for openSUSE:Factory Date: Mon, 27 Jan 2014 11:14:26 +0100 Message-ID: <20140127101426.3D09EAE150@hilbert.suse.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6955776698510562629==" --===============6955776698510562629== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory chec= ked 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:1= 4:24.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 15:33:31 UTC 2014 - tittiatcoke(a)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 @@ =20 =20 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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.000= 000000 +0100 +++ new/kde-baseapps-4.12.1/doc/dolphin/index.docbook 2014-01-09 14:28:46.000= 000000 +0100 @@ -580,7 +580,7 @@ =20 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 editable mode, +with the &LMB; switches the location bar to editable 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;. @@ -597,10 +597,39 @@ Location bar in editable mode. + + +Using Kioslaves + If the location bar is empty in editable mode, a drop down box appears= in=20 -front of the bar with all available kioslaves on your system. Using these io= slaves -you can ⪚ launch a &systemsettings; module or KFontview from &dolphin;.=20 +front of the bar listing all available kioslaves on your system. Kioslaves a= re=20 +programs built into &kde; which add support for many different protocols to = +&dolphin; and other &kde; applications.=20 + +For example with the fish kioslave &dolphin; can be=20 +used to manage files and folders on a remote host that is accessible=20 +via SSH. To do this you would type fish://user= name(a)remotehost=20 +into the location bar. Similar remote file management can be done on=20 +remote hosts accessible via the &FTP;, NFS, SFTP, SMB (CIFS) or webdav proto= cols. + +It is also possible to use the kioslaves drop down list to access=20 +&systemsettings;, fonts, trash, other programs and devices attached to your = computer.=20 +See the drop down list for the full list of capabilities available from kios= laves on your system. + +Screenshot of the list of kioslaves + + + + + +Location bar showing list of available kioslaves. + +List of available kioslaves. + + + + =20 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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemm= odel.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 wha= t has changed!"; emit itemsChanged(KItemRangeList() << KItemRange(0, count()), QSet()); } + + // Clear the 'values' of all filtered items. They will be re-populated w= ith the + // correct roles the next time 'values' will be accessed via data(int). + QHash::iterator filteredIt =3D m_filteredItems.beg= in(); + const QHash::iterator filteredEnd =3D m_filteredIt= ems.end(); + while (filteredIt !=3D filteredEnd) { + (*filteredIt)->values.clear(); + ++filteredIt; + } } =20 QSet 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 =3D m_filteredItems.fin= d(oldItem); + if (it !=3D m_filteredItems.end()) { + ItemData* itemData =3D it.value(); + itemData->item =3D 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); + } } } =20 @@ -1033,6 +1056,7 @@ #endif =20 m_groups.clear(); + prepareItemsForSorting(newItems); =20 if (m_sortRole =3D=3D NameRole && m_naturalSorting) { // Natural sorting of items can be very slow. However, it becomes mu= ch @@ -1196,6 +1220,11 @@ itemDataList.append(itemData); } =20 + 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 =3D retrieveData(itemData->item, parentItem); + if (itemData->values.isEmpty()) { + itemData->values =3D retrieveData(itemData->item, itemData->= parent); + } } break; =20 case TypeRole: // At least store the data including the file type for items with kn= own MIME type. foreach (ItemData* itemData, itemDataList) { - const KFileItem item =3D itemData->item; - if (item.isDir() || item.isMimeTypeKnown()) { - itemData->values =3D retrieveData(itemData->item, parentItem= ); + if (itemData->values.isEmpty()) { + const KFileItem item =3D itemData->item; + if (item.isDir() || item.isMimeTypeKnown()) { + itemData->values =3D retrieveData(itemData->item, itemDa= ta->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 c= an - // be retrieved directly from the KFileItem (NameRole, SiezRole for = files, + // be retrieved directly from the KFileItem (NameRole, SizeRole for = files, // DateRole). break; } - - return itemDataList; } =20 int KFileItemModel::expandedParentsCount(const ItemData* data) diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/kitemviews/kfileitemm= odel.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-0= 6 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/dolphin/src/kitemviews/kfileitemmodel.h 2014-01-0= 9 14:28:46.000000000 +0100 @@ -320,6 +320,13 @@ */ QList createItemDataList(const KUrl& parentUrl, const KFileIt= emList& items) const; =20 + /** + * Prepares the items for sorting. Normally, the hash 'values' in ItemDa= ta is filled + * lazily to save time and memory, but for some sort roles, it is expect= ed that the + * sort role data is stored in 'values'. + */ + void prepareItemsForSorting(QList& itemDataList); + static int expandedParentsCount(const ItemData* data); =20 void removeExpandedItems(); diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/panels/information/in= formationpanelcontent.cpp new/kde-baseapps-4.12.1/dolphin/src/panels/informat= ion/informationpanelcontent.cpp --- old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelco= ntent.cpp 2013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelco= ntent.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 @@ =20 void InformationPanelContent::showItem(const KFileItem& item) { - m_pendingPreview =3D 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(); + } =20 const KUrl itemUrl =3D item.url(); const bool isSearchUrl =3D 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 =3D true; =20 // Mark the currently shown preview as outdated. This is done // with a small delay to prevent a flickering when the next prev= iew @@ -186,16 +189,16 @@ m_outdatedPreviewTimer->start(); } =20 - KIO::PreviewJob* job =3D 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 =3D new KIO::PreviewJob(KFileItemList() << item, QS= ize(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); } =20 - 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 @@ =20 void InformationPanelContent::showItems(const KFileItemList& items) { - m_pendingPreview =3D 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(); + } =20 KIconLoader iconLoader; QPixmap icon =3D iconLoader.loadIcon("dialog-information", @@ -315,7 +322,6 @@ void InformationPanelContent::showIcon(const KFileItem& item) { m_outdatedPreviewTimer->stop(); - m_pendingPreview =3D 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 =3D pixmap; - KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader:= :Desktop); - m_preview->setPixmap(p); - m_pendingPreview =3D false; - } + + QPixmap p =3D pixmap; + KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Des= ktop); + m_preview->setPixmap(p); } =20 void InformationPanelContent::markOutdatedPreview() diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/panels/information/in= formationpanelcontent.h new/kde-baseapps-4.12.1/dolphin/src/panels/informatio= n/informationpanelcontent.h --- old/kde-baseapps-4.12.0/dolphin/src/panels/information/informationpanelco= ntent.h 2013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/dolphin/src/panels/information/informationpanelco= ntent.h 2014-01-09 14:28:46.000000000 +0100 @@ -26,6 +26,8 @@ #include #include =20 +#include + class KFileItemList; class PhononWidget; class PixmapViewer; @@ -35,6 +37,10 @@ class QLabel; class QScrollArea; =20 +namespace KIO { + class PreviewJob; +} + #ifndef HAVE_NEPOMUK class KFileMetaDataWidget; #else @@ -135,7 +141,7 @@ private: KFileItem m_item; =20 - bool m_pendingPreview; + QPointer m_previewJob; QTimer* m_outdatedPreviewTimer; =20 PixmapViewer* m_preview; diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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} ${Q= T_QTTEST_LIBRARY}) diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/tests/kfileitemmodelt= est.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(); =20 private: QStringList itemsInModel() const; @@ -1462,6 +1466,159 @@ =20 } =20 +void KFileItemModelTest::testChangeRolesForFilteredItems() +{ + QSet modelRoles =3D 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(KItemRangeLi= st)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "aa.txt" << "aaa.tx= t"); + + for (int index =3D 0; index < m_model->count(); ++index) { + // All items should have the "text" and "owner" roles, but not "grou= p". + 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 =3D 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.tx= t"); + + for (int index =3D 0; index < m_model->count(); ++index) { + // All items should have the "text" and "group" roles, but now "owne= r". + 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(KItemRangeLi= st)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.jpg" = << "d.jpg"); + + const KFileItem fileItemC =3D 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 =3D fileItemC; + KUrl urlE =3D fileItemE.url(); + urlE.setFileName("e.jpg"); + fileItemE.setUrl(urlE); + + m_model->slotRefreshItems(QList >() << qMake= Pair(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 modelRoles =3D 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(KItemRangeLi= st)), DefaultTimeout)); + QCOMPARE(itemsInModel(), QStringList() << "a"); + + // Expand "a/". + m_model->setExpanded(0, true); + QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeLi= st)), 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=3D329119 + KItemSet selection; + selection.insert(1); + QMimeData* mimeData =3D m_model->createMimeData(selection); + delete mimeData; +} + QStringList KFileItemModelTest::itemsInModel() const { QStringList items; diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewacti= onhandler.cpp new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhand= ler.cpp --- old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewactionhandler.cpp 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandler.cpp 20= 14-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))); } =20 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 slotWriteState= Changed(bool) if the current URL is writable connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory(= ))); =20 // File menu @@ -482,6 +485,11 @@ showHiddenFilesAction->setChecked(shown); } =20 +void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) +{ + m_actionCollection->action("create_dir")->setEnabled(isFolderWritable); +} + KToggleAction* DolphinViewActionHandler::iconsModeAction() { KToggleAction* iconsView =3D m_actionCollection->add("ico= ns"); diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/dolphin/src/views/dolphinviewacti= onhandler.h new/kde-baseapps-4.12.1/dolphin/src/views/dolphinviewactionhandle= r.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); =20 /** + * Updates the state of the 'Create Folder...' action. + */ + void slotWriteStateChanged(bool isFolderWritable); + + /** * Opens the view properties dialog, which allows to modify the properti= es * of the currently active view. */ diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ada-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c++h-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c++h-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-c-pr= int.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-c-print.desk= top --- 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]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ch-p= rint.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ch-print.de= sktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-ch-print.desktop 201= 3-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-ch-print.desktop 201= 4-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-css-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-diff-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-diff-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-html-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-html-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-java-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-java-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-log-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-make= file-print.desktop new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-makef= ile-print.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-makefile-print.deskt= op 2013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-makefile-print.deskt= op 2014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-pas-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-perl-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-perl-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-prin= t.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-1= 2-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-print.desktop 2014-0= 1-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-pyth= on-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]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tcl-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-tex-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xml-print.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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-prin= t.desktop --- old/kde-baseapps-4.12.0/konq-plugins/quickprint/text-xslt-print.desktop 2= 013-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konq-plugins/quickprint/text-xslt-print.desktop 2= 014-01-09 14:28:46.000000000 +0100 @@ -30,7 +30,7 @@ Name[et]=3DTr=C3=BCki... Name[eu]=3DInprimatu... Name[fa]=3D=DA=86=D8=A7=D9=BE... -Name[fi]=3DTulosta... +Name[fi]=3DTulosta=E2=80=A6 Name[fr]=3DImprimer... Name[fy]=3DPrintsje... Name[ga]=3DPriont=C3=A1il... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konqueror/settings/ebrowsing/ebro= wsing.desktop new/kde-baseapps-4.12.1/konqueror/settings/ebrowsing/ebrowsing.= desktop --- old/kde-baseapps-4.12.0/konqueror/settings/ebrowsing/ebrowsing.desktop 20= 13-12-06 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konqueror/settings/ebrowsing/ebrowsing.desktop 20= 14-01-09 14:28:46.000000000 +0100 @@ -28,7 +28,7 @@ Name[csb]=3DS=C3=A9cow=C3=A9 skrodz=C3=ABn=C3=AB Name[cy]=3DByr-lwybrau Gwe Name[da]=3DWebgenveje -Name[de]=3DWeb-K=C3=BCrzel +Name[de]=3DWebk=C3=BCrzel Name[el]=3D=CE=A3=CF=85=CE=BD=CF=84=CE=BF=CE=BC=CE=B5=CF=8D=CF=83=CE=B5=CE= =B9=CF=82 =CE=B9=CF=83=CF=84=CE=BF=CF=8D Name[en_GB]=3DWeb Shortcuts Name[eo]=3DTTT klavokombinoj diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/konqueror/sidebar/default_entries= /places.desktop new/kde-baseapps-4.12.1/konqueror/sidebar/default_entries/pla= ces.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]=3DT=C3=A4m=C3=A4 on luettelo sijainneista. Comment[fr]=3DCeci est la liste des emplacements. Comment[ga]=3DSeo =C3=A9 an liosta d'=C3=A1iteanna. -Comment[gl]=3DEsta =C3=A9 a lista de lugares. +Comment[gl]=3DEsta =C3=A9 a lista de lugares. Comment[gu]=3D=E0=AA=86 =E0=AA=9C=E0=AA=97=E0=AB=8D=E0=AA=AF=E0=AA=BE=E0=AA= =93=E0=AA=A8=E0=AB=80 =E0=AA=AF=E0=AA=BE=E0=AA=A6=E0=AB=80 =E0=AA=9B=E0=AB=87 Comment[he]=3D=D7=96=D7=95=D7=94=D7=99 =D7=A8=D7=A9=D7=99=D7=9E=D7=AA =D7=94= =D7=9E=D7=A7=D7=95=D7=9E=D7=95=D7=AA. Comment[hi]=3D=E0=A4=AF=E0=A4=B9 =E0=A4=B8=E0=A5=8D=E0=A4=A5=E0=A4=BE=E0=A4= =A8=E0=A5=8B=E0=A4=82 =E0=A4=95=E0=A5=80 =E0=A4=B8=E0=A5=82=E0=A4=9A=E0=A5=80= =E0=A4=B9=E0=A5=88 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 in= to the menu KToggleAction* action =3D new KToggleAction(KIcon(serviceAct= ion.icon()), serviceAction.text(), this); //actionCollection()->addAction(desktopEntryName /*not uniqu= e!*/, action); - action->setObjectName(desktopEntryName); + action->setObjectName(desktopEntryName + QLatin1String("-vie= wmode")); action->setData(QVariant(serviceAction.name())); action->setActionGroup(m_viewModesGroup); m_viewModeMenu->menu()->addAction(action); diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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:5= 6:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/konqueror/src/konqundomanager.cpp 2014-01-09 14:2= 8:46.000000000 +0100 @@ -130,7 +130,7 @@ KonqClosedItem* closedItem =3D m_closedItemList.first(); =20 // Check what to undo - if (!m_supportsFileUndo || !KIO::FileUndoManager::self()->undoAvaila= ble() || closedItem->serialNumber() > fileUndoManager->currentCommandSerialNu= mber()) { + if (!m_supportsFileUndo || !fileUndoManager->undoAvailable() || clos= edItem->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, close= dRemoteWindowItem); + emit openClosedWindow(*closedRemoteWindowItem); } else if(closedWindowItem) { - emit openClosedWindow(*closedWindowItem); KonqClosedWindowsManager::self()->removeClosedWindowItem(this, close= dWindowItem); + emit openClosedWindow(*closedWindowItem); closedWindowItem->configGroup().deleteGroup(); - =20 + // Save config so that this window won't appear in new konqueror pro= cesses KonqClosedWindowsManager::self()->saveConfig(); } diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/Directory.desk= top 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 0= 0:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/lib/konq/Templates/Directory.desktop 2014-01-09 1= 4:28:46.000000000 +0100 @@ -24,7 +24,7 @@ Name[es]=3DCarpeta... Name[et]=3DKataloog... Name[eu]=3DKarpeta... -Name[fi]=3DKansio... +Name[fi]=3DKansio=E2=80=A6 Name[fr]=3DDossier... Name[fy]=3DMap... Name[ga]=3DFillte=C3=A1n... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/HTMLFile.deskt= op 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]=3DArchivo HTML... Name[et]=3DHTML-fail... Name[eu]=3DHTML fitxategia... -Name[fi]=3DHTML-tiedosto... +Name[fi]=3DHTML-tiedosto=E2=80=A6 Name[fr]=3DFichier HTML... Name[fy]=3DHTML-triem....... Name[ga]=3DComhad HTML... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/TextFile.deskt= op 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]=3DArchivo de texto... Name[et]=3DTekstifail... Name[eu]=3DTestu fitxategia... -Name[fi]=3DTekstitiedosto... +Name[fi]=3DTekstitiedosto=E2=80=A6 Name[fr]=3DFichier texte... Name[fy]=3DTeksttriem...... Name[ga]=3DT=C3=A9acschomhad... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCAMERA.des= ktop 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]=3DC=C3=A1mara... Name[et]=3DKaameraseade Name[eu]=3DKamera... -Name[fi]=3DKamera... +Name[fi]=3DKamera=E2=80=A6 Name[fr]=3DAppareil photo... Name[fy]=3DKamera... Name[ga]=3DGl=C3=A9as Ceamara... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDROM.desk= top 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 0= 0:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDROM.desktop 2014-01-09 1= 4:28:46.000000000 +0100 @@ -24,7 +24,7 @@ Name[es]=3DCD-ROM... Name[et]=3DCD-ROM seade... Name[eu]=3DCD-ROM gailua... -Name[fi]=3DCD-ROM-laite... +Name[fi]=3DCD-ROM-laite=E2=80=A6 Name[fr]=3DLecteur de CD-ROM... Name[fy]=3Dkompaktskiifstasjon ... Name[ga]=3DGl=C3=A9as CD-ROM... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDWRITER.d= esktop new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDWRITER.desktop --- old/kde-baseapps-4.12.0/lib/konq/Templates/linkCDWRITER.desktop 2013-12-0= 6 00:56:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkCDWRITER.desktop 2014-01-0= 9 14:28:46.000000000 +0100 @@ -24,7 +24,7 @@ Name[es]=3DGrabador de CD... Name[et]=3DCD-kirjutaja... Name[eu]=3DCDWRITER gailua... -Name[fi]=3DCDWRITER-laite... +Name[fi]=3DCDWRITER-laite=E2=80=A6 Name[fr]=3DGraveur de CD... Name[fy]=3Dkompaktskiifstasjon... Name[ga]=3DGl=C3=A9as CDWRITER... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkFloppy.des= ktop 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]=3DDisquetera... Name[et]=3DFlopiseade... Name[eu]=3DDiskete gailua... -Name[fi]=3DLevykeasema... +Name[fi]=3DLevykeasema=E2=80=A6 Name[fr]=3DLecteur de disquettes... Name[fy]=3DSlappe skiifstasjon... Name[ga]=3DGl=C3=A9as Diosca Flapach... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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:5= 6:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkHD.desktop 2014-01-09 14:2= 8:46.000000000 +0100 @@ -24,7 +24,7 @@ Name[es]=3DDisco duro... Name[et]=3DK=C3=B5vaketas... Name[eu]=3DDisko gogorra... -Name[fi]=3DKiintolevy... +Name[fi]=3DKiintolevy=E2=80=A6 Name[fr]=3DDisque dur... Name[fy]=3DF=C3=AAste skiif...=20 Name[ga]=3DGl=C3=A9as Diosca Crua... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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:5= 6:34.000000000 +0100 +++ new/kde-baseapps-4.12.1/lib/konq/Templates/linkMO.desktop 2014-01-09 14:2= 8:46.000000000 +0100 @@ -24,7 +24,7 @@ Name[es]=3DDispositivo MO... Name[et]=3DMO seade... Name[eu]=3DMO gailua... -Name[fi]=3DMO-laite... +Name[fi]=3DMO-laite=E2=80=A6 Name[fr]=3DP=C3=A9riph=C3=A9rique MO... Name[fy]=3DMagnetyske skiif stasjon... Name[ga]=3DGl=C3=A9as MO... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkNFS.deskto= p 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]=3DNFS... Name[et]=3DNFS... Name[eu]=3DNFS... -Name[fi]=3DNFS... +Name[fi]=3DNFS=E2=80=A6 Name[fr]=3DNFS... Name[fy]=3DNFS... Name[ga]=3DNFS... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkPath.deskt= op 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]=3DEnlace b=C3=A1sico a archivo o carpeta... Name[et]=3DLihtlink failile v=C3=B5i kataloogile... Name[eu]=3DOinarrizko esteka fitxategi edo karpetara... -Name[fi]=3DPeruslinkki tiedostoon tai kansioon... +Name[fi]=3DPeruslinkki tiedostoon tai kansioon=E2=80=A6 Name[fr]=3DLien standard vers un fichier ou un dossier... Name[fy]=3DBasis keppeling nei triem of triemtafel Name[ga]=3DNasc bun=C3=BAsach le comhad n=C3=B3 comhadlann... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkProgram.de= sktop 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]=3DEnlace a aplicaci=C3=B3n... Name[et]=3DViit rakendusele... Name[eu]=3DEstekatu aplikazioa... -Name[fi]=3DLinkki sovellukseen... +Name[fi]=3DLinkki sovellukseen=E2=80=A6 Name[fr]=3DLien vers une application... Name[fy]=3DKeppeling nei applikaasje... Name[ga]=3DNasc le Feidhmchl=C3=A1r... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkURL.deskto= p 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]=3DEnlace a ubicaci=C3=B3n (URL)... Name[et]=3DViit asukohale (URL)... Name[eu]=3DEstekatu kokapena (URLa)... -Name[fi]=3DLinkki sijaintiin (URL)... +Name[fi]=3DLinkki sijaintiin (URL)=E2=80=A6 Name[fr]=3DLien vers un emplacement (URL)... Name[fy]=3DKeppeling nei lokaasje (URL-adres)... Name[ga]=3DNasc le Su=C3=ADomh (URL)... diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kde-baseapps-4.12.0/lib/konq/Templates/linkZIP.deskto= p 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]=3DUnidad ZIP... Name[et]=3DZIP seade... Name[eu]=3DZIP gailua... -Name[fi]=3DZIP-laite... +Name[fi]=3DZIP-laite=E2=80=A6 Name[fr]=3DLecteur ZIP... Name[fy]=3DZIP-apparaat... Name[ga]=3DGl=C3=A9as ZIP... --=20 To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org --===============6955776698510562629==--