Commit graph

538 commits

Author SHA1 Message Date
David Faure 3e5ff13f92 Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut 2014-08-13 18:27:09 +02:00
Arnold Dumas ed20a18a73 Clean up KAction leftovers. 2014-07-31 20:06:17 +02:00
Luca Beltrame 674a9c08bb Fix build 2014-07-22 16:15:25 +02:00
Luca Beltrame de3e2ae40f Merge branch 'master' into frameworks 2014-07-22 15:58:03 +02:00
Arjun AK 9a69506572 make CTRL+SHIFT+T reopen last closed tab
BUG: 336818
FEATURE: 118994
2014-07-22 17:31:49 +05:30
Luca Beltrame e242d9548d Merge branch 'master' into frameworks
Conflicts:
	kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
	plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
2014-07-16 10:13:57 +02:00
Frank Reininghaus abd114f710 Merge branch 'KDE/4.14' 2014-07-16 09:16:24 +02:00
Frank Reininghaus 7cb193de10 Fix regression concerning the "Places" selector in the location bar
This commit ensures that the selector is visible in all location bars
if and only if the Places Panel is hidden. It fixes a regression caused
by commit 6a98d83312.

BUG: 337389
FIXED-IN: 4.14.0
REVIEW: 119238
2014-07-16 09:12:16 +02:00
Emmanuel Pescosta fc4315d57e Merge branch 'master' into frameworks
Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinviewcontainer.cpp
2014-07-10 22:49:05 +02:00
Emmanuel Pescosta 1dfafcb176 Implemented (QTabBar based) DolphinTabBar class to encapsulate the tab bar handling from DolphinMainWindow.
REVIEW: 118969
2014-07-08 19:38:18 +02:00
Emmanuel Pescosta 00754dda30 Avoid opening unused tabs which are closed again after startup has finished (when directory/file urls are given)
Instead of always opening a new tab with the home url and closing it again when directory/file urls are passed on,
we now use the given directories/files directly to open new tabs on startup.

Makes the code easier and we can reuse openDirectories/openFiles in future (if needed).

REVIEW: 118966
2014-07-08 19:16:17 +02:00
Emmanuel Pescosta b0fb590ebd Implemented DolphinTabPage class to encapsulate the split view handling from DolphinMainWindow.
The signal activeViewUrlChanged in DolphinTabPage is currently unused, but we need it later when
we implement the tab widget and tab bar.

DolphinTabPage has saveState/restoreState which are using a QByteArray instead of the KConfigGroup to
be more generic.

REVIEW: 118964
2014-07-04 17:16:03 +02:00
Frank Reininghaus 81b84a1eaf Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinmainwindow.h
2014-06-29 20:28:46 +02:00
Christophe Giboudeaux a769261131 Remove the automoc noise 2014-06-29 10:36:32 +02:00
Arjun AK 0a607c28f5 prevent goBack, goForward, goHome and goUp from being called twice
REVIEW: 118782
2014-06-25 18:53:05 +05:30
Emmanuel Pescosta 24823bbfd1 Implemented DolphinRecentTabsMenu to encapsulate the recent
tabs menu related code from DolphinMainWindow in a new class.

The DolphinRecentTabsMenu remembers the tab configuration if a
tab has been closed.

REVIEW: 118805
2014-06-19 22:04:36 +02:00
Frank Reininghaus c7d607a7fc Make Dolphin windows with multiple tabs closable
The return type and return values of KMessageBox::createKMessageBox()
have changed in KF5. We have to adjust the code
in DolphinMainWindow::closeEvent(QCloseEvent* event) in order to make
windows with multiple tabs closable.

BUG: 335732
REVIEW: 118508
2014-06-04 21:56:36 +02:00
Frank Reininghaus a46121dc51 Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/search/filenamesearchprotocol.cpp
2014-05-21 22:49:40 +02:00
Frank Reininghaus d152bfc53b Merge branch 'KDE/4.13' 2014-05-13 19:14:25 +02:00
Frank Reininghaus 4cf04b91dd Merge remote-tracking branch 'origin/master' into frameworks
Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:kfm-devel@kde.org

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp
2014-05-13 18:42:05 +02:00
Alex Richardson 8611c990f0 KIcon -> QIcon and KMimeType::iconNameForUrl() -> KIO::iconNameForUrl() 2014-05-05 23:05:34 +02:00
Alex Richardson 00ee5d6727 dolphin: convert the remaining code to Qt5 signal/slot syntax
Middle clicking on Forward/Backward/Home/etc. will no longer open a new
tab since the QAction triggered signal no longer tell us which mouse
button was pressed
2014-05-05 23:05:34 +02:00
Alex Richardson 2f045c6010 Allow compiling Dolphin with KF5
This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.

Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.

This is the first commit for review 117395
2014-05-05 23:05:13 +02:00
Frank Reininghaus 4660ea3a48 Update the "Paste" action only if it is necessary
Updating this action is only required if the clipboard contents change,
or if the "is writable" state of the current location changes. In all
other cases, an update of this action should be prevented because it
can be very expensive if many files are in the clipboard.

In particular, the update when the selection changes could make
changing the current item in the view very slow.

BUG: 333903
REVIEW: 117782
FIXED-IN: 4.13.1
2014-04-30 09:34:32 +02:00
Renato Atilio 5780fab172 Change the icon text for Previous and Next toolbar buttons
In addition to the current long text for previous and next toolbar
buttons ("Activate Previous/Next Tab"), this commit adds shorter icon
texts for them to be used only on the toolbar ("Previous/Next Tab").

BUG: 332629
REVIEW: 117794
FIXED-IN: 4.14.0
2014-04-29 21:54:33 +02:00
Renato Atilio afa1a8ef11 Enable the previous and next tab toolbar buttons
when multiple tabs are opened. Disable them again
when there is only one remaining tab.

Additionally set the default state to disabled.

BUG: 332628
FIXED-IN: 4.13.1
REVIEW: 117778
2014-04-26 12:28:42 +02:00
Frank Reininghaus 75c0f24020 Restore the URLs of both views correctly when restoring a session
The problem was that we restored the URL of the right view while the
left one is still active. When we received the signal
urlChanged(KUrl& url) from the right URL navigator, we then set the URL
of the active (i.e., left) view to 'url', such that both views showed
the same URL.

BUG: 330047
FIXED-IN: 4.12.3
REVIEW: 115406
2014-02-02 10:19:57 +01:00
Wolfgang Bauer b1448a0c32 Make it build with QT_STRICT_ITERATORS
Redo commit 81c99da7e0 by Kevin Ottens

Was removed by mistake during the last merge with KDE/4.11, sorry!
2013-11-06 17:53:43 +01:00
Wolfgang Bauer ee92ff0d42 Merge branch 'KDE/4.11' into KDE/4.12
Revert "Files passed as arguments: Ignore unsupported files"

This reverts commit cd9e50ae4f.

See bug#327224 for details.
2013-11-06 17:07:10 +01:00
Wolfgang Bauer ae1911e6b0 Revert "Files passed as arguments: Ignore unsupported files"
This reverts commit cd9e50ae4f.

See bug#327224 for details.
2013-11-06 16:46:09 +01:00
Frank Reininghaus 70cd04df40 Merge remote-tracking branch 'origin/KDE/4.11' 2013-10-26 09:30:18 +02:00
Frank Reininghaus f55119945f Fix broken view state restoration
The fix for bug 161385 (which was about Dolphin still showing an empty
view if a device that had been unmounted earlier was clicked in the
Places Panel) caused a regression: the view state (current item, scroll
position, Details View expansion state) was not restored any more when
going "Back".

The reason is that "m_view->reload()" in
DolphinViewContainer::setUrl(const KUrl& newUrl) was always executed
just after entering a directory, and that command overwrites this
information.

Distinguishing between "change URL" and "reload the view" works better
if it's done in DolphinMainWindow instead of DolphinViewContainer.

BUG: 326039
FIXED-IN: 4.11.3
REVIEW: 113290
2013-10-26 09:24:04 +02:00
Kevin Ottens 011299eb6e Make it build with QT_STRICT_ITERATORS 2013-10-16 19:24:01 +02:00
David Faure 8bbddb3b63 Merge remote-tracking branch 'origin/KDE/4.11' 2013-10-15 09:08:47 +02:00
Frank Reininghaus 96ba990d86 Fix crash when triggereing the "Compare files" action via D-Bus
If the number of selected items is not two, Dolphin disables this
action. However, it is still possible to trigger it via D-Bus, and this
could cause a crash in DolphinMainWindow::compareFiles() because this
function did not test at all if there are really two items selected.

This patch adds such a check and simplifies the code in that function.

BUG: 325517
FIXED-IN: 4.11.3
2013-10-13 10:55:21 +02:00
Erik Hahn 0c55297ce4 Files passed as arguments: Ignore unsupported files
With this patch, Dolphin ignores all files passed to it that it can't

Also, archives are now opened inside Dolphin so it can be used as an
archive manager at least for local files. If the user tries to open a
remote archive Dolphin still opens it externally; I have observed that
if it receives one as an argument, it will display a pseudo-folder that
contains only said archive. So having it set as the archive handler is
still broken, but in a less annoying way.

CCBUG: 318683
REVIEW: 113191
FIXED-IN: 4.11.3
2013-10-13 10:48:00 +02:00
Emmanuel Pescosta a4ef4bbfde Replaced all KNewFileMenu usages in DolphinPart by DolphinNewFileMenu.
Removed all signal-slot-connections related to DolphinNewFileMenu->errorMessage(QString)
in DolphinMainWindow and DolphinContextMenu and replaced it by a better solution.

Now we make use of the already existing DolphinNewFileMenuObserver singleton class to achieve a better
error handling, because every newly created DolphinContextMenu instance registers himself by DolphinNewFileMenuObserver
and we use this to connect the errorMessage(QString) signal of every DolphinContextMenu instance to the errorMessage(QString)
signal of the DolphinNewFileMenuObserver singleton class.

So we need only one connection from DolphinNewFileMenuObserver to DolphinMainWindow (or to DolphinPart) to
collect all error messages thrown by every DolphinNewFileMenu instance.

REVIEW: 112178
2013-08-28 18:46:45 +02:00
Emmanuel Pescosta 804e83f893 Cut the ropes between DolphinMainWindow and DolphinNewFileMenu. Error handling is now done via signals.
REVIEW: 111989
2013-08-16 20:22:33 +02:00
Emmanuel Pescosta 616294bc80 Bug 196035 - middle clicking on archive files in dolphin does not open them in a new tab
When 'browse through archives' is enabled, open archive files
like folders on middle clicking, context menu -> new tab action
and context menu -> new window action.

BUG: 196035
REVIEW: 110487
2013-06-04 15:27:45 +02:00
Emmanuel Pescosta 45c659b440 Added the "Open in new Tabs" action to the Dolphin Context menu.
BUG: 312296
REVIEW: 110371
FIXED-IN: 4.11.0
2013-05-22 21:47:14 +02:00
David Faure 57e65aab7f Reimplement handling of Shift while showing menu without KModifierKeyInfo
Finding out whether shift is pressed initially can be done
with qApp->keyboardModifiers(), and finding out that the user is pressing
or release shift can be done with keyPressEvent/keyReleaseEvent.

This required to inherit from KMenu rather than having the KMenu
as a member.

KModifierKeyInfo is only implemented on X11, so this makes the code
more portable. If similar solutions can be found for other users of
KModifierKeyInfo, it will be deprecated in KF5.

REVIEW: 110303
2013-05-05 22:42:49 +02:00
Simeon Bird 72de114a94 Merge branch 'KDE/4.10' 2013-01-15 11:11:11 -05:00
Kai Uwe Broulik dde672ac94 Don't delay popup menus of "Create New" and "Recently Closed Tabs" toolbar buttons
REVIEW: 108397
2013-01-14 10:42:03 +01:00
Emmanuel Pescosta 804d8119b3 Fix Bug 233335 - Wrong icons selected after pasting files and renaming them (because there exists items with it's names
Fixed the "same" buggy behavior when dropping files/folders

Select also putted files (PUT operation - SimpleJob) - e.g. Paste content from clipboard

BUG: 233335
REVIEW: 107351
2013-01-09 15:16:30 +01:00
Frank Reininghaus 1353c92cce Fix some indentation issues 2012-10-30 08:25:21 +01:00
Dawit Alemayehu bc66254304 Merge branch '4.9' 2012-10-03 15:09:58 -04:00
Frank Reininghaus 0e49df9214 Find out the main window by calling the parent widget's window() member
KFileItemModel calls the dir lister's setMainWindow() method to make
sure that the dir lister caches authentication data. However, the method
used to determine the main window (qApp->activeWindow()) is not
guaranteed to yield the DolphinMainWindow or the KonqMainWindow. In
particular, if "Split View" is enabled in Dolphin's settings dialog, the
active window is the dialog, and when it is closed, any later access to
the stored pointer leads to a crash.

A better method is to verify that the model's parent is a QWidget and
then use this widget's window(). I had to make a small modification in
DolphinMainWindow to make sure that it also works correctly when the
view is split (the new view container had been created with a 0 parent
previously).

I tested it in Dolphin and Konqueror and verified that the "main window"
passed to the dir lister is really the application's main window.

BUG: 306459
FIXED-IN: 4.9.3
2012-09-29 19:53:14 +02:00
Emmanuel Pescosta e280e7f68c Fixes Bug 242007 - "Open Folder during Drag operation" cannot go into different partition using "Places Panel"
BUG: 242007
REVIEW: 106380
2012-09-11 20:09:01 +02:00
Emmanuel Pescosta 9e203ab2b9 Changed the behaviour when middle clicking folders in places- and folders-dockwidget. Now it opens the folders in a new background tab (General behaviour of Dolphin)
BUG: 196263
REVIEW: 106069
2012-08-23 21:14:56 +02:00
David Faure 5fbe52c151 Fix open-in-new-window to work with remote URLs
FIXED-IN: 4.9.0
BUGS: 274655, 292822
2012-08-13 22:25:28 +02:00