Made the 'align' flags somewhat more typesafe and the associated functions more self explenatory. The large commit results from a new run of Fluid of the Fluid .fl files.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6160 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-08-15 20:32:01 +00:00
parent 358af515f7
commit 3d6201a610
15 changed files with 224 additions and 226 deletions
+141 -143
View File
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
// generated by Fast Light User Interface Designer (fluid) version 1.0107
// generated by Fast Light User Interface Designer (fluid) version 1.0300
#include "print_panel.h"
#include <stdio.h>
@@ -244,272 +244,270 @@ static void cb_Use(Fl_Button*, void*) {
}
Fl_Double_Window* make_print_panel() {
Fl_Double_Window* w;
{ Fl_Double_Window* o = print_panel = new Fl_Double_Window(465, 235, "Print");
w = o;
{ Fl_Group* o = print_panel_controls = new Fl_Group(10, 10, 447, 216);
{ Fl_Choice* o = print_choice = new Fl_Choice(113, 10, 181, 25, "Printer:");
o->down_box(FL_BORDER_BOX);
o->labelfont(1);
o->callback((Fl_Callback*)cb_print_choice);
o->when(FL_WHEN_CHANGED);
}
{ Fl_Button* o = print_properties = new Fl_Button(294, 10, 105, 25, "Properties...");
o->callback((Fl_Callback*)cb_print_properties);
}
{ Fl_Box* o = print_status = new Fl_Box(111, 41, 288, 17, "printer/job status");
o->align(68|FL_ALIGN_INSIDE);
}
{ print_panel = new Fl_Double_Window(465, 235, "Print");
{ print_panel_controls = new Fl_Group(10, 10, 447, 216);
{ print_choice = new Fl_Choice(113, 10, 181, 25, "Printer:");
print_choice->down_box(FL_BORDER_BOX);
print_choice->labelfont(1);
print_choice->callback((Fl_Callback*)cb_print_choice);
print_choice->when(FL_WHEN_CHANGED);
} // Fl_Choice* print_choice
{ print_properties = new Fl_Button(294, 10, 105, 25, "Properties...");
print_properties->callback((Fl_Callback*)cb_print_properties);
} // Fl_Button* print_properties
{ print_status = new Fl_Box(111, 41, 288, 17, "printer/job status");
print_status->align(68|FL_ALIGN_INSIDE);
} // Fl_Box* print_status
{ Fl_Group* o = new Fl_Group(10, 86, 227, 105, "Print Range");
o->box(FL_THIN_DOWN_BOX);
o->labelfont(1);
o->align(FL_ALIGN_TOP_LEFT);
{ Fl_Round_Button* o = print_all = new Fl_Round_Button(20, 96, 38, 25, "All");
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
o->value(1);
o->callback((Fl_Callback*)cb_print_all);
}
{ Fl_Round_Button* o = print_pages = new Fl_Round_Button(20, 126, 64, 25, "Pages");
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
o->callback((Fl_Callback*)cb_print_pages);
}
{ Fl_Round_Button* o = print_selection = new Fl_Round_Button(20, 156, 82, 25, "Selection");
o->type(102);
o->down_box(FL_ROUND_DOWN_BOX);
o->callback((Fl_Callback*)cb_print_selection);
}
{ Fl_Input* o = print_from = new Fl_Input(136, 126, 28, 25, "From:");
o->type(2);
o->textfont(4);
o->deactivate();
}
{ Fl_Input* o = print_to = new Fl_Input(199, 126, 28, 25, "To:");
o->type(2);
o->textfont(4);
o->deactivate();
}
{ print_all = new Fl_Round_Button(20, 96, 38, 25, "All");
print_all->type(102);
print_all->down_box(FL_ROUND_DOWN_BOX);
print_all->value(1);
print_all->callback((Fl_Callback*)cb_print_all);
} // Fl_Round_Button* print_all
{ print_pages = new Fl_Round_Button(20, 126, 64, 25, "Pages");
print_pages->type(102);
print_pages->down_box(FL_ROUND_DOWN_BOX);
print_pages->callback((Fl_Callback*)cb_print_pages);
} // Fl_Round_Button* print_pages
{ print_selection = new Fl_Round_Button(20, 156, 82, 25, "Selection");
print_selection->type(102);
print_selection->down_box(FL_ROUND_DOWN_BOX);
print_selection->callback((Fl_Callback*)cb_print_selection);
} // Fl_Round_Button* print_selection
{ print_from = new Fl_Input(136, 126, 28, 25, "From:");
print_from->type(2);
print_from->textfont(4);
print_from->deactivate();
} // Fl_Input* print_from
{ print_to = new Fl_Input(199, 126, 28, 25, "To:");
print_to->type(2);
print_to->textfont(4);
print_to->deactivate();
} // Fl_Input* print_to
o->end();
}
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(247, 86, 210, 105, "Copies");
o->box(FL_THIN_DOWN_BOX);
o->labelfont(1);
o->align(FL_ALIGN_TOP_LEFT);
{ Fl_Spinner* o = print_copies = new Fl_Spinner(321, 96, 45, 25, "# Copies:");
o->callback((Fl_Callback*)cb_print_copies);
o->when(FL_WHEN_CHANGED);
}
{ Fl_Check_Button* o = print_collate_button = new Fl_Check_Button(376, 96, 64, 25, "Collate");
o->down_box(FL_DOWN_BOX);
o->callback((Fl_Callback*)cb_print_collate_button);
o->when(FL_WHEN_CHANGED);
o->deactivate();
}
{ Fl_Group* o = print_collate_group[0] = new Fl_Group(257, 131, 191, 50);
o->deactivate();
{ print_copies = new Fl_Spinner(321, 96, 45, 25, "# Copies:");
print_copies->value(1);
print_copies->callback((Fl_Callback*)cb_print_copies);
print_copies->when(FL_WHEN_CHANGED);
} // Fl_Spinner* print_copies
{ print_collate_button = new Fl_Check_Button(376, 96, 64, 25, "Collate");
print_collate_button->down_box(FL_DOWN_BOX);
print_collate_button->callback((Fl_Callback*)cb_print_collate_button);
print_collate_button->when(FL_WHEN_CHANGED);
print_collate_button->deactivate();
} // Fl_Check_Button* print_collate_button
{ print_collate_group[0] = new Fl_Group(257, 131, 191, 50);
print_collate_group[0]->deactivate();
{ Fl_Box* o = new Fl_Box(287, 141, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(272, 136, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(257, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(352, 141, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(337, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(322, 131, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(417, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(402, 136, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(387, 131, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
o->deactivate();
}
o->end();
}
{ Fl_Group* o = print_collate_group[1] = new Fl_Group(257, 131, 191, 50);
o->hide();
o->deactivate();
} // Fl_Box* o
print_collate_group[0]->end();
} // Fl_Group* print_collate_group[0]
{ print_collate_group[1] = new Fl_Group(257, 131, 191, 50);
print_collate_group[1]->hide();
print_collate_group[1]->deactivate();
{ Fl_Box* o = new Fl_Box(287, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(272, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(257, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(352, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(337, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(322, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(417, 141, 30, 40, "3");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(402, 136, 30, 40, "2");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
} // Fl_Box* o
{ Fl_Box* o = new Fl_Box(387, 131, 30, 40, "1");
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
}
o->end();
}
} // Fl_Box* o
print_collate_group[1]->end();
} // Fl_Group* print_collate_group[1]
o->end();
}
} // Fl_Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(309, 201, 70, 25, "Print");
o->callback((Fl_Callback*)print_cb);
}
} // Fl_Return_Button* o
{ Fl_Button* o = new Fl_Button(389, 201, 68, 25, "Cancel");
o->callback((Fl_Callback*)cb_Cancel);
}
o->end();
}
{ Fl_Progress* o = print_progress = new Fl_Progress(10, 203, 289, 21);
o->selection_color((Fl_Color)4);
o->hide();
}
o->set_modal();
o->end();
}
{ Fl_Double_Window* o = print_properties_panel = new Fl_Double_Window(290, 130, "Printer Properties");
w = o;
o->callback((Fl_Callback*)cb_print_properties_panel);
{ Fl_Choice* o = print_page_size = new Fl_Choice(110, 10, 80, 25, "Page Size:");
o->down_box(FL_BORDER_BOX);
o->labelfont(1);
o->menu(menu_print_page_size);
}
} // Fl_Button* o
print_panel_controls->end();
} // Fl_Group* print_panel_controls
{ print_progress = new Fl_Progress(10, 203, 289, 21);
print_progress->selection_color((Fl_Color)4);
print_progress->hide();
} // Fl_Progress* print_progress
print_panel->set_modal();
print_panel->end();
} // Fl_Double_Window* print_panel
{ print_properties_panel = new Fl_Double_Window(290, 130, "Printer Properties");
print_properties_panel->callback((Fl_Callback*)cb_print_properties_panel);
{ print_page_size = new Fl_Choice(110, 10, 80, 25, "Page Size:");
print_page_size->down_box(FL_BORDER_BOX);
print_page_size->labelfont(1);
print_page_size->menu(menu_print_page_size);
} // Fl_Choice* print_page_size
{ Fl_Group* o = new Fl_Group(110, 45, 170, 40, "Output Mode:");
o->labelfont(1);
o->align(FL_ALIGN_LEFT);
{ Fl_Button* o = print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
o->type(102);
o->box(FL_BORDER_BOX);
o->down_box(FL_BORDER_BOX);
o->value(1);
o->color(FL_BACKGROUND2_COLOR);
o->selection_color(FL_FOREGROUND_COLOR);
o->image(image_print_color);
}
{ Fl_Button* o = print_output_mode[1] = new Fl_Button(150, 50, 40, 30);
o->type(102);
o->box(FL_BORDER_BOX);
o->down_box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->selection_color(FL_FOREGROUND_COLOR);
o->image(image_print_color);
}
{ Fl_Button* o = print_output_mode[2] = new Fl_Button(200, 45, 30, 40);
o->type(102);
o->box(FL_BORDER_BOX);
o->down_box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->selection_color(FL_FOREGROUND_COLOR);
o->image(image_print_gray);
}
{ Fl_Button* o = print_output_mode[3] = new Fl_Button(240, 50, 40, 30);
o->type(102);
o->box(FL_BORDER_BOX);
o->down_box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->selection_color(FL_FOREGROUND_COLOR);
o->image(image_print_gray);
}
{ print_output_mode[0] = new Fl_Button(110, 45, 30, 40);
print_output_mode[0]->type(102);
print_output_mode[0]->box(FL_BORDER_BOX);
print_output_mode[0]->down_box(FL_BORDER_BOX);
print_output_mode[0]->value(1);
print_output_mode[0]->color(FL_BACKGROUND2_COLOR);
print_output_mode[0]->selection_color(FL_FOREGROUND_COLOR);
print_output_mode[0]->image(image_print_color);
} // Fl_Button* print_output_mode[0]
{ print_output_mode[1] = new Fl_Button(150, 50, 40, 30);
print_output_mode[1]->type(102);
print_output_mode[1]->box(FL_BORDER_BOX);
print_output_mode[1]->down_box(FL_BORDER_BOX);
print_output_mode[1]->color(FL_BACKGROUND2_COLOR);
print_output_mode[1]->selection_color(FL_FOREGROUND_COLOR);
print_output_mode[1]->image(image_print_color);
} // Fl_Button* print_output_mode[1]
{ print_output_mode[2] = new Fl_Button(200, 45, 30, 40);
print_output_mode[2]->type(102);
print_output_mode[2]->box(FL_BORDER_BOX);
print_output_mode[2]->down_box(FL_BORDER_BOX);
print_output_mode[2]->color(FL_BACKGROUND2_COLOR);
print_output_mode[2]->selection_color(FL_FOREGROUND_COLOR);
print_output_mode[2]->image(image_print_gray);
} // Fl_Button* print_output_mode[2]
{ print_output_mode[3] = new Fl_Button(240, 50, 40, 30);
print_output_mode[3]->type(102);
print_output_mode[3]->box(FL_BORDER_BOX);
print_output_mode[3]->down_box(FL_BORDER_BOX);
print_output_mode[3]->color(FL_BACKGROUND2_COLOR);
print_output_mode[3]->selection_color(FL_FOREGROUND_COLOR);
print_output_mode[3]->image(image_print_gray);
} // Fl_Button* print_output_mode[3]
o->end();
}
} // Fl_Group* o
{ Fl_Return_Button* o = new Fl_Return_Button(123, 95, 79, 25, "Save");
o->callback((Fl_Callback*)cb_Save);
}
} // Fl_Return_Button* o
{ Fl_Button* o = new Fl_Button(212, 95, 68, 25, "Cancel");
o->callback((Fl_Callback*)cb_Cancel1);
}
} // Fl_Button* o
{ Fl_Button* o = new Fl_Button(60, 95, 53, 25, "Use");
o->callback((Fl_Callback*)cb_Use);
}
o->set_modal();
o->end();
}
return w;
} // Fl_Button* o
print_properties_panel->set_modal();
print_properties_panel->end();
} // Fl_Double_Window* print_properties_panel
return print_properties_panel;
}
void print_cb(Fl_Return_Button *, void *);
void print_cb(Fl_Return_Button *, void *);
void print_load() {
FILE *lpstat;