Commit graph

67 commits

Author SHA1 Message Date
Tom Albers 671b224bd8 RELICENSE: GPL2->GPL2+/GPL23
svn path=/trunk/KDE/kdebase/apps/; revision=751022
2007-12-20 22:23:07 +00:00
Robert Knight 5c7ab6fbd1 Fix crashes when opening and importing bookmarks. Makes importing bookmarks from KDE 3's Konqueror possible. Also re-arrange the import list so the KDE 3 import action is at the top with a KDE icon. Force an update of the model after importing bookmarks. This has the unwanted side-effect of collapsing the tree-view to the root item, but at least it works.
svn path=/trunk/KDE/kdebase/apps/; revision=707658
2007-09-02 15:44:11 +00:00
Daniel Teske 83a9b94295 Now missing #includes.
svn path=/trunk/KDE/kdebase/apps/; revision=699507
2007-08-13 09:57:36 +00:00
Daniel Teske 09389ba5a2 Port to KBookmark::addBookmark and ::createNewFolder changes.
Also a few changes in KEditBookmark to use the KBookmark API
instead of directly modifying the internalElement().


svn path=/trunk/KDE/kdebase/apps/; revision=699501
2007-08-13 09:27:01 +00:00
David Faure d1090b6e6d Ah, doh, empty string is actually allowed here.
svn path=/trunk/KDE/kdebase/apps/; revision=680317
2007-06-25 21:49:55 +00:00
David Faure 63da248b5a We really don't need to import kde1 bookmarks anymore :)
This removes a nasty bool argument in managerForFile().

svn path=/trunk/KDE/kdebase/apps/; revision=680309
2007-06-25 21:37:51 +00:00
Dirk Mueller 52d6d2f9ce include cleanup
svn path=/trunk/KDE/kdebase/apps/; revision=663054
2007-05-09 22:23:52 +00:00
David Faure 6d787d427f KCommand -> K3Command etc.
svn path=/trunk/KDE/kdebase/apps/; revision=649413
2007-04-02 16:12:14 +00:00
Daniel Teske c371faca0b KBookmarkManager::managerForFile and KBookmarkOwner::openBookmark changes.
svn path=/trunk/KDE/kdebase/apps/; revision=596012
2006-10-16 13:43:54 +00:00
Will Entriken bd2a34800e construct KGuiItem(QString) explicitly
svn path=/trunk/KDE/kdebase/kdepasswd/; revision=583808
2006-09-13 15:05:55 +00:00
Stephan Kulow 91b7578268 merge back from bleedingedge
svn path=/trunk/KDE/kdebase/libkonq/; revision=558070
2006-07-04 16:34:13 +00:00
Laurent Montel 49ebc2ce72 #include <q...h> -> #include <Q...>
svn path=/trunk/KDE/kdebase/nsplugins/; revision=539617
2006-05-11 08:04:23 +00:00
Hamish Rodda e7d5dfa47f Merging in from bleeding edge kdebase branch
- i18n ported
- KAccel removed
- Some fixes for OS X

svn path=/trunk/KDE/kdebase/kfind/; revision=528190
2006-04-10 11:57:13 +00:00
Laurent Montel aed1a8b78d deprecated--
svn path=/trunk/KDE/kdebase/konqueror/; revision=506335
2006-02-06 15:07:10 +00:00
Laurent Montel df86b65639 QString::null->QString()
svn path=/trunk/KDE/kdebase/kfind/; revision=493574
2006-01-02 17:28:18 +00:00
Urs Wolfer 85b2034d9d less warnings
svn path=/trunk/KDE/kdebase/apps/; revision=485112
2005-12-02 22:22:51 +00:00
André Wöbbeking 73be974b33 include cleanup
svn path=/trunk/KDE/kdebase/apps/; revision=484132
2005-11-29 13:56:41 +00:00
Dirk Mueller 40b74b7fc1 SVN_SILENT: fix typo
svn path=/trunk/KDE/kdebase/nsplugins/; revision=467416
2005-10-05 08:44:32 +00:00
Daniel Teske 36476349bf Should compile now.
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=467290
2005-10-04 20:42:32 +00:00
Laurent Montel b74b2ed68b Q3_support--
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=464926
2005-09-28 16:21:42 +00:00
Daniel Teske 17db133f4c Remove bogus #includes.
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=464602
2005-09-27 22:35:44 +00:00
Laurent Montel 87f8e38219 qt3support--
svn path=/trunk/KDE/kdebase/konqueror/; revision=463841
2005-09-25 14:49:01 +00:00
Daniel Teske aa3cb7cfe7 Forgot to remove these #includes
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=462406
2005-09-20 23:47:35 +00:00
Daniel Teske fddf326d4e Port keditbookmarks to Qt4's model/view framework.
Editing, creating and selecting bookmarks works.
For deleting you have to run apply-patches in your qt-copy directory.
All other things are broken. (E.g. drag'n'drop, the edit fields at the bottom, the searchline...)

I wrote down some of my learned lessons while working with Qt4's model/view framework
at http://www.squorn.de/kde/qtmodelview.html


svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=448977
2005-08-13 20:13:21 +00:00
Stephan Kulow e77f20dbaf svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057
svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase
          .

I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts

svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=439627
2005-07-28 14:59:42 +00:00
Daniel Teske c9c1f7b99d Fix handling of current item. (And improve handling of selections somewhat.)
After a command execution currentItem should now always be something sensible.


svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=434423
2005-07-14 01:29:14 +00:00
Daniel Teske 27b3e69662 Fix ImportCommand::affectedBookmark(). The notification to other kbookmarkmanagers
after a import command is now correct.


svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=434420
2005-07-14 01:10:15 +00:00
Dirk Mueller b3736b51bc update FSF address
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=431577
2005-07-04 19:02:09 +00:00
David Faure 41aff60420 Fix compiler warning, and fix wrong mode in emacs (this is C++, not perl)
svn path=/trunk/KDE/kdebase/konqueror/keditbookmarks/; revision=412727
2005-05-12 12:15:44 +00:00
Stephan Binner af6304bed8 CVS_SILENT i18n style guide fixes
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=372779
2004-12-22 17:57:34 +00:00
Alexander Kellett be418833d9 aah. so thats how its done. thanks david, note the comment above ;-)
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=267488
2003-11-16 16:15:01 +00:00
Alexander Kellett 5de2cd94b7 fix up the rest of 67813 with a hack to get non "perfect" xml files importing correctly
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=267442
2003-11-16 13:37:00 +00:00
Alexander Kellett e2bca4d7e3 minor code cleanup and change the default kde import directory "~/.kde" is useless,
this directory as a default provides the user with more information about the system
and clicking on "home directory" is easy enough. this makes my job easier too...

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=267438
2003-11-16 13:11:51 +00:00
Alexander Kellett 1c9594e12c add --import.* command line options to ease my debugging work
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=259480
2003-10-16 20:08:08 +00:00
Alexander Kellett 807e476f82 indent to 4 spaces
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=257985
2003-10-11 13:39:50 +00:00
Alexander Kellett 7f65c026be sick of having two different coding styles between kio/bookmarks and here,
so, add 4 space modelines to all files. i'll gradually fix the files over
the coming days.

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=256804
2003-10-06 18:31:25 +00:00
Alexander Kellett 3f9ac74421 add m_contentOnly member to DeleteCommand
set via second param of DeleteCommand constructor
used to remove stale metadata from the root when doing a replacment import

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=252201
2003-09-18 18:46:21 +00:00
Alexander Kellett 1d4c784546 updates to coding style
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=251638
2003-09-16 20:01:54 +00:00
Alexander Kellett 0458ac2248 reorder includes - $0.h, "*.h", <*.h>
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=251057
2003-09-14 18:07:31 +00:00
Alexander Kellett d885b874ad auto-devel crash session data after import.. umm.. maybe this should be asked...
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=235661
2003-07-05 23:57:49 +00:00
Alexander Kellett ea26bc1def importer for crashed sessions
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=235551
2003-07-05 10:01:16 +00:00
Alexander Kellett 471bfbd21b minor comments/debugging stuff
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=220977
2003-04-19 08:32:39 +00:00
Alexander Kellett 0f1f9671cb start to use the newly exported kbookmarkimporterbase
requires a kdelibs/kio/bookmarks up if you've got a damn old checkout

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=215705
2003-03-22 23:10:30 +00:00
Alexander Kellett e14fa8644c shuffle around importers.cpp
update TODO list

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=215678
2003-03-22 20:50:12 +00:00
Alexander Kellett a738859225 fold mymanager.* back into toplevel, too small to be in a seperate file now
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=215667
2003-03-22 19:50:23 +00:00
Alexander Kellett 5e3f64a1aa use kdelibs/kio/bookmarks version of kbookmarkdombuilder
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=214106
2003-03-15 20:15:17 +00:00
Alexander Kellett 532867e91a remove warning
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=212340
2003-03-08 13:44:44 +00:00
Alexander Kellett ac6e315e78 move connectimporter into the dombuilder
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=211920
2003-03-06 22:02:36 +00:00
Alexander Kellett 4e027681c0 split out a new KBookmarkDomBuilder class from out of ImportCommand
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=211774
2003-03-06 14:52:20 +00:00
Alexander Kellett b5c65017ba shuffle and minor cleanup
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=211553
2003-03-05 19:10:23 +00:00