Changeset 183 for trunk/desktop/class_c

Timestamp:

Jan 7, 2007, 10:36:52 PM (19 years ago)

Author:

cinc

Message:

New methods and additions all over the place.

Location:

trunk/desktop/class_c

Files:

• wpfilesystem.c (modified) (2 diffs)
• wpfolder.c (modified) (3 diffs)
• wpobject.c (modified) (5 diffs)

trunk/desktop/class_c/wpfilesystem.c

@@ -43 +43 @@
 
 #include <string.h>
+#include "gtk/gtk.h"
+/* Gui stuff */
+#include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
+#include "nomfolderwindow.h"
+
+
 #include "wpfilesystem.ih"
 
@@ -54 +63 @@
 }
 
-NOM_Scope PNOMPath NOMLINK impl_WPFileSystem_wpQueryRealName(WPFileSystem* nomSelf, const CORBA_boolean bFullPath,
+NOM_Scope PNOMPath NOMLINK impl_WPFileSystem_wpQueryFileName(WPFileSystem* nomSelf, const CORBA_boolean bFullPath,
                                                              CORBA_Environment *ev)
 {
   WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf);
-  PNOMPath nomRetval=NOMPathNew();
-  
-  NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+  PNOMPath nomRetval;
+  PNOMPath nomPath;
+  PWPFolder wpParent;
 
-  return nomRetval;
+  if(!bFullPath){
+    nomRetval=NOMPathNew();
+    return (PNOMPath) NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+  }
+
+  /* we are interested in the full path */
+
+  /* Get parent folder */
+  wpParent=WPFileSystem_wpQueryFolder(nomSelf, NULLHANDLE);
+
+  if(NULLHANDLE==wpParent)
+    {
+      /* We are root folder */
+      nomRetval=NOMPathNew();
+      return (PNOMPath) NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+    }
+
+  /* We area folder somwhere in the chain */
+  nomRetval=WPFileSystem_wpQueryFileName((WPFileSystem*)wpParent, bFullPath, NULLHANDLE);
+  nomPath=NOMPathNew();
+  nomPath= (PNOMPath) NOMPath_assignCString(nomPath, _pszFullPath, ev);
+
+  return (PNOMPath)NOMPath_appendPath(nomRetval, nomPath, NULLHANDLE);
 }
 

trunk/desktop/class_c/wpfolder.c

@@ -59 +59 @@
 /* Gui stuff */
 #include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
 #include "nomfolderwindow.h"
 
@@ -65 +68 @@
 #include "desktop.h"
 #include "helper.h"
-#include "desktoptypes.h"
+
 
 
@@ -249 +252 @@
 
 #warning !!!!! Path taken from a test location !!!!!
-        WPFolder_wpPopulate(nomSelf, 0L, NOMPath_getCString(WPFolder_wpQueryRealName(nomSelf, TRUE, ev) , ev), FALSE,  ev);
+        WPFolder_wpPopulate(nomSelf, 0L, NOMPath_queryCString(WPFolder_wpQueryFileName(nomSelf, TRUE, ev) , ev), FALSE,  ev);
         break;
 

trunk/desktop/class_c/wpobject.c

@@ -61 +61 @@
 #endif
 
+#ifndef WPFolder
+typedef struct WPFolder_struct {
+  struct nomMethodTabStruct  *mtab;
+  gulong body[1];
+} WPFolderObj;
+#define WPFolder WPFolderObj
+typedef WPFolder *PWPFolder;
+#endif
+
 #include "nomwindow.h"
 #include "desktoptypes.h"
@@ -186 +195 @@
 
   g_return_val_if_fail(NULLHANDLE!=wpObject, FALSE);
+
+  WPObject_wpSaveDeferred(wpObject, NULLHANDLE);
 
   WPObject_wpDeleteFromObjUseList(wpObject, pUseItem, NULLHANDLE);
@@ -445 +456 @@
 
   /* Create a new title */
-  NOMString_assignString(tmpString, pnomStrNewTitle, ev);
+  NOMString_assign(tmpString, pnomStrNewTitle, ev);
 
   /* It may happen that someone changed the title from another thread. We may either
@@ -472 +483 @@
   tmpPtr=g_atomic_pointer_get(&_pnomStringTitle);
 
-  return NOMString_copyString(tmpPtr, ev);
+  return NOMString_copy(tmpPtr, ev);
 }
 
@@ -656 +667 @@
 }
 
-
-
-
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpSaveDeferred(WPObject* nomSelf, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  g_message("%s not implemented", __FUNCTION__);
+
+  return TRUE;
+}
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpSaveImmediate(WPObject* nomSelf, CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  g_message("%s not implemented", __FUNCTION__);
+
+  return TRUE;
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpSetFolder(WPObject* nomSelf, const PWPFolder wpParentFolder,
+                                                 CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+
+  _wpParentFldr=wpParentFolder;
+}
+
+NOM_Scope PWPFolder NOMLINK impl_WPObject_wpQueryFolder(WPObject* nomSelf, CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+
+  return _wpParentFldr;
+}
+