From c214b3751fe6a09a298d5904b62628caeff3bc56 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 7 Jun 2012 22:59:16 +0200 Subject: Setup storage device if needed BUG: 301071 FIXED-IN: 4.9.0 --- src/panels/places/placesitemmodel.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/panels/places/placesitemmodel.h') diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 89a111730..b0f66d652 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -114,6 +114,9 @@ public: void requestEject(int index); void requestTeardown(int index); + bool storageSetupNeeded(int index) const; + void requestStorageSetup(int index); + /** @reimp */ virtual QMimeData* createMimeData(const QSet& indexes) const; @@ -129,6 +132,7 @@ public: signals: void errorMessage(const QString& message); + void storageSetupDone(int index, bool success); protected: virtual void onItemInserted(int index); @@ -139,6 +143,7 @@ private slots: void slotDeviceAdded(const QString& udi); void slotDeviceRemoved(const QString& udi); void slotStorageTeardownDone(Solid::ErrorType error, const QVariant& errorData); + void slotStorageSetupDone(Solid::ErrorType error, const QVariant& errorData, const QString& udi); void hideItem(); /** @@ -169,7 +174,8 @@ private: * current application (e.g. bookmarks from other applications * will be ignored). */ - bool acceptBookmark(const KBookmark& bookmark) const; + bool acceptBookmark(const KBookmark& bookmark, + const QSet& availableDevices) const; /** * Creates a PlacesItem for a system-bookmark: @@ -290,6 +296,8 @@ private: QTimer* m_saveBookmarksTimer; QTimer* m_updateBookmarksTimer; + + QHash m_storageSetupInProgress; }; #endif -- cgit v1.3