[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kio/bookmarks
From:       Daniel Teske <teske () squorn ! de>
Date:       2005-03-28 3:08:47
Message-ID: 20050328030847.84FD862E () office ! kde ! org
[Download RAW message or body]

CVS commit by teske: 

Fix the location field of the properties dialog for bookmark menu entries.

CCBUGS: 101349


  M +1 -1      kbookmarkbar.cc   1.129
  M +6 -3      kbookmarkmenu.cc   1.254


--- kdelibs/kio/bookmarks/kbookmarkbar.cc  #1.128:1.129
@@ -206,5 +206,5 @@ void KBookmarkBar::fillBookmarkBar(KBook
                 action->setProperty( "address", bm.address() );
 
-                action->setToolTip( bm.url().prettyURL() );
+                action->setToolTip( bm.url().pathOrURL() );
 
                 action->plug(m_toolBar);

--- kdelibs/kio/bookmarks/kbookmarkmenu.cc  #1.253:1.254
@@ -313,5 +313,5 @@ void RMB::slotRMBActionProperties( int v
   KBookmark bookmark = atAddress(s_highlightedAddress);
 
-  QString folder = bookmark.isGroup() ? QString::null : bookmark.url().url();
+  QString folder = bookmark.isGroup() ? QString::null : bookmark.url().pathOrURL();
   KBookmarkEditDialog dlg( bookmark.fullText(), folder,
                            m_pManager, KBookmarkEditDialog::ModifyMode, 0,
@@ -322,5 +322,8 @@ void RMB::slotRMBActionProperties( int v
   makeTextNodeMod(bookmark, "title", dlg.finalTitle());
   if ( !dlg.finalUrl().isNull() )
-    bookmark.internalElement().setAttribute("href", dlg.finalUrl());
+  {
+    KURL u = KURL::fromPathOrURL(dlg.finalUrl());
+    bookmark.internalElement().setAttribute("href", u.url(0, 106));
+  }
 
   kdDebug(7043) << "Requested move to " << dlg.finalAddress() << "!" << endl;
@@ -646,5 +649,5 @@ void KBookmarkMenu::fillBookmarkMenu()
         action->setProperty( "address", bm.address() );
 
-        action->setToolTip( bm.url().prettyURL() );
+        action->setToolTip( bm.url().pathOrURL() );
 
         action->plug( m_parentMenu );


[prev in list] [next in list] [prev in thread] [next in thread]