Changeset 146

Timestamp:

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

Author:

cinc

Message:

Improvements to WPFolder and fixes to related classes.

Location:

trunk

Files:

• desktop/Makefile (modified) (2 diffs)
• desktop/class_c/wpfilesystem.c (modified) (1 diff)
• desktop/class_c/wpfolder.c (modified) (12 diffs)
• desktop/idl/wpfilesystem.idl (modified) (2 diffs)
• desktop/idl/wpfolder.idl (modified) (3 diffs)
• foundation/class_c/nomfilepath.c (modified) (1 diff)
• foundation/class_c/nomstring.c (modified) (1 diff)
• foundation/exports.def (modified) (1 diff)
• gui/Makefile (modified) (2 diffs)
• gui/class_c/nomfolderwindow.c (modified) (4 diffs)
• gui/class_c/nomwindow.c (modified) (1 diff)
• gui/idl/nomfolderwindow.idl (modified) (2 diffs)

trunk/desktop/Makefile

@@ -18 +18 @@
 
 TKIDLDIR        =       $(NOMPATH)/idl  # The object TK lives here
-IDLINC          =       --include=$(FOUNDATIONPATH)/idl
+IDLINC          =       -include=$(FOUNDATIONPATH)/idl -include=$(TKIDLDIR) \
+                        -include=$(GUITKPATH)/idl
 
-#INC            =       ./include -I $(NOMPATH)/include -I $(NOMPATH)/class_h
-INC             =       ./include -I ./class_h -I $(NOMPATH)/class_h -I $(NOMPATH)/include \
+INC             =       ./include -I ./class_h -I $(NOMPATH)/class_h -I $(NOMPATH)/include\
                         -I $(GUITKPATH)/class_h -I $(GUITKPATH)/include -I $(FOUNDATIONPATH)/class_h \
                         -I $(FOUNDATIONPATH)/include
@@ -68 +68 @@
 ###################################
 
-BASE_NOMCOMPILEH        =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEIH       =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEC        =       $(IDLCOMP) -include=$(TKIDLDIR) $(IDLINC) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
+BASE_NOMCOMPILEH        =       $(IDLCOMP) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
+BASE_NOMCOMPILEIH       =       $(IDLCOMP) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
+BASE_NOMCOMPILEC        =       $(IDLCOMP) $(IDLINC) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
 
 

trunk/desktop/class_c/wpfilesystem.c

@@ -45 +45 @@
 #include "wpfilesystem.ih"
 
-NOM_Scope void NOMLINK impl_WPFileSystem_tstSetFullPath(WPFileSystem* nomSelf, const CORBA_char * fullPath, CORBA_Environment *ev)
+NOM_Scope void NOMLINK impl_WPFileSystem_tstSetFullPath(WPFileSystem* nomSelf, const CORBA_char * fullPath,
+                                                        CORBA_Environment *ev)
 {
-/* WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf); */
+  WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf);
 
   nomPrintf("thePath: ---> %s \n", fullPath);
+  _pszFullPath=fullPath;
 }
 
+NOM_Scope PNOMPath NOMLINK impl_WPFileSystem_wpQueryRealName(WPFileSystem* nomSelf, const CORBA_boolean bFullPath,
+                                                             CORBA_Environment *ev)
+{
+  WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf);
+  PNOMPath nomRetval=NOMPathNew();
+  
+  NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+
+  return nomRetval;
+}
+

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);
+}
+
+
+

trunk/desktop/idl/wpfilesystem.idl

@@ -37 +37 @@
 
 #include "wpobject.idl"
+#include "nomfilepath.idl"
 
 interface WPFileSystem : WPObject
@@ -44 +45 @@
 
   void tstSetFullPath(in string fullPath);   
+  PNOMPath wpQueryRealName(in boolean bFullPath);
 
 #if 0
-    ULONG cbEASize;
+  ULONG cbEASize;
 #endif
-    NOMINSTANCEVAR(string pszFullPath);  /* ONLY FOR TESTING!!! */  
-    NOMINSTANCEVAR(string pszType);
+  NOMINSTANCEVAR(string pszFullPath);  /* ONLY FOR TESTING!!! */  
+  NOMINSTANCEVAR(string pszType);
 };
 

trunk/desktop/idl/wpfolder.idl

@@ -38 +38 @@
 #include "wpfilesystem.idl"
 #include "nomfilepath.idl"
+/*#include "nomfolderwindow.idl"*/
+
+native PNOMFolderWindow;
 
 NOMCLASSNAME(WPFolder);
@@ -46 +49 @@
 
   boolean wpPopulate(in unsigned long ulReserved,
-                  in string pszPath,
-                  in boolean fFoldersOnly);
-  gpointer wpCreateFolderWindow();
-  void tstSetFolderPath(in string thePath); /* Only for testing */
+                     in string pszPath,
+                     in boolean fFoldersOnly);
+  PNOMFolderWindow wpCreateFolderWindow();
+
 #if 0
   WPObject wpQueryContent(in WPObject Object,
@@ -62 +65 @@
 
   NOMINSTANCEVAR(PPRIVFOLDERDATA privFolderData);
-  NOMINSTANCEVAR(PNOMPath pnomPath);
+  NOMINSTANCEVAR(PNOMPath pnomPath_);
 };
 

trunk/foundation/class_c/nomfilepath.c

@@ +1 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: CDDL 1.0/LGPL 2.1
+*
+* The contents of this file are subject to the COMMON DEVELOPMENT AND
+* DISTRIBUTION LICENSE (CDDL) Version 1.0 (the "License"); you may not use
+* this file except in compliance with the License. You may obtain a copy of
+* the License at http://www.sun.com/cddl/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is "NOM" Netlabs Object Model
+*
+* The Initial Developer of the Original Code is
+* netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
+* Portions created by the Initial Developer are Copyright (C) 2006
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*
+* Alternatively, the contents of this file may be used under the terms of
+* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
+* case the provisions of the LGPL are applicable instead of those above. If
+* you wish to allow use of your version of this file only under the terms of
+* the LGPL, and not to allow others to use your version of this file under
+* the terms of the CDDL, indicate your decision by deleting the provisions
+* above and replace them with the notice and other provisions required by the
+* LGPL. If you do not delete the provisions above, a recipient may use your
+* version of this file under the terms of any one of the CDDL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
 /*
- * This file was generated by orbit-idl-2 for Voyager - DO NOT EDIT!
- *
- *
  * And remember, phase 3 is near...
  */

trunk/foundation/class_c/nomstring.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2006
 * the Initial Developer. All Rights Reserved.
 *

trunk/foundation/exports.def

@@ -9 +9 @@
         NOMStringNewClass    
 
+        _NOMPathClassData  
+        _NOMPathCClassData 
+        NOMPathNewClass    

trunk/gui/Makefile

@@ -17 +17 @@
 IDLDIR          =       ./idl
 
-TKIDLDIR        =       $(NOMPATH)/idl  # The object TK lives here
-
-INC             =       ./include -I ./class_h -I $(NOMPATH)/class_h -I $(NOMPATH)/include
+# The object TK lives here
+TKIDLDIR        =       $(NOMPATH)/idl
+IDLINC          =       -include=$(TKIDLDIR) -include=$(DESKTOPPATH)/idl -include=$(FOUNDATIONPATH)/idl
+ 
+INC             =       ./include -I ./class_h \
+                        -I $(NOMPATH)/class_h -I $(NOMPATH)/include \
+                        -I $(DESKTOPPATH)/class_h -I $(DESKTOPPATH)/include \
+                        -I $(FOUNDATIONPATH)/class_h -I $(FOUNDATIONPATH)/include
 
 ADDLIBS         =        -l$(OBJDIR)/nobjtk
@@ -49 +54 @@
 ###################################
 
-BASE_NOMCOMPILEH        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --header --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEIH       =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
-BASE_NOMCOMPILEC        =       $(IDLCOMP) -include=$(TKIDLDIR) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
+BASE_NOMCOMPILEH        =       $(IDLCOMP) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
+BASE_NOMCOMPILEIH       =       $(IDLCOMP) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
+BASE_NOMCOMPILEC        =       $(IDLCOMP) $(IDLINC) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $< 
 
 

trunk/gui/class_c/nomfolderwindow.c

@@ -46 +46 @@
 #include "nomfolderwindow.ih"
 
+#warning !!!!! nomIsObj() must be globaly defined !!!!!
+#define nomIsObj(a) ((a)!= 0)
+
+
 NOM_Scope PGtkWidget NOMLINK impl_NOMFolderWindow_getContainerHandle(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
 {
   NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
 
-  return _pgContainerHandle;
+  return (PGtkWidget) g_atomic_pointer_get(&_pgContainerHandle);
 }
 
@@ -61 +65 @@
 }
 
+NOM_Scope void NOMLINK impl_NOMFolderWindow_setWPFolderObject(NOMFolderWindow* nomSelf, const PWPFolder pWPFolderObject,
+                                                              CORBA_Environment *ev)
+{
+  NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
+
+  if(!nomIsObj(pWPFolderObject))
+    return;
+
+  _pWPFolderObj=pWPFolderObject;
+}
+
+NOM_Scope PWPFolder NOMLINK impl_NOMFolderWindow_getWPFolderObject(NOMFolderWindow* nomSelf, CORBA_Environment *ev)
+{
+  NOMFolderWindowData* nomThis=NOMFolderWindowGetData(nomSelf);
+
+  return _pWPFolderObj;
+}
 
 static void
@@ -104 +125 @@
   if(fldr_checkContextButton(event))
     {
+      PNOMFolderWindow pWindow;
+      GtkTreePath* treePath;
+
       DosBeep(5000, 100);
+      pWindow=(NOMFolderWindow*)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=NOMFolderWindow_getWPFolderObject(pWindow, NULLHANDLE);
+          g_message("%s: %s", __FUNCTION__, wpFolder->mtab->nomClassName);
+        }
+      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__, 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);
+
+        }
+
 #if 0      
       /* This is the folder object not the object on which a click occured */
@@ -208 +263 @@
 }
 
+
+
+
+
+
+
+
+
+

trunk/gui/class_c/nomwindow.c

@@ -53 +53 @@
   NOMWindowData* nomThis=NOMWindowGetData(nomSelf);
 
-
-  return _pgWindowHandle;
+  return (PGtkWidget) g_atomic_pointer_get(&_pgWindowHandle);
 }
 

trunk/gui/idl/nomfolderwindow.idl

@@ -37 +37 @@
 
 #include "nomwindow.idl"
+#include "wpfolder.idl"
 
 interface NOMFolderWindow : NOMWindow
@@ -44 +45 @@
   PGtkWidget getContainerHandle();
   void setContainerHandle(in PGtkWidget pgWidget);   
+  void setWPFolderObject(in PWPFolder pWPFolderObject);
+  PWPFolder getWPFolderObject();
 
   NOMOVERRIDE(nomInit);
 
-  NOMINSTANCEVAR(PGtkWidget _pgContainerHandle);
+  NOMINSTANCEVAR(PGtkWidget pgContainerHandle);
+  NOMINSTANCEVAR(PWPFolder pWPFolderObj);
+
 };