mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hook up color printing with print dialog.

Browse source 
- Add a button and callback to the print dialog to let the user select
  color printing.
- Add a state variable to the options struct to track the users choice.
- Use a darker color for the grid on dive plot; that way we can see it.
- Default to use color printing.

Signed-off-by: Amit Chaudhuri <amit.k.chaudhuri@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Amit Chaudhuri 2013-03-13 07:18:49 +00:00 • committed by Dirk Hohndel
parent 099953e776
commit 3e1098bd03
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
display.h
View file

@ -54,6 +54,7 @@ extern void get_plot_details(struct graphics_context *gc, int time, char *buf, s
struct options {
enum { PRETTY, TABLE, TWOPERPAGE } type;
int print_selected;
int color_selected;
};
extern char zoomed_plot, dc_number;

10
print.c
View file

@ -599,8 +599,9 @@ static int show_dive_table(struct dive *dive, cairo_t *cr, PangoLayout *layout,
static void show_dive_profile(struct dive *dive, cairo_t *cr, double w,
double h)
{
int color = print_options.color_selected == 1 ? 2 : 1; /* 1 for B/W, 2 for color */
struct graphics_context gc = {
.printer = 1,
.printer = color,
.cr = cr,
.drawing_area = { w/20.0, h/20.0, w, h},
};
@ -871,6 +872,7 @@ static void name(GtkWidget *w, gpointer data) \
}
OPTIONSELECTEDCALLBACK(print_selection_toggle, print_options.print_selected)
OPTIONSELECTEDCALLBACK(color_selection_toggle, print_options.color_selected)
static GtkWidget *print_dialog(GtkPrintOperation *operation, gpointer user_data)
@ -920,6 +922,12 @@ static GtkWidget *print_dialog(GtkPrintOperation *operation, gpointer user_data)
gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 2);
g_signal_connect(G_OBJECT(button), "toggled",
G_CALLBACK(print_selection_toggle), NULL);
GtkWidget *colorButton;
colorButton = gtk_check_button_new_with_label(_("Print in color"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(colorButton),TRUE);
gtk_box_pack_start(GTK_BOX(box), colorButton, FALSE, FALSE, 2);
g_signal_connect(G_OBJECT(colorButton), "toggled",
G_CALLBACK(color_selection_toggle), NULL);
}
gtk_widget_show_all(vbox);

4
profile.c
View file

@ -117,9 +117,9 @@ static const color_t profile_color[] = {
[SAMPLE_SHALLOW] = {{PERSIANRED1, BLACK1_LOW_TRANS, PERSIANRED1}},
[SMOOTHED] = {{REDORANGE1_HIGH_TRANS, BLACK1_LOW_TRANS, REDORANGE1_HIGH_TRANS}},
[MINUTE] = {{MEDIUMREDVIOLET1_HIGHER_TRANS, BLACK1_LOW_TRANS, MEDIUMREDVIOLET1_HIGHER_TRANS}},
[TIME_GRID] = {{WHITE1, TUNDORA1_MED_TRANS, WHITE1}},
[TIME_GRID] = {{WHITE1, TUNDORA1_MED_TRANS, TUNDORA1_MED_TRANS}},
[TIME_TEXT] = {{FORESTGREEN1, BLACK1_LOW_TRANS, FORESTGREEN1}},
[DEPTH_GRID] = {{WHITE1, TUNDORA1_MED_TRANS, WHITE1}},
[DEPTH_GRID] = {{WHITE1, TUNDORA1_MED_TRANS, TUNDORA1_MED_TRANS}},
[MEAN_DEPTH] = {{REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS, REDORANGE1_MED_TRANS}},
[DEPTH_BOTTOM] = {{GOVERNORBAY1_MED_TRANS, TUNDORA1_MED_TRANS, GOVERNORBAY1_MED_TRANS}},
[DEPTH_TOP] = {{MERCURY1_MED_TRANS, WHITE1_MED_TRANS, MERCURY1_MED_TRANS}},