Changeset 194 for trunk/desktop/class_c

Timestamp:

Jan 16, 2007, 8:32:50 PM (19 years ago)

Author:

cinc

Message:

Improvements to folders

Location:

trunk/desktop/class_c

Files:

• wpdatafile.c (modified) (2 diffs)
• wpfilesystem.c (modified) (1 diff)
• wpfolder.c (modified) (14 diffs)
• wpfolderwindow.c (modified) (5 diffs)

trunk/desktop/class_c/wpdatafile.c

@@ -56 +56 @@
 /* wpdatafile.ih includes some WPObject stuff and that needs these
    includes. */
-#include "nomfolderwindow.h"
-
+#include "wpfolderwindow.h"
+#include "wpnotebook.h"
+#include "wpfolder.h"
 #include "wpdatafile.ih"
 
@@ -94 +95 @@
   }
 #warning !!!!! Dont create an icon for each object !!!!!
-  return gdk_pixbuf_new_from_file (gchrIconName, &error);
+  if(ptrIcon)
+    return ptrIcon;
+  else
+    return gdk_pixbuf_new_from_file (gchrIconName, &error);
 
 #if 0

trunk/desktop/class_c/wpfilesystem.c

@@ -49 +49 @@
 #include "desktoptypes.h"
 
-#include "nomfolderwindow.h"
-
-
+#include "wpfolderwindow.h"
+#include "wpnotebook.h"
+#include "wpfolder.h"
 #include "wpfilesystem.ih"
 

trunk/desktop/class_c/wpfolder.c

@@ -71 +71 @@
 #include "desktop.h"
 #include "helper.h"
+#include "exception.h"
 
 typedef struct _FLDRGTREEVALUE
@@ -76 +77 @@
   PGTree pGTree;
   WPObject* wpObject;
-  const gchar* chrKey;
+  gchar* chrKey;
 }FLDRGTREEVALUE, *PFLDRGTREEVALUE;
 
@@ -111 +112 @@
 /***************************************************************/
 
-#if 0
-static BOOL
-fldr_fillStore (GtkListStore *store, const gchar* gchrPath)
-{
-
-  GDir *gDir;
-  const gchar *gchrCurrentEntry;
-  GtkTreeIter iter;
-
-  nomPrintf("In %s:  %s\n", __FUNCTION__, gchrPath);          
-
-  /* First clear the store */
-  gtk_list_store_clear (store);
-
-  /* Now go through the directory and extract all the file
-   * information */
-  gDir = g_dir_open (gchrPath, 0, NULL);
-  if (!gDir)
-    return FALSE;
-
-  while ((gchrCurrentEntry = g_dir_read_name (gDir))!= NULL)
-    {
-      gchar *path, *display_name;
-      gboolean is_dir;
-
-      if (gchrCurrentEntry[0] != '\0')
-        {
-          path = g_build_filename (gchrPath, gchrCurrentEntry, NULL);
-          nomPrintf("  %s\n", path);          
-
-          display_name = g_filename_to_utf8 (gchrCurrentEntry, -1, NULL, NULL, NULL);
-          if(g_file_test (path, G_FILE_TEST_IS_DIR))
-            {
-              /* It's a folder */
-              WPFolder* wpFolder;
-
-              wpFolder=WPFolderNew();
-              if(nomIsObj((PNOMObject)wpFolder))
-                {
-                  gtk_list_store_append (store, &iter);
-
-                  gtk_list_store_set (store, &iter,
-                                      COL_OBJECT_PTR, wpFolder,
-                                      COL_PATH, path,
-                                      COL_DISPLAY_NAME, display_name,
-                                      COL_IS_DIRECTORY, is_dir,
-                                      COL_PIXBUF, _wpQueryIcon(wpFolder, NULLHANDLE), //folder_pixbuf ,
-                                      -1);
-
-                }/* if(nomIsObj(wpFolder)) */
-            }/* if(g_file_test (path, G_FILE_TEST_IS_DIR)) */
-          else
-            {
-              /* It's a file */
-              WPDataFile* wpDataFile;
-
-              wpDataFile=WPDataFileNew();
-
-              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, path,
-                                      COL_DISPLAY_NAME, display_name,
-                                      COL_IS_DIRECTORY, is_dir,
-                                      COL_PIXBUF, _wpQueryIcon((WPObject*)wpDataFile, NULLHANDLE), //file_pixbuf,
-                                      -1);
-                }
-            }
-          g_free (path);
-          g_free (display_name);
-        }/* if (gchrCurrentEntry[0] != '\0') */
-    }/* while */
-
-  g_dir_close(gDir);
-
-  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,
-                                                         const CORBA_char * pszPath, const CORBA_boolean fFoldersOnly,
-                                                         CORBA_Environment *ev)
-{
- WPFolderData* nomThis=WPFolderGetData(nomSelf); 
-  GtkListStore* gStore;
-  PPRIVFOLDERDATA priv;
-
-  nomPrintf("    Entering %s with nomSelf: 0x%x. nomSelf is: %s. Path is %s\n",
-            __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName, pszPath);
-
-  g_return_val_if_fail(_privFolderData!=NULLHANDLE, FALSE);      /* Huh! What happened in wpInitData()? */
-  g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s\n", __FUNCTION__, pszPath);
-
-
-#if 0
-  /* Already populated? */
-  if(fFoldersOnly && 
-     (_wpQueryFldrFlags(nomSelf) & (FOI_POPULATEDWITHFOLDERS | FOI_POPULATEDWITHALL)))
-    return TRUE;
-  else if(_wpQueryFldrFlags(nomSelf) & FOI_POPULATEDWITHALL)
-    return TRUE;
-#endif
-
-  priv=_privFolderData;
-
-  if(!priv->gstoreFldContents)
-    {
-      /* 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(gStore, pszPath);
-  else
-    return FALSE;
-
-  gtk_icon_view_set_model(GTK_ICON_VIEW (priv->gtkIconView), GTK_TREE_MODEL (priv->gstoreFldContents));
-
-  /* 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);
-
-  g_object_unref (gStore);
-
-  return FALSE;
-}
-#endif
-
 static
 gboolean fillStoreTraverseFunc(gpointer pKey, gpointer pTraverseValue, gpointer pData)
@@ -258 +120 @@
   GtkListStore *store=(GtkListStore *)pData;
 
-  g_message("In %s with %s %x", __FUNCTION__, (char*)pKey, (UINT)pValue->wpObject);
+  //  g_message("In %s with %s %x", __FUNCTION__, (char*)pKey, (UINT)pValue->wpObject);
 
 #warning !!!!! Use Title here !!!!!
-  display_name=pKey;  
+  display_name=g_strdup(pKey); /* New string necessary? */  
 
 
@@ -290 +152 @@
 
     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);
@@ -336 +198 @@
   pValue->pGTree=_fldrObjects;
   pValue->wpObject=wpObject;
-  pValue->chrKey=chrFileName;
-  g_tree_insert(_fldrObjects, chrFileName, pValue);
+  pValue->chrKey=g_strdup(chrFileName);
+
+  g_tree_insert(_fldrObjects, pValue->chrKey, pValue);
 
 #if 0
@@ -353 +216 @@
 {
 /* WPFolderData* nomThis=WPFolderGetData(nomSelf); */
-  PWPObject nomRetval;
-
-  return nomRetval;
+
+  return NULLHANDLE;
 }
 
@@ -370 +232 @@
   PNOMPath fldrPath;
 
-  g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s (0x%x)\n", __FUNCTION__, pszPath, (UINT)nomSelf);
+  //  g_log("WPFolder", G_LOG_LEVEL_DEBUG, "%s: Populating %s (0x%x)\n", __FUNCTION__, pszPath, (UINT)nomSelf);
 
   /* Already populated? */
@@ -409 +271 @@
           if(nomIsObj((PNOMObject)wpObject))
             {
+              WPObject_wpLockObject(wpObject, NULLHANDLE);
               WPObject_wpSetTitleFromCString(wpObject, display_name, NULLHANDLE);
               WPFileSystem_tstSetFullPath((WPFileSystem*)wpObject, gchrCurrentEntry, NULLHANDLE);
               WPFileSystem_wpSetFolder(wpObject, nomSelf, NULLHANDLE);
+#if 9
               g_message("%d %s : %s (%x) , %s",
                         __LINE__, __FUNCTION__, gchrCurrentEntry, (UINT)wpObject,
                         NOMPath_queryCString(WPFolder_wpQueryFileName(wpObject, TRUE, NULLHANDLE), NULLHANDLE));
-
+#endif
               /* insert into contents list */
-              WPFolder_wpAddToContent(nomSelf, wpObject, g_strdup(gchrCurrentEntry), NULLHANDLE);
+              WPFolder_wpAddToContent(nomSelf, wpObject, gchrCurrentEntry, NULLHANDLE);
             }/* if(nomIsObj(wpObject)) */
           g_free (path);
@@ -491 +355 @@
             PPRIVFOLDERDATA priv;
             GtkListStore* gStore;
-            
+            GtkIconView*  gtkIconView;
+
             pszPath=NOMPath_queryCString(WPFolder_wpQueryFileName(nomSelf, TRUE, NULLHANDLE), NULLHANDLE);
             g_message("%d %s, %s", __LINE__, __FUNCTION__, pszPath);
@@ -526 +391 @@
                 g_return_val_if_fail(gStore!=NULLHANDLE, FALSE);
                 priv->gstoreFldContents=gStore;
+
+                /* Fill our store */
+                if(gStore)
+                  fldr_fillStore(nomSelf, gStore, pszPath);
+                else
+                  return FALSE;
               }
-            
-            /* Fill our store */
-            if(gStore)
-              fldr_fillStore(nomSelf, gStore, pszPath);
-            else
-              return FALSE;
-            
-            gtk_icon_view_set_model(GTK_ICON_VIEW (priv->gtkIconView), GTK_TREE_MODEL (priv->gstoreFldContents));
-            
+
+            gtkIconView=WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE);
+
+            gtk_icon_view_set_model(GTK_ICON_VIEW (gtkIconView),
+                                    GTK_TREE_MODEL (priv->gstoreFldContents));
+
             /* 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);
-            
-            g_object_unref (gStore);
+            gtk_icon_view_set_text_column (GTK_ICON_VIEW (gtkIconView), COL_DISPLAY_NAME);
+            gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (gtkIconView), COL_PIXBUF);
+            gtk_icon_view_set_item_width (GTK_ICON_VIEW (gtkIconView), 100);
+            
+            //            g_object_unref (gStore);
             
             return wpFldrWindow;
@@ -609 +477 @@
       g_message("%s: %s", __FUNCTION__, wpObject->mtab->nomClassName);
       /*      WPObject_wpOpen(wpObject, pWindow, OPEN_CONTENTS, NULL, NULL); */
-      WPObject_wpViewObject(wpObject, pWindow, OPEN_DEFAULT, 0, NULLHANDLE, NULL);
+      TRY(FLDR_ITEMACTIVATED) {
+        WPObject_wpViewObject(wpObject, pWindow, OPEN_DEFAULT, 0, NULLHANDLE, NULL);
+      }
+      CATCH{
+        LOUD;
+        g_message("Line %d: Trap in %s", __LINE__, __FUNCTION__);  
+      }END_CATCH(FLDR_ITEMACTIVATED);
     }
 }
@@ -627 +501 @@
   wpFldrWindow=WPFolderWindowNew();
 
-#warning !!!!! This is only for testing !!!!!
-  priv->gtkIconView=WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, ev);
-
   /* Connect to the "item_activated" signal */
-  g_signal_connect (priv->gtkIconView, "item-activated",
+  g_signal_connect (WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE), "item-activated",
                     G_CALLBACK (itemActivated), nomSelf);
 
@@ -719 +590 @@
 
 
+

trunk/desktop/class_c/wpfolderwindow.c

@@ -36 +36 @@
  *
  */
+#define METHOD_DEBUG
+
 #include <os2.h>
 
@@ -52 +54 @@
 #include "wpfolderwindow.ih"
 #include "wpobject.h"
+#include "exception.h"
 
 NOM_Scope PGtkWidget NOMLINK impl_WPFolderWindow_wpQueryContainerHandle(WPFolderWindow* nomSelf, CORBA_Environment *ev)
@@ -100 +103 @@
 fldr_handleButtonEvent (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-  if(fldr_checkContextButton(event))
-    {
-      PWPFolderWindow pWindow;
-      GtkTreePath* treePath;
-
-      DosBeep(5000, 100);
-      pWindow=(WPFolderWindow*)user_data;
-
-      treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(widget), event->x, event->y );
-      if(NULL==treePath)
-        {
-          /* Click on white space */
-          WPFolder* wpFolder;
-          wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);
-          g_message("%s: %s", __FUNCTION__, wpFolder->mtab->nomClassName);
-          WPObject_wpDisplayMenu((WPObject*)wpFolder, pWindow, NULL, MENU_OPENVIEWPOPUP, 0, NULL);
-        }
-      else
-        {
-          GtkTreeIter iter;
-          GtkTreeModel* model;
-          WPObject *wpObject;
-          /* Click on an icon */
-
-          g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
-
-          model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
-          g_message("%s: model: %x", __FUNCTION__, (UINT)model);
-
-          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_wpDisplayMenu((WPObject*)wpObject, pWindow, NULL, MENU_OBJECTPOPUP, 0, NULL);
-        }
-    }
+  
+
+  TRY(FLDR_BUTTONEVENT) {
+    if(fldr_checkContextButton(event))
+      {
+        PWPFolderWindow pWindow;
+        GtkTreePath* treePath;
+        DosBeep(5000, 100);
+        pWindow=(WPFolderWindow*)user_data;
+        TST_OBJECT(pWindow);
+        treePath=gtk_icon_view_get_path_at_pos(GTK_ICON_VIEW(widget), event->x, event->y );
+        if(NULL==treePath)
+          {
+            /* Click on white space */
+            WPFolder* wpFolder;
+            wpFolder=(WPFolder*)WPFolderWindow_wpQueryWPObject(pWindow, NULLHANDLE);
+            TST_OBJECT(wpFolder);
+            
+            if(nomIsObj(wpFolder))
+              WPObject_wpDisplayMenu((WPObject*)wpFolder, pWindow, NULL, MENU_OPENVIEWPOPUP, 0, NULL);
+            else
+              g_message("%d %s: WPFolder object not valid!", __LINE__, __FUNCTION__);
+          }
+        else
+          {
+            GtkTreeIter iter;
+            GtkTreeModel* model;
+            WPObject *wpObject;
+            /* Click on an icon */
+            
+            g_message("%s: %s", __FUNCTION__, gtk_tree_path_to_string(treePath));
+            
+            model=gtk_icon_view_get_model(GTK_ICON_VIEW(widget));
+            g_message("%s: model: %x", __FUNCTION__, (UINT)model);
+            
+            gtk_tree_model_get_iter(model , &iter, treePath);            
+            gtk_tree_model_get(model, &iter, 0, &wpObject, -1);
+
+            TST_OBJECT(wpObject);
+
+            if(nomIsObj(wpObject)){
+              g_message("%s: %s calling wpDisplayMenu()", __FUNCTION__, wpObject->mtab->nomClassName);
+              WPObject_wpDisplayMenu((WPObject*)wpObject, pWindow, NULL, MENU_OBJECTPOPUP, 0, NULL);
+            }
+            else
+              g_message("%d %s: WPDataFile object not valid!", __LINE__, __FUNCTION__);
+
+          }
+      }/* if() */
+  }CATCH{    
+    //LOUD;
+    g_message("Line %d: Trap in %s", __LINE__, __FUNCTION__);  
+  }  END_CATCH(FLDR_BUTTONEVENT);
+
   return FALSE;
 }
@@ -210 +229 @@
   /* Create an icon view without model */
   icon_view = gtk_icon_view_new ();
-  WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);
-                                     
+
   /* Allow multiple selection in icon view */
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
@@ -239 +257 @@
                     G_CALLBACK (up_clicked), store);
 #endif
+
+  WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);
+
   /* Add icon view as child to the scroll window created earlier */
   gtk_container_add (GTK_CONTAINER (sw), icon_view);