Changeset 542

Timestamp:

03/06/08 08:00:20 (6 months ago)

Author:

kickback

Message:

sweep: scheme menu previews plus some more code cleanage

Files:

• sweep/trunk/src/question_dialogs.c (modified) (1 diff)
• sweep/trunk/src/schemes.c (modified) (16 diffs)
• sweep/trunk/src/sweep-scheme.c (modified) (9 diffs)
• sweep/trunk/src/sweep-scheme.h (modified) (2 diffs)

sweep/trunk/src/question_dialogs.c

@@ -97 +97 @@
-  GtkWidget * label;
-  GtkWidget * pixmap;
-  GtkWidget * button_label;
-  GtkWidget * image;
-  GtkWidget * button_hbox;
-

sweep/trunk/src/schemes.c

@@ -311 +311 @@
-schemes_refresh_color_scheme_menu_cb (GtkMenuItem * menuitem, gpointer user_data)
-{
-
-
-
+
+
-                                        
-  gtk_menu_item_set_submenu (menuitem, NULL);
@@ -363 +362 @@
-  gint          element;
-  gchar       * default_name;
+  GdkColor    *color;
-    
-  if (length != SCHEME_ELEMENT_LAST)
@@ -369 +369 @@
-  scheme = sweep_scheme_new ();
-  scheme->name = g_strdup(group);
+  
+  color = g_new0 (GdkColor, 1);
-    
-  FOR_EACH_ELEMENT {
@@ -379 +381 @@
-    if ((string_list != NULL)  && 
-      ((gint)num_strings == 3) &&  /* color, style-type and toggle */
-
+
+
+
-   
-      scheme->element_enabled[element] = 
@@ -394 +398 @@
-      g_strfreev (string_list);
-    } else {
-//unref scheme
+g_object_unref ((gpointer)scheme);
-      return NULL;
-    }
-  }
+    
+  g_free (color);
+    
-  return scheme;
-}
@@ -405 +412 @@
-{
-  gboolean ret;
- 
-if (scheme != NULL) {
+
+g_return_if_fail (scheme != NULL);
-      
-    if (prepend)
@@ -419 +426 @@
-      g_signal_emit_by_name ((gpointer)menu_item_proxy, "event", NULL, &ret, NULL);
-    }
-  }
-}
-
@@ -427 +433 @@
-  gboolean ret;
-    
+  g_return_if_fail (scheme != NULL);
+    
-  // unref scheme triggering signals etc
-  schemes_list = g_list_remove (schemes_list, scheme);
-//
+
-  schemes_modified = TRUE;
-  schemes_refresh_combo (0);
@@ -525 +533 @@
-  SweepScheme * scheme = NULL;
-    
+  g_return_val_if_fail ((name != NULL), NULL);
+    
-  for (list = schemes_list; list; list = list->next)
-  {
@@ -546 +556 @@
-  gint     i;
-  SweepScheme * scheme;
-    
-    
-  groups = g_key_file_get_groups (key_file, &groups_length);
@@ -720 +729 @@
-{
-  GtkWidget * menuitem;
+  GtkWidget * hbox;
+  GtkWidget * label;
+  GtkWidget * image;
-  GtkWidget * submenu;
-  GList     * list;
@@ -728 +740 @@
-  gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_menuitem), submenu);
-
-Show c
+C
-  gtk_menu_append (GTK_MENU(submenu), menuitem);
-  
@@ -748 +760 @@
-  for (list = schemes_list; list; list = list->next) {
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    g_object_set_data (G_OBJECT(menuitem), "scheme", 
@@ -776 +800 @@
-    sweep_set_window_icon (GTK_WINDOW (window));
-  
-//attach_window_close_accel(window
+attach_window_close_accel (GTK_WINDOW (window)
-    
-    gtk_window_set_title (GTK_WINDOW (window), _("Sweep: Color Scheme Options"));
@@ -1028 +1052 @@
-                    NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (schemes_combo), TRUE, TRUE, 0);
+  gtk_tooltips_set_tip (tooltips, hbox, 
+                          _("Select a color scheme to edit"),
+                          _("Select a color scheme to edit"));
-    
-  /* new scheme button */
@@ -1279 +1306 @@
-
-  colorselection = gtk_color_selection_new ();
-
-
+
-  gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (colorselection), FALSE);
-  gtk_container_add (GTK_CONTAINER (notebook1), colorselection);

sweep/trunk/src/sweep-scheme.c

@@ -82 +82 @@
-  gint element;
-  SweepScheme * scheme = SWEEP_SCHEME (object);
+  g_object_unref ((gpointer) scheme->preview_icon);
-    
-  g_free (scheme->name);
@@ -90 +91 @@
-  }
-  g_free (scheme);
+    
+  if (G_OBJECT_CLASS (sweep_scheme_parent_class)->finalize)
+    G_OBJECT_CLASS (sweep_scheme_parent_class)->finalize (object);
-      
-}
@@ -97 +101 @@
-  
-  gint element;
-
+
+
+
-  scheme->modified = FALSE;
-  scheme->is_default = FALSE;
-NULL
+gdk_pixmap_new (NULL, 16, 16, visual->depth)
-
-  for (element = 0; element < SCHEME_ELEMENT_LAST; element++)
@@ -137 +143 @@
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+  /* this may not be necessary */
+  object_signals[CHANGED] =
+    g_signal_new ("preview-changed",
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+                  G_STRUCT_OFFSET (SweepSchemeClass, changed),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
-    
-  klass->changed = NULL;
+  klass->preview_changed = NULL;
-    
-}
@@ -148 +164 @@
-    return g_object_new (SWEEP_TYPE_SCHEME, NULL);
-    
+}
+
+static void
+update_scheme_preview (SweepScheme * scheme)
+{
+  GdkDrawable * preview_icon = GDK_DRAWABLE (scheme->preview_icon);
+  GdkGC       * gc = gdk_gc_new (preview_icon);
+    
+  gdk_gc_set_rgb_fg_color (gc, scheme->scheme_colors[SCHEME_ELEMENT_BG]);
+  gdk_draw_rectangle (preview_icon, 
+                      gc,
+                      TRUE, 0, 0, 16, 16);
+    
+  gdk_gc_set_rgb_fg_color (gc, scheme->scheme_colors[SCHEME_ELEMENT_FG]);
+  gdk_draw_rectangle (preview_icon, 
+                      gc,
+                      TRUE, 4, 4, 8, 8);
+   
+  g_signal_emit_by_name ((gpointer) scheme, "preview-changed");
+    
+  g_object_unref ((gpointer) gc);
-}
-
@@ -173 +210 @@
-        scheme_copy->element_enabled[element]      = scheme->element_enabled[element]; 
-    }
+    update_scheme_preview (scheme_copy);
-
-  }
@@ -184 +222 @@
-                                GdkColor * color)
-{
-  
-
-  
-  
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-}
@@ -217 +257 @@
-            
-    g_signal_emit_by_name ((gpointer) scheme, "changed");
-        
-  } 
-}
@@ -238 +277 @@
-            
-    g_signal_emit_by_name ((gpointer) scheme, "changed");
-
+
+
+
-  } 
-    
-}
+
+
+

sweep/trunk/src/sweep-scheme.h

@@ -82 +82 @@
-struct _SweepScheme {
-  
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-};
-
@@ -101 +99 @@
-  void (* destroy) (SweepScheme * object);
-  void (* changed) (SweepScheme * object);
+  void (* preview_changed) (SweepScheme * object);
-};
-