Changeset 186

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.

Location:

trunk

Files:

• desktop/class_c/wpfilesystem.c (modified) (1 diff)
• desktop/class_c/wpfolder.c (modified) (15 diffs)
• desktop/class_c/wpobject.c (modified) (5 diffs)
• desktop/idl/wpfolder.idl (modified) (1 diff)
• desktop/idl/wpobject.idl (modified) (2 diffs)
• desktop/include/desktoptypes.h (modified) (1 diff)
• desktop/src/vdesktop.c (modified) (6 diffs)
• gui/class_c/nomfolderwindow.c (modified) (7 diffs)

trunk/desktop/class_c/wpfilesystem.c

@@ -60 +60 @@
 
   nomPrintf("thePath: ---> %s \n", fullPath);
-  _pszFullPath=fullPath;
+  _pszFullPath=g_strdup(fullPath);
 }
 

trunk/desktop/class_c/wpfolder.c

@@ -48 +48 @@
 #include "gtk/gtk.h"
 
-#warning !!!!! nomIsObj() must be globaly defined !!!!!
-#define nomIsObj(a) ((a)!= 0)
-
 typedef struct _PRIVFOLDERDATA
 {
@@ -56 +53 @@
   GtkWidget    *gtkIconView;
 }PRIVFOLDERDATA, *PPRIVFOLDERDATA;
+
+typedef struct _FLDRGTREEKEY
+{
+  PGTree pGTree;
+  gchar* chrKey;
+}FLDRGTREEKEY, *PFLDRGTREEKEY;
 
 /* Gui stuff */
@@ -69 +72 @@
 #include "helper.h"
 
+typedef struct _FLDRGTREEVALUE
+{
+  PGTree pGTree;
+  WPObject* wpObject;
+  const gchar* chrKey;
+}FLDRGTREEVALUE, *PFLDRGTREEVALUE;
 
 
@@ -92 +101 @@
                               GDK_TYPE_PIXBUF,
                               G_TYPE_BOOLEAN);
-  g_message("%s: store: %x", __FUNCTION__, store);
+  g_message("%s: store: %x", __FUNCTION__, (UINT) store);
   return store;
 }
 
+#if 0
 static BOOL
 fldr_fillStore (GtkListStore *store, const gchar* gchrPath)
@@ -132 +142 @@
 
               wpFolder=WPFolderNew();
-              if(nomIsObj(wpFolder))
+              if(nomIsObj((PNOMObject)wpFolder))
                 {
                   gtk_list_store_append (store, &iter);
@@ -153 +163 @@
               wpDataFile=WPDataFileNew();
 
-              if(nomIsObj(wpDataFile))
+              if(nomIsObj((PNOMObject)wpDataFile))
                 {
                   gtk_list_store_append (store, &iter);
@@ -177 +187 @@
   return TRUE;
 }
-
 /* pszPath contains the fully qualified path (checked with WPS) */
 NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpPopulate(WPFolder* nomSelf, const CORBA_unsigned_long ulReserved,
@@ -197 +206 @@
   /* Already populated? */
   if(fFoldersOnly && 
-     (_wpQueryFldrFlags(somSelf) & (FOI_POPULATEDWITHFOLDERS | FOI_POPULATEDWITHALL)))
+     (_wpQueryFldrFlags(nomSelf) & (FOI_POPULATEDWITHFOLDERS | FOI_POPULATEDWITHALL)))
     return TRUE;
-  else if(_wpQueryFldrFlags(somSelf) & FOI_POPULATEDWITHALL)
+  else if(_wpQueryFldrFlags(nomSelf) & FOI_POPULATEDWITHALL)
     return TRUE;
 #endif
@@ -233 +242 @@
   return FALSE;
 }
+/* Insert an object into the folders object list */
+void tst_insertObject(WPFolder* nomSelf, WPObject* wpObject, gchar* chrName)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
+
+  g_tree_insert(_fldrObjects, chrName, wpObject);
+}
+#endif
+
+static
+gboolean fillStoreTraverseFunc(gpointer pKey, gpointer pTraverseValue, gpointer pData)
+{
+  GtkTreeIter iter;
+  PFLDRGTREEVALUE pValue=pTraverseValue;
+  gchar * display_name;
+  GtkListStore *store=(GtkListStore *)pData;
+
+  g_message("In %s with %s %x", __FUNCTION__, (char*)pKey, (UINT)pValue->wpObject);
+
+#warning !!!!! Use Title here !!!!!
+  display_name=pKey;  
+
+
+  if(!strcmp("WPDataFile", pValue->wpObject->mtab->nomClassName)){
+    WPDataFile* wpDataFile;
+
+    wpDataFile=(WPDataFile*)pValue->wpObject;
+
+    if(nomIsObj((PNOMObject)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);
+      }
+  }
+  else{
+    WPFolder* wpFolder;
+
+    wpFolder=(WPFolder*)pValue->wpObject;
+
+    if(nomIsObj((NOMObject*)wpFolder)){
+
+      g_message("%d %s : %s, %s",
+                __LINE__, __FUNCTION__, (char*)pKey,
+                NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE), NULLHANDLE));
+
+
+      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 */
+}
+
+static gboolean
+fldr_fillStore (WPFolder* nomSelf, GtkListStore *store, const gchar* gchrPath)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf); 
+
+  nomPrintf("In %s:  %s\n", __FUNCTION__, gchrPath);          
+
+  /* First clear the store */
+  gtk_list_store_clear (store);
+
+  g_tree_foreach(_fldrObjects, (GTraverseFunc) fillStoreTraverseFunc, store);
+
+  return TRUE;
+}
+
+
+NOM_Scope gulong NOMLINK impl_WPFolder_wpAddToContent(WPFolder* nomSelf, const PWPObject wpObject, 
+                                                      const CORBA_char * chrFileName, CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+  PFLDRGTREEVALUE pValue;
+
+  pValue=(PFLDRGTREEVALUE)NOMMalloc(sizeof(FLDRGTREEVALUE));
+  pValue->pGTree=_fldrObjects;
+  pValue->wpObject=wpObject;
+  pValue->chrKey=chrFileName;
+  g_tree_insert(_fldrObjects, chrFileName, pValue);
+
+#if 0
+  PFLDRGTREEKEY pKey;
+  pKey=(PFLDRGTREEKEY)NOMMalloc(sizeof(FLDRGTREEKEY));
+  pKey->pGTree=_fldrObjects;
+  pKey->chrKey=chrFileName;
+  g_tree_insert(_fldrObjects, pKey, wpObject);
+#endif
+
+  return 0;
+}
+
+NOM_Scope PWPObject NOMLINK impl_WPFolder_wpQueryContent(WPFolder* nomSelf, CORBA_Environment *ev)
+{
+/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+  PWPObject nomRetval;
+
+  return nomRetval;
+}
+
+
+/* pszPath contains the fully qualified path (checked with WPS) */
+NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpPopulate(WPFolder* nomSelf, const CORBA_unsigned_long ulReserved,
+                                                         const CORBA_char * pszPath, const CORBA_boolean fFoldersOnly,
+                                                         CORBA_Environment *ev)
+{
+  /*  WPFolderData* nomThis=WPFolderGetData(nomSelf); */
+  GDir *gDir;
+  const gchar *gchrCurrentEntry;
+  const gchar* gchrPath;
+  PNOMPath fldrPath;
+
+  g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s (0x%x)\n", __FUNCTION__, pszPath, (UINT)nomSelf);
+
+  /* Already populated? */
+  if(fFoldersOnly && 
+     (_wpQueryFldrFlags(nomSelf, NULLHANDLE) & (FOI_POPULATEDWITHFOLDERS | FOI_POPULATEDWITHALL)))
+    return TRUE;
+  else if(_wpQueryFldrFlags(nomSelf, NULLHANDLE) & FOI_POPULATEDWITHALL)
+    return TRUE;
+
+  /* Go through the directory and extract all the file
+   * information */
+  fldrPath=WPFolder_wpQueryFileName(nomSelf, TRUE, NULLHANDLE);
+  gchrPath=NOMPath_queryCString(fldrPath, NULLHANDLE);
+  gDir = g_dir_open(gchrPath, 0, NULL);
+  if (!gDir)
+    return FALSE;
+
+  while ((gchrCurrentEntry = g_dir_read_name (gDir))!= NULL)
+    {
+      gchar *path, *display_name;
+
+      if (gchrCurrentEntry[0] != '\0')
+        {
+          WPObject* wpObject;
+
+          path = g_build_filename (gchrPath, gchrCurrentEntry, NULL);
+
+          display_name = g_filename_to_utf8 (gchrCurrentEntry, -1, NULL, NULL, NULL);
+
+          if(g_file_test (path, G_FILE_TEST_IS_DIR))
+            wpObject=(WPObject*)WPFolderNew(); /* It's a folder */
+          else{
+            if(!fFoldersOnly)
+              wpObject=(WPObject*)WPDataFileNew(); /* It's a file */
+            else
+              wpObject=NULLHANDLE;
+          }
+          if(nomIsObj((PNOMObject)wpObject))
+            {
+              WPObject_wpSetTitleFromCString(wpObject, display_name, NULLHANDLE);
+              WPFileSystem_tstSetFullPath((WPFileSystem*)wpObject, gchrCurrentEntry, NULLHANDLE);
+              WPFileSystem_wpSetFolder(wpObject, nomSelf, NULLHANDLE);
+              g_message("%d %s : %s (%x) , %s",
+                        __LINE__, __FUNCTION__, gchrCurrentEntry, (UINT)wpObject,
+                        NOMPath_queryCString(WPFolder_wpQueryFileName(wpObject, TRUE, NULLHANDLE), NULLHANDLE));
+
+              /* insert into contents list */
+              WPFolder_wpAddToContent(nomSelf, wpObject, g_strdup(gchrCurrentEntry), NULLHANDLE);
+            }/* if(nomIsObj(wpObject)) */
+          g_free (path);
+          g_free (display_name);
+        }/* if (gchrCurrentEntry[0] != '\0') */
+    }/* while */
+  g_dir_close(gDir);
+
+  if(fFoldersOnly)
+    _wpSetFldrFlags(nomSelf, FOI_POPULATEDWITHFOLDERS, FOI_POPULATEDWITHFOLDERS, NULLHANDLE);
+  else
+    _wpSetFldrFlags(nomSelf, FOI_POPULATEDWITHFOLDERS| FOI_POPULATEDWITHALL,
+                    FOI_POPULATEDWITHFOLDERS| FOI_POPULATEDWITHALL, NULLHANDLE);
+
+  return TRUE;
+}
+
+
+/*
+  This will change when NOMFolderWindow is migrated to WPFolderWindow.
+ */
+static
+gboolean tempWPWindowDeleteHandler(GtkWidget* gtkWidget, GdkEvent* gdkEvent, gpointer pData)
+{
+  WPObject* wpObject;
+  NOMFolderWindow* wpWindow;
+
+  PUSEITEM pUseItem=(PUSEITEM) pData;
+
+  /* This is also in the use item */
+  wpWindow=(NOMFolderWindow*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
+
+  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);
+
+  WPObject_wpDeleteFromObjUseList(wpObject, pUseItem, NULLHANDLE);
+
+  return FALSE; /* Let other handlers run */
+}
+
 
 NOM_Scope gpointer NOMLINK impl_WPFolder_wpOpen(WPFolder* nomSelf, const PNOMFolderWindow nomFolder,
@@ -238 +469 @@
                                                 CORBA_Environment *ev)
 {
-/* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
-
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+  g_message("%d %s", __LINE__, __FUNCTION__);
   switch(ulView)
     {
@@ -245 +476 @@
     case OPEN_DEFAULT:
       {
-        static NOMFolderWindow * nomFldrWindow;
-
+        PUSEITEM pui;
+        ULONG ulError;
+        NOMFolderWindow * nomFldrWindow;
+        gchar* pszPath;
+        PPRIVFOLDERDATA priv;
+        GtkListStore* gStore;
+  
+        pszPath=NOMPath_queryCString(WPFolder_wpQueryFileName(nomSelf, TRUE, NULLHANDLE), NULLHANDLE);
+        g_message("%d %s, %s", __LINE__, __FUNCTION__, pszPath);
+        WPFolder_wpPopulate(nomSelf, 0L, pszPath, FALSE,  NULLHANDLE);
+
+
+        nomFldrWindow=WPFolder_wpCreateFolderWindow(nomSelf, ev);
+#warning !!!!! There is WPWindow now. Use that for any WPS windows, Then this call must be changed
+        NOMFolderWindow_setWPFolderObject(nomFldrWindow, nomSelf, NULLHANDLE);
+
+        /* Insert it into inuse list */
+        pui=(PUSEITEM)WPFolder_wpAllocMem(nomSelf, sizeof(USEITEM)+sizeof(VIEWITEM), &ulError, ev);
+        /* Fill the structures */
+        pui->type=(gulong)USAGE_OPENVIEW;
+        pui->wpObject=(PWPObject)nomSelf;
+        pui++;
+        ((VIEWITEM*)pui)->ulView=VIEW_CONTENTS;
+        ((VIEWITEM*)pui)->nomWindow=(NOMWindow*)nomFldrWindow;
+        pui--;
 #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_queryCString(WPFolder_wpQueryFileName(nomSelf, TRUE, ev) , ev), FALSE,  ev);
-        break;
-
-#if 0
-        char path[CCHMAXPATH];
-        ULONG ulSize;
+        /* Make sure the view item is removed when the window is closed */
+        g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)nomFldrWindow, NULLHANDLE)),"delete-event", 
+                         G_CALLBACK(tempWPWindowDeleteHandler), (gpointer) pui);
+        WPFolder_wpAddToObjUseList(nomSelf, pui, NULLHANDLE);
+
+        /* Now create a folder store and insert icons into the window */
+        priv=_privFolderData;
+        gStore=priv->gstoreFldContents;
+
+        if(!gStore)
+          {
+            /* Create a store holding the folder contents */
+            gStore=fldr_CreateStore();
+            g_return_val_if_fail(gStore!=NULLHANDLE, FALSE);
+            priv->gstoreFldContents=gStore;
+          }
+
+        /* Fill our store */
+        if(gStore)
+          fldr_fillStore(nomSelf, gStore, pszPath);
+        else
+          return FALSE;
         
-        /* Get full path of folder */
-        ulSize=sizeof(path);
+        gtk_icon_view_set_model(GTK_ICON_VIEW (priv->gtkIconView), GTK_TREE_MODEL (priv->gstoreFldContents));
         
-        if(!_wpQueryRealName(somSelf, path, &ulSize, TRUE))
-          return NULLHANDLE; /* Error */
+        /* We now set which model columns that correspond to the text
+         * and pixbuf of each item
+         */
+        gtk_icon_view_set_text_column (GTK_ICON_VIEW (priv->gtkIconView), COL_DISPLAY_NAME);
+        gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (priv->gtkIconView), COL_PIXBUF);
+        gtk_icon_view_set_item_width (GTK_ICON_VIEW (priv->gtkIconView), 100);
         
-        nomPrintf("%s: opening %s\n", __FUNCTION__, path);
+        g_object_unref (gStore);
         
-        /* Create folder window */
-        hwndFolder=fldr_createFolderWindow(somSelf, path);
-        
-        if(!hwndFolder)
-          return NULLHANDLE;
-
-        /* populate the folder */
-        _wpPopulate(somSelf, 0, path, FALSE); /* Contents or details. Tree isn't supported yet */
-
-        break;
-#endif
+        return nomFldrWindow;
       }/* default */
     default:
@@ -308 +567 @@
 }
 
+static void
+itemActivated (GtkIconView *widget,
+                GtkTreePath *treePath,
+                gpointer     user_data)
+{
+  PNOMFolderWindow pWindow;
+
+  pWindow=(NOMFolderWindow*)user_data;
+
+  if(NULL!=treePath)
+    {
+      GtkTreeIter iter;
+      GtkTreeModel* model;
+      WPObject *wpObject;
+
+      /* Click on an icon */            
+      model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
+      gtk_tree_model_get_iter(model , &iter, treePath);
+      
+      gtk_tree_model_get(model, &iter,
+                         0, &wpObject,
+                         -1);
+      g_message("%s: %s", __FUNCTION__, wpObject->mtab->nomClassName);
+      WPObject_wpOpen(wpObject, pWindow, OPEN_CONTENTS, NULL, NULL);
+    }
+}
+
 /*
   This method creates the folder window it doesn't query any files or creates
@@ -325 +611 @@
   priv->gtkIconView=NOMFolderWindow_queryContainerHandle(nomFldrWindow, ev);
 
+  /* Connect to the "item_activated" signal */
+  g_signal_connect (priv->gtkIconView, "item-activated",
+                    G_CALLBACK (itemActivated), nomSelf);
+
+  gtk_window_set_title (GTK_WINDOW (NOMFolderWindow_queryWindowHandle(nomFldrWindow, NULLHANDLE)),
+                        NOMString_queryCString(WPFolder_wpQueryTitle(nomSelf, NULLHANDLE), NULLHANDLE));
   /* Show the new window */
   NOMFolderWindow_show(nomFldrWindow, ev);
@@ -331 +623 @@
 }
 
+NOM_Scope gulong NOMLINK impl_WPFolder_wpQueryFldrFlags(WPFolder* nomSelf, CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+
+  return g_atomic_int_get(&_ulFldrFlags);
+}
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPFolder_wpSetFldrFlags(WPFolder* nomSelf, const gulong ulFlags,
+                                                             const gulong ulMask, CORBA_Environment *ev)
+{
+  WPFolderData* nomThis=WPFolderGetData(nomSelf);
+
+  WPFolder_wpRequestObjectMutexSem(nomSelf, 0,ev);
+
+  _ulFldrFlags=(_ulFldrFlags & ~ulMask)| ulFlags;
+
+  WPFolder_wpReleaseObjectMutexSem(nomSelf,ev);
+
+  return TRUE;
+}
+
+#if 0
+static gint fldrCompareObjects(gconstpointer a, gconstpointer b, gpointer pUserData)
+{
+  return strcmp(((PFLDRGTREEKEY)a)->chrKey, ((PFLDRGTREEKEY)b)->chrKey);
+}
+#endif
+
+static void fldrCatchDuplicates(gpointer pOrgValue)
+{
+  PFLDRGTREEVALUE pValue;
+  PFLDRGTREEVALUE pValueRemove;
+
+  pValue=(PFLDRGTREEVALUE)pOrgValue;
+
+  g_message("%d %s: value (object): %x %s", __LINE__, __FUNCTION__, (UINT)pValue->wpObject, pValue->chrKey);
+
+#warning !!!!! Duplicate handling is still kind of broken !!!!!
+  /*
+    When we end here another object with the same key was inserted. This may be due to populating
+    all when we first just populated with folders. ATM we just remove the accidently inserted
+    second data and reinsert the original data (which may be already used by now). The wrong data
+    must be freed here later. 
+    We should check the lock counter if we really dealing with wrong insertion here before freeing.
+    This way we might use this func also for freeing when normally removing objects.  
+   */
+  /* Remove the wrong data */
+  pValueRemove=(PFLDRGTREEVALUE)g_tree_lookup(pValue->pGTree, pValue->chrKey);
+  g_tree_steal(pValue->pGTree, pValue->chrKey); /* This does not free the stuff in this func */
+  /* Reinsert the old one */
+  g_tree_insert(pValue->pGTree, pValue->chrKey, pValue);
+}
+
 NOM_Scope void NOMLINK impl_WPFolder_wpInitData(WPFolder* nomSelf, CORBA_Environment *ev)
 {
@@ -340 +685 @@
   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);
-}
-
-
-
+  _privFolderData=_wpAllocMem((WPObject*)nomSelf, sizeof(PRIVFOLDERDATA),&ulErr, NULLHANDLE);
+
+  /* This balanced binary tree holds the objects in this folder. We create a tree
+     which may be searched using the name of the file/directory */
+  //_fldrObjects=g_tree_new((GCompareFunc)strcmp);
+  _fldrObjects=g_tree_new_full((GCompareFunc)strcmp, nomSelf, NULL, (GDestroyNotify) fldrCatchDuplicates);
+}
+
+
+

trunk/desktop/class_c/wpobject.c

@@ -185 +185 @@
 {
   WPObject* wpObject;
-  WPNoteBook* wpNoteBook;
+  WPWindow* wpWindow;
+
   PUSEITEM pUseItem=(PUSEITEM) pData;
 
-  wpNoteBook=(WPNoteBook*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
-
-  g_return_val_if_fail(NULLHANDLE!=wpNoteBook, FALSE);
-
-  wpObject=WPNoteBook_wpQueryWPObject(wpNoteBook, NULLHANDLE);
+  wpWindow=(WPWindow*)g_object_get_data(G_OBJECT(gtkWidget), NOMOBJECT_KEY_STRING);
+
+  g_return_val_if_fail(NULLHANDLE!=wpWindow, FALSE);
+
+  /* This is also in the use item */
+  wpObject=WPNoteBook_wpQueryWPObject(wpWindow, NULLHANDLE);
 
   g_return_val_if_fail(NULLHANDLE!=wpObject, FALSE);
@@ -232 +234 @@
         pui--;
         //g_message("   in %s wpNoteBook: %lx pui %lx", __FUNCTION__, wpNoteBook, pui);
+        /* Make sure the view item is removed when the window is closed */
         g_signal_connect(G_OBJECT(NOMWindow_queryWindowHandle((NOMWindow*)wpNoteBook, NULLHANDLE)),"delete-event", 
                          G_CALLBACK(defaultWPWindowDeleteHandler), (gpointer) pui);
@@ -268 +271 @@
       {
         pViewItem=WPObject_wpFindViewItem(nomSelf, VIEW_SETTINGS, NULLHANDLE, ev);
+        if(pViewItem){
+          //g_message("   in %s : OPEN_SETTINGS returning %x %x ...", __FUNCTION__, pViewItem, pViewItem->nomWindow);
+          /* Bring the window to the foreground */
+          NOMWindow_present(pViewItem->nomWindow, ev);
+          return (gpointer)pViewItem->nomWindow;
+        }
+        break;
+      }
+    case OPEN_CONTENTS:
+      {
+#warning !!!!! This belongs into WPFolder !!!!!
+        pViewItem=WPObject_wpFindViewItem(nomSelf, VIEW_CONTENTS, NULLHANDLE, ev);
         if(pViewItem){
           //g_message("   in %s : OPEN_SETTINGS returning %x %x ...", __FUNCTION__, pViewItem, pViewItem->nomWindow);
@@ -449 +464 @@
 }
 
-NOM_Scope PNOMString NOMLINK impl_WPObject_wpSetTitle(WPObject* nomSelf, const PNOMString pnomStrNewTitle, CORBA_Environment *ev)
-{
-  WPObjectData* nomThis=WPObjectGetData(nomSelf);
-  PNOMString tmpString=NOMStringNew();
+NOM_Scope void NOMLINK impl_WPObject_wpSetTitle(WPObject* nomSelf, const PNOMString pnomStrNewTitle,
+                                                      CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+  PNOMString tmpString=(PNOMString)NOMString_new(pnomStrNewTitle, NULLHANDLE);
   gpointer tmpPtr;
 
   /* Create a new title */
-  NOMString_assign(tmpString, pnomStrNewTitle, ev);
+  NOMString_assign(tmpString, pnomStrNewTitle, NULLHANDLE);
 
   /* It may happen that someone changed the title from another thread. We may either
@@ -468 +484 @@
     tmpPtr=g_atomic_pointer_get(&_pnomStringTitle);
   }while(!g_atomic_pointer_compare_and_exchange((gpointer*)&_pnomStringTitle, tmpPtr, (gpointer) tmpString));
-
-  return pnomStrNewTitle;
+}
+
+NOM_Scope void NOMLINK impl_WPObject_wpSetTitleFromCString(WPObject* nomSelf, const CORBA_char * chrNewTitle,
+                                                           CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+  PNOMString orgTitle;
+  PNOMString tmpString;
+
+  orgTitle=(PNOMString)g_atomic_pointer_get(&_pnomStringTitle);
+  tmpString=(PNOMString)NOMString_new(orgTitle, NULLHANDLE);
+
+  NOMString_assignCString(tmpString, chrNewTitle, NULLHANDLE);
+  do{
+    /* Get old NOMString containing old title */
+    orgTitle=(PNOMString)g_atomic_pointer_get(&_pnomStringTitle);
+  }while(!g_atomic_pointer_compare_and_exchange((gpointer*)&_pnomStringTitle,
+                                                (gpointer)orgTitle, (gpointer) tmpString));
 }
 

trunk/desktop/idl/wpfolder.idl

@@ -67 +67 @@
 #endif
 
+  gulong wpQueryFldrFlags();
+  boolean wpSetFldrFlags(in gulong ulFlags, in gulong ulMask);
+
+  gulong wpAddToContent(in PWPObject wpObject, in string chrFileName);
+  PWPObject wpQueryContent();
+
   NOMOVERRIDE(wpInitData);
   NOMOVERRIDE(wpOpen);
   NOMOVERRIDE(wpQueryIcon);
 
-  NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData);
-  NOMINSTANCEVAR(PNOMPath pnomPath_);
+  NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData); /* This will go away... */
+  NOMINSTANCEVAR(PGTree fldrObjects);
+  NOMINSTANCEVAR(gulong ulFldrFlags);
 };
 

trunk/desktop/idl/wpobject.idl

@@ -84 +84 @@
   unsigned long  wpReleaseObjectMutexSem();
 
-  PNOMString wpSetTitle(in PNOMString pnomStrNewTitle);
+  void wpSetTitle(in PNOMString pnomStrNewTitle);
   PNOMString wpQueryTitle();
 
@@ -116 +116 @@
   PWPFolder wpQueryFolder();
 
+  void wpSetTitleFromCString(in string chrNewTitle);
+
   /* Methods overriden by this class */
   NOMOVERRIDE(nomInit);

trunk/desktop/include/desktoptypes.h

@@ -69 +69 @@
 #define WPMENUID_PROPERTIES        112
 
+/* Folder flags */
+#define FOI_POPULATEDWITHALL       0x0001
+#define FOI_POPULATEDWITHFOLDERS   0x0002
+
 /* Misc types used with objects */
 typedef GSList *PGSList;

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

trunk/gui/class_c/nomfolderwindow.c

@@ -44 +44 @@
 #include <gtk/gtk.h>
 #include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
 #include "nomfolderwindow.ih"
-
-#warning !!!!! nomIsObj() must be globaly defined !!!!!
-#define nomIsObj(a) ((a)!= 0)
-
 
 NOM_Scope PGtkWidget NOMLINK impl_NOMFolderWindow_queryContainerHandle(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -70 +69 @@
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
 
-  if(!nomIsObj(pWPFolderObject))
+  if(!nomIsObj((NOMObject*)pWPFolderObject))
     return;
 
@@ -83 +82 @@
 }
 
+#if 0
 static void
 itemActivated (GtkIconView *icon_view,
@@ -90 +90 @@
   DosBeep(1500, 100);
 }
+#endif
 
 /*
@@ -164 +165 @@
 }
 
-
+#if 0
 static gboolean
 handleEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-  DosBeep(5000, 100);
+  DosBeep(500, 100);
   
   return FALSE;
 }
 
-extern gpointer *pGlobalMemInExe;
+static void
+itemActivated (GtkIconView *widget,
+                GtkTreePath *treePath,
+                gpointer     user_data)
+{
+  PNOMFolderWindow pWindow;
+  //  GtkTreePath* treePath;
+
+  pWindow=(NOMFolderWindow*)user_data;
+
+  g_message("%s: %x %s", __FUNCTION__, treePath , gtk_tree_path_to_string(treePath));
+
+  return;
+}
+#endif
+
 
 NOM_Scope void NOMLINK impl_NOMFolderWindow_nomInit(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -249 +265 @@
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
                                     GTK_SELECTION_MULTIPLE);
+#if 0
   /* Connect to the "item_activated" signal */
   g_signal_connect (icon_view, "item-activated",
                     G_CALLBACK (itemActivated), nomSelf);
+#endif
   //#endif
 
@@ -276 +294 @@
   gtk_widget_grab_focus (icon_view);
 
-  g_signal_connect (GTK_WIDGET(window), "size-request",
-                    G_CALLBACK (handleEvent), nomSelf);
+  //  g_signal_connect (GTK_WIDGET(window), "size-request",
+  //                G_CALLBACK (handleEvent), nomSelf);
 
   NOMFolderWindow_setWindowHandle(nomSelf, window, NULLHANDLE);