semi-working tabbed interface



Hi,

These are the changes:

+Synchronized the remaining menu items to diagram in the tabbed notebook.
+Removed right-click pop-up menu from dia-canvas.
+Fixed crasher bug when closing diagrams in tabbed notebook.

I found it difficult to get the View->Show Rulers menu item to work correctly and while I was working on that I saw that sometimes the menu items would not be ready during application startup, so I made this change to app_init():

@@ -950,17 +954,13 @@
   if (dia_is_interactive && files == NULL && !nonew) {
     if (prefs.use_integrated_ui)
     {
-      /* Use the same function call to create a new diagram as that used by
-       * the menu and toolbar                                               */
-      GList * list;
-      file_new_callback(NULL); 
-      list = dia_open_diagrams();
-      if (list)
-      {
-        Diagram * diagram = list->data;
-        diagram_update_extents(diagram);
-        diagram->is_default = TRUE;
-      }
+      /* Add Diagram after window is shown */
+      GtkWidget *ui = interface_get_toolbox_shell();
+
+      g_signal_connect (G_OBJECT (ui),
+                       "window-state-event",
+                        integrated_ui_create_initial_diagrams_callback,
+                        NULL);

This moves the create-initial-diagram code to after the window is initialized (I hope).  I don't know if it's OK to do this in an event handler.

This also doesn't handle the case of loading diagrams on the command line.  I thought I'd check to see if this is OK before I do that.

Pat.

Attachment: dia.diff
Description: Text Data



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]