Changeset 244 for trunk/desktop/class_c/wpobject.c

Timestamp:

Mar 10, 2007, 12:11:43 PM (18 years ago)

Author:

cinc

Message:

Implemented methods to add/remove objects to/from folders (and folder windows).

File:

• trunk/desktop/class_c/wpobject.c (modified) (6 diffs)

trunk/desktop/class_c/wpobject.c

@@ -250 +250 @@
             //g_message("   in %s wpNoteBook: %lx pui %lx", __FUNCTION__, wpNoteBook, pui);
             /* Make sure the view item is removed when the window is closed */
-            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),"delete-event", 
+            g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),
+                             "delete-event", 
                              G_CALLBACK(defaultWPWindowDeleteHandler), (gpointer) pui);
             WPObject_wpAddToObjUseList(nomSelf, pui, ev);
@@ -418 +419 @@
   else{
     pUseItem=(PUSEITEM)pCurrentItem;
-    pUseItem--;
+    pUseItem--; /* Note that VIEWITEM comes after the USEITEM structure */
     pUseItem=WPObject_wpFindUseItem(nomSelf, USAGE_OPENVIEW,  pUseItem, ev);
   }
@@ -426 +427 @@
       ++pUseItem;
       pViewItem=(PVIEWITEM)pUseItem;
-      pUseItem--;
+      pUseItem--; /* Note that VIEWITEM comes after the USEITEM structure */
       //g_message("        a in %s %d", __FUNCTION__, flViews);
       if((pViewItem->ulView == ulView) && (pViewItem->nameSpaceId==nameSpaceId))
@@ -811 +812 @@
 }
 
+
 NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpMoveObject(WPObject* nomSelf,
                                                            const PWPFolder wpTargetFolder,
@@ -816 +818 @@
 {
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-  g_message("Calling %s, not implemented yet", __FUNCTION__);
+  WPFolder * wpFolder;
+  PUSEITEM pui;
+
+  if(!nomIsObj(wpTargetFolder))
+    return FALSE;
+
+  /* Get folder holding the object */
+  wpFolder=WPObject_wpQueryFolder(nomSelf, NULLHANDLE);
+
+  g_message("Parent folder is %s", 
+            NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
+                                 NULLHANDLE));
+
+  /* Remove it from the parent folders content list. */
+  WPFolder_wpDeleteFromContent(wpFolder, nomSelf, NULLHANDLE);
+
+  /* Remove it from the folders model thus any folder window. */
+  pui=_wpDeleteFromStore(wpFolder, nomSelf, NULLHANDLE);
+  _wpFreeMem(nomSelf, pui, NULLHANDLE);
+
+  g_message("Target folder is %s", 
+            NOMPath_queryCString(WPFolder_wpQueryFileName(wpTargetFolder, TRUE, NULLHANDLE),
+                                 NULLHANDLE));
+
+  /* Insert into the new folder */
+  _wpAddToContent(wpTargetFolder, nomSelf, NULLHANDLE, NULLHANDLE);
+  _wpAddToStore(wpTargetFolder, nomSelf, NULLHANDLE);
 
   return FALSE;
@@ -828 +856 @@
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
 
-  g_message("Calling %s, not implmnted yet", __FUNCTION__);
+  g_message("Calling %s, not implmented yet", __FUNCTION__);
+
   return FALSE;
 }