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

Timestamp:

Dec 3, 2006, 9:54:12 PM (19 years ago)

Author:

cinc

Message:

Improvements to WPFolder and fixes to related classes.

File:

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

trunk/desktop/class_c/wpfolder.c

@@ -57 +57 @@
 }PRIVFOLDERDATA, *PPRIVFOLDERDATA;
 
+/* Gui stuff */
+#include "nomguitk.h"
+#include "nomfolderwindow.h"
+
 #include "wpfolder.ih"
 #include "wpdatafile.h"
@@ -63 +67 @@
 #include "desktoptypes.h"
 
-/* Gui stuff */
-#include "nomguitk.h"
-#include "nomfolderwindow.h"
 
 /* Enum for the folder store */
 enum
 {
+  COL_OBJECT_PTR,
   COL_PATH,
   COL_DISPLAY_NAME,
@@ -82 +84 @@
 
   store = gtk_list_store_new (NUM_COLS,
-                              G_TYPE_STRING, 
-                              G_TYPE_STRING, 
-                              GDK_TYPE_PIXBUF,
-                              G_TYPE_BOOLEAN);
-
+                              G_TYPE_POINTER,
+                              G_TYPE_STRING, 
+                              G_TYPE_STRING, 
+                              GDK_TYPE_PIXBUF,
+                              G_TYPE_BOOLEAN);
+  g_message("%s: store: %x", __FUNCTION__, store);
   return store;
 }
@@ -131 +134 @@
 
                   gtk_list_store_set (store, &iter,
+                                      COL_OBJECT_PTR, wpFolder,
                                       COL_PATH, path,
                                       COL_DISPLAY_NAME, display_name,
@@ -153 +157 @@
                   nomPrintf("Icon ptr: %x\n", _wpQueryIcon((WPObject*)wpDataFile, NULLHANDLE));
                   gtk_list_store_set (store, &iter,
+                                      COL_OBJECT_PTR, wpDataFile,
                                       COL_PATH, path,
                                       COL_DISPLAY_NAME, display_name,
@@ -185 +190 @@
   g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s\n", __FUNCTION__, pszPath);
 
-#warning !!!!! Window creation must be done elsewhere !!!!!
-  _wpCreateFolderWindow(nomSelf, NULLHANDLE);
 
 #if 0
@@ -215 +218 @@
   gtk_icon_view_set_model(GTK_ICON_VIEW (priv->gtkIconView), GTK_TREE_MODEL (priv->gstoreFldContents));
 
-  /* We now set which model columns that correspont to the text
+  /* We now set which model columns that correspond to the text
    * and pixbuf of each item
    */
@@ -228 +231 @@
 }
 
-
-NOM_Scope void NOMLINK impl_WPFolder_wpInitData(WPFolder* nomSelf, CORBA_Environment *ev)
-{
-  gulong ulErr;
-  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
-
-  /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */
-  WPFolder_wpInitData_parent((WPObject*)nomSelf,  ev);
-
-  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
-            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
-  _privFolderData=_wpAllocMem((WPObject*)nomSelf, sizeof(PRIVFOLDERDATA), (CORBA_unsigned_long*)&ulErr, NULLHANDLE);
-}
-
 NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const gpointer ptrReserved,
                                                 const CORBA_unsigned_long ulView, const gpointer ptrParams,
@@ -253 +242 @@
     case OPEN_DEFAULT:
       {
-        WPFolder_wpCreateFolderWindow(nomSelf, ev);
+        NOMFolderWindow * nomFldrWindow;
+
+#warning !!!!! Folder window must be inserted into inuse list !!!!!
+        nomFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, ev);
+        NOMFolderWindow_setWPFolderObject(nomFldrWindow, nomSelf, ev);
+
+#warning !!!!! Path taken from a test location !!!!!
+        WPFolder_wpPopulate(nomSelf, 0L, NOMPath_getCString(WPFolder_wpQueryRealName(nomSelf, TRUE, ev) , ev), FALSE,  ev);
+        break;
+
 #if 0
         char path[CCHMAXPATH];
@@ -271 +269 @@
         if(!hwndFolder)
           return NULLHANDLE;
-        
-        somPrintf("somSelf: %x, hwndFolder: %x\n", somSelf, hwndFolder);
-        /* Set object pointer */
-        /*          dw_window_set_data(hwndFolder, "thisObject", somSelf);
-                    msg("somSelf 2: %x, hwnd: %x", dw_window_get_data(hwndFolder, "thisObject"), hwndFolder); */
 
         /* populate the folder */
@@ -316 +309 @@
   models and stuff.
 */
-NOM_Scope gpointer NOMLINK impl_WPFolder_wpCreateFolderWindow(WPFolder* nomSelf, CORBA_Environment *ev)
+NOM_Scope PNOMFolderWindow NOMLINK impl_WPFolder_wpCreateFolderWindow(WPFolder* nomSelf, CORBA_Environment *ev)
 {
   NOMFolderWindow * nomFldrWindow;
@@ -329 +322 @@
   priv->gtkIconView=NOMFolderWindow_getContainerHandle(nomFldrWindow, ev);
 
+  /* Show the new window */
   NOMFolderWindow_show(nomFldrWindow, ev);
 
-  return NOMFolderWindow_getWindowHandle(nomFldrWindow, ev);;
-}
-
-
-NOM_Scope void NOMLINK impl_WPFolder_tstSetFolderPath(WPFolder* nomSelf, const CORBA_char * thePath, CORBA_Environment *ev)
-{
-/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
-
-
-}
-
-
-
-
+  return nomFldrWindow;
+}
+
+NOM_Scope void NOMLINK impl_WPFolder_wpInitData(WPFolder* nomSelf, CORBA_Environment *ev)
+{
+  gulong ulErr;
+  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
+
+  WPFolder_wpInitData_parent((WPObject*)nomSelf,  ev);
+
+  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s.\n",
+            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
+  _privFolderData=_wpAllocMem((WPObject*)nomSelf, sizeof(PRIVFOLDERDATA), (CORBA_unsigned_long*)&ulErr, NULLHANDLE);
+}
+
+
+