Changeset 540

Show
Ignore:
Timestamp:
03/03/08 13:43:26 (6 months ago)
Author:
kickback
Message:

sweep: ICON TSUNAMI! and some other stuff

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/src/callbacks.c

    r539 r540  
    11071107 
    11081108void 
    1109 scheme_ed_ok_clicked_cb (GtkButton *button, gpointer user_data) 
     1109scheme_ed_close_clicked_cb (GtkButton *button, gpointer user_data) 
    11101110{ 
    11111111  GtkWidget *widget = GTK_WIDGET (user_data); 
    …… 
    11431143                        -1); 
    11441144         
    1145     schemes_picker_set_edited_color (scheme, element); 
     1145    schemes_color_chooser_set_color (scheme, element); 
    11461146  } 
    11471147} 

  • sweep/trunk/src/callbacks.h

    r538 r540  
    312312scheme_ed_delete_clicked_cb (GtkButton *button, gpointer user_data); 
    313313void 
    314 scheme_ed_ok_clicked_cb (GtkButton *button, gpointer user_data); 
     314scheme_ed_close_clicked_cb (GtkButton *button, gpointer user_data); 
    315315void 
    316316scheme_ed_combo_changed_cb (GtkComboBox *widget, gpointer user_data); 

  • sweep/trunk/src/driver.c

    r535 r540  
    4242 
    4343#include "driver.h" 
     44#include "interface.h" 
    4445 
    4546extern sw_driver * driver_alsa; 
    …… 
    348349  GtkWidget * notebook; 
    349350  GtkWidget * separator; 
    350   GtkWidget * hbox, * hbox2; 
     351  GtkWidget * hbox, * hbox2, *hbox3; 
    351352  GtkWidget * vbox; 
    352353  GtkWidget * label; 
    …… 
    367368 
    368369    gtk_window_set_title (GTK_WINDOW(dialog), _("Sweep: audio device configuration")); 
     370    sweep_set_window_icon (GTK_WINDOW (dialog)); 
    369371    gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); 
    370372 
    371373    /* OK */ 
    372374 
    373     ok_button = gtk_button_new_with_label (_("OK")); 
     375    ok_button = gtk_button_new_from_stock ("gtk-ok"); 
    374376    GTK_WIDGET_SET_FLAGS (GTK_WIDGET (ok_button), GTK_CAN_DEFAULT); 
    375377    gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), ok_button, 
    …… 
    384386    /* Cancel */ 
    385387 
    386     button = gtk_button_new_with_label (_("Cancel")); 
     388    button = gtk_button_new_from_stock ("gtk-cancel"); 
    387389    GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT); 
    388390    gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), button, 
    …… 
    518520    gtk_widget_show (hbox2); 
    519521 
    520     button = gtk_button_new_with_label (_("Reset")); 
     522    button = gtk_button_new (); 
     523    hbox3   = create_widget_label (NULL, "gtk-undo",  
     524                                  GTK_ICON_SIZE_MENU, _("Reset"), FALSE); 
     525    gtk_container_add (GTK_CONTAINER (button), hbox3); 
    521526    gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, TRUE, 4); 
    522527    g_signal_connect (G_OBJECT(button), "clicked", 
    …… 
    619624    gtk_widget_show (hbox2); 
    620625 
    621     button = gtk_button_new_with_label (_("Reset")); 
     626    button = gtk_button_new (); 
     627    hbox3   = create_widget_label (NULL, "gtk-undo",  
     628                                  GTK_ICON_SIZE_MENU, _("Reset"), FALSE); 
     629    gtk_container_add (GTK_CONTAINER (button), hbox3); 
    622630    gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, TRUE, 4); 
    623631    g_signal_connect (G_OBJECT(button), "clicked", 

  • sweep/trunk/src/interface.c

    r519 r540  
    300300} 
    301301 
     302/* returns an hbox with aligned label and image/widget from supplied params */  
     303GtkWidget * 
     304create_widget_label (GtkWidget * icon, gchar * icon_stock_name, gint icon_size,  
     305                     gchar * label_text, gboolean use_markup) 
     306{ 
     307  GtkWidget * label; 
     308  GtkWidget * image; 
     309  GtkWidget * hbox; 
     310     
     311  if ((icon == NULL) && 
     312    (icon_stock_name != NULL))  { 
     313    image = gtk_image_new_from_stock (icon_stock_name, icon_size); 
     314       
     315  } else 
     316    image = icon; 
     317       
     318  hbox  = gtk_hbox_new (FALSE, 0); 
     319  label = gtk_label_new (label_text); 
     320  gtk_label_set_use_markup (GTK_LABEL (label), use_markup); 
     321  gtk_misc_set_alignment (GTK_MISC (image), 1, 0.5); 
     322  gtk_misc_set_padding (GTK_MISC (image), 2, 0); 
     323  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); 
     324  gtk_misc_set_padding (GTK_MISC (label), 2, 0); 
     325  gtk_box_pack_start_defaults (GTK_BOX (hbox), image); 
     326  gtk_box_pack_start_defaults (GTK_BOX (hbox), label); 
     327       
     328  gtk_widget_show_all (hbox); 
     329       
     330  return hbox; 
     331} 
     332                    
    302333 
    303334#if 0 

  • sweep/trunk/src/interface.h

    r519 r540  
    5050                      gpointer data); 
    5151 
     52GtkWidget * 
     53create_widget_label (GtkWidget * icon, gchar * icon_stock_name, gint icon_size,  
     54                     gchar * label_text, gboolean use_markup); 
     55 
    5256 
    5357GtkWidget* create_toolbox (void); 

  • sweep/trunk/src/paste_dialogs.c

    r233 r540  
    197197  GtkWidget * dialog; 
    198198  GtkWidget * main_vbox, * vbox; 
    199   GtkWidget * hbox, * hbox2; 
     199  GtkWidget * hbox, * hbox2, * hbox3; 
    200200  GtkWidget * frame; 
    201201  GtkWidget * slider; 
    …… 
    225225 
    226226  dialog = gtk_dialog_new (); 
     227  sweep_set_window_icon (GTK_WINDOW (dialog)); 
    227228  gtk_window_set_wmclass(GTK_WINDOW(dialog), "paste_dialog", "Sweep"); 
    228229 
    …… 
    373374  /* OK */ 
    374375 
    375   ok_button = gtk_button_new_with_label (xfade ? _("Crossfade") : _("Mix"));; 
     376  ok_button = gtk_button_new (); 
     377  hbox3  = create_widget_label (NULL, "gtk-apply", GTK_ICON_SIZE_BUTTON, 
     378                                xfade ? _("Crossfade") : _("Mix"), 
     379                                FALSE); 
     380  gtk_container_add (GTK_CONTAINER (ok_button), hbox3); 
    376381  GTK_WIDGET_SET_FLAGS (GTK_WIDGET (ok_button), GTK_CAN_DEFAULT); 
    377382  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), 
    …… 
    391396  /* Cancel */ 
    392397 
    393   button = gtk_button_new_with_label (xfade ? 
    394                                       _("Don't crossfade") : _("Don't mix")); 
     398  button = gtk_button_new (); 
     399  hbox3  = create_widget_label (NULL, "gtk-cancel", GTK_ICON_SIZE_BUTTON, 
     400                                xfade ?  _("Don't crossfade") : _("Don't mix"), 
     401                                FALSE); 
     402  gtk_container_add (GTK_CONTAINER (button), hbox3); 
    395403  GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT); 
    396404  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), 

  • sweep/trunk/src/question_dialogs.c

    r532 r540  
    153153  { 
    154154    ok_button = gtk_button_new (); 
    155     button_label = gtk_label_new (ok_answer); 
    156     image = gtk_image_new_from_stock (ok_stock_id, GTK_ICON_SIZE_BUTTON); 
    157     button_hbox  = gtk_hbox_new (FALSE, 0); 
    158    
     155    button_hbox = create_widget_label (NULL, ok_stock_id, GTK_ICON_SIZE_BUTTON,  
     156                                         ok_answer, FALSE); 
    159157    gtk_container_add (GTK_CONTAINER (ok_button), button_hbox); 
    160     gtk_box_pack_start (GTK_BOX (button_hbox), image, TRUE, TRUE, 2); 
    161     gtk_box_pack_start (GTK_BOX (button_hbox), button_label, TRUE, TRUE, 2);  
    162     gtk_misc_set_alignment (GTK_MISC (image), 1, 0.5); 
    163     gtk_misc_set_alignment (GTK_MISC (button_label), 0, 0.5); 
    164158  } 
    165159  GTK_WIDGET_SET_FLAGS (GTK_WIDGET (ok_button), GTK_CAN_DEFAULT); 
    …… 
    182176    { 
    183177      button = gtk_button_new (); 
    184       button_label = gtk_label_new (no_answer); 
    185       image = gtk_image_new_from_stock (no_stock_id, GTK_ICON_SIZE_BUTTON); 
    186       button_hbox  = gtk_hbox_new (FALSE, 0); 
    187    
     178      button_hbox = create_widget_label (NULL, no_stock_id, GTK_ICON_SIZE_BUTTON,  
     179                                         no_answer, FALSE); 
    188180      gtk_container_add (GTK_CONTAINER (button), button_hbox); 
    189       gtk_box_pack_start (GTK_BOX (button_hbox), image, TRUE, TRUE, 2); 
    190       gtk_box_pack_start (GTK_BOX (button_hbox), button_label, TRUE, TRUE, 2); 
    191       gtk_misc_set_alignment (GTK_MISC (image), 1, 0.5); 
    192       gtk_misc_set_alignment (GTK_MISC (button_label), 0, 0.5); 
    193181    } 
    194182 

  • sweep/trunk/src/schemes.c

    r539 r540  
    3434#include "sample-display.h" 
    3535#include "view.h" 
     36#include "interface.h" 
    3637 
    3738#include <sweep/sweep_i18n.h> 
    …… 
    773774    view = (sw_view *)user_data; 
    774775    window = gtk_window_new (GTK_WINDOW_TOPLEVEL); 
     776    sweep_set_window_icon (GTK_WINDOW (window)); 
    775777   
    776778    //attach_window_close_accel(window); 
    …… 
    864866 
    865867void 
    866 schemes_picker_set_edited_color (SweepScheme * scheme, gint element) 
     868schemes_color_chooser_set_color (SweepScheme * scheme, gint element) 
    867869{ 
    868870  if ((colorselection == NULL) || 
    …… 
    965967  GtkWidget * sel_options_vbox; 
    966968  GtkWidget * checkbutton; 
    967   GtkWidget * color_picker; 
     969  GtkWidget * color_chooser; 
    968970  GtkWidget * treeview; 
    969971  GtkWidget * button; 
    …… 
    977979  GtkTooltips * tooltips; 
    978980  GtkTreeSelection * selection; 
    979   gint method; 
     981  gint method, i; 
    980982 
    981983  tooltips = gtk_tooltips_new (); 
    …… 
    995997  /* scheme editor notebook tab widgets */ 
    996998     
    997   hbox = gtk_hbox_new (FALSE, 0); 
    998   image = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_BUTTON); 
    999   gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0); 
    1000   gtk_misc_set_padding (GTK_MISC (image), 2, 0); 
    1001      
    1002   label = gtk_label_new (_("Color scheme editor")); 
    1003   gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); 
    1004   gtk_misc_set_padding (GTK_MISC (label), 2, 0); 
    1005   gtk_widget_show_all (hbox); 
    1006          
     999  hbox = create_widget_label (NULL, "gtk-select-color", GTK_ICON_SIZE_BUTTON, 
     1000                              _("Color scheme editor"), FALSE); 
    10071001  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), editor_vbox, hbox); 
    10081002 
    …… 
    10101004  /* general notebook tab widgets */ 
    10111005     
    1012   hbox = gtk_hbox_new (FALSE, 0); 
    1013   image = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_BUTTON); 
    1014   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); 
    1015   gtk_misc_set_padding (GTK_MISC (image), 2, 0); 
    1016  
    1017   label = gtk_label_new (_("General scheme options")); 
    1018   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); 
    1019   gtk_misc_set_padding (GTK_MISC (label), 2, 0); 
    1020   gtk_widget_show_all (hbox); 
    1021      
     1006  hbox = create_widget_label (NULL, "gtk-preferences", GTK_ICON_SIZE_BUTTON, 
     1007                              _("General scheme options"), FALSE); 
    10221008  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), general_vbox, hbox); 
    10231009     
    …… 
    10281014  hbox = gtk_hbox_new (FALSE, 0); 
    10291015  gtk_widget_show (hbox); 
    1030   gtk_box_pack_start (GTK_BOX (editor_vbox), hbox, FALSE, FALSE, 2); 
    1031   gtk_container_set_border_width (GTK_CONTAINER (hbox), 3); 
     1016  gtk_box_pack_start (GTK_BOX (editor_vbox), hbox, FALSE, FALSE, 3); 
     1017  gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); 
    10321018     
    10331019  label = gtk_label_new (_("<b>Selected scheme</b>")); 
    1034   gtk_misc_set_padding (GTK_MISC (label), 4, 0); 
     1020  gtk_misc_set_padding (GTK_MISC (label), 3, 0); 
    10351021  gtk_label_set_use_markup (GTK_LABEL (label), TRUE); 
    10361022  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); 
    …… 
    10411027                    G_CALLBACK (scheme_ed_combo_changed_cb), 
    10421028                    NULL); 
    1043   gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (schemes_combo), TRUE, TRUE, 2); 
     1029  gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (schemes_combo), TRUE, TRUE, 0); 
    10441030     
    10451031  /* new scheme button */ 
    …… 
    10931079                    G_CALLBACK (scheme_ed_default_button_toggled_cb), 
    10941080                    schemes_combo); 
    1095   /* sync with selected scheme */ 
     1081     /* sync with selected scheme */ 
    10961082  g_signal_connect ((gpointer) schemes_combo, "changed", 
    10971083                    G_CALLBACK (scheme_ed_update_default_button_cb), 
    …… 
    11191105  /* color selection */   
    11201106     
    1121   color_picker = schemes_create_color_picker (); 
    1122   gtk_box_pack_start (GTK_BOX (hbox), color_picker, TRUE, TRUE, 2); 
     1107  color_chooser = schemes_create_color_chooser (); 
     1108  gtk_box_pack_start (GTK_BOX (hbox), color_chooser, TRUE, TRUE, 2); 
    11231109     
    11241110  /** global dialog close button box **/ 
    …… 
    11351121  gtk_container_set_border_width (GTK_CONTAINER (button), 1); 
    11361122  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); 
    1137      
     1123  g_signal_connect ((gpointer) button, "clicked", 
     1124                    G_CALLBACK (scheme_ed_close_clicked_cb), 
     1125                    scheme_editor); 
     1126 
    11381127  /** scheme save / revert buttons **/ 
    11391128     
    …… 
    11461135 
    11471136  button = gtk_button_new (); 
    1148   label  = gtk_label_new (_("Revert")); 
    1149   image  = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); 
    1150   hbox   = gtk_hbox_new (FALSE, 0); 
    1151    
     1137  hbox   = create_widget_label (NULL, "gtk-revert-to-saved", GTK_ICON_SIZE_MENU, 
     1138                              _("Revert"), FALSE);   
    11521139  gtk_container_add (GTK_CONTAINER (button), hbox); 
    1153   gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 2); 
    1154   gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);  
    1155   gtk_misc_set_alignment (GTK_MISC (image), 1, 0.5); 
    1156   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); 
     1140     
    11571141  g_signal_connect ((gpointer) button, "clicked", 
    11581142                    G_CALLBACK (scheme_ed_revert_clicked_cb), 
    …… 
    11611145  gtk_container_set_border_width (GTK_CONTAINER (button), 1); 
    11621146  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); 
    1163   //gtk_widget_set_sensitive (button, FALSE); 
     1147  gtk_widget_set_sensitive (button, FALSE); 
    11641148     
    11651149  /* save scheme button */ 
    11661150     
    11671151  button = gtk_button_new (); 
    1168   label  = gtk_label_new (_("Save")); 
    1169   image  = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); 
    1170   hbox   = gtk_hbox_new (FALSE, 0); 
    1171  
     1152  hbox   = create_widget_label (NULL, "gtk-save", GTK_ICON_SIZE_MENU, 
     1153                              _("Save"), FALSE);   
    11721154  gtk_container_add (GTK_CONTAINER (button), hbox); 
    1173   gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 2); 
    1174   gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);  
    1175   gtk_misc_set_alignment (GTK_MISC (image), 1, 0.5); 
    1176   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); 
     1155     
    11771156  g_signal_connect ((gpointer) button, "clicked", 
    11781157                    G_CALLBACK (scheme_ed_save_clicked_cb), 
    …… 
    11811160  gtk_container_set_border_width (GTK_CONTAINER (button), 1); 
    11821161  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); 
    1183    
     1162  gtk_widget_set_sensitive (button, FALSE); 
     1163     
    11841164  /** general tab option widgets **/ 
    11851165     
    …… 
    12151195                    _("Select random scheme")); 
    12161196     
    1217   g_signal_connect ((gpointer) GTK_TOGGLE_BUTTON (radiobuttons[0]), "toggled", 
    1218                       G_CALLBACK (schemes_ed_radio_toggled_cb), 
    1219                       GINT_TO_POINTER (SCHEME_SELECT_DEFAULT)); 
    1220   g_signal_connect ((gpointer) GTK_TOGGLE_BUTTON (radiobuttons[1]), "toggled", 
    1221                       G_CALLBACK (schemes_ed_radio_toggled_cb), 
    1222                       GINT_TO_POINTER (SCHEME_SELECT_FILENAME)); 
    1223   g_signal_connect ((gpointer) GTK_TOGGLE_BUTTON (radiobuttons[2]), "toggled", 
    1224                       G_CALLBACK (schemes_ed_radio_toggled_cb), 
    1225                       GINT_TO_POINTER (SCHEME_SELECT_RANDOM)); 
     1197  for (i = 0; i > 3; i++) { 
     1198    g_signal_connect ((gpointer) GTK_TOGGLE_BUTTON (radiobuttons[i]), "toggled", 
     1199                        G_CALLBACK (schemes_ed_radio_toggled_cb), 
     1200                        GINT_TO_POINTER (i)); 
     1201  } 
    12261202     
    12271203  gtk_box_pack_start_defaults (GTK_BOX (sel_options_vbox),  
    …… 
    12421218 
    12431219GtkWidget * 
    1244 schemes_create_color_picker (void) 
    1245 { 
    1246   GtkWidget * vbox1; 
     1220schemes_create_color_chooser (void) 
     1221{ 
     1222  GtkWidget * vbox; 
    12471223  GtkWidget * hbox1; 
    12481224  GtkWidget * label1; 
    …… 
    12501226  GtkWidget * notebook1; 
    12511227  GtkWidget * vbox2; 
     1228  GtkWidget * radiobuttons[9]; 
    12521229  GtkWidget * radiobutton1; 
    12531230  GSList    * radiobutton1_group = NULL; 
    …… 
    12671244 
    12681245  scrollwindow = gtk_scrolled_window_new (NULL, NULL); 
    1269   vbox1 = gtk_vbox_new (FALSE, 0); 
     1246  vbox = gtk_vbox_new (FALSE, 0); 
    12701247     
    12711248  viewport = gtk_viewport_new (NULL, NULL); 
    1272   gtk_container_add (GTK_CONTAINER (viewport), vbox1); 
     1249  gtk_container_add (GTK_CONTAINER (viewport), vbox); 
    12731250  gtk_container_add (GTK_CONTAINER (scrollwindow), viewport); 
    12741251  //gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwindow), vbox1); 
    …… 
    12791256 
    12801257  hbox1 = gtk_hbox_new (FALSE, 0); 
    1281   gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 2); 
     1258  gtk_box_pack_start (GTK_BOX (vbox), hbox1, FALSE, FALSE, 4); 
    12821259 
    12831260  label1 = gtk_label_new (_("Color source:")); 
    1284   gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0); 
    1285   gtk_misc_set_padding (GTK_MISC (label1), 6, 0); 
     1261  gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 3); 
     1262  gtk_misc_set_padding (GTK_MISC (label1), 3, 0); 
    12861263 
    12871264  combobox1 = gtk_combo_box_new_text (); 
    1288   gtk_box_pack_start (GTK_BOX (hbox1), combobox1, FALSE, FALSE, 2); 
     1265  gtk_box_pack_start (GTK_BOX (hbox1), combobox1, FALSE, FALSE, 0); 
    12891266  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox1), _("Custom color")); 
    12901267  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox1), _("GtkStyle color")); 
    …… 
    12921269  gtk_combo_box_set_active (GTK_COMBO_BOX (combobox1), 0); 
    12931270  gtk_widget_set_sensitive (combobox1, FALSE); 
    1294   gtk_widget_set_size_request (combobox1, 280, -1); 
     1271  gtk_widget_set_size_request (combobox1, 272, -1); 
    12951272 
    12961273  notebook1 = gtk_notebook_new (); 
    1297   gtk_box_pack_start (GTK_BOX (vbox1), notebook1, TRUE, TRUE, 0); 
    1298   gtk_container_set_border_width (GTK_CONTAINER (notebook1), 5); 
     1274  gtk_box_pack_start (GTK_BOX (vbox), notebook1, TRUE, TRUE, 2); 
     1275  gtk_container_set_border_width (GTK_CONTAINER (notebook1), 0); 
    12991276  GTK_WIDGET_UNSET_FLAGS (notebook1, GTK_CAN_FOCUS); 
    13001277  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook1), FALSE); 

  • sweep/trunk/src/schemes.h

    r538 r540  
    6969 
    7070SweepScheme * 
    71 schemes_get_prefered_scheme (gchar *filename); 
     71schemes_get_prefered_scheme (gchar * filename); 
    7272 
    7373SweepScheme * 
    …… 
    7878 
    7979void 
    80 schemes_remove_scheme (SweepScheme *scheme); 
     80schemes_remove_scheme (SweepScheme * scheme); 
    8181 
    8282void  
    83 schemes_copy_scheme (SweepScheme *scheme, gchar *newname); 
     83schemes_copy_scheme (SweepScheme * scheme, gchar * newname); 
    8484 
    8585gpointer 
    …… 
    8787 
    8888SweepScheme * 
    89 schemes_find_by_name (gchar *name); 
     89schemes_find_by_name (gchar * name); 
    9090 
    9191void 
    92 schemes_show_editor_window_cb (GtkMenuItem *item, gpointer user_data); 
     92schemes_show_editor_window_cb (GtkMenuItem * item, gpointer user_data); 
    9393 
    9494void 
    95 schemes_create_menu (GtkWidget *parent_menuitem, gboolean connect_signals); 
     95schemes_create_menu (GtkWidget * parent_menuitem, gboolean connect_signals); 
    9696 
    9797GtkWidget * 
    …… 
    102102 
    103103GdkColor * 
    104 copy_gdk_colour (GdkColor *color_src); 
     104copy_gdk_colour (GdkColor * color_src); 
    105105 
    106106GtkWidget* 
    107 schemes_create_color_picker (void); 
     107schemes_create_color_chooser (void); 
    108108 
    109109void 
    110 schemes_picker_set_edited_color (SweepScheme *scheme, gint element); 
     110schemes_color_chooser_set_color (SweepScheme * scheme, gint element); 
    111111 
    112112void 
    113 schemes_set_active_element_color (GtkColorSelection *selection); 
     113schemes_set_active_element_color (GtkColorSelection * selection); 
    114114 
    115115 

  • sweep/trunk/src/sweep-scheme.h

    r538 r540  
    8585  GdkColor * scheme_colors[SCHEME_ELEMENT_LAST]; 
    8686  gboolean   element_enabled[SCHEME_ELEMENT_LAST]; /* always true for some elements */ 
    87   gint       element_style[SCHEME_ELEMENT_LAST]; /* overrides custom colors if >0 */ 
     87  gint       element_style[SCHEME_ELEMENT_LAST]; /* overrides custom colors if > 0 */ 
    8888  gchar    * name; 
    8989  gboolean   modified; 

  • sweep/trunk/src/sweep_sample.c

    r538 r540  
    365365  GtkWidget * dialog; 
    366366  GtkWidget * main_vbox, * vbox; 
    367   GtkWidget * main_hbox, * hbox, * hbox2; 
     367  GtkWidget * main_hbox, * hbox, * hbox2, * hbox3; 
    368368  GtkWidget * pixmap; 
    369369  GtkWidget * frame; 
    …… 
    510510  gtk_widget_show (hbox2); 
    511511 
    512   button = gtk_button_new_with_label (_("Reset")); 
     512  button = gtk_button_new (); 
     513  hbox3   = create_widget_label (NULL, "gtk-undo",  
     514                                 GTK_ICON_SIZE_MENU, _("Reset"), FALSE); 
     515  gtk_container_add (GTK_CONTAINER (button), hbox3); 
    513516  gtk_box_pack_start (GTK_BOX (hbox2), button, FALSE, TRUE, 4); 
    514517  g_signal_connect (G_OBJECT(button), "clicked", 

  • sweep/trunk/src/undo_dialog.c

    r279 r540  
    4040#include "callbacks.h" 
    4141 
    42 #include "../pixmaps/undo.xpm" 
    43 #include "../pixmaps/redo.xpm" 
    4442#include "../pixmaps/done.xpm" 
    4543 
    …… 
    290288} 
    291289 
    292 static GtkWidget * 
    293 ud_create_pixmap_button (GtkWidget * widget, gchar ** xpm_data, 
    294                          const gchar * label_text, const gchar * tip_text, 
    295                          GCallback clicked) 
    296 { 
    297   GtkWidget * hbox; 
    298   GtkWidget * label; 
    299   GtkWidget * pixmap; 
    300   GtkWidget * button; 
    301   GtkTooltips * tooltips; 
    302  
    303   button = gtk_button_new (); 
    304  
    305   hbox = gtk_hbox_new (FALSE, 2); 
    306   gtk_container_add (GTK_CONTAINER(button), hbox); 
    307   gtk_container_set_border_width (GTK_CONTAINER(button), 8); 
    308   gtk_widget_show (hbox); 
    309  
    310   if (xpm_data != NULL) { 
    311     pixmap = create_widget_from_xpm (widget, xpm_data); 
    312     gtk_box_pack_start (GTK_BOX(hbox), pixmap, FALSE, FALSE, 8); 
    313     gtk_widget_show (pixmap); 
    314   } 
    315  
    316   if (label_text != NULL) { 
    317     label = gtk_label_new (label_text); 
    318     gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 8); 
    319     gtk_widget_show (label); 
    320   } 
    321  
    322   if (tip_text != NULL) { 
    323     tooltips = gtk_tooltips_new (); 
    324     gtk_tooltips_set_tip (tooltips, button, tip_text, NULL); 
    325   } 
    326  
    327   if (clicked != NULL) { 
    328     g_signal_connect (G_OBJECT (button), "clicked", 
    329                         G_CALLBACK(clicked), NULL); 
    330   } 
    331  
    332   return button; 
    333 } 
    334  
    335290void 
    336291undo_dialog_create (sw_sample * sample) 
    337292{ 
    338293  GtkWidget * vbox; 
    339   GtkWidget * hbox /* , *button_hbox */; 
     294  GtkWidget * hbox, *hbox2/* , *button_hbox */; 
    340295  GtkWidget * label; 
    341296  /*  GtkWidget * ok_button;*/ 
    …… 
    345300  GClosure *gclosure; 
    346301  GtkAccelGroup * accel_group; 
     302  GtkTooltips *tooltips; 
    347303 
    348304  if (undo_dialog == NULL) { 
    349     undo_dialog = gtk_dialog_new (); 
    350     gtk_window_set_wmclass(GTK_WINDOW(undo_dialog), "undo_dialog", "Sweep"); 
    351     gtk_window_set_title(GTK_WINDOW(undo_dialog), _("Sweep: History")); 
    352     gtk_window_set_resizable (GTK_WINDOW(undo_dialog), FALSE); 
    353     gtk_window_set_position (GTK_WINDOW(undo_dialog), GTK_WIN_POS_MOUSE); 
    354     gtk_container_set_border_width  (GTK_CONTAINER(undo_dialog), 8); 
    355  
    356     accel_group = gtk_accel_group_new (); 
    357     gtk_window_add_accel_group (GTK_WINDOW(undo_dialog), accel_group); 
    358  
    359     g_signal_connect (G_OBJECT(undo_dialog), "destroy", 
     305   undo_dialog = gtk_dialog_new (); 
     306   gtk_window_set_wmclass(GTK_WINDOW(undo_dialog), "undo_dialog", "Sweep"); 
     307   gtk_window_set_title(GTK_WINDOW(undo_dialog), _("Sweep: History")); 
     308   gtk_window_set_resizable (GTK_WINDOW(undo_dialog), FALSE); 
     309   gtk_window_set_position (GTK_WINDOW(undo_dialog), GTK_WIN_POS_MOUSE); 
     310   gtk_container_set_border_width  (GTK_CONTAINER(undo_dialog), 8); 
     311   sweep_set_window_icon (GTK_WINDOW (undo_dialog)); 
     312   accel_group = gtk_accel_group_new (); 
     313   gtk_window_add_accel_group (GTK_WINDOW(undo_dialog), accel_group); 
     314 
     315   g_signal_connect (G_OBJECT(undo_dialog), "destroy", 
    360316                      G_CALLBACK(undo_dialog_destroy), NULL); 
    361317 
     318       
     319   tooltips = gtk_tooltips_new (); 
    362320 
    363321   gclosure = g_cclosure_new  ((GCallback)hide_window_cb, NULL, NULL); 
    …… 
    391349    gtk_widget_show (hbox); 
    392350 
    393     button = ud_create_pixmap_button (undo_dialog, undo_xpm, _("Undo"), _("Undo"), 
    394                                    G_CALLBACK (ud_undo_cb)); 
     351 
     352    button = gtk_button_new (); 
     353    gtk_container_set_border_width (GTK_CONTAINER (button), 8); 
     354    gtk_tooltips_set_tip (tooltips, button, _("Undo"), _("Undo")); 
     355    hbox2  = create_widget_label (NULL, "gtk-undo", GTK_ICON_SIZE_BUTTON, 
     356                                _("Undo"), FALSE); 
     357    g_signal_connect (G_OBJECT(button), "clicked", 
     358                                        G_CALLBACK (ud_undo_cb), 
     359                                        NULL); 
     360    gtk_container_add (GTK_CONTAINER (button), hbox2); 
    395361    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); 
    396362    gtk_widget_show (button); 
     363    undo_button = button; 
     364       
    397365    gtk_widget_add_accelerator (button, "clicked", accel_group, 
    398                                 GDK_z, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); 
    399     undo_button = button; 
    400  
    401     button = ud_create_pixmap_button (undo_dialog, redo_xpm, _("Redo"), _("Redo"), 
    402                                    G_CALLBACK (ud_redo_cb)); 
     366    GDK_z, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); 
     367 
     368    button = gtk_button_new (); 
     369    gtk_container_set_border_width (GTK_CONTAINER (button), 8); 
     370    gtk_tooltips_set_tip (tooltips, button, _("Redo"), _("Redo")); 
     371    hbox2  = create_widget_label (NULL, "gtk-redo", GTK_ICON_SIZE_BUTTON, 
     372                                _("Redo"), FALSE); 
     373    g_signal_connect (G_OBJECT(button), "clicked", 
     374                                        G_CALLBACK (ud_redo_cb), 
     375                                        NULL); 
     376    gtk_container_add (GTK_CONTAINER (button), hbox2); 
     377     
    403378    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); 
    404     gtk_widget_show (button); 
     379    gtk_widget_show (button);   
     380       
     381    redo_button = button; 
     382       
    405383    gtk_widget_add_accelerator (button, "clicked", accel_group, 
    406384                                GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); 
    …… 
    424402    gtk_widget_show (undo_clist); 
    425403 
    426     button = gtk_button_new_with_label (_("Revert to selected state")); 
     404    button = gtk_button_new (); 
     405    hbox2  = create_widget_label (NULL, "gtk-undo", GTK_ICON_SIZE_BUTTON, 
     406                                _("Revert to selected state"), 
     407                                FALSE); 
     408    gtk_container_add (GTK_CONTAINER (button), hbox2); 
    427409    GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT); 
    428410    gtk_box_pack_start (GTK_BOX (GTK_DIALOG(undo_dialog)->action_area), 
    …… 
    450432    /* Cancel */ 
    451433 
    452     button = gtk_button_new_with_label (_("Close")); 
     434    button = gtk_button_new (); 
     435    hbox2  = create_widget_label (NULL, "gtk-close", GTK_ICON_SIZE_BUTTON, 
     436                                _("Close"), 
     437                                FALSE); 
     438    gtk_container_add (GTK_CONTAINER (button), hbox2); 
    453439    GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT); 
    454440    gtk_box_pack_start (GTK_BOX (GTK_DIALOG(undo_dialog)->action_area),