From bffb4a25df01b481601e70dc12c241c2cabd6076 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 26 Nov 2014 10:27:41 +0100 Subject: Set version number to 14.11.97 for the KDE Applications 14.12 RC --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 620505666..ffdaeb6bd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("dolphin", 0, ki18nc("@title", "Dolphin"), - "4.14.98", + "14.11.97", ki18nc("@title", "File Manager"), KAboutData::License_GPL, ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); -- cgit v1.3 From ac944bab8dcf3159d7c80fcaff8a7fe2565935c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Jan 2015 06:55:27 +0000 Subject: SVN_SILENT made messages (.desktop file) --- src/settings/kcm/kcmdolphingeneral.desktop | 2 -- src/settings/kcm/kcmdolphinnavigation.desktop | 1 - src/settings/kcm/kcmdolphinservices.desktop | 3 --- src/settings/kcm/kcmdolphinviewmodes.desktop | 1 - 4 files changed, 7 deletions(-) (limited to 'src') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 3573b63a6..79b243338 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -87,7 +87,6 @@ Comment[es]=Este servicio le permite hacer la configuración general de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi. Comment[eu]=Zerbitzu honen bitartez Dolphin-en ezarpen orokorrak konfiguratu daitezke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. -Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de algemiene dolfyn opsjes ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir na socruithe ginearálta Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración xeral de Dolphin. @@ -242,7 +241,6 @@ Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri üldiste seadistuste seadistamine Comment[eu]=Konfiguratu fitxategi kudeatzailearen ezarpen orokorrak Comment[fi]=Tiedostonhallinnan yleisasetukset -Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[fy]=Algemiene triembehearopsjes ynstelle Comment[ga]=Cumraigh socruithe ginearálta bhainisteoir na gcomhad Comment[gl]=Configura as opcións xerais do xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 372df9eef..955d2b05c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -88,7 +88,6 @@ Comment[es]=Este servicio le permite configurar la navegación de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini liikumist. Comment[eu]=Zerbitzu honen bitartez Dolphin-en nabigazioa konfiguratu daiteke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. -Comment[fr]=Ce service permet de configurer la navigation avec Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn navigaasje ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir nascleanúint Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración da navegación de Dolphin. diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 81d3ce389..71e817050 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -17,7 +17,6 @@ Name[es]=Servicios de Dolphin Name[et]=Dolphini teenused Name[eu]=Dolphin zerbitzuak Name[fi]=Dolphin – palvelut -Name[fr]=Services de Dolphin Name[fy]=Dolfyn tsjinsten Name[ga]=Seirbhísí Dolphin Name[gl]=Servizos de Dolphin @@ -107,7 +106,6 @@ Name[et]=Teenused Name[eu]=Zerbitzuak Name[fa]=خدمات Name[fi]=Palvelut -Name[fr]=Services Name[fy]=Tsjinsten Name[ga]=Seirbhísí Name[gl]=Servizos @@ -192,7 +190,6 @@ Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri teenuste seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzaile zerbitzuak Comment[fi]=Tiedostonhallinnan palveluasetukset -Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[fy]=Triembeheartsjinsten ynstelle Comment[ga]=Cumraigh seirbhísí bhainisteoir na gcomhad Comment[gl]=Configura os servizos do xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index f5f1fbd22..72ff130d1 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -88,7 +88,6 @@ Comment[es]=Este servicio le permite configurar los modos de vista de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini vaaterežiime. Comment[eu]=Zerbitzu honen bitartez Dolphin-en ikuspegi moduak aldatu daitezke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia. -Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn werjeftemodus ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir na hamhairc Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración das vistas de Dolphin. -- cgit v1.3 From cf6bb7bdb8df6f484a39403c7842343bceebf4b7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Jan 2015 07:14:40 +0000 Subject: SVN_SILENT made messages (.desktop file) --- src/settings/kcm/kcmdolphingeneral.desktop | 2 ++ src/settings/kcm/kcmdolphinnavigation.desktop | 1 + src/settings/kcm/kcmdolphinservices.desktop | 3 +++ src/settings/kcm/kcmdolphinviewmodes.desktop | 1 + 4 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 79b243338..3573b63a6 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -87,6 +87,7 @@ Comment[es]=Este servicio le permite hacer la configuración general de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi. Comment[eu]=Zerbitzu honen bitartez Dolphin-en ezarpen orokorrak konfiguratu daitezke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. +Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de algemiene dolfyn opsjes ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir na socruithe ginearálta Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración xeral de Dolphin. @@ -241,6 +242,7 @@ Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri üldiste seadistuste seadistamine Comment[eu]=Konfiguratu fitxategi kudeatzailearen ezarpen orokorrak Comment[fi]=Tiedostonhallinnan yleisasetukset +Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[fy]=Algemiene triembehearopsjes ynstelle Comment[ga]=Cumraigh socruithe ginearálta bhainisteoir na gcomhad Comment[gl]=Configura as opcións xerais do xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 955d2b05c..372df9eef 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -88,6 +88,7 @@ Comment[es]=Este servicio le permite configurar la navegación de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini liikumist. Comment[eu]=Zerbitzu honen bitartez Dolphin-en nabigazioa konfiguratu daiteke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. +Comment[fr]=Ce service permet de configurer la navigation avec Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn navigaasje ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir nascleanúint Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración da navegación de Dolphin. diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 71e817050..81d3ce389 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -17,6 +17,7 @@ Name[es]=Servicios de Dolphin Name[et]=Dolphini teenused Name[eu]=Dolphin zerbitzuak Name[fi]=Dolphin – palvelut +Name[fr]=Services de Dolphin Name[fy]=Dolfyn tsjinsten Name[ga]=Seirbhísí Dolphin Name[gl]=Servizos de Dolphin @@ -106,6 +107,7 @@ Name[et]=Teenused Name[eu]=Zerbitzuak Name[fa]=خدمات Name[fi]=Palvelut +Name[fr]=Services Name[fy]=Tsjinsten Name[ga]=Seirbhísí Name[gl]=Servizos @@ -190,6 +192,7 @@ Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri teenuste seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzaile zerbitzuak Comment[fi]=Tiedostonhallinnan palveluasetukset +Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[fy]=Triembeheartsjinsten ynstelle Comment[ga]=Cumraigh seirbhísí bhainisteoir na gcomhad Comment[gl]=Configura os servizos do xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 72ff130d1..f5f1fbd22 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -88,6 +88,7 @@ Comment[es]=Este servicio le permite configurar los modos de vista de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini vaaterežiime. Comment[eu]=Zerbitzu honen bitartez Dolphin-en ikuspegi moduak aldatu daitezke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia. +Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn werjeftemodus ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir na hamhairc Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración das vistas de Dolphin. -- cgit v1.3 From 4cc444b8ba1e7c5c57a9899e32f25fc2faa1df27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Feb 2015 06:55:16 +0000 Subject: SVN_SILENT made messages (.desktop file) --- src/settings/kcm/kcmdolphingeneral.desktop | 5 ----- src/settings/kcm/kcmdolphinnavigation.desktop | 2 -- src/settings/kcm/kcmdolphinservices.desktop | 5 ----- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 -- 4 files changed, 14 deletions(-) (limited to 'src') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 3573b63a6..3982e49c4 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -111,10 +111,8 @@ Comment[mk]=Овој сервис овозможува конфигурациј Comment[ml]=പൊതുവായ ഡോള്‍ഫിന്‍ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[mr]=ही सेवा तुम्हाला डॉल्फिनच्या सामान्य व्यवस्थेचे संयोजन करण्यास मदत करते. Comment[ms]=Servis ini membenarkan tetapan bagi tetapan umum Dolphin. -Comment[nb]=Denne tjenesten tilbyr oppsett av generelle Dolphin-innstillinger. Comment[nds]=Mit dissen Deenst laat sik allmeen Dolphin-Optschonen instellen. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. -Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin. Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite-lhe configurar as opções gerais do Dolphin. @@ -266,17 +264,14 @@ Comment[mk]=Конфигурирајте ги општите поставува Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=फाईल व्यवस्थापकाच्या सामान्य व्यवस्थेचे संयोजन करा Comment[ms]=Selaraskan tetapan pengurus fail -Comment[nb]=Tilpass generelle filbehandler-innstillinger Comment[nds]=Den Dateipleger allmeen instellen Comment[nl]=Algemene bestandsbeheerderinstellingen configureren -Comment[nn]=Set opp generelle innstillingar for filhandsamaren Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as opções gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos Comment[ro]=Configurează opțiunile generale ale gestionarul de fișiere Comment[ru]=Настройка диспетчера файлов -Comment[se]=Heivet oppalaš fiilagieđahallanheivehusat Comment[si]=සාමාන්‍ය ගොනු කළමාණාකරන සැකසුම් සකසන්න Comment[sk]=Všeobecné nastavenie správcu súborov Comment[sl]=Splošne nastavitve upravljalnika datotek diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 372df9eef..e7f0bc4b9 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -112,10 +112,8 @@ Comment[mk]=Овој сервис овозможува конфигурациј Comment[ml]=ഡോള്‍ഫിനകത്തു് നീങ്ങുന്നതു് ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[mr]=ही सेवा तुम्हाला डॉल्फिन संचारणाचे संयोजन करण्यास मदत करते. Comment[ms]=Servis ini membenarkan tetapan bagi pengemudian Dolphin. -Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin-navigasjon Comment[nds]=Mit dissen Deenst lett sik de Dolphin-Navigeren instellen. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. -Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin. Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite-lhe configurar a navegação do Dolphin. diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 81d3ce389..c96baa2bf 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -42,10 +42,8 @@ Name[mk]=Сервиси во Делфин Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍ Name[mr]=डॉल्फिन सेवा Name[ms]=Servis Dolphin -Name[nb]=Dolphin-tjenester Name[nds]=Dolphin-Deensten Name[nl]=Dolphin-services -Name[nn]=Dolphin-tenester Name[pa]=ਡਾਲਫਿਨ ਸਰਵਿਸਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin @@ -136,11 +134,9 @@ Name[mk]=Сервиси Name[ml]=സേവനങ്ങള്‍ Name[mr]=सेवा Name[ms]=Servis -Name[nb]=Tjenester Name[nds]=KDE-Deensten Name[ne]=सेवा Name[nl]=Services -Name[nn]=Tenester Name[oc]=Servicis Name[or]=ସର୍ଭିସଗୁଡ଼ିକ Name[pa]=ਸਰਵਿਸਾਂ @@ -149,7 +145,6 @@ Name[pt]=Serviços Name[pt_BR]=Serviços Name[ro]=Servicii Name[ru]=Действия -Name[se]=Bálvalusat Name[si]=සේවා Name[sk]=Služby Name[sl]=Storitve diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index f5f1fbd22..39cc0e2a5 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -111,10 +111,8 @@ Comment[mai]=ई सेवा अहाँकेँ डॉल्फिन दृ Comment[mk]=Овој сервис овозможува конфигурација на режимите за преглед во Делфин. Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. Comment[mr]=ही सेवा तुम्हाला डॉल्फिन दृश्य पद्धतीचे संयोजन करण्यास मदत करते. -Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin visningsmåter. Comment[nds]=Mit dissen Deenst laat sik de Dolphin-Ansichten instellen. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. -Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingar. Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin. -- cgit v1.3 From f7c85b42252c7c17255f9f56639f1e95992dfeed Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Thu, 19 Feb 2015 20:05:55 +0100 Subject: Sync bookmark manager only if the change was done by the current process Adoption of http://commits.kde.org/kdelibs/2b5c6e42fc8114c6854ce490b9cdd4356be683d9 FIXED-IN: 14.12.3 BUG: 343620 BUG: 310080 REVIEW: 122640 --- src/panels/places/placesitemmodel.cpp | 20 -------------------- src/panels/places/placesitemmodel.h | 21 ++++++++------------- src/panels/places/placespanel.cpp | 5 +++++ 3 files changed, 13 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 6accdc837..46f40b65c 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -78,7 +78,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : m_systemBookmarksIndexes(), m_bookmarkedItems(), m_hiddenItemToRemove(-1), - m_saveBookmarksTimer(0), m_updateBookmarksTimer(0), m_storageSetupInProgress() { @@ -95,11 +94,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : const int syncBookmarksTimeout = 100; - m_saveBookmarksTimer = new QTimer(this); - m_saveBookmarksTimer->setInterval(syncBookmarksTimeout); - m_saveBookmarksTimer->setSingleShot(true); - connect(m_saveBookmarksTimer, SIGNAL(timeout()), this, SLOT(saveBookmarks())); - m_updateBookmarksTimer = new QTimer(this); m_updateBookmarksTimer->setInterval(syncBookmarksTimeout); m_updateBookmarksTimer->setSingleShot(true); @@ -498,8 +492,6 @@ void PlacesItemModel::onItemInserted(int index) m_bookmarkedItems.insert(bookmarkIndex, 0); } - triggerBookmarksSaving(); - #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Inserted item" << index; showModelState(); @@ -518,8 +510,6 @@ void PlacesItemModel::onItemRemoved(int index, KStandardItem* removedItem) Q_ASSERT(!m_bookmarkedItems[boomarkIndex]); m_bookmarkedItems.removeAt(boomarkIndex); - triggerBookmarksSaving(); - #ifdef PLACESITEMMODEL_DEBUG kDebug() << "Removed item" << index; showModelState(); @@ -549,8 +539,6 @@ void PlacesItemModel::onItemChanged(int index, const QSet& changedRo QTimer::singleShot(0, this, SLOT(hideItem())); } } - - triggerBookmarksSaving(); } void PlacesItemModel::slotDeviceAdded(const QString& udi) @@ -1033,20 +1021,12 @@ void PlacesItemModel::hideItem(int index) // bookmark should still be remembered, so readd it again: m_bookmarkManager->root().addBookmark(hiddenBookmark); m_bookmarkManager->root().moveBookmark(hiddenBookmark, previousBookmark); - triggerBookmarksSaving(); } m_bookmarkedItems.insert(newIndex, hiddenItem); } } -void PlacesItemModel::triggerBookmarksSaving() -{ - if (m_saveBookmarksTimer) { - m_saveBookmarksTimer->start(); - } -} - QString PlacesItemModel::internalMimeType() const { return "application/x-dolphinplacesmodel-" + diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 4a374e502..7cbf99e95 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -124,6 +124,14 @@ public: static KUrl convertedUrl(const KUrl& url); virtual void clear(); + + /** + * Saves the bookmarks and indicates to other applications that the + * state of the bookmarks has been changed. Is only called by the + * timeout of m_saveBookmarksTimer to prevent unnecessary savings. + */ + void saveBookmarks(); + signals: void errorMessage(const QString& message); void storageSetupDone(int index, bool success); @@ -147,12 +155,6 @@ private slots: */ void updateBookmarks(); - /** - * Saves the bookmarks and indicates to other applications that the - * state of the bookmarks has been changed. Is only called by the - * timeout of m_saveBookmarksTimer to prevent unnecessary savings. - */ - void saveBookmarks(); private: struct SystemBookmarkData; @@ -199,12 +201,6 @@ private: */ void hideItem(int index); - /** - * Triggers a delayed saving of bookmarks by starting - * m_saveBookmarksTimer. - */ - void triggerBookmarksSaving(); - QString internalMimeType() const; /** @@ -287,7 +283,6 @@ private: // removing an item is not allowed. int m_hiddenItemToRemove; - QTimer* m_saveBookmarksTimer; QTimer* m_updateBookmarksTimer; QHash m_storageSetupInProgress; diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 720e07ce3..6b840ef57 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -280,8 +280,10 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) editEntry(index); } else if (action == removeAction) { m_model->removeItem(index); + m_model->saveBookmarks(); } else if (action == hideAction) { item->setHidden(hideAction->isChecked()); + m_model->saveBookmarks(); } else if (action == openInNewTabAction) { // TriggerItem does set up the storage first and then it will // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton. @@ -405,6 +407,7 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success) void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) { m_model->dropMimeDataBefore(index, event->mimeData()); + m_model->saveBookmarks(); } void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent) @@ -477,6 +480,7 @@ void PlacesPanel::addEntry() if (dialog->exec() == QDialog::Accepted) { PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon()); m_model->appendItemToGroup(item); + m_model->saveBookmarks(); } delete dialog; @@ -498,6 +502,7 @@ void PlacesPanel::editEntry(int index) oldItem->setText(dialog->text()); oldItem->setUrl(dialog->url()); oldItem->setIcon(dialog->icon()); + m_model->saveBookmarks(); } } -- cgit v1.3 From a8f4f01eaa4027476ea799b7815f353f5cdd99ad Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Thu, 19 Feb 2015 20:09:47 +0100 Subject: Increase the version number to 14.12.3 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index ffdaeb6bd..f0ab1d9dc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,7 @@ KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("dolphin", 0, ki18nc("@title", "Dolphin"), - "14.11.97", + "14.12.3", ki18nc("@title", "File Manager"), KAboutData::License_GPL, ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); -- cgit v1.3