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

List:       kde-commits
Subject:    kdebase/kmenuedit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-05-04 13:48:38
Message-ID: 20040504134838.3F53B9A72 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Making changes to a menu-item didn't work if a shortcut was added first.


  M +7 -7      menuinfo.cpp   1.12


--- kdebase/kmenuedit/menuinfo.cpp  #1.11:1.12
@@ -227,4 +227,5 @@ bool MenuFolderInfo::hasDirt()
    {
       if (entryInfo->dirty) return true;
+      if (entryInfo->shortcutDirty) return true;
    }
    return false;
@@ -315,7 +316,9 @@ bool MenuEntryInfo::needInsertion()
 void MenuEntryInfo::save()
 {
-   if (!dirty) return;
-
+   if (dirty)
+   {
    df->sync();
+      dirty = false;
+   }
 
    if (shortcutDirty)
@@ -327,6 +330,4 @@ void MenuEntryInfo::save()
       shortcutDirty = false;
    }
-
-   dirty = false;
 }
 
@@ -426,5 +427,4 @@ void MenuEntryInfo::setShortcut(const KS
    shortcutLoaded = true;
    shortcutDirty = true;
-   dirty = true;
 }
 
@@ -438,5 +438,5 @@ void MenuEntryInfo::setInUse(bool inUse)
          shortCut = temp;
       else
-         dirty = true;
+         shortcutDirty = true;
       allocateShortcut(shortCut);
 


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