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

List:       kde-commits
Subject:    kdebase/konqueror/keditbookmarks
From:       Alexander Kellett <lypanov () kde ! org>
Date:       2003-11-26 22:26:47
[Download RAW message or body]

CVS commit by lypanov: 

   fix 1: fix a major regression 
      couldn't set root folder as toolbar, or sort on it (recursivly or otherwise).
a single sideeffect leads to
   fix 2: don't show edit_copy for root item.


  M +1 -1      actionsimpl.cpp   1.66
  M +5 -2      listview.cpp   1.134


--- kdebase/konqueror/keditbookmarks/actionsimpl.cpp  #1.65:1.66
@@ -328,5 +328,5 @@ void KEBApp::setActionsEnabled(SelcAbili
     QStringList toEnable;
     
-    if (sa.itemSelected) {
+    if (sa.itemSelected && !sa.root) {
         toEnable << "edit_copy";
         if (!sa.urlIsEmpty && !sa.group && !sa.separator)

--- kdebase/konqueror/keditbookmarks/listview.cpp  #1.133:1.134
@@ -105,5 +105,8 @@ QValueList<KBookmark> ListView::itemsToB
 }
 
-#define VALID_ITEM(item) ( !item->isEmptyFolderPadder() && item->bookmark().hasParent() )
+#define VALID_ITEM(item)                                            \
+    ( !item->isEmptyFolderPadder()                                  \
+   && (item->bookmark().hasParent() || item->parent() == 0) )
+
 #define VALID_FIRST(items) ( (items->count() > 0) && VALID_ITEM(items->first()) )
 
@@ -295,6 +298,6 @@ SelcAbilities ListView::getSelectionAbil
         sa.separator      = nbk.isSeparator();
         sa.urlIsEmpty     = nbk.url().isEmpty();
+        sa.root           = (selectedItems()->first() == m_listView->rootItem());
         sa.singleSelect   = (!sa.multiSelect && sa.itemSelected);
-        sa.root           = (m_listView->rootItem() == selectedItems()->first());
         sa.multiSelect    = (selectedItems()->count() > 1);
         sa.tbShowState    = CmdGen::self()->shownInToolbar(nbk);


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