]> cloud.milkyroute.net Git - dolphin.git/log
dolphin.git
11 years agoget rid of unused warnings
Emmanuel Pescosta [Mon, 10 Nov 2014 07:42:37 +0000 (08:42 +0100)]
get rid of unused warnings

11 years agoFix more unit test failures
Frank Reininghaus [Tue, 4 Nov 2014 21:42:45 +0000 (22:42 +0100)]
Fix more unit test failures

This commit is analogous to 5cf8941ac789e47da70fe466033f45df9af1a3fa,
but the problem existed since the frameworks port was started and was
not obvious because the QString -> KUrl/QUrl port was done implicitly
when calling KIO::rename(oldPath, newPath, KIO::HideProgressInfo).

REVIEW: 120941

11 years agoFix unit test failures
Frank Reininghaus [Tue, 4 Nov 2014 21:37:42 +0000 (22:37 +0100)]
Fix unit test failures

These were caused by 86e31084ced8ba4875a6128f91ec2ca3d6df7a31 - note
that the correct replacement for KUrl(fileName) is
QUrl::fromLocalFile(fileName), and that calling the const function
urlA.adjusted(QUrl::RemoveFilename) only has an effect if the return
value is taken.

11 years agofix default tab prev/next shortcuts
Lukáš Tinkl [Mon, 3 Nov 2014 23:00:04 +0000 (00:00 +0100)]
fix default tab prev/next shortcuts

take into accound the whole list, not just the first shortcut

11 years agoQ_DECL_OVERRIDE
Lukáš Tinkl [Mon, 3 Nov 2014 22:52:18 +0000 (23:52 +0100)]
Q_DECL_OVERRIDE

11 years agouse QUrl::fromLocalFile() on devices
Lukáš Tinkl [Mon, 3 Nov 2014 17:25:19 +0000 (18:25 +0100)]
use QUrl::fromLocalFile() on devices

fixes being unable to access eg. removable drives

11 years agofix initializer list
Lukáš Tinkl [Mon, 3 Nov 2014 15:16:52 +0000 (16:16 +0100)]
fix initializer list

11 years agoKonqOperations: KIO::pasteMimeData -> KIO::paste, update signal and simplify dolphin...
David Faure [Sun, 2 Nov 2014 16:17:24 +0000 (17:17 +0100)]
KonqOperations: KIO::pasteMimeData -> KIO::paste, update signal and simplify dolphin accordingly.

11 years agoMany cleanups in KonqOperations
David Faure [Sun, 2 Nov 2014 16:03:18 +0000 (17:03 +0100)]
Many cleanups in KonqOperations

11 years agoUpdate status of paste action once directory has finished loading.
David Faure [Sun, 2 Nov 2014 14:34:30 +0000 (15:34 +0100)]
Update status of paste action once directory has finished loading.

Since 6a6cf1ab328e7600f0c2b375e43a1e3bd236a5a7, it depends on rootItem()
which is not available until the dirlister emits it.

11 years agoPort from KonqOperations::doPaste to new job KIO::paste
David Faure [Sun, 2 Nov 2014 14:20:41 +0000 (15:20 +0100)]
Port from KonqOperations::doPaste to new job KIO::paste

Remove KonqOperations::doPaste.

11 years agoEnable KRun's script execution prompt.
Arjun AK [Sat, 1 Nov 2014 11:11:29 +0000 (16:41 +0530)]
Enable KRun's script execution prompt.

This commit enables KRun's script/desktop file execution prompts,
which is shown when the user launches an executable script or a
desktop file. This is done so as to prevent the user from accidentaly
executing programs. A checkbox to enable or disable the prompts is also
being added to the preferences window

REVIEW: 120171
BUG: 275405

11 years agoPort to QDialog
Montel Laurent [Tue, 28 Oct 2014 20:49:53 +0000 (21:49 +0100)]
Port to QDialog

11 years agoPort to QDebug*. KVBox--
Montel Laurent [Mon, 27 Oct 2014 21:30:02 +0000 (22:30 +0100)]
Port to QDebug*. KVBox--

11 years agodon't save view_properties in ~/.local/share/dolphindolphin
Lukáš Tinkl [Sun, 26 Oct 2014 18:02:03 +0000 (19:02 +0100)]
don't save view_properties in ~/.local/share/dolphindolphin

looks like writableLocation() already includes the app name

11 years agoMerge remote-tracking branch 'origin/master' into frameworks
Frank Reininghaus [Fri, 24 Oct 2014 16:49:05 +0000 (18:49 +0200)]
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/panels/terminal/terminalpanel.cpp
dolphin/src/panels/terminal/terminalpanel.h

11 years agoMerge remote-tracking branch 'origin/KDE/4.14'
Frank Reininghaus [Fri, 24 Oct 2014 16:45:28 +0000 (18:45 +0200)]
Merge remote-tracking branch 'origin/KDE/4.14'

11 years agoMake the view/Terminal Panel synchronization less error-prone
Frank Reininghaus [Fri, 24 Oct 2014 16:13:47 +0000 (18:13 +0200)]
Make the view/Terminal Panel synchronization less error-prone

The previous solution could cause problems if the user navigates to a
different URL in one view, and then activates another split view very
quickly: the new active view might be switched to the same URL as the
first view, which is unwanted.

To fix this problem, we record a history of "cd" commands that Dolphin
sends to the Terminal Panel in a queue. If a currentDirectoryChanged
signal is received, and the new terminal directory is "dir", this patch
does the following:

1.  If the queue is empty, change the view URL to "dir".
2.  Otherwise, take the queue's head, and check if it is equal to
    "dir". If that is the case, ignore the signal and return.
3.  Go back to step 1.

This ensures that every currentDirectoryChange signal that is caused by
a "cd" that was sent from Dolphin to the terminal is ignored.

BUG: 339009
BUG: 314038
REVIEW: 120768

11 years agoFix the information panel video player in Dolphin.
Andrey Bondrov [Fri, 24 Oct 2014 06:21:37 +0000 (08:21 +0200)]
Fix the information panel video player in Dolphin.

Patch from ROSA Linux.

BUG: 337107
BUG: 337033
BUG: 334924
CCBUG: 339882
REVIEW: 120745
FIXED-IN: 4.14.3

11 years agoMerge branch 'KDE/4.14'
Frank Reininghaus [Thu, 23 Oct 2014 21:23:19 +0000 (23:23 +0200)]
Merge branch 'KDE/4.14'

11 years agoConnect to the currentDirectoryChanged signal after the shell setup
Frank Reininghaus [Thu, 23 Oct 2014 21:17:43 +0000 (23:17 +0200)]
Connect to the currentDirectoryChanged signal after the shell setup

This fixes the problem that the view URL may be reset to the Home URL
when opening the Terminal Panel while browsing a remote URL. Moreover,
it fixes crashes that can occur when the signal is received during the
shell setup if the DolphinMainWindow does not have a valid
m_activeViewContainer yet.

BUG: 339502
BUG: 340233
REVIEW: 120726
FIXED-IN: 4.14.3

11 years agoUse the path instead of the display string in PlacesItemModel::closestItem,
Emmanuel Pescosta [Tue, 21 Oct 2014 20:54:15 +0000 (22:54 +0200)]
Use the path instead of the display string in PlacesItemModel::closestItem,
fixes the determination of the closest item for me.

11 years agoFix Dolphin build (protocol -> scheme)
Emmanuel Pescosta [Tue, 21 Oct 2014 20:31:50 +0000 (22:31 +0200)]
Fix Dolphin build (protocol -> scheme)

11 years agoaddress 2 more KUrl -> QUrl issues mentioned in rr#120688
Lukáš Tinkl [Tue, 21 Oct 2014 20:01:34 +0000 (22:01 +0200)]
address 2 more KUrl -> QUrl issues mentioned in rr#120688

11 years agoDolphin: port to KIO::pasteInfoText().
David Faure [Tue, 21 Oct 2014 18:44:37 +0000 (20:44 +0200)]
Dolphin: port to KIO::pasteInfoText().

DolphinContextMenu::createPasteAction used to be precise about destination
("Paste To Folder"), while now it's precise about the source (what to paste).
It was decided that this was more useful and consistent anyway.

REVIEW: 120695

11 years agoport away from KMimeType
Lukáš Tinkl [Tue, 21 Oct 2014 19:37:30 +0000 (21:37 +0200)]
port away from KMimeType

11 years agolibkonq now loads its own catalog
Lukáš Tinkl [Tue, 21 Oct 2014 19:37:09 +0000 (21:37 +0200)]
libkonq now loads its own catalog

11 years agoport Dolphin from KUrl to QUrl
Lukáš Tinkl [Tue, 21 Oct 2014 19:18:43 +0000 (21:18 +0200)]
port Dolphin from KUrl to QUrl

REVIEW: 120688

11 years agoMerge doPaste and doPasteV2. Remove unused QPoint. Remove unused editMimeType.
David Faure [Mon, 20 Oct 2014 20:07:39 +0000 (22:07 +0200)]
Merge doPaste and doPasteV2. Remove unused QPoint. Remove unused editMimeType.

11 years agoPort from KonqOperations::editMimeType to KMimeTypeEditor::editMimeType (from kwidget...
David Faure [Mon, 20 Oct 2014 20:13:23 +0000 (22:13 +0200)]
Port from KonqOperations::editMimeType to KMimeTypeEditor::editMimeType (from kwidgetsaddons)

11 years agoport Konqueror from KUrl to QUrl
Lukáš Tinkl [Mon, 20 Oct 2014 22:27:42 +0000 (00:27 +0200)]
port Konqueror from KUrl to QUrl

REVIEW: 120650

11 years agoThe filenamesearch ioslave has been moved to kio-extras, remove it from Dolphin.
Emmanuel Pescosta [Mon, 20 Oct 2014 09:08:22 +0000 (11:08 +0200)]
The filenamesearch ioslave has been moved to kio-extras, remove it from Dolphin.

See commit 05689c462745edbaeebcfc63d456877746805451 in kio-extras

11 years agoIncrease version
Montel Laurent [Sun, 19 Oct 2014 13:07:34 +0000 (15:07 +0200)]
Increase version

11 years agoFix includes
Montel Laurent [Sat, 18 Oct 2014 13:00:17 +0000 (15:00 +0200)]
Fix includes

11 years agoport to QPushButton
Montel Laurent [Sat, 18 Oct 2014 12:43:41 +0000 (14:43 +0200)]
port to QPushButton

11 years agoFix includes
Montel Laurent [Sat, 18 Oct 2014 12:42:41 +0000 (14:42 +0200)]
Fix includes

11 years agoRemove kdelibs4support
Montel Laurent [Sat, 18 Oct 2014 12:40:47 +0000 (14:40 +0200)]
Remove kdelibs4support

11 years agofix forward declaration
Montel Laurent [Sat, 18 Oct 2014 12:38:28 +0000 (14:38 +0200)]
fix forward declaration

11 years agoPort test to qt5
Montel Laurent [Sat, 18 Oct 2014 12:36:34 +0000 (14:36 +0200)]
Port test to qt5

11 years agoMerge remote-tracking branch 'origin/master' into frameworks
Frank Reininghaus [Thu, 16 Oct 2014 18:36:49 +0000 (20:36 +0200)]
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp

11 years agoMerge remote-tracking branch 'origin/KDE/4.14'
Frank Reininghaus [Thu, 16 Oct 2014 18:33:19 +0000 (20:33 +0200)]
Merge remote-tracking branch 'origin/KDE/4.14'

11 years agoUpdate "About" dialog after maintainership change
Frank Reininghaus [Thu, 16 Oct 2014 18:19:59 +0000 (20:19 +0200)]
Update "About" dialog after maintainership change

See http://lists.kde.org/?t=140990649300001&r=1&w=2

REVIEW: 120608

11 years agoPort to QDialog
Montel Laurent [Wed, 15 Oct 2014 17:56:52 +0000 (19:56 +0200)]
Port to QDialog

11 years agoPort to QDialog
Montel Laurent [Wed, 15 Oct 2014 17:51:06 +0000 (19:51 +0200)]
Port to QDialog

11 years agoReplaced the ItemState structure with QPair<KFileItem, KVersionControlPlugin2::ItemVe...
Emmanuel Pescosta [Wed, 15 Oct 2014 15:42:42 +0000 (17:42 +0200)]
Replaced the ItemState structure with QPair<KFileItem, KVersionControlPlugin2::ItemVersion>

11 years agoPort Dolphin to the new Baloo APIs
Vishesh Handa [Tue, 14 Oct 2014 13:51:51 +0000 (15:51 +0200)]
Port Dolphin to the new Baloo APIs

REVIEW: 120582

11 years agoMade the free space indicator and zoom slider a little bit larger. (was reduced by...
Emmanuel Pescosta [Mon, 13 Oct 2014 09:53:06 +0000 (11:53 +0200)]
Made the free space indicator and zoom slider a little bit larger. (was reduced by an older commit)

BUG: 339768
FIXED-IN: 4.14.3

11 years agoSVN_SILENT made messages (.desktop file)
l10n daemon script [Sun, 12 Oct 2014 07:05:59 +0000 (07:05 +0000)]
SVN_SILENT made messages (.desktop file)

11 years agoSVN_SILENT made messages (after extraction)
l10n daemon script [Sun, 12 Oct 2014 05:17:04 +0000 (05:17 +0000)]
SVN_SILENT made messages (after extraction)

11 years agoSVN_SILENT made messages (.desktop file)
l10n daemon script [Sun, 12 Oct 2014 04:06:23 +0000 (04:06 +0000)]
SVN_SILENT made messages (.desktop file)

11 years agoSVN_SILENT made messages (after extraction)
l10n daemon script [Sun, 12 Oct 2014 01:38:49 +0000 (01:38 +0000)]
SVN_SILENT made messages (after extraction)

11 years agoclean forward declaration
Montel Laurent [Sat, 11 Oct 2014 12:18:23 +0000 (14:18 +0200)]
clean forward declaration

11 years agoClean includes + port to QMenu
Montel Laurent [Fri, 10 Oct 2014 21:36:36 +0000 (23:36 +0200)]
Clean includes + port to QMenu

11 years agoSVN_SILENT made messages (after extraction)
l10n daemon script [Thu, 9 Oct 2014 05:14:24 +0000 (05:14 +0000)]
SVN_SILENT made messages (after extraction)

11 years agoSVN_SILENT made messages (after extraction)
l10n daemon script [Thu, 9 Oct 2014 01:31:06 +0000 (01:31 +0000)]
SVN_SILENT made messages (after extraction)

11 years agoRevert "Fix desktop file"
Hrvoje Senjan [Wed, 8 Oct 2014 10:51:30 +0000 (12:51 +0200)]
Revert "Fix desktop file"

This reverts commit ecd2ca2222f88c9aea1c23a57658a8a4e9ff54f9.

Dolphin still uses KApp/KCmdLineArgs, so qwindowtitle is not recognized

11 years agoFix includes erroneously having slipped into baloo-only sections
Marko Käning [Wed, 8 Oct 2014 07:54:58 +0000 (09:54 +0200)]
Fix includes erroneously having slipped into baloo-only sections

CCMAIL: bhush94@gmail.com

11 years agoFix desktop file
Montel Laurent [Wed, 8 Oct 2014 06:12:46 +0000 (08:12 +0200)]
Fix desktop file

11 years agokdelibs4support--
Montel Laurent [Tue, 7 Oct 2014 05:38:16 +0000 (07:38 +0200)]
kdelibs4support--

11 years agoConvert to reverse dns
Montel Laurent [Tue, 7 Oct 2014 05:32:35 +0000 (07:32 +0200)]
Convert to reverse dns

11 years agoPorted Dolphin away from KStandardDirs
Emmanuel Pescosta [Wed, 1 Oct 2014 10:34:49 +0000 (12:34 +0200)]
Ported Dolphin away from KStandardDirs

removed unused mirroredDirectory method

REVIEW: 120194

11 years agoMake constants const, avoids unnecessary symbols in the .data section.
Volker Krause [Fri, 26 Sep 2014 18:38:57 +0000 (20:38 +0200)]
Make constants const, avoids unnecessary symbols in the .data section.

11 years agoPort away from KonqOperations::renameV2.
David Faure [Thu, 4 Sep 2014 16:33:04 +0000 (18:33 +0200)]
Port away from KonqOperations::renameV2.

Tested. The if before the connect looks suspicious to me, though.

11 years agoPort away from KonqOperations::rename
David Faure [Thu, 4 Sep 2014 16:14:43 +0000 (18:14 +0200)]
Port away from KonqOperations::rename

It's a bit more code, but this way if you want e.g. custom error handling
you know what to change :)

11 years agoPort away from KonqOperations::rename
David Faure [Thu, 4 Sep 2014 16:09:27 +0000 (18:09 +0200)]
Port away from KonqOperations::rename

11 years agoMerge branch 'master' into frameworks
Luca Beltrame [Sun, 21 Sep 2014 12:36:15 +0000 (14:36 +0200)]
Merge branch 'master' into frameworks

11 years agoMerge branch 'KDE/4.14'
Luca Beltrame [Sun, 21 Sep 2014 12:36:02 +0000 (14:36 +0200)]
Merge branch 'KDE/4.14'

11 years agoDo not allow files or folders inside trash to be added to dolphin's places panel
Arjun AK [Sun, 21 Sep 2014 11:31:51 +0000 (17:01 +0530)]
Do not allow files or folders inside trash to be added to dolphin's places panel

REVIEW: 120286
BUG: 339204
FIXED-IN: 4.14.2

11 years ago* Fixed wrong signal-slot connection between KUrlNavigator and DolphinMainWindow
Emmanuel Pescosta [Mon, 15 Sep 2014 16:17:30 +0000 (18:17 +0200)]
* Fixed wrong signal-slot connection between KUrlNavigator and DolphinMainWindow
* Use the new syntax to connect to DolphinMainWindow::openNewTab from the url
navigator and from folders panel (removed the unused optional parameters from
openNewTab and openNewActivatedTab)

11 years agosimple setShortcuts => setDefaultShortcuts porting, done
Christoph Cullmann [Sun, 14 Sep 2014 20:52:01 +0000 (22:52 +0200)]
simple setShortcuts => setDefaultShortcuts porting, done

11 years agosimple setShortcuts => setDefaultShortcuts porting
Christoph Cullmann [Sun, 14 Sep 2014 20:49:25 +0000 (22:49 +0200)]
simple setShortcuts => setDefaultShortcuts porting

11 years agosimple setShortcuts => setDefaultShortcuts porting
Christoph Cullmann [Sun, 14 Sep 2014 20:46:26 +0000 (22:46 +0200)]
simple setShortcuts => setDefaultShortcuts porting

11 years agosimple setShortcuts => setDefaultShortcuts porting
Christoph Cullmann [Sun, 14 Sep 2014 20:45:10 +0000 (22:45 +0200)]
simple setShortcuts => setDefaultShortcuts porting

11 years agoMake the statusbar space info use the new KIO::fileSystemFreeSpace job.
Mathias Tillman [Sun, 14 Sep 2014 16:53:05 +0000 (18:53 +0200)]
Make the statusbar space info use the new KIO::fileSystemFreeSpace job.

REVIEW: 120137
BUG: 245226

11 years agoPorted KIcon to QIcon
Emmanuel Pescosta [Fri, 12 Sep 2014 11:02:43 +0000 (13:02 +0200)]
Ported KIcon to QIcon

REVIEW: 120159

11 years agofixed TODO:
Emmanuel Pescosta [Thu, 11 Sep 2014 12:51:06 +0000 (14:51 +0200)]
fixed TODO:
Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton

11 years agoMerge branch 'master' into frameworks
Emmanuel Pescosta [Thu, 11 Sep 2014 08:50:56 +0000 (10:50 +0200)]
Merge branch 'master' into frameworks

11 years agoMerge branch 'KDE/4.14'
Emmanuel Pescosta [Thu, 11 Sep 2014 08:49:58 +0000 (10:49 +0200)]
Merge branch 'KDE/4.14'

11 years agoFix an #ifdef that referred to Nepomuk instead of Baloo
Denis Steckelmacher [Wed, 10 Sep 2014 11:04:45 +0000 (13:04 +0200)]
Fix an #ifdef that referred to Nepomuk instead of Baloo

The query builder widget is now properly disabled when the user wants to look
for files by filename and not by content.

11 years agoUse the Baloo Query Builder widget to add syntax-highlighting in Dolphin search
Denis Steckelmacher [Wed, 10 Sep 2014 08:16:11 +0000 (10:16 +0200)]
Use the Baloo Query Builder widget to add syntax-highlighting in Dolphin search

REVIEW: 112589

11 years agoMerge branch 'master' into frameworks
Luca Beltrame [Wed, 10 Sep 2014 08:08:20 +0000 (10:08 +0200)]
Merge branch 'master' into frameworks

11 years agoSet the focus to the active view if the current tab has been changed.
Emmanuel Pescosta [Tue, 9 Sep 2014 22:23:04 +0000 (00:23 +0200)]
Set the focus to the active view if the current tab has been changed.

BUG: 338892
FIXED-IN: 4.15.0
REVIEW: 120125

11 years agoAdd "Open Path" context menu action
Kai Uwe Broulik [Tue, 9 Sep 2014 13:31:55 +0000 (15:31 +0200)]
Add "Open Path" context menu action

This adds a third option to the "in new tab" and "in new window" which opens
the parent folder in the same view

BUG: 298704
FIXED-IN: 4.15
REVIEW: 110133

11 years agoextract method renameItem, factorizes the common code
David Faure [Thu, 4 Sep 2014 15:50:48 +0000 (17:50 +0200)]
extract method renameItem, factorizes the common code

11 years agoRename "Recently Accessed" to "Recently Saved"
kdeuser 56 [Tue, 2 Sep 2014 19:37:41 +0000 (21:37 +0200)]
Rename "Recently Accessed" to "Recently Saved"

In dolphin the Section that leads you to timeline claims
to show "Recently Accessed", which is not true, it shows
"Recently Saved" instead.

BUG: 304854
REVIEW: 119986

11 years agoMake it possible to open archives via the command line
Frank Reininghaus [Sun, 31 Aug 2014 22:06:18 +0000 (00:06 +0200)]
Make it possible to open archives via the command line

This used to work before afcf8961f6666a912e0e6e5072a000837f7cf6aa (only
if "Open archives as folder" was enabled in the settings though). The
reason why this commit broke it is that the mime type of a file is not
determined automatically any more before asking
KProtocolManager::protocolForArchiveMimetype for the correct protocol,
so the determination of the protocol may fail.

Keeping the isMimeTypeKnown() check in DolphinView::openItemAsFolderUrl
still makes sense, because it prevents GUI blocking if the user tries
to open many files at the same time.

Therefore, we now call determineMimeType() in
DolphinViewContainer::slotUrlIsFileError(const KUrl&) and then try to
determine the correct protocol and use it to open the archive in the
view, rather than hoping that slotItemActivated(item) will do the right
thing.

BUG: 333078
REVIEW: 119877
FIXED-IN: 4.14.1

11 years agoMerge branch 'KDE/4.14'
Emmanuel Pescosta [Sun, 31 Aug 2014 15:09:29 +0000 (17:09 +0200)]
Merge branch 'KDE/4.14'

Conflicts:
dolphin/src/dolphinmainwindow.cpp

11 years agoOnly keep the active view container connected with the main window, all inactive
Emmanuel Pescosta [Wed, 27 Aug 2014 20:40:06 +0000 (22:40 +0200)]
Only keep the active view container connected with the main window, all inactive
view containers are disconnected. Changing the connections is done whenever the
active view has been changed, so we can always guarantee that the active view is
connected.

The problem with restoring saved sessions is, that we create a new view container
in DolphinTabPage::restoreState() when split view was used in the previous session,
but this view container isn't connected to the main window slots because
DolphinMainWindow::connectViewSignals() is not called for this container. This leads
to these strange problems: no context menu, ...

BUG: 338549
REVIEW: 119961
FIXED-IN: 4.14.1

11 years agocleanups
David Faure [Sun, 24 Aug 2014 13:41:04 +0000 (15:41 +0200)]
cleanups

11 years agouse non-deprecated cmake var name
David Faure [Sun, 24 Aug 2014 13:40:50 +0000 (15:40 +0200)]
use non-deprecated cmake var name

11 years agoSVN_SILENT made messages (after extraction)
l10n daemon script [Sun, 24 Aug 2014 01:43:17 +0000 (01:43 +0000)]
SVN_SILENT made messages (after extraction)

11 years agoMerge branch 'master' into frameworks
Emmanuel Pescosta [Fri, 22 Aug 2014 21:17:02 +0000 (23:17 +0200)]
Merge branch 'master' into frameworks

Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinmainwindow.h
dolphin/src/dolphinrecenttabsmenu.cpp
dolphin/src/dolphinviewcontainer.cpp
kfind/CMakeLists.txt

11 years agoMerge branch 'KDE/4.14'
Emmanuel Pescosta [Fri, 22 Aug 2014 20:44:53 +0000 (22:44 +0200)]
Merge branch 'KDE/4.14'

11 years agoHide an already visible KMessageWidget message before showing a new one
Arjun AK [Fri, 22 Aug 2014 13:12:50 +0000 (18:42 +0530)]
Hide an already visible KMessageWidget message before showing a new one

1. Do some operation that causes the KMessageWidget to show an error message
2. Immediately Repeat the same action.

The user has no way to know whether the error message is from the second operation or
is a leftover from the first one. By hiding the widget first and then showing it using
animatedShow(), the user can clearly see that a new message was generated. Also once the
directory successfully loads, the widget should be hidden.

BUG: 323077
FIXED-IN: 4.14.1
REVIEW: 119401

11 years agoPort away from KonqOperations::askDeleteConfirmation and KonqOperations::del
David Faure [Fri, 22 Aug 2014 08:16:48 +0000 (10:16 +0200)]
Port away from KonqOperations::askDeleteConfirmation and KonqOperations::del

and remove them. Porting docs added to https://community.kde.org/Frameworks/Porting_Notes#libkonq

11 years agoRemove KonqOperations::emptyTrash() and port to KIO::emptyTrash() instead.
David Faure [Thu, 21 Aug 2014 20:01:23 +0000 (22:01 +0200)]
Remove KonqOperations::emptyTrash() and port to KIO::emptyTrash() instead.

11 years agoSave the view states in addition to the view urls and splitter state in DolphinTabPage.
Emmanuel Pescosta [Wed, 20 Aug 2014 21:06:39 +0000 (23:06 +0200)]
Save the view states in addition to the view urls and splitter state in DolphinTabPage.

Also added version numbers to view and tab state.

REVIEW: 119792

11 years agoPort from KonqOperations::restoreTrashedItems to KIO::restoreFromTrash.
David Faure [Sun, 17 Aug 2014 09:07:42 +0000 (11:07 +0200)]
Port from KonqOperations::restoreTrashedItems to KIO::restoreFromTrash.

11 years agoMerge branch 'KDE/4.14'
Emmanuel Pescosta [Thu, 14 Aug 2014 16:28:51 +0000 (18:28 +0200)]
Merge branch 'KDE/4.14'

Conflicts:
dolphin/src/dolphin.appdata.xml

11 years agoFixes display issues of Dolphin statusbar widgets when a high DPI value is used ...
Mathieu Tarral [Sun, 10 Aug 2014 20:40:40 +0000 (22:40 +0200)]
Fixes display issues of Dolphin statusbar widgets when a high DPI value is used (>= 196 for example).

BUG: 334271
REVIEW: 119701
FIXED-IN: 4.14.1