Further cleanup in for Token,TokenDropTarget, TokenPool and so on. refactoring3-filenameLayoutDialog
authorRalf Engels <ralf.engels@nokia.com>
Mon, 5 Nov 2012 18:15:51 +0000 (19:15 +0100)
committerRalf Engels <ralf.engels@nokia.com>
Thu, 8 Nov 2012 15:21:17 +0000 (16:21 +0100)
commite3a101295871728b65dd4635f4b9ec4481e8c7bf
treedd0f17f1a50de78121f20a8e9d9b4af9a026f132
parentf667364d100ad202e62516c84554da7e4ee8427e
Further cleanup in for Token,TokenDropTarget, TokenPool and so on.

- Remove event filter of token drop target. Event filters are evil.
  instead change the LayoutEditWidget and add a strut to the
  TokenDropTarget

- Clean up the mimetype. Now Token has a static function to return
  the amarok token mime type.
  The old mime type was defined in five different places.

- Have one function to return the mime data of a token in the token
  object. Old code had two places where the data was returned with
  different implementations.

- Correctly set the drop cursor pixmap for the TokenPool

- Remove some needless widget settings from the .ui files, restoring
  the defaults.

- Rename the FilenameLayoutDialog file to FilenameLayoutWidget.
  That file always had a widget and never a dialog. Dialogs are
  defined in different files.
30 files changed:
src/CMakeLists.txt
src/core-impl/collections/umscollection/UmsCollection.cpp
src/core-impl/collections/umscollection/UmsConfiguration.ui
src/dialogs/EditFilterDialog.cpp
src/dialogs/EditFilterDialog.h
src/dialogs/EditFilterDialog.ui
src/dialogs/FilenameLayoutDialog.cpp [deleted file]
src/dialogs/FilenameLayoutDialog.h [deleted file]
src/dialogs/FilenameLayoutOptions.ui [deleted file]
src/dialogs/OrganizeCollectionDialog.cpp
src/dialogs/OrganizeCollectionDialog.h
src/dialogs/OrganizeCollectionOptions.ui [new file with mode: 0644]
src/dialogs/TagDialog.cpp
src/dialogs/TagGuesserDialog.cpp
src/dialogs/TagGuesserDialog.h
src/playlist/layouts/LayoutEditDialog.cpp
src/playlist/layouts/LayoutEditWidget.cpp
src/playlist/layouts/LayoutEditWidget.h
src/playlist/layouts/PlaylistLayoutEditDialog.cpp
src/playlist/layouts/PlaylistLayoutEditDialog.ui
src/widgets/FilenameLayoutWidget.cpp [new file with mode: 0644]
src/widgets/FilenameLayoutWidget.h [new file with mode: 0644]
src/widgets/Token.cpp
src/widgets/Token.h
src/widgets/TokenDropTarget.cpp
src/widgets/TokenDropTarget.h
src/widgets/TokenPool.cpp
src/widgets/TokenPool.h
src/widgets/TokenWithLayout.cpp
src/widgets/TokenWithLayout.h