Changeset 224 for trunk/desktop/class_c/wpfolder.c

Timestamp:

Feb 4, 2007, 1:22:24 PM (19 years ago)

Author:

cinc

Message:

Added doxygen documentation.

File:

• trunk/desktop/class_c/wpfolder.c (modified) (15 diffs)

trunk/desktop/class_c/wpfolder.c

@@ -38 +38 @@
  * And remember, phase 3 is near...
  */
-#ifndef NOM_M_WPFolder_IMPLEMENTATION_FILE
-#define NOM_M_WPFolder_IMPLEMENTATION_FILE
+#ifndef NOM_WPFolder_IMPLEMENTATION_FILE
+#define NOM_WPFolder_IMPLEMENTATION_FILE
 #endif
 
@@ -70 +70 @@
 #include "wpnotebook.h"
 #include "wpfolderwindow.h"
+#include "m_wpfolder.h"
 #include "wpfolder.ih"
-#include "m_wpfolder.h"
+
 #include "wpdatafile.h"
 #include "desktop.h"
@@ -92 +93 @@
   COL_DISPLAY_NAME,
   COL_PIXBUF,
-  COL_IS_DIRECTORY,
   NUM_COLS
 };
@@ -104 +104 @@
                               G_TYPE_STRING, 
                               G_TYPE_STRING, 
-                              GDK_TYPE_PIXBUF,
-                              G_TYPE_BOOLEAN);
-  g_message("%s: store: %x", __FUNCTION__, (UINT) store);
+                              GDK_TYPE_PIXBUF);
+  // g_message("%s: store: %x", __FUNCTION__, (UINT) store);
   return store;
 }
@@ -115 +114 @@
 
 /***************************************************************/
-
+/*
+  The folder is already populated, that means the internal folder list
+  is filled with all the objects in the folder. We traverse that list
+  and fill the store utilisized by the icon view with the objects.
+ */
 static
 gboolean fillStoreTraverseFunc(gpointer pKey, gpointer pTraverseValue, gpointer pData)
@@ -123 +126 @@
   gchar * display_name;
   GtkListStore *store=(GtkListStore *)pData;
-
+  WPObject* wpObject;
+    
   //  g_message("In %s with %s %x", __FUNCTION__, (char*)pKey, (UINT)pValue->wpObject);
 
@@ -129 +133 @@
   display_name=g_strdup(pKey); /* New string necessary? */  
 
-
-  if(!strcmp("WPDataFile", pValue->wpObject->mtab->nomClassName)){
-    WPDataFile* wpDataFile;
-
-    wpDataFile=(WPDataFile*)pValue->wpObject;
-
-    if(nomIsObj(wpDataFile))
-      {
-        gtk_list_store_append (store, &iter);
-        
-#warning !!!! some problems with icon handling here !!!!
-        //nomPrintf("Icon ptr: %x\n", _wpQueryIcon((WPObject*)wpDataFile, NULLHANDLE));
-        gtk_list_store_set (store, &iter,
-                            COL_OBJECT_PTR, wpDataFile,
-                            COL_PATH, "",
-                            COL_DISPLAY_NAME, display_name,
-                            COL_IS_DIRECTORY, FALSE,
-                            COL_PIXBUF, _wpQueryIcon((WPObject*)wpDataFile, NULLHANDLE), //file_pixbuf,
-                            -1);
-      }
+  wpObject=pValue->wpObject;
+  
+  if(nomIsObj(wpObject)){
+#if 0
+    g_message("%d %s : %s, %s",
+              __LINE__, __FUNCTION__, (char*)pKey,
+              NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE), NULLHANDLE));
+#endif
+    
+    gtk_list_store_append (store, &iter);
+    
+    gtk_list_store_set (store, &iter,
+                        COL_OBJECT_PTR, wpObject,
+                        COL_PATH, "",
+                        COL_DISPLAY_NAME, display_name,
+                        COL_PIXBUF, _wpQueryIcon(wpObject, NULLHANDLE),
+                        -1);
   }
-  else{
-    WPFolder* wpFolder;
-
-    wpFolder=(WPFolder*)pValue->wpObject;
-
-    if(nomIsObj((NOMObject*)wpFolder)){
-#if 0
-      g_message("%d %s : %s, %s",
-                __LINE__, __FUNCTION__, (char*)pKey,
-                NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE), NULLHANDLE));
-#endif
-
-      gtk_list_store_append (store, &iter);
-      
-      gtk_list_store_set (store, &iter,
-                          COL_OBJECT_PTR, wpFolder,
-                          COL_PATH, "",
-                          COL_DISPLAY_NAME, display_name,
-                          COL_IS_DIRECTORY, TRUE,
-                          COL_PIXBUF, _wpQueryIcon((WPObject*)wpFolder, NULLHANDLE), //folder_pixbuf ,
-                          -1);
-    }
-  }
-
   return FALSE; /* Traverse every item */
 }
@@ -181 +158 @@
 {
   WPFolderData* nomThis=WPFolderGetData(nomSelf); 
-
-  nomPrintf("In %s:  %s\n", __FUNCTION__, gchrPath);          
 
   /* First clear the store */
@@ -273 +248 @@
               wpObject=NULLHANDLE;
           }
+
           if(nomIsObj((PNOMObject)wpObject))
             {
@@ -279 +255 @@
               WPFileSystem_tstSetFullPath((WPFileSystem*)wpObject, gchrCurrentEntry, NULLHANDLE);
               WPFileSystem_wpSetFolder(wpObject, nomSelf, NULLHANDLE);
-#if 9
+#if 0
               g_message("%d %s : %s (%x) , %s",
                         __LINE__, __FUNCTION__, gchrCurrentEntry, (UINT)wpObject,
@@ -319 +295 @@
   g_return_val_if_fail(NULLHANDLE!=wpWindow, FALSE);
 
-  /* This call will be different when using WPFolderWindow */
-  //wpObject=NOMFolderWindow_wpQueryWPFolderObject(wpWindow, NULLHANDLE);
   wpObject=pUseItem->wpObject;
   g_return_val_if_fail(NULLHANDLE!=wpObject, FALSE);
 
   WPObject_wpSaveDeferred(wpObject, NULLHANDLE);
-
+  /* Remove the open folder view from the inuse list */
   WPObject_wpDeleteFromObjUseList(wpObject, pUseItem, NULLHANDLE);
 
@@ -344 +318 @@
   /* Special parameter representing a double click or "I just don't know" ;-) */
   if(OPEN_DEFAULT==ulView)
-    ulV=WPObject_wpQueryDefaultView(nomSelf, &nSpaceId, NULLHANDLE);
+    ulV=WPFolder_wpQueryDefaultView(nomSelf, &nSpaceId, NULLHANDLE);
 
   /* We only handle items with in own name space */
@@ -361 +335 @@
             GtkIconView*  gtkIconView;
 
-            pszPath=NOMPath_queryCString(WPFolder_wpQueryFileName(nomSelf, TRUE, NULLHANDLE), NULLHANDLE);
+            pszPath=NOMPath_queryCString(_wpQueryFileName(nomSelf, TRUE, NULLHANDLE), NULLHANDLE);
             g_message("%d %s, %s", __LINE__, __FUNCTION__, pszPath);
             WPFolder_wpPopulate(nomSelf, 0L, pszPath, FALSE,  NULLHANDLE);
@@ -370 +344 @@
             
             /* Insert it into inuse list */
-            pui=(PUSEITEM)WPFolder_wpAllocMem(nomSelf, sizeof(USEITEM)+sizeof(VIEWITEM), &ulError, ev);
+            pui=(PUSEITEM)WPFolder_wpAllocMem(nomSelf, sizeof(USEITEM)+sizeof(VIEWITEM), &ulError, NULLHANDLE);
             /* Fill the structures */
             pui->type=(gulong)USAGE_OPENVIEW;
@@ -379 +353 @@
             ((VIEWITEM*)pui)->nameSpaceId=WPFolderNomId;
             pui--;
-#warning !!!!! Folder window must be inserted into inuse list !!!!!
+
             /* Make sure the view item is removed when the window is closed */
             g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpFldrWindow, NULLHANDLE)),"delete-event",