Changeset 186 for trunk/desktop/src/vdesktop.c

Timestamp:

Jan 13, 2007, 12:36:01 PM (19 years ago)

Author:

cinc

Message:

Folder viws are working now. Load of fixes and enhancements for it to work.

File:

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

trunk/desktop/src/vdesktop.c

@@ -96 +96 @@
   PNOMPath nomPath;  
   PNOMPath np;
+  gchar *chrDisplayName;
 
   hReg=nomBeginRegisterDLLWithGC();
@@ -145 +146 @@
   //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
 
+  /* Desktop directory oath */
   nomPath=NOMPathNew();
   NOMPath_assignCString(nomPath, desktopDir, NULLHANDLE);
@@ -151 +153 @@
 
   /* Create root folder */
+  np=NOMPath_queryPathBegin(nomPath, NULLHANDLE);
   wpRootFolder=WPFolderNew();
-  WPFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(nomPath, NULLHANDLE),NULLHANDLE),
+  WPFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(np, NULLHANDLE),NULLHANDLE),
                           NULLHANDLE);
+  chrDisplayName = g_filename_to_utf8 (NOMPath_queryCString(np,NULLHANDLE), -1, NULL, NULL, NULL);
+  WPFolder_wpSetTitleFromCString((WPObject*)wpRootFolder, chrDisplayName, NULLHANDLE);
+
   wpTempFolder=wpRootFolder;
-
   nomPath=NOMPath_erasePathBegin(nomPath, NULLHANDLE);
 
@@ -161 +166 @@
   while(NOMPath_length(nomPath, NULLHANDLE)>0)
     {
-      NOMPath* np;
       WPFolder* wpFolder;
+
       np=NOMPath_queryPathBegin(nomPath, NULLHANDLE);
 
@@ -168 +173 @@
       WPFolder_tstSetFullPath(wpFolder, NOMPath_queryCString(np,NULLHANDLE),
                               NULLHANDLE);
+      chrDisplayName = g_filename_to_utf8 (NOMPath_queryCString(np,NULLHANDLE), -1, NULL, NULL, NULL);
+      WPFolder_wpSetTitleFromCString((WPObject*)wpFolder, chrDisplayName, NULLHANDLE);
       WPFolder_wpSetFolder(wpFolder, wpTempFolder, NULLHANDLE);
+      /* insert into contents list */
+      WPFolder_wpAddToContent(wpTempFolder, (WPObject*) wpFolder, 
+                              NOMPath_copyCString(wpFolder, NULLHANDLE), NULLHANDLE);
+      
       wpTempFolder=wpFolder;
+      /* Move to next path part */
       nomPath=NOMPath_erasePathBegin(nomPath, NULLHANDLE);
-      WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE);
+      //WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE);
       //g_message("   path: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
       //                                            NULLHANDLE));
@@ -184 +196 @@
   //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);  */
-    
-#if 0
-  /* Folder toplevel window. */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  /* FIXME: Set default size of folder frame. Will later use a stored value */
-  gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
-
-  g_signal_connect (GTK_WIDGET(window), "size-request",
-                    G_CALLBACK (handleEvent), NULL/*nomSelf*/);
-
-  gtk_widget_show(window);
-  g_message("Window handle: %x", window);
-#endif
+  WPFolder_wpOpen(wpDesktop, NULL, OPEN_CONTENTS,  NULL, NULL);
 
   /* All GTK applications must have a gtk_main(). Control ends here