From kde-commits  Thu Jan 27 20:19:14 2011
From: =?utf-8?q?Dennis=20Nienh=C3=BCser?= <earthwings () gentoo ! org>
Date: Thu, 27 Jan 2011 20:19:14 +0000
To: kde-commits
Subject: KDE/kdeedu/marble/src
Message-Id: <20110127201914.516C2AC8BF () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129615959527477

SVN commit 1217542 by nienhueser:

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.
FEATURE: 261124
REVIEW: 6411

 M  +21 -7     QtMainWindow.cpp  
 M  +1 -1      QtMainWindow.h  
 D             lib/BookmarkInfoDialog.cpp  
 D             lib/BookmarkInfoDialog.h  
 D             lib/BookmarkInfoDialog.ui  
 M  +5 -3      lib/BookmarkManager.cpp  
 M  +209 -14   lib/BookmarkManagerDialog.cpp  
 M  +11 -0     lib/BookmarkManagerDialog.h  
 M  +4 -4      lib/BookmarkManagerDialog.ui  
 M  +4 -4      lib/CMakeLists.txt  
 A             lib/EditBookmarkDialog.cpp   [License: LGPL]
 A             lib/EditBookmarkDialog.h   lib/BookmarkInfoDialog.h#1217541 [License: LGPL]
 A             lib/EditBookmarkDialog.ui  
 M  +6 -2      lib/MarbleWidgetPopupMenu.cpp  
 D             lib/NameDialog.ui  
 A             lib/NewBookmarkFolderDialog.cpp   [License: LGPL]
 A             lib/NewBookmarkFolderDialog.h   [License: LGPL]
 A             lib/NewBookmarkFolderDialog.ui  
 D             lib/NewFolderInfoDialog.cpp  
 D             lib/NewFolderInfoDialog.h  
 M  +12 -8     marble_part.cpp  
 M  +1 -1      marble_part.h  


http://websvn.kde.org/?view=rev&revision=1217542