Changeset 246

Timestamp:

Mar 10, 2007, 6:49:44 PM (18 years ago)

Author:

cinc

Message:

Added new method wpConnectDefaultSignalHandlers() to WPFolderWindow.

Location:

trunk/desktop

Files:

• class_c/wpfolderwindow.c (modified) (4 diffs)
• idl/wpfolderwindow.idl (modified) (2 diffs)

trunk/desktop/class_c/wpfolderwindow.c

@@ -651 +651 @@
 #endif
 
+#if 0
   /* Handle mouse buttons */
   g_signal_connect (GTK_WIDGET(icon_view), "button-press-event",
@@ -675 +676 @@
   gtk_drag_dest_set(GTK_WIDGET(icon_view), GTK_DEST_DEFAULT_ALL, targetEntries, 1,
                       GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
-
+#endif
 #if 0
   /* Connect to the "clicked" signal of the "Up" tool button */
@@ -682 +683 @@
 #endif
 
+  _wpConnectDefaultSignalHandlers(nomSelf, icon_view, NULLHANDLE);
   WPFolderWindow_wpSetContainerHandle(nomSelf, icon_view, NULLHANDLE);
 
@@ -696 +698 @@
 }
 
-
+NOM_Scope void NOMLINK impl_WPFolderWindow_wpConnectDefaultSignalHandlers(WPFolderWindow* nomSelf,
+                                                                          const PGtkWidget pgWidget,
+                                                                          CORBA_Environment *ev)
+{
+/* WPFolderWindowData* nomThis=WPFolderWindowGetData(nomSelf); */
+
+  /* Handle mouse buttons */
+  g_signal_connect (GTK_WIDGET(pgWidget), "button-press-event",
+                    G_CALLBACK (fldr_handleButtonEvent), nomSelf);
+  g_signal_connect (GTK_WIDGET(pgWidget), "button-release-event",
+                    G_CALLBACK (fldr_handleButtonEvent), nomSelf);
+
+  /* Handle folder DnD */
+  g_signal_connect(GTK_WIDGET(pgWidget), "drag-begin",
+                   G_CALLBACK(fldrWindowHandleDragBegin), nomSelf);
+  g_signal_connect(GTK_WIDGET(pgWidget), "drag-motion",
+                   G_CALLBACK(fldrWindowHandleDragMotion), nomSelf);
+  g_signal_connect(GTK_WIDGET(pgWidget), "drag-drop",
+                   G_CALLBACK(fldrWindowHandleDragDrop), nomSelf);
+  g_signal_connect(GTK_WIDGET(pgWidget), "drag_data_received",
+                   G_CALLBACK(fldrWindowHandleDragDataReceived), nomSelf);
+  g_signal_connect(GTK_WIDGET(pgWidget), "drag_data_get",
+                   G_CALLBACK(fldrWindowHandleDragDataGet), nomSelf);
+
+  /* Prepare drag and drop */
+  gtk_drag_source_set(GTK_WIDGET(pgWidget), GDK_BUTTON3_MASK, targetEntries,
+                      G_N_ELEMENTS(targetEntries),
+                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+  gtk_drag_dest_set(GTK_WIDGET(pgWidget), GTK_DEST_DEFAULT_ALL, targetEntries, 1,
+                      GDK_ACTION_DEFAULT|GDK_ACTION_LINK|GDK_ACTION_COPY|GDK_ACTION_MOVE);
+
+}
+

trunk/desktop/idl/wpfolderwindow.idl

@@ -59 +59 @@
 
     Default desktop window used by folders to show objects to the user.
+    It's essential that the WPFolder owning the WPFolderWindow is set
+    into the instance variable by using wpSetObject() a method inherited
+    from WPWindow.
+
+    This class can be used as a base class for window classes which will
+    be used for folder windows. When creating a new class override nomInit()
+    and create your window. Be sure to have at least one container window as
+    a child of the toplevel window which will hold the folders objects. Save
+    the handle to this container using wpSetContainerHandle(). Default drag and
+    drop behaviour for desktop objects can easily be added by calling
+    wpConnectDefaultSignalHandlers() with the created container handle.
+
+    There is no limitation on the number of containers held by the toplevel
+    window. Each of these containers can be drag and drop enabled for desktop
+    objects.
+
 
  */
@@ -65 +81 @@
   NOMCLASSVERSION(1, 0);
 
+  /**
+     Query the handle to the container holding the objects.
+ 
+     \par How to override:
+     This method is usually not overriden.
+
+     \sa wpSetContainerHandle()
+   */
   PGtkWidget wpQueryContainerHandle();
-  void wpSetContainerHandle(in PGtkWidget pgWidget);   
 
+  /**
+     Set the container handle of this folder window into the instance variable.
+
+     \remarks Always use this method to save the handle to the folder container.
+     While it's possible to write to the instance variable from within nomInit()
+     (where the toplevel window is created with at least one container window as a
+     child), using this methods gives subclasses the chance to alter the container
+     by overriding this method.
+
+     \param pgWidget Handle to a container window (usually GtkIconView)
+
+     \sa wpQueryContainerHandle()
+   */
+  void wpSetContainerHandle(in PGtkWidget pgWidget);
+
+  /**
+     Connect signal handlers with the given container which enable drag and drop
+     of desktop objects and context menus.
+
+     \remarks Using this method every container window (don't confuse that with GtkContainer)
+     can be enabled for drag and drop of desktop objects. Default context menu behaviour
+     known by desktop object will be enabled, too. There's no limit on the number
+     of containers in a folder window.
+
+     \par How to override:
+     This method can be overriden if additional signal handlers should be connected to the
+     container.
+
+     \param pgWidget Container window handle. This is for example an icon view.
+
+     \sa wpSetContainerHandle()
+   */  
+  void wpConnectDefaultSignalHandlers(in PGtkWidget pgWidget);
+
+  /**
+     Override which creates a toplevel window with a container for icons.
+   */
   NOMOVERRIDE(nomInit);
 
+  /**
+     This variable holds the container window handle (normaly a handle of a GtkIconView).
+
+     \sa wpSetContainerHandle(), wpQueryContainerHandle()
+   */
   NOMINSTANCEVAR(PGtkWidget pgContainerHandle);
 };