From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 26 Aug 2012 04:30:51 +0000 (-0300)
Subject: Merge branch 'KDE/4.9'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/89960b65e9041bb22f896c8d5be2e44de4369040

Merge branch 'KDE/4.9'

`git merge -s recursive --log --edit KDE/4.9' was run first, and it looked
like the only conflicts were in some docbooks. I then aborted the merge and
ran `git merge' with `-Xours' to use this branch's version of the
conflicting files.

Even though a lot of changes are listed below, all but the last two are
already present in master because they were cherry-picked from one branch to
another.

Hopefully this sets a trend and people start using git as it was intended to
be used.

* KDE/4.9: (50 commits)
  Adjust to Ark's drag'n'drop D-Bus interface changes.
  Adjust to Ark's drag'n'drop D-Bus interface changes.
  Fix wrong behaviour, when Dolphin is started with --split argument.
  Do not crash when finishing inline renaming in unusual ways
  Fix regression that caused "(I18N_EMPTY_MESSAGE)" sub menus in menus
  Select the correct item in places-panel, when a directory is opened.
  SVN_SILENT made messages (.desktop file)
  avoid duplicate entries in konqueror address completion list
  Fix translations not showing in the Sort by and Additional Information submenus
  Fix wrong text color in Places Group Header. Use QPalette::Window for base color and QPalette::WindowText for text color. Also changed m_roleColor color mixing to 60% (from 70%) -> Better visible color difference when base color is darker than text color. Also changed styleOption().palette.brush(group, role).color() to styleOption().palette.color(group, role) in KStandardItemListWidget -> should be more efficient.
  Fix wrong text color in places and in folders panel.
  Show icon size as tooltip when adjusting icon size
  Fix a long standing security issue with the hiding of Konqueror's location (address) bar through javascript.
  Fixed the display of the security sheild icon for SSL sites.
  SVN_SILENT made messages (.desktop file)
  Follow-up to d7e7ca53bb95c7555bbf107d92b47ac25eda1918 - use correct icon
  Use a better icon for recently accessed items in the Places Panel
  Use a saner check for multimedia files in infopanel.
  Fix the size of the rating stars in Icons View
  Stop preview jobs when closing Dolphin
  ...
---

89960b65e9041bb22f896c8d5be2e44de4369040