Changeset 183 for trunk/desktop/src

Timestamp:

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

Author:

cinc

Message:

New methods and additions all over the place.

File:

• trunk/desktop/src/vdesktop.c (modified) (6 diffs)

trunk/desktop/src/vdesktop.c

@@ -38 +38 @@
 #define INCL_DOSERRORS
 #define INCL_PM
+
 #include <os2.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <gtk/gtk.h> 
 #include "debug_window.h"
@@ -50 +52 @@
 #include "nomgc.h"
 #include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
 #include "nomfolderwindow.h"
 #include "wpobject.h"
 #include "wpfolder.h"
-#include "desktoptypes.h"
+#include "nomfilepath.h"
+
 
 int createQuitWindow(void);
@@ -68 +74 @@
   return FALSE;
 }
+
+WPFolder* wpRootFolder;
 
 /*
@@ -85 +93 @@
   /* Desktop folder */
   WPFolder *wpDesktop;
-  
+  WPFolder *wpTempFolder;
+  PNOMPath nomPath;  
+  PNOMPath np;
+
   hReg=nomBeginRegisterDLLWithGC();
   if(NULLHANDLE==hReg)
@@ -117 +128 @@
   /* Query current dir */
   g_strlcpy(desktopDir, g_get_current_dir(), sizeof(desktopDir));
-  dbgPrintf("Desktop: %s", desktopDir);
+  g_message("Desktop: %s", desktopDir);
 
   /*
@@ -133 +144 @@
   NOMClassMgrObject=nomEnvironmentNew();
   //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
-  
+
+  nomPath=NOMPathNew();
+  NOMPath_assignCString(nomPath, desktopDir, NULLHANDLE);
+  /* Make sure there's no '/' at the end */
+  nomPath=NOMPath_stripSeparator(nomPath, NULLHANDLE);
+
+  /* Create root folder */
+  wpRootFolder=WPFolderNew();
+  WPFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(nomPath, NULLHANDLE),NULLHANDLE),
+                          NULLHANDLE);
+  wpTempFolder=wpRootFolder;
+
+  nomPath=NOMPath_erasePathBegin(nomPath, NULLHANDLE);
+
+  /* Now create all folders up the chain */
+  while(NOMPath_length(nomPath, NULLHANDLE)>0)
+    {
+      NOMPath* np;
+      WPFolder* wpFolder;
+      np=NOMPath_queryPathBegin(nomPath, NULLHANDLE);
+
+      wpFolder=WPFolderNew();
+      WPFolder_tstSetFullPath(wpFolder, NOMPath_queryCString(np,NULLHANDLE),
+                              NULLHANDLE);
+      WPFolder_wpSetFolder(wpFolder, wpTempFolder, NULLHANDLE);
+      wpTempFolder=wpFolder;
+      nomPath=NOMPath_erasePathBegin(nomPath, NULLHANDLE);
+      WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE);
+      //g_message("   path: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
+      //                                            NULLHANDLE));
+    };
+
+  g_message("   --> Desktop dir: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpTempFolder, TRUE, NULLHANDLE),
+                                                            NULLHANDLE));
+
   /* Create desktop folder */
-  wpDesktop=WPFolderNew();
-
-  dbgPrintf( "Created desktop object: %x", wpDesktop);
-  WPFolder_tstSetFullPath(wpDesktop, desktopDir, NULLHANDLE);
-  
+  wpDesktop=wpTempFolder;//WPFolderNew();
+
+  //WPFolder_tstSetFullPath(wpDesktop, desktopDir, NULLHANDLE);
+  //WPFolder_tstSetFullPath(wpDesktop, "r:", NULLHANDLE);
   WPFolder_wpOpen(wpDesktop, NULL, OPEN_DEFAULT,  NULL, NULL);
   /*    WPFolder_wpPopulate(wpObject, 0,"blabla 2", 0,  NULL);  */