Revision 1217542

Go back to digest for 30th January 2011

Features in Educational

Dennis Nienhüser committed changes in /trunk/KDE/kdeedu/marble/src:

Bookmark Manager:
Delete folders, rename them, create new ones, delete bookmarks and edit bookmarks (including moving to other folders).
Also adds support for importing .kml files.

The only missing thing -- which I plan to make a junior job -- is drag & drop support.
(Internal move to change the order of folders and bookmarks inside folders. Maybe also D&D between views to support dragging bookmarks quickly to other folders.)

Squashed patch of a local git branch:
- Support importing bookmarks from .kml files. When conflicts arise (imported bookmark already exists), the user is asked whether to skip the new or replace the existing bookmark.
- NewFolderInfoDialog is a misleading name. Rename it NewBookmarkFolderDialog.
- Rename NameDialog to NewBookmarkFolderDialog, the former is too generic. Fix broken license header in NewBookmarkFolderDialog.h. Make it possible to use the dialog without changing existing bookmarks directly. Use a ButtonBox in the .ui to get a consistent interface.
- New bookmark folders can be created within the bookmark manager.
- Deletion of individual folders and bookmarks. Use the first folder as default selection.
- Use the existing dialogs to edit bookmark folders and bookmarks in the bookmark manager.
- Rename BookmarkInfoDialog to EditBookmarkDialog which describes its purpose better.

REVIEW: 6411

File Changes

Added 6 files
  • /trunk/KDE/kdeedu/marble/src/lib
  •   /EditBookmarkDialog.cpp
  •   /EditBookmarkDialog.h
  •   /EditBookmarkDialog.ui
  •   /NewBookmarkFolderDialog.cpp
  •   /NewBookmarkFolderDialog.h
  •   /NewBookmarkFolderDialog.ui
Deleted 6 files
  • /trunk/KDE/kdeedu/marble/src/lib
  •   /BookmarkInfoDialog.cpp
  •   /BookmarkInfoDialog.h
  •   /BookmarkInfoDialog.ui
  •   /NameDialog.ui
  •   /NewFolderInfoDialog.cpp
  •   /NewFolderInfoDialog.h
Modified 10 files
  • /trunk/KDE/kdeedu/marble/src
  •   /marble_part.cpp
  •   /marble_part.h
  •   /QtMainWindow.cpp
  •   /QtMainWindow.h
  •   /lib/BookmarkManager.cpp
  •   /lib/BookmarkManagerDialog.cpp
  •   /lib/BookmarkManagerDialog.h
  •   /lib/BookmarkManagerDialog.ui
  •   /lib/CMakeLists.txt
  •   /lib/MarbleWidgetPopupMenu.cpp
22 files changed in total