In D11012#222883, @markg wrote:

I think it gets complicated now.
This patch and D11216 are now both not correct anymore (they are both the same, both do too much).

Reduce this patch to just the Trash addition. Just the refactoring that is needed for that.
So no icon changes in here.

It's already true. If you are talking about the code that updates the icon with the notification signal, it's the part of refactoring. No logic changes involved.

• dolphinui.rc version bump

• Fixes from comments

In D11012#222653, @elvisangelaccio wrote:

First of all, please read https://community.kde.org/Policies/Commit_Policy#Always_add_descriptive_log_messages

Done. Understood.

• Split refactoring and bug fixing
• Make commit message more descriptive

• Move watchEmptinessChanged to constructor

• Bump Qt version to 5.8

In D10990#222356, @ngraham wrote:

Dolphin's menubar situation isn't as dire as it seems, and I don't think it needs a big redesign. Window and tab-related items are in the File menu mostly for historical reasons, same as every other app with a file menu. Not ideal, but convention, traditional, familiarity, yadda yadda yadda.
mostly for historical reasons

It's not excusable. On the other hand, I use File menu nor Control menu very little. If we do not agree, I will keep the situation as is.

• Fix show "Show Terminal Panel" button when terminal panel is hidden

Use delete[] for array deletion

In D11204#222421, @broulik wrote:

Shouldn't that rather go into the file KIO slave so it sets the UDS_HIDDEN attribute?

I think you are right, but I don't have an idea what "file KIO slave" means. Can you point me out to appropriate files?

• Use focusProxy for Terminal Panel

@markg, can you please review it again?

• Fix hideEvent

• Remove unused #include

• Automaticaly load console on installation

In D10990#221937, @ngraham wrote:

In D10990#221801, @rominf wrote:

Are you going to do a follow-up patch to add the missing items to the menus, @rominf?

To be honest, I'm not interested because I don't use the menu as most of the Dolphin users I guess. I don't use a menu because it's hidden by default, I like control button more and file menu is bad structured and scanty.

OK, then can you add the new Show Original item to the File menu in this patch? Let's not make things even worse in patches where we add something to the context menu.

Maybe we should even add it to the Control menu too, as it's contextual and won't appear there all the time, so it won't amount to much clutter.

No, I don't want to add this action right now because I don't like the situation about actions. They are done completely non-systematically.

In D10990#221691, @ngraham wrote:

Yes, I agree with @rkflx that it would be nice if we can find a way to temporarily show hidden files to reveal the original.

I think that it would be even better if we show only required the hidden file, but not all. It might be a lot of work though.

Fix relative symlink handling

• Show message when clicked Show Original on broken link

• Replace space with newline in Konsole missing message
• Fix crash on appstream installation

• Hide Install Konsole button if OS doesn't handle appstream
• Hide close button

Is the UI better now? Note the animation and layout.

• Improve UI for Konsole missing message

In D11118#221449, @ngraham wrote:

Found a bug: If you click the X button to dismiss the message, then close and re-open the terminal panel, it doesn't show up again.

Fixed.

Show message that Konsole is not installed even after closing

• Add install Konsole button

Use Q_FALLTHROUGH

In D11135#221297, @ngraham wrote:

When I made a positive comment in the bug report, what I had in mind was that the text would very selectively and conditionally become a bit larger when the icon size is huge. Because right now, 10pt font with 256pt icons just looks silly.
Whereas increasing it to 15pt looks a lot more appropriate IMHO.
But I think it would have to be hand-tuned, rather than just implementing a simple linear scaling factor like this patch does.

+1. But we should not forget about user configured font size. I.e. if the user configured to use font size 14, then we should scale it to 21 (but not 15) for 256pt icons.

OK, @rkflx, you convinced me. Moreover, Nautilus acts the same way (text size is always the same).

Remove GCC specific warning ignore code

@ngraham, please review

Replace QLabel with KMessageWidget

Converted to KStandardAction

OK, it was RFC, I wanted to know whether I'm doing the right thing or not at all. Sorry for not specifying this in the first place.

Hide a message when Konsole part is installed during the Dolphin session.

• Show "Show Terminal Panel" button only if terminal panel is hidden

I also find a bug (?) in KIO::highlightInFileManager().

• Change icon for Show Original

In D10990#220215, @ngraham wrote:

In D10990#220203, @rominf wrote:

In D10990#220200, @ngraham wrote:

So what do you think about adding Show Original into the File menu when a shortcut is selected?

I'm positive about this. But I think this should be done after unifying file menu and context menu (Compress, Actions, etc. is not shown in the file menu).

Why not do it now? We're already touching this code, might as well do the right thing here to set a good example. If we don't, we're just making that problem worse and giving ourselves more work later, no?

I don't understand the logic supporting main menus: Rename, Move to Trash, Delete items are located in File menu, while Cut, Copy, Paste are located in Edit menu; New Tab is in the File menu, while Recently closed tabs is in the Go menu. I think this should be refactored. On the other hand, menu is not shown be default. Is it worth to have it, especially in this state?

• Handle relative symlinks correctly in Show Original

Remove line

This is strange. It works on my machine:

build> git fetch origin
build> git co origin/master
HEAD is now at 3b69ac3 Optimize #include
build> git rev-parse HEAD
3b69ac3a7aff4dedd4a2578174f5465f02fcc02b
build> make clean; make -s -j5 >/dev/null
/data/romas/projects/spectacle/src/Main.cpp: In function ‘int main(int, char**)’:
/data/romas/projects/spectacle/src/Main.cpp:127:9: warning: this statement may fall through [-Wimplicit-fallthrough=]
         }
         ^
/data/romas/projects/spectacle/src/Main.cpp:128:5: note: here
     case SpectacleCore::DBusMode:
     ^~~~
/data/romas/projects/spectacle/src/SpectacleCore.cpp: In member function ‘void SpectacleCore::screenshotFailed()’:
/data/romas/projects/spectacle/src/SpectacleCore.cpp:210:30: warning: this statement may fall through [-Wimplicit-fallthrough=]
         showErrorMessage(i18n("Screenshot capture canceled or failed"));
                          ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/data/romas/projects/spectacle/src/SpectacleCore.cpp:211:5: note: here
     case DBusMode:
     ^~~~
build>

Fix compilation error

Rebase on master

Revert removing "Config.h"

In D10990#220200, @ngraham wrote:

So what do you think about adding Show Original into the File menu when a shortcut is selected?

I'm positive about this. But I think this should be done after unifying file menu and context menu (Compress, Actions, etc. is not shown in the file menu).

Remove almost all static_cast (only 5 is left!)

Revert unrelated changes

Fit filename format help into small window

Rebase on master

In D10990#219907, @ngraham wrote:

The patch no longer applies for me on master

Created and checked out branch arcpatch-D10990.


    This diff is against commit 48b58f830a585b773435c9af5ee2fe8f0c7c641d, but
    the commit is nowhere in the working copy. Try to apply it against the
    current working copy state? (436ad965e93409e2225b3d0451e997fb655b3e87)
    [Y/n] y

Checking patch src/dolphinmainwindow.cpp...
error: while searching for:
#include <KFilePlacesModel>
#include <KHelpMenu>
#include <KIO/JobUiDelegate>
#include <KJobWidgets>
#include <KLocalizedString>
#include <KMessageBox>

error: patch failed: src/dolphinmainwindow.cpp:51
Hunk #2 succeeded at 1213 (offset -2 lines).
Checking patch src/dolphincontextmenu.cpp...
Hunk #1 succeeded at 195 (offset 3 lines).
Hunk #2 succeeded at 312 (offset 3 lines).
Applying patch src/dolphinmainwindow.cpp with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch src/dolphincontextmenu.cpp cleanly.

 Patch Failed! 
Usage Exception: Unable to apply patch!

It works fine for me:

$ arc patch  D10990
Created and checked out branch arcpatch-D10990.     
Checking patch src/dolphinmainwindow.cpp...   
Checking patch src/dolphincontextmenu.cpp...                                  
Applied patch src/dolphinmainwindow.cpp cleanly.      
Applied patch src/dolphincontextmenu.cpp cleanly.                                                            
 OKAY  Successfully committed patch.

• Replace standard QKeySequence with KStandardShortcut

Fix compilation

Truncate long filenames done right

• Cleanup

What about this diff? Will this be accepted if I revert all enums that require static_cast?

Rebase on master

Rebase on master

More fixes