Author: AlbrechtS
Date: 2010-03-05 13:18:18 -0800 (Fri, 05 Mar 2010)
New Revision: 7222
Log:
Fixed localization issue in fluid's print dialog (would not find printers
if LC_MESSAGES wasn't "C").
Modified:
branches/branch-1.3/fluid/print_panel.cxx
branches/branch-1.3/fluid/print_panel.fl
Modified: branches/branch-1.3/fluid/print_panel.cxx
===================================================================
--- branches/branch-1.3/fluid/print_panel.cxx 2010-03-05 21:10:38 UTC (rev
7221)
+++ branches/branch-1.3/fluid/print_panel.cxx 2010-03-05 21:18:18 UTC (rev
7222)
@@ -256,12 +256,12 @@
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);
+ print_status->align(Fl_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);
+ o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
{ print_all = new Fl_Round_Button(20, 96, 38, 25, "All");
print_all->type(102);
print_all->down_box(FL_ROUND_DOWN_BOX);
@@ -293,9 +293,8 @@
{ 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);
+ o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
{ 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
@@ -311,63 +310,63 @@
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
+ o->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_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->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
o->deactivate();
} // Fl_Box* o
print_collate_group[0]->end();
@@ -379,55 +378,55 @@
o->box(FL_BORDER_BOX);
o->color(FL_BACKGROUND2_COLOR);
o->labelsize(11);
- o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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);
+ o->align(Fl_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->align(Fl_Align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE));
} // Fl_Box* o
print_collate_group[1]->end();
} // Fl_Group* print_collate_group[1]
@@ -457,7 +456,7 @@
} // 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);
+ o->align(Fl_Align(FL_ALIGN_LEFT));
{ 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);
@@ -526,7 +525,7 @@
defname[0] = '\0';
-if ((lpstat = popen("lpstat -p -d", "r")) != NULL) {
+if ((lpstat = popen("LC_MESSAGES=C LANG=C lpstat -p -d", "r")) != NULL) {
while (fgets(line, sizeof(line), lpstat)) {
if (!strncmp(line, "printer ", 8) &&
sscanf(line + 8, "%s", name) == 1) {
Modified: branches/branch-1.3/fluid/print_panel.fl
===================================================================
--- branches/branch-1.3/fluid/print_panel.fl 2010-03-05 21:10:38 UTC (rev
7221)
+++ branches/branch-1.3/fluid/print_panel.fl 2010-03-05 21:18:18 UTC (rev
7222)
@@ -304,7 +304,7 @@
defname[0] = '\\0';
-if ((lpstat = popen("lpstat -p -d", "r")) != NULL) {
+if ((lpstat = popen("LC_MESSAGES=C LANG=C lpstat -p -d", "r")) != NULL) {
while (fgets(line, sizeof(line), lpstat)) {
if (!strncmp(line, "printer ", 8) &&
sscanf(line + 8, "%s", name) == 1) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
