Changeset 167 for trunk/desktop

Timestamp:

Jan 3, 2007, 3:32:31 PM (19 years ago)

Author:

cinc

Message:

Implemented settings notebooks.

Location:

trunk/desktop

Files:

• Makefile (modified) (3 diffs)
• class_c/wpnotebook.c (added)
• class_c/wpobject.c (modified) (3 diffs)
• exports.def (modified) (1 diff)
• idl/wpnotebook.idl (added)
• idl/wpobject.idl (modified) (3 diffs)

trunk/desktop/Makefile

@@ -39 +39 @@
                         $(OBJDIR)/wpdatafile.o \
                         $(OBJDIR)/wpfolder.o \
+                        $(OBJDIR)/wpnotebook.o \
                         $(OBJDIR)/wpclassmanager.o \
                         $(OBJDIR)/helper.o
@@ -75 +76 @@
 
 # Rules for desktop classes
-$(OBJDIR)/%.o:  $(CLASSCDIR)/%.c $(CLASSINC)/%.ih
+$(OBJDIR)/%.o:  $(CLASSCDIR)/%.c
         $(CC) -I $(INC) $(GCCFLAGS)  -o$@ $<
 
@@ -92 +93 @@
         $(CC) -I $(INC) $(GCCFLAGSDLL)  -o$@ $<
 
+$(CLASSCDIR)/%.c:       $(IDLDIR)/%.idl
+        $(BASE_NOMCOMPILEIH)
+        $(BASE_NOMCOMPILEH)
+        $(BASE_NOMCOMPILEC)
+
 # Create the directories for temp files
 $(OBJDIR)/o.dep:

trunk/desktop/class_c/wpobject.c

@@ -64 +64 @@
 #include "wpobject.ih"
 #include "nomfolderwindow.h"
+#include "wpnotebook.h"
 
 /*************** Local vars ************************************/
@@ -260 +261 @@
 }
 
+NOM_Scope CORBA_unsigned_long NOMLINK impl_WPObject_wpAddObjectGeneralPage(WPObject* nomSelf,
+                                                                           const PWPNoteBook wpNoteBook,
+                                                                           CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  GtkWidget *frame;
+  GtkWidget *label;
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkWidget *entry;
+
+  /* A vbox to layout the settings page */
+  vbox=gtk_vbox_new(FALSE, 0);
+
+  hbox=gtk_hbutton_box_new ();
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
+  gtk_box_set_spacing (GTK_BOX (hbox), 2);
+
+  /* Create buttons */
+  button = gtk_button_new_from_stock (GTK_STOCK_OK);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
+  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
+  /* Put the buttons at the very bottom */
+  gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 1);  
+
+  /* The icon part */
+  frame = gtk_frame_new ("Current Icon");
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+  gtk_widget_set_size_request(frame, 200, 100);
+  gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 1);
+
+  /* The Title part */
+  frame = gtk_frame_new ("Title");
+  gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+  entry=gtk_entry_new();
+  gtk_entry_set_max_length(GTK_ENTRY(entry), CCHMAXPATH);
+  gtk_container_add (GTK_CONTAINER (frame), entry);
+  gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 1);
+
+  /* The label for the tab */
+  label = gtk_label_new ("Icon");
+
+  gtk_widget_show_all (vbox);
+  //  GUIProperties *tst=GUIPropertiesNew();
+
+  /*  _addNotebookPage(tst, vbox, "Icon");
+      _show(tst);*/
+  
+  gtk_notebook_prepend_page (GTK_NOTEBOOK (
+                                           NOMNoteBook_queryWindowHandle(
+                                           WPNoteBook_wpQueryNoteBookObject(wpNoteBook, ev), ev)), vbox, label);
+
+  return 1234;
+}
+
+NOM_Scope CORBA_boolean NOMLINK impl_WPObject_wpAddSettingsPages(WPObject* nomSelf, const PWPNoteBook wpNoteBook,
+                                                                 CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+
+  _wpAddObjectGeneralPage(nomSelf, wpNoteBook, ev);
+  return TRUE;
+}
+
+NOM_Scope CORBA_unsigned_long NOMLINK impl_WPObject_wpInsertSettingsPage(WPObject* nomSelf, 
+                                                                         const PWPNoteBook wpNoteBook,
+                                                                         const gpointer ppageinfo, 
+                                                                         CORBA_Environment *ev)
+{
+/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  CORBA_unsigned_long nomRetval;
+
+  return nomRetval;
+}
+
+
 NOM_Scope PNOMMenu NOMLINK impl_WPObject_wpDisplayMenu(WPObject* nomSelf, const PNOMFolderWindow nomFolder,
                                                        const gpointer gReserved, const CORBA_unsigned_long ulMenuType,
@@ -317 +396 @@
       switch(NOMMenuItem_queryId(nomMenuItem, ev))
         {
+        case WPMENUID_PROPERTIES:
+          {
+            WPNoteBook* wpNoteBook;
+            wpNoteBook=WPNoteBookNew();
+            _wpAddSettingsPages(nomSelf, wpNoteBook, ev);
+            WPNoteBook_show(wpNoteBook, ev);
+            break;
+          }
         default:
           break;

trunk/desktop/exports.def

@@ -33 +33 @@
 ;       M_WPDataFileNewClass
 
+        _WPNoteBookClassData
+        _WPNoteBookCClassData
+        WPNoteBookNewClass
+
 ;IMPORTS

trunk/desktop/idl/wpobject.idl

@@ -42 +42 @@
 #include "nommenu.idl"
 #include "nommenuitem.idl"
+#include "wpnotebook.idl"
 
 #ifndef NOMFolderWindow_defined
@@ -53 +54 @@
 {
   NOMCLASSVERSION(1, 0);
-#if 0
-  /* Settings pages */
-  BOOL wpAddSettingsPages(in HWND hwndNotebook);
-
-  ULONG wpInsertSettingsPage(in HWND hwndNotebook,
-                             in PPAGEINFO ppageinfo);
-
-  ULONG wpAddObjectGeneralPage(in HWND hwndNotebook);
-#endif
 
   /* Memory allocation */
@@ -89 +81 @@
   void wpInsertMenuItem( in PNOMMenu nomMenu, in PNOMMenuItem nomMenuItem, in unsigned long ulPosition);
 
+  /* Settings pages */
+  boolean wpAddSettingsPages(in PWPNoteBook wpNoteBook);
+  unsigned long wpInsertSettingsPage(in PWPNoteBook wpNoteBook, in gpointer ppageinfo);
+  unsigned long wpAddObjectGeneralPage(in PWPNoteBook wpNoteBook);
+
+
   /* Methods overriden by this class */
   NOMOVERRIDE(nomInit);