Add missing icons in konqueror. #180

This relate to issue #179
Work with PR: TDE/tdelibs#123

I'm removing this PR as WIP, please test.

@MicheleC if you adjust few source code here and there please make a commit for each icon that I/we can see It for reference/use later on.

@MicheleC if you adjust few source code here and there please make a commit for each icon that I/we can see It for reference/use later on.

Ok will do. Probably this will wait a few days since I am still processing other PRs and other tasks, but I will look into in near future. Thanks for the good work.

Thanks Greg! Nice catch.

Not sure who recreated the branch. The PR has already been merged.
Ok to redelete it?

I assume that @VinceR pushed branch by mistake – he is not subscribed to this issue, and thus doesn't even get a notification of this query. I think we can remove the branch again.

I assume that @VinceR pushed branch by mistake – he is not subscribed to this issue, and thus doesn't even get a notification of this query. I think we can remove the branch again.

👍 I thought exactly the same thing.

Now I understand. Trying to delete the branch gives this error:

"Branch 'TDE/fix/miss_icons_konqueror' cannot be deleted because new commits have been added after merging."

Most likely on the branch recently pushed by @VinceR for konqueror sorting

Actually this is very weird... the commit graph does not show any additional commit on top of this branch...

Actually this is very weird... the commit graph does not show any additional commit on top of this branch...

@VinceR seems to push some old state of that branch that he was accidentally cloned == before rebase that preceded merge.

After rebase to the final state of branch before merge, branch can be removed again.

Hi,

I am very sorry to have messed things up. Take a look at comments in PR # 183 to see what I had intended to do.

Vince

No worries @VinceR, that is exactly why there is branch protection on master, r14.0.x and v3.5.13 branches, so they can't get accidentally messed up.

The way we set things up in TGW is a bit different from most git repository you find in internet. We want a clean linear history on the main branches because merge commits can introduce subtle errors and are a mess when you need to look back in history. Because of that, any branch other than master,r14.0.x,v3.5.13 is consider "temporary" and will be removed when no longer needed. So occasianal mess up on a non-main branch is not a big deal in the end.

A couple of tips:

when you update your repo, use 'git fetch --all --prune', this makes sure you download all the recent changes and removes all no longer existing branches. Then use 'git rebase' to make sure your branch is fast forwarded to the latest commit downloaded from the previous command
to push on a specific branch, make sure you are in that branch and then use 'git push origin HEAD'. This will update only that specific branch.
avoid 'git push -f' unless you are really sure of what you are doing