anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

expanding Preferences; rename unsorted to collated in Print

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1101 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2000-10-11 07:59:25 +00:00
parent eb3e6cd057
commit 0e65803860
10 changed files with 489 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
2000-10-11 Allan Rae <rae@lyx.org> 2000-10-11 Allan Rae <rae@lyx.org>
* src/frontends/xforms/FormPreferences.C (input): template path must be
a readable directory. It doesn't need to be writeable.
(build, delete, update, apply): New inputs in the various tabfolders
* src/frontends/xforms/forms/form_preferences.fd:
* src/frontends/xforms/FormPreferences.h: New tabfolder and added
several new entries to existing folders. Shuffled some existing stuff
around.
* src/frontends/xforms/forms/form_print.fd:
* src/frontends/xforms/FormPrint.C (apply): rename unsorted to collated.
Should probably rework PrinterParams as well. Note that the switch to
collated is effectively the same as !unsorted so changing PrinterParams
will require a lot of fiddly changes to reverse the existing logic.
* src/lyx_cb.C (TimerCB): cleaned up Angus's patch. * src/lyx_cb.C (TimerCB): cleaned up Angus's patch.
2000-10-10 Angus Leeming <a.leeming@ic.ac.uk> 2000-10-10 Angus Leeming <a.leeming@ic.ac.uk>

94
src/frontends/xforms/FormPreferences.C
View File

@ -31,8 +31,8 @@ FormPreferences::FormPreferences(LyXView * lv, Dialogs * d)
: FormBase(lv, d, _("Preferences"), : FormBase(lv, d, _("Preferences"),
BUFFER_INDEPENDENT, HIDE, new PreferencesPolicy), BUFFER_INDEPENDENT, HIDE, new PreferencesPolicy),
dialog_(0), outputs_tab_(0), look_n_feel_tab_(0), inputs_tab_(0), dialog_(0), outputs_tab_(0), look_n_feel_tab_(0), inputs_tab_(0),
lnf_general_(0), screen_fonts_(0), interface_fonts_(0), lnf_general_(0), screen_fonts_(0), interface_(0),
printer_(0), paths_(0), minw_(0), minh_(0) printer_(0), paths_(0), outputs_general_(0), minw_(0), minh_(0)
{ {
// let the dialog be shown // let the dialog be shown
// This is a permanent connection so we won't bother // This is a permanent connection so we won't bother
@ -49,14 +49,17 @@ FormPreferences::~FormPreferences()
delete outputs_tab_; delete outputs_tab_;
delete lnf_general_; delete lnf_general_;
delete screen_fonts_; delete screen_fonts_;
delete interface_fonts_; delete interface_;
delete printer_; delete printer_;
delete paths_; delete paths_;
delete outputs_general_;
} }
void FormPreferences::hide() void FormPreferences::hide()
{ {
// We need to hide the active tabfolder otherwise we get a
// BadDrawable error from X windows and LyX crashes without saving.
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs); FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
if (outer_form if (outer_form
&& outer_form->visible) { && outer_form->visible) {
@ -89,16 +92,16 @@ void FormPreferences::build()
// build actual tabfolder contents // build actual tabfolder contents
// these will become nested tabfolders // these will become nested tabfolders
screen_fonts_ = build_screen_fonts(); screen_fonts_ = build_screen_fonts();
interface_fonts_ = build_interface_fonts(); interface_ = build_interface();
lnf_general_ = build_lnf_general(); lnf_general_ = build_lnf_general();
printer_ = build_printer(); printer_ = build_printer();
paths_ = build_paths(); paths_ = build_paths();
outputs_general_ = build_outputs_general();
// setup the input returns // setup the input returns
// Lnf_General tab // Lnf_General tab
fl_set_input_return(lnf_general_->input_bind, FL_RETURN_CHANGED);
fl_set_counter_return(lnf_general_->counter_autosave, FL_RETURN_CHANGED); fl_set_counter_return(lnf_general_->counter_autosave, FL_RETURN_CHANGED);
fl_set_counter_return(lnf_general_->counter_line_len, FL_RETURN_CHANGED); fl_set_counter_return(lnf_general_->counter_wm_jump, FL_RETURN_CHANGED);
// Screen fonts // Screen fonts
fl_set_input_return(screen_fonts_->input_roman, FL_RETURN_CHANGED); fl_set_input_return(screen_fonts_->input_roman, FL_RETURN_CHANGED);
fl_set_input_return(screen_fonts_->input_sans, FL_RETURN_CHANGED); fl_set_input_return(screen_fonts_->input_sans, FL_RETURN_CHANGED);
@ -117,12 +120,16 @@ void FormPreferences::build()
fl_set_input_return(screen_fonts_->input_largest, FL_RETURN_CHANGED); fl_set_input_return(screen_fonts_->input_largest, FL_RETURN_CHANGED);
fl_set_input_return(screen_fonts_->input_huge, FL_RETURN_CHANGED); fl_set_input_return(screen_fonts_->input_huge, FL_RETURN_CHANGED);
fl_set_input_return(screen_fonts_->input_huger, FL_RETURN_CHANGED); fl_set_input_return(screen_fonts_->input_huger, FL_RETURN_CHANGED);
// interface fonts // interface
fl_set_input_return(interface_fonts_->input_popup_font, fl_set_input_return(interface_->input_popup_font,
FL_RETURN_CHANGED); FL_RETURN_CHANGED);
fl_set_input_return(interface_fonts_->input_menu_font, fl_set_input_return(interface_->input_menu_font,
FL_RETURN_CHANGED); FL_RETURN_CHANGED);
fl_set_input_return(interface_fonts_->input_popup_encoding, fl_set_input_return(interface_->input_popup_encoding,
FL_RETURN_CHANGED);
fl_set_input_return(interface_->input_bind_file,
FL_RETURN_CHANGED);
fl_set_input_return(interface_->input_ui_file,
FL_RETURN_CHANGED); FL_RETURN_CHANGED);
// printer // printer
fl_set_input_return(printer_->input_command, FL_RETURN_CHANGED); fl_set_input_return(printer_->input_command, FL_RETURN_CHANGED);
@ -149,6 +156,9 @@ void FormPreferences::build()
fl_set_input_return(paths_->input_lastfiles, FL_RETURN_CHANGED); fl_set_input_return(paths_->input_lastfiles, FL_RETURN_CHANGED);
fl_set_input_return(paths_->input_backup_path, FL_RETURN_CHANGED); fl_set_input_return(paths_->input_backup_path, FL_RETURN_CHANGED);
fl_set_counter_return(paths_->counter_lastfiles, FL_RETURN_CHANGED); fl_set_counter_return(paths_->counter_lastfiles, FL_RETURN_CHANGED);
// outputs general
fl_set_counter_return(outputs_general_->counter_line_len,
FL_RETURN_CHANGED);
// Now add them to the tabfolder // Now add them to the tabfolder
fl_addto_tabfolder(dialog_->tabfolder_prefs, fl_addto_tabfolder(dialog_->tabfolder_prefs,
@ -167,8 +177,8 @@ void FormPreferences::build()
_("Screen Fonts"), _("Screen Fonts"),
screen_fonts_->form); screen_fonts_->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer, fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
_("Interface Fonts"), _("Interface"),
interface_fonts_->form); interface_->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer, fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
_("General"), _("General"),
lnf_general_->form); lnf_general_->form);
@ -183,16 +193,21 @@ void FormPreferences::build()
fl_addto_tabfolder(outputs_tab_->tabfolder_outer, fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
_("Printer"), _("Printer"),
printer_->form); printer_->form);
fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
_("General"),
outputs_general_->form);
// deactivate the various browse buttons because they // deactivate the various browse buttons because they
// currently aren't implemented // currently aren't implemented
fl_deactivate_object(lnf_general_->button_bind_file_browse); fl_deactivate_object(interface_->button_bind_file_browse);
fl_deactivate_object(interface_->button_ui_file_browse);
fl_deactivate_object(paths_->button_document_browse); fl_deactivate_object(paths_->button_document_browse);
fl_deactivate_object(paths_->button_template_browse); fl_deactivate_object(paths_->button_template_browse);
fl_deactivate_object(paths_->button_temp_dir_browse); fl_deactivate_object(paths_->button_temp_dir_browse);
fl_deactivate_object(paths_->button_lastfiles_browse); fl_deactivate_object(paths_->button_lastfiles_browse);
fl_deactivate_object(paths_->button_backup_path_browse); fl_deactivate_object(paths_->button_backup_path_browse);
fl_set_object_lcol(lnf_general_->button_bind_file_browse, FL_INACTIVE); fl_set_object_lcol(interface_->button_bind_file_browse, FL_INACTIVE);
fl_set_object_lcol(interface_->button_ui_file_browse, FL_INACTIVE);
fl_set_object_lcol(paths_->button_document_browse, FL_INACTIVE); fl_set_object_lcol(paths_->button_document_browse, FL_INACTIVE);
fl_set_object_lcol(paths_->button_template_browse, FL_INACTIVE); fl_set_object_lcol(paths_->button_template_browse, FL_INACTIVE);
fl_set_object_lcol(paths_->button_temp_dir_browse, FL_INACTIVE); fl_set_object_lcol(paths_->button_temp_dir_browse, FL_INACTIVE);
@ -236,17 +251,21 @@ void FormPreferences::apply()
lyxrc.exit_confirmation = fl_get_button(lnf_general_->check_exit_confirm); lyxrc.exit_confirmation = fl_get_button(lnf_general_->check_exit_confirm);
lyxrc.display_shortcuts = lyxrc.display_shortcuts =
fl_get_button(lnf_general_->check_display_shortcuts); fl_get_button(lnf_general_->check_display_shortcuts);
lyxrc.bind_file = fl_get_input(lnf_general_->input_bind); lyxrc.new_ask_filename = fl_get_button(lnf_general_->check_ask_new_file);
lyxrc.cursor_follows_scrollbar =
fl_get_button(lnf_general_->check_cursor_follows_scrollbar);
lyxrc.autosave = static_cast<unsigned int> lyxrc.autosave = static_cast<unsigned int>
(fl_get_counter_value(lnf_general_->counter_autosave)); (fl_get_counter_value(lnf_general_->counter_autosave));
lyxrc.ascii_linelen = static_cast<unsigned int> lyxrc.wheel_jump = static_cast<unsigned int>
(fl_get_counter_value(lnf_general_->counter_line_len)); (fl_get_counter_value(lnf_general_->counter_wm_jump));
// Interface fonts // Interface
lyxrc.popup_font_name = lyxrc.popup_font_name =
fl_get_input(interface_fonts_->input_popup_font); fl_get_input(interface_->input_popup_font);
lyxrc.menu_font_name = fl_get_input(interface_fonts_->input_menu_font); lyxrc.menu_font_name = fl_get_input(interface_->input_menu_font);
lyxrc.font_norm_menu = lyxrc.font_norm_menu =
fl_get_input(interface_fonts_->input_popup_encoding); fl_get_input(interface_->input_popup_encoding);
lyxrc.bind_file = fl_get_input(interface_->input_bind_file);
lyxrc.ui_file = fl_get_input(interface_->input_ui_file);
// Screen fonts // Screen fonts
if (lyxrc.roman_font_name != if (lyxrc.roman_font_name !=
fl_get_input(screen_fonts_->input_roman) || fl_get_input(screen_fonts_->input_roman) ||
@ -351,6 +370,9 @@ void FormPreferences::apply()
lyxrc.make_backup = fl_get_button(paths_->check_make_backups); lyxrc.make_backup = fl_get_button(paths_->check_make_backups);
lyxrc.num_lastfiles = static_cast<unsigned int> lyxrc.num_lastfiles = static_cast<unsigned int>
(fl_get_counter_value(paths_->counter_lastfiles)); (fl_get_counter_value(paths_->counter_lastfiles));
// outputs general
lyxrc.ascii_linelen = static_cast<unsigned int>
(fl_get_counter_value(outputs_general_->counter_line_len));
} }
@ -367,12 +389,14 @@ void FormPreferences::update()
lyxrc.exit_confirmation); lyxrc.exit_confirmation);
fl_set_button(lnf_general_->check_display_shortcuts, fl_set_button(lnf_general_->check_display_shortcuts,
lyxrc.display_shortcuts); lyxrc.display_shortcuts);
fl_set_input(lnf_general_->input_bind, fl_set_button(lnf_general_->check_ask_new_file,
lyxrc.bind_file.c_str()); lyxrc.new_ask_filename);
fl_set_button(lnf_general_->check_cursor_follows_scrollbar,
lyxrc.cursor_follows_scrollbar);
fl_set_counter_value(lnf_general_->counter_autosave, fl_set_counter_value(lnf_general_->counter_autosave,
lyxrc.autosave); lyxrc.autosave);
fl_set_counter_value(lnf_general_->counter_line_len, fl_set_counter_value(lnf_general_->counter_wm_jump,
lyxrc.ascii_linelen); lyxrc.wheel_jump);
// Screen fonts // Screen fonts
fl_set_input(screen_fonts_->input_roman, fl_set_input(screen_fonts_->input_roman,
lyxrc.roman_font_name.c_str()); lyxrc.roman_font_name.c_str());
@ -406,13 +430,17 @@ void FormPreferences::update()
tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGE]).c_str()); tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGE]).c_str());
fl_set_input(screen_fonts_->input_huger, fl_set_input(screen_fonts_->input_huger,
tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGER]).c_str()); tostr(lyxrc.font_sizes[LyXFont::SIZE_HUGER]).c_str());
// interface fonts // interface
fl_set_input(interface_fonts_->input_popup_font, fl_set_input(interface_->input_popup_font,
lyxrc.popup_font_name.c_str()); lyxrc.popup_font_name.c_str());
fl_set_input(interface_fonts_->input_menu_font, fl_set_input(interface_->input_menu_font,
lyxrc.menu_font_name.c_str()); lyxrc.menu_font_name.c_str());
fl_set_input(interface_fonts_->input_popup_encoding, fl_set_input(interface_->input_popup_encoding,
lyxrc.font_norm_menu.c_str()); lyxrc.font_norm_menu.c_str());
fl_set_input(interface_->input_bind_file,
lyxrc.bind_file.c_str());
fl_set_input(interface_->input_ui_file,
lyxrc.ui_file.c_str());
// printer // printer
fl_set_button(printer_->check_adapt_output, fl_set_button(printer_->check_adapt_output,
lyxrc.print_adapt_output); lyxrc.print_adapt_output);
@ -469,6 +497,10 @@ void FormPreferences::update()
lyxrc.make_backup); lyxrc.make_backup);
fl_set_counter_value(paths_->counter_lastfiles, fl_set_counter_value(paths_->counter_lastfiles,
lyxrc.num_lastfiles); lyxrc.num_lastfiles);
// outputs general
fl_set_counter_value(outputs_general_->counter_line_len,
lyxrc.ascii_linelen);
} }
} }
@ -484,8 +516,10 @@ bool FormPreferences::input(FL_OBJECT *, long)
// paths -- all dirs in the path should exist, be writable & absolute // paths -- all dirs in the path should exist, be writable & absolute
if (!AbsolutePath(fl_get_input(paths_->input_default_path)) if (!AbsolutePath(fl_get_input(paths_->input_default_path))
|| 1 != IsDirWriteable(fl_get_input(paths_->input_default_path)) || 1 != IsDirWriteable(fl_get_input(paths_->input_default_path))
// template_path should be a readable directory
|| !AbsolutePath(fl_get_input(paths_->input_template_path)) || !AbsolutePath(fl_get_input(paths_->input_template_path))
|| 1 != IsDirWriteable(fl_get_input(paths_->input_template_path)) || 1 != FileInfo(fl_get_input(paths_->input_template_path)).isDir()
|| 1 != FileInfo(fl_get_input(paths_->input_template_path)).readable()
// lastfiles: exists && writeable || non-existent && isn't a dir // lastfiles: exists && writeable || non-existent && isn't a dir
// NOTE: assumes IsFileWriteable == -1 means non-existent hence // NOTE: assumes IsFileWriteable == -1 means non-existent hence
// the extra check to see if its a directory // the extra check to see if its a directory

11
src/frontends/xforms/FormPreferences.h
View File

@ -29,10 +29,11 @@ class Dialogs;
struct FD_form_preferences; struct FD_form_preferences;
struct FD_form_lnf_general; struct FD_form_lnf_general;
struct FD_form_screen_fonts; struct FD_form_screen_fonts;
struct FD_form_interface_fonts; struct FD_form_interface;
struct FD_form_printer; struct FD_form_printer;
struct FD_form_paths; struct FD_form_paths;
struct FD_form_outer_tab; struct FD_form_outer_tab;
struct FD_form_outputs_general;
/** This class provides an XForms implementation of the FormPreferences Dialog. /** This class provides an XForms implementation of the FormPreferences Dialog.
The preferences dialog allows users to set/save their preferences. The preferences dialog allows users to set/save their preferences.
@ -71,11 +72,13 @@ private:
/// ///
FD_form_screen_fonts * build_screen_fonts(); FD_form_screen_fonts * build_screen_fonts();
/// ///
FD_form_interface_fonts * build_interface_fonts(); FD_form_interface * build_interface();
/// ///
FD_form_printer * build_printer(); FD_form_printer * build_printer();
/// ///
FD_form_paths * build_paths(); FD_form_paths * build_paths();
///
FD_form_outputs_general * build_outputs_general();
/// Real GUI implementation. /// Real GUI implementation.
FD_form_preferences * dialog_; FD_form_preferences * dialog_;
@ -90,11 +93,13 @@ private:
/// ///
FD_form_screen_fonts * screen_fonts_; FD_form_screen_fonts * screen_fonts_;
/// ///
FD_form_interface_fonts * interface_fonts_; FD_form_interface * interface_;
/// ///
FD_form_printer * printer_; FD_form_printer * printer_;
/// ///
FD_form_paths * paths_; FD_form_paths * paths_;
///
FD_form_outputs_general * outputs_general_;
/// Overcome a dumb xforms sizing bug /// Overcome a dumb xforms sizing bug
int minw_; int minw_;
/// ///

4
src/frontends/xforms/FormPrint.C
View File

@ -154,8 +154,8 @@ void FormPrint::apply()
string(fl_get_input(dialog_->input_file)), string(fl_get_input(dialog_->input_file)),
wp, from, to, wp, from, to,
static_cast<bool>(order_.getButton()), static_cast<bool>(order_.getButton()),
static_cast<bool>(fl_get_button(dialog_-> !static_cast<bool>(fl_get_button(dialog_->
radio_unsorted)), radio_collated)),
strToInt(fl_get_input(dialog_->input_count))))) { strToInt(fl_get_input(dialog_->input_count))))) {
WriteAlert(_("Error:"), WriteAlert(_("Error:"),
_("Unable to print"), _("Unable to print"),

155
src/frontends/xforms/form_preferences.C
View File

@ -25,23 +25,26 @@ FD_form_lnf_general * FormPreferences::build_lnf_general()
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320); fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, ""); obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 30, 240, 30, _("Show banner")); fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 310, 30, idex(_("Show banner|#S")));
fl_set_button_shortcut(obj, scex(_("Show banner|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1); fl_set_button(obj, 1);
fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 240, 30, _("Auto region delete")); fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 310, 30, idex(_("Auto region delete|#A")));
fl_set_button_shortcut(obj, scex(_("Auto region delete|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1); fl_set_button(obj, 1);
fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 90, 240, 30, _("Exit confirmation")); fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 310, 30, idex(_("Exit confirmation|#E")));
fl_set_button_shortcut(obj, scex(_("Exit confirmation|#E")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1); fl_set_button(obj, 1);
fdui->check_display_shortcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 120, 240, 30, _("Display keyboard shortcuts")); fdui->check_display_shortcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 310, 30, _("Display keyboard shortcuts"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1); fl_set_button(obj, 1);
fdui->counter_autosave = obj = fl_add_counter(FL_NORMAL_COUNTER, 240, 255, 170, 30, _("Autosave interval")); fdui->counter_autosave = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 255, 115, 30, _("Autosave interval"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@ -49,19 +52,24 @@ FD_form_lnf_general * FormPreferences::build_lnf_general()
fl_set_counter_bounds(obj, 0, 1200); fl_set_counter_bounds(obj, 0, 1200);
fl_set_counter_value(obj, 300); fl_set_counter_value(obj, 300);
fl_set_counter_step(obj, 1, 1); fl_set_counter_step(obj, 1, 1);
fdui->counter_line_len = obj = fl_add_counter(FL_NORMAL_COUNTER, 240, 225, 170, 30, _("Ascii line length")); fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 310, 30, idex(_("File->New asks for name|#N")));
fl_set_button_shortcut(obj, scex(_("File->New asks for name|#N")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 310, 30, idex(_("Cursor follows scrollbar|#C")));
fl_set_button_shortcut(obj, scex(_("Cursor follows scrollbar|#C")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fdui->counter_wm_jump = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 225, 115, 30, _("Wheel mouse jump"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0); fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 120); fl_set_counter_bounds(obj, 0, 250);
fl_set_counter_value(obj, 75); fl_set_counter_value(obj, 100);
fl_set_counter_step(obj, 1, 1); fl_set_counter_step(obj, 1, 1);
fdui->input_bind = obj = fl_add_input(FL_NORMAL_INPUT, 140, 175, 190, 30, _("Bind file"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_bind_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 175, 80, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;
@ -82,9 +90,9 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_screen_fonts *fdui = new FD_form_screen_fonts; FD_form_screen_fonts *fdui = new FD_form_screen_fonts;
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320); fdui->form = fl_bgn_form(FL_NO_BOX, 455, 345);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, ""); obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 345, "");
fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 210, 5, 200, 30, _("Roman")); fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 210, 5, 200, 30, _("Roman"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@ -94,7 +102,7 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 210, 65, 200, 30, _("Typewriter")); fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 210, 65, 200, 30, _("Typewriter"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER, 210, 125, 200, 30, _("%")); fdui->counter_zoom = obj = fl_add_counter(FL_SIMPLE_COUNTER, 210, 125, 200, 30, _("%"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@ -147,30 +155,42 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
} }
/*---------------------------------------*/ /*---------------------------------------*/
FD_form_interface_fonts::~FD_form_interface_fonts() FD_form_interface::~FD_form_interface()
{ {
if( form->visible ) fl_hide_form( form ); if( form->visible ) fl_hide_form( form );
fl_free_form( form ); fl_free_form( form );
} }
FD_form_interface_fonts * FormPreferences::build_interface_fonts() FD_form_interface * FormPreferences::build_interface()
{ {
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_interface_fonts *fdui = new FD_form_interface_fonts; FD_form_interface *fdui = new FD_form_interface;
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320); fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, ""); obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 215, 50, 200, 30, _("Popup")); fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 50, 200, 30, _("Popup Font"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_menu_font = obj = fl_add_input(FL_NORMAL_INPUT, 215, 80, 200, 30, _("Menu")); fdui->input_menu_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 80, 200, 30, _("Menu Font"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 215, 110, 200, 30, _("Encoding")); fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 110, 200, 30, _("Popup Encoding"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 210, 190, 30, idex(_("Bind file|#B")));
fl_set_button_shortcut(obj, scex(_("Bind file|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_bind_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 210, 80, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 180, 190, 30, idex(_("User Interface file|#U")));
fl_set_button_shortcut(obj, scex(_("User Interface file|#U")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_ui_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 180, 80, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;
@ -194,52 +214,52 @@ FD_form_printer * FormPreferences::build_printer()
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320); fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, ""); obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
fdui->input_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 60, 80, 30, _("command")); fdui->input_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 75, 80, 30, _("command"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_page_range = obj = fl_add_input(FL_NORMAL_INPUT, 130, 90, 80, 30, _("page range")); fdui->input_page_range = obj = fl_add_input(FL_NORMAL_INPUT, 130, 105, 80, 30, _("page range"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_copies = obj = fl_add_input(FL_NORMAL_INPUT, 130, 120, 80, 30, _("copies")); fdui->input_copies = obj = fl_add_input(FL_NORMAL_INPUT, 130, 135, 80, 30, _("copies"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_reverse = obj = fl_add_input(FL_NORMAL_INPUT, 130, 150, 80, 30, _("reverse")); fdui->input_reverse = obj = fl_add_input(FL_NORMAL_INPUT, 130, 165, 80, 30, _("reverse"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_to_printer = obj = fl_add_input(FL_NORMAL_INPUT, 130, 180, 80, 30, _("to printer")); fdui->input_to_printer = obj = fl_add_input(FL_NORMAL_INPUT, 130, 195, 80, 30, _("to printer"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_file_extension = obj = fl_add_input(FL_NORMAL_INPUT, 130, 210, 80, 30, _("file extension")); fdui->input_file_extension = obj = fl_add_input(FL_NORMAL_INPUT, 130, 225, 80, 30, _("file extension"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_spool_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 240, 80, 30, _("spool command")); fdui->input_spool_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 255, 80, 30, _("spool command"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_paper_type = obj = fl_add_input(FL_NORMAL_INPUT, 130, 270, 80, 30, _("paper type")); fdui->input_paper_type = obj = fl_add_input(FL_NORMAL_INPUT, 130, 285, 80, 30, _("paper type"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_even_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 60, 80, 30, _("even pages")); fdui->input_even_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 75, 80, 30, _("even pages"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_odd_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 90, 80, 30, _("odd pages")); fdui->input_odd_pages = obj = fl_add_input(FL_NORMAL_INPUT, 360, 105, 80, 30, _("odd pages"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_collated = obj = fl_add_input(FL_NORMAL_INPUT, 360, 120, 80, 30, _("collated")); fdui->input_collated = obj = fl_add_input(FL_NORMAL_INPUT, 360, 135, 80, 30, _("collated"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_landscape = obj = fl_add_input(FL_NORMAL_INPUT, 360, 150, 80, 30, _("landscape")); fdui->input_landscape = obj = fl_add_input(FL_NORMAL_INPUT, 360, 165, 80, 30, _("landscape"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_to_file = obj = fl_add_input(FL_NORMAL_INPUT, 360, 180, 80, 30, _("to file")); fdui->input_to_file = obj = fl_add_input(FL_NORMAL_INPUT, 360, 195, 80, 30, _("to file"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_extra_options = obj = fl_add_input(FL_NORMAL_INPUT, 360, 210, 80, 30, _("extra options")); fdui->input_extra_options = obj = fl_add_input(FL_NORMAL_INPUT, 360, 225, 80, 30, _("extra options"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_spool_prefix = obj = fl_add_input(FL_NORMAL_INPUT, 360, 240, 80, 30, _("spool printer prefix")); fdui->input_spool_prefix = obj = fl_add_input(FL_NORMAL_INPUT, 360, 255, 80, 30, _("spool printer prefix"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_paper_size = obj = fl_add_input(FL_NORMAL_INPUT, 360, 270, 80, 30, _("paper size")); fdui->input_paper_size = obj = fl_add_input(FL_NORMAL_INPUT, 360, 285, 80, 30, _("paper size"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 130, 10, 80, 30, _("name")); fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 130, 10, 80, 30, _("name"));
@ -248,6 +268,8 @@ FD_form_printer * FormPreferences::build_printer()
fdui->check_adapt_output = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 240, 10, 120, 30, _("adapt output")); fdui->check_adapt_output = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 240, 10, 120, 30, _("adapt output"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 0, 60, 452, 260, _("Printer Command and Flags"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;
@ -276,7 +298,7 @@ FD_form_paths * FormPreferences::build_paths()
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_document_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 90, 30, _("Browse...")); fdui->button_document_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->counter_lastfiles = obj = fl_add_counter(FL_NORMAL_COUNTER, 170, 130, 110, 30, _("Last file count")); fdui->counter_lastfiles = obj = fl_add_counter(FL_SIMPLE_COUNTER, 170, 130, 90, 30, _("Last file count"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@ -337,26 +359,29 @@ FD_form_preferences * FormPreferences::build_preferences()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_preferences *fdui = new FD_form_preferences; FD_form_preferences *fdui = new FD_form_preferences;
fdui->form = fl_bgn_form(FL_NO_BOX, 485, 435); fdui->form = fl_bgn_form(FL_NO_BOX, 470, 475);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 485, 435, ""); obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 475, "");
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 275, 395, 90, 30, idex(_("Apply|#A"))); fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 90, 30, idex(_("Apply|#A")));
fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0); fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 375, 395, 90, 30, idex(_("Cancel|^["))); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 380, 90, 30, idex(_("Cancel|^[")));
fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 175, 395, 90, 30, _("Save")); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 170, 380, 90, 30, _("Save"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseOKCB, 0); fl_set_object_callback(obj, C_FormBaseOKCB, 0);
fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 470, 385, ""); fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 10, 455, 365, "");
fl_set_object_boxtype(obj, FL_FLAT_BOX); fl_set_object_boxtype(obj, FL_FLAT_BOX);
fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 395, 90, 30, idex(_("Restore|#R"))); fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 380, 90, 30, idex(_("Restore|#R")));
fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 420, 460, 55, "");
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 0, 415, 470, 1, "");
fl_end_form(); fl_end_form();
fdui->form->fdui = fdui; fdui->form->fdui = fdui;
@ -377,10 +402,10 @@ FD_form_outer_tab * FormPreferences::build_outer_tab()
FL_OBJECT *obj; FL_OBJECT *obj;
FD_form_outer_tab *fdui = new FD_form_outer_tab; FD_form_outer_tab *fdui = new FD_form_outer_tab;
fdui->form = fl_bgn_form(FL_NO_BOX, 475, 365); fdui->form = fl_bgn_form(FL_NO_BOX, 455, 345);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 475, 365, ""); obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 345, "");
fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 10, 455, 345, ""); fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 345, "");
fl_set_object_boxtype(obj, FL_FLAT_BOX); fl_set_object_boxtype(obj, FL_FLAT_BOX);
fl_end_form(); fl_end_form();
@ -390,3 +415,35 @@ FD_form_outer_tab * FormPreferences::build_outer_tab()
} }
/*---------------------------------------*/ /*---------------------------------------*/
FD_form_outputs_general::~FD_form_outputs_general()
{
if( form->visible ) fl_hide_form( form );
fl_free_form( form );
}
FD_form_outputs_general * FormPreferences::build_outputs_general()
{
FL_OBJECT *obj;
FD_form_outputs_general *fdui = new FD_form_outputs_general;
fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
fdui->counter_line_len = obj = fl_add_counter(FL_SIMPLE_COUNTER, 295, 50, 120, 30, idex(_("Ascii line length|#A")));
fl_set_button_shortcut(obj, scex(_("Ascii line length|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 120);
fl_set_counter_value(obj, 75);
fl_set_counter_step(obj, 1, 1);
fl_end_form();
fdui->form->fdui = fdui;
return fdui;
}
/*---------------------------------------*/

23
src/frontends/xforms/form_preferences.h
View File

@ -21,6 +21,8 @@ extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long); extern "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
/**** Forms and Objects ****/ /**** Forms and Objects ****/
struct FD_form_lnf_general { struct FD_form_lnf_general {
@ -32,9 +34,9 @@ struct FD_form_lnf_general {
FL_OBJECT *check_exit_confirm; FL_OBJECT *check_exit_confirm;
FL_OBJECT *check_display_shortcuts; FL_OBJECT *check_display_shortcuts;
FL_OBJECT *counter_autosave; FL_OBJECT *counter_autosave;
FL_OBJECT *counter_line_len; FL_OBJECT *check_ask_new_file;
FL_OBJECT *input_bind; FL_OBJECT *check_cursor_follows_scrollbar;
FL_OBJECT *button_bind_file_browse; FL_OBJECT *counter_wm_jump;
}; };
struct FD_form_screen_fonts { struct FD_form_screen_fonts {
~FD_form_screen_fonts(); ~FD_form_screen_fonts();
@ -57,13 +59,17 @@ struct FD_form_screen_fonts {
FL_OBJECT *input_huge; FL_OBJECT *input_huge;
FL_OBJECT *input_huger; FL_OBJECT *input_huger;
}; };
struct FD_form_interface_fonts { struct FD_form_interface {
~FD_form_interface_fonts(); ~FD_form_interface();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *input_popup_font; FL_OBJECT *input_popup_font;
FL_OBJECT *input_menu_font; FL_OBJECT *input_menu_font;
FL_OBJECT *input_popup_encoding; FL_OBJECT *input_popup_encoding;
FL_OBJECT *input_bind_file;
FL_OBJECT *button_bind_file_browse;
FL_OBJECT *input_ui_file;
FL_OBJECT *button_ui_file_browse;
}; };
struct FD_form_printer { struct FD_form_printer {
~FD_form_printer(); ~FD_form_printer();
@ -116,6 +122,7 @@ struct FD_form_preferences {
FL_OBJECT *button_ok; FL_OBJECT *button_ok;
FL_OBJECT *tabfolder_prefs; FL_OBJECT *tabfolder_prefs;
FL_OBJECT *button_restore; FL_OBJECT *button_restore;
FL_OBJECT *text_warning;
}; };
struct FD_form_outer_tab { struct FD_form_outer_tab {
~FD_form_outer_tab(); ~FD_form_outer_tab();
@ -123,5 +130,11 @@ struct FD_form_outer_tab {
FL_FORM *form; FL_FORM *form;
FL_OBJECT *tabfolder_outer; FL_OBJECT *tabfolder_outer;
}; };
struct FD_form_outputs_general {
~FD_form_outputs_general();
FL_FORM *form;
FL_OBJECT *counter_line_len;
};
#endif /* FD_form_lnf_general_h_ */ #endif /* FD_form_lnf_general_h_ */

4
src/frontends/xforms/form_print.C
View File

@ -114,8 +114,8 @@ FD_form_print * FormPrint::build_print()
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->radio_unsorted = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_("Unsorted|#U"))); fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_("Collated|#C")));
fl_set_button_shortcut(obj, scex(_("Unsorted|#U")), 1); fl_set_button_shortcut(obj, scex(_("Collated|#C")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_to_page = obj = fl_add_input(FL_INT_INPUT, 110, 160, 50, 30, _("to")); fdui->input_to_page = obj = fl_add_input(FL_INT_INPUT, 110, 160, 50, 30, _("to"));

2
src/frontends/xforms/form_print.h
View File

@ -33,7 +33,7 @@ struct FD_form_print {
FL_OBJECT *radio_order_reverse; FL_OBJECT *radio_order_reverse;
FL_OBJECT *input_from_page; FL_OBJECT *input_from_page;
FL_OBJECT *input_count; FL_OBJECT *input_count;
FL_OBJECT *radio_unsorted; FL_OBJECT *radio_collated;
FL_OBJECT *input_to_page; FL_OBJECT *input_to_page;
}; };

368
src/frontends/xforms/forms/form_preferences.fd
View File

@ -3,9 +3,9 @@ Magic: 13000
Internal Form Definition File Internal Form Definition File
(do not change) (do not change)
Number of forms: 7 Number of forms: 8
Unit of measure: FL_COORD_PIXEL Unit of measure: FL_COORD_PIXEL
SnapGrid: 5 SnapGrid: 1
=============== FORM =============== =============== FORM ===============
Name: form_lnf_general Name: form_lnf_general
@ -34,14 +34,14 @@ argument:
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 20 30 240 30 box: 15 15 310 30
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Show banner label: Show banner|#S
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -53,14 +53,14 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 20 60 240 30 box: 15 45 310 30
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Auto region delete label: Auto region delete|#A
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -72,14 +72,14 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 20 90 240 30 box: 15 75 310 30
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Exit confirmation label: Exit confirmation|#E
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -91,7 +91,7 @@ argument: 0
-------------------- --------------------
class: FL_CHECKBUTTON class: FL_CHECKBUTTON
type: PUSH_BUTTON type: PUSH_BUTTON
box: 20 120 240 30 box: 15 105 310 30
boxtype: FL_NO_BOX boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -109,8 +109,8 @@ argument: 0
-------------------- --------------------
class: FL_COUNTER class: FL_COUNTER
type: NORMAL_COUNTER type: SIMPLE_COUNTER
box: 240 255 170 30 box: 320 255 115 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_BLUE colors: FL_COL1 FL_BLUE
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -129,74 +129,76 @@ argument: 0
value: 300 value: 300
sstep: 1 sstep: 1
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 15 135 310 30
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: File->New asks for name|#N
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: check_ask_new_file
callback: C_FormBaseInputCB
argument: 0
value: 1
--------------------
class: FL_CHECKBUTTON
type: PUSH_BUTTON
box: 15 165 310 30
boxtype: FL_NO_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Cursor follows scrollbar|#C
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: check_cursor_follows_scrollbar
callback: C_FormBaseInputCB
argument: 0
value: 1
-------------------- --------------------
class: FL_COUNTER class: FL_COUNTER
type: NORMAL_COUNTER type: SIMPLE_COUNTER
box: 240 225 170 30 box: 320 225 115 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_BLUE colors: FL_COL1 FL_BLUE
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Ascii line length label: Wheel mouse jump
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
name: counter_line_len name: counter_wm_jump
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: 0 argument: 0
bounds: 0 120 bounds: 0 250
precision: 0 precision: 0
value: 75 value: 100
sstep: 1 sstep: 1
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 140 175 190 30
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Bind file
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_bind
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 330 175 80 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Browse...
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_bind_file_browse
callback:
argument:
=============== FORM =============== =============== FORM ===============
Name: form_screen_fonts Name: form_screen_fonts
Width: 450 Width: 455
Height: 320 Height: 345
Number of Objects: 17 Number of Objects: 17
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: FLAT_BOX type: FLAT_BOX
box: 0 0 450 320 box: 0 0 455 345
boxtype: FL_FLAT_BOX boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -267,7 +269,7 @@ argument: 0
-------------------- --------------------
class: FL_COUNTER class: FL_COUNTER
type: NORMAL_COUNTER type: SIMPLE_COUNTER
box: 210 125 200 30 box: 210 125 200 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_BLUE colors: FL_COL1 FL_BLUE
@ -505,10 +507,10 @@ callback: C_FormBaseInputCB
argument: 0 argument: 0
=============== FORM =============== =============== FORM ===============
Name: form_interface_fonts Name: form_interface
Width: 450 Width: 450
Height: 320 Height: 320
Number of Objects: 4 Number of Objects: 8
-------------------- --------------------
class: FL_BOX class: FL_BOX
@ -531,14 +533,14 @@ argument:
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 215 50 200 30 box: 230 50 200 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Popup label: Popup Font
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -549,14 +551,14 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 215 80 200 30 box: 230 80 200 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Menu label: Menu Font
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -567,14 +569,14 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 215 110 200 30 box: 230 110 200 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Encoding label: Popup Encoding
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -582,11 +584,83 @@ name: input_popup_encoding
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: 0 argument: 0
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 160 210 190 30
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Bind file|#B
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_bind_file
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 350 210 80 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Browse...
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_bind_file_browse
callback:
argument:
--------------------
class: FL_INPUT
type: NORMAL_INPUT
box: 160 180 190 30
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: User Interface file|#U
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_ui_file
callback: C_FormBaseInputCB
argument: 0
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 350 180 80 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Browse...
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_ui_file_browse
callback:
argument:
=============== FORM =============== =============== FORM ===============
Name: form_printer Name: form_printer
Width: 450 Width: 450
Height: 320 Height: 320
Number of Objects: 19 Number of Objects: 20
-------------------- --------------------
class: FL_BOX class: FL_BOX
@ -609,7 +683,7 @@ argument:
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 60 80 30 box: 130 75 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -627,7 +701,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 90 80 30 box: 130 105 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -645,7 +719,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 120 80 30 box: 130 135 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -663,7 +737,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 150 80 30 box: 130 165 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -681,7 +755,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 180 80 30 box: 130 195 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -699,7 +773,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 210 80 30 box: 130 225 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -717,7 +791,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 240 80 30 box: 130 255 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -735,7 +809,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 130 270 80 30 box: 130 285 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -753,7 +827,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 60 80 30 box: 360 75 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -771,7 +845,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 90 80 30 box: 360 105 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -789,7 +863,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 120 80 30 box: 360 135 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -807,7 +881,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 150 80 30 box: 360 165 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -825,7 +899,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 180 80 30 box: 360 195 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -843,7 +917,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 210 80 30 box: 360 225 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -861,7 +935,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 240 80 30 box: 360 255 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -879,7 +953,7 @@ argument: 0
-------------------- --------------------
class: FL_INPUT class: FL_INPUT
type: NORMAL_INPUT type: NORMAL_INPUT
box: 360 270 80 30 box: 360 285 80 30
boxtype: FL_DOWN_BOX boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -930,6 +1004,24 @@ name: check_adapt_output
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: 0 argument: 0
--------------------
class: FL_LABELFRAME
type: ENGRAVED_FRAME
box: 0 60 452 260
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Printer Command and Flags
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
=============== FORM =============== =============== FORM ===============
Name: form_paths Name: form_paths
Width: 450 Width: 450
@ -992,8 +1084,8 @@ argument:
-------------------- --------------------
class: FL_COUNTER class: FL_COUNTER
type: NORMAL_COUNTER type: SIMPLE_COUNTER
box: 170 130 110 30 box: 170 130 90 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_BLUE colors: FL_COL1 FL_BLUE
alignment: FL_ALIGN_LEFT alignment: FL_ALIGN_LEFT
@ -1215,14 +1307,14 @@ argument:
=============== FORM =============== =============== FORM ===============
Name: form_preferences Name: form_preferences
Width: 485 Width: 470
Height: 435 Height: 475
Number of Objects: 6 Number of Objects: 8
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: UP_BOX type: UP_BOX
box: 0 0 485 435 box: 0 0 470 475
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1240,7 +1332,7 @@ argument:
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
type: NORMAL_BUTTON type: NORMAL_BUTTON
box: 275 395 90 30 box: 270 380 90 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1258,7 +1350,7 @@ argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
type: NORMAL_BUTTON type: NORMAL_BUTTON
box: 375 395 90 30 box: 370 380 90 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1276,7 +1368,7 @@ argument: 0
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
type: RETURN_BUTTON type: RETURN_BUTTON
box: 175 395 90 30 box: 170 380 90 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1294,7 +1386,7 @@ argument: 0
-------------------- --------------------
class: FL_TABFOLDER class: FL_TABFOLDER
type: TOP_TABFOLDER type: TOP_TABFOLDER
box: 5 5 470 385 box: 5 10 455 365
boxtype: FL_FLAT_BOX boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_TOP_LEFT alignment: FL_ALIGN_TOP_LEFT
@ -1312,7 +1404,7 @@ argument:
-------------------- --------------------
class: FL_BUTTON class: FL_BUTTON
type: NORMAL_BUTTON type: NORMAL_BUTTON
box: 10 395 90 30 box: 5 380 90 30
boxtype: FL_UP_BOX boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1327,16 +1419,52 @@ name: button_restore
callback: C_FormBaseRestoreCB callback: C_FormBaseRestoreCB
argument: 0 argument: 0
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 5 420 460 55
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_warning
callback:
argument:
--------------------
class: FL_FRAME
type: ENGRAVED_FRAME
box: 0 415 470 1
boxtype: FL_NO_BOX
colors: FL_BLACK FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
=============== FORM =============== =============== FORM ===============
Name: form_outer_tab Name: form_outer_tab
Width: 475 Width: 455
Height: 365 Height: 345
Number of Objects: 2 Number of Objects: 2
-------------------- --------------------
class: FL_BOX class: FL_BOX
type: FLAT_BOX type: FLAT_BOX
box: 0 0 475 365 box: 0 0 455 345
boxtype: FL_FLAT_BOX boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER alignment: FL_ALIGN_CENTER
@ -1354,7 +1482,7 @@ argument:
-------------------- --------------------
class: FL_TABFOLDER class: FL_TABFOLDER
type: TOP_TABFOLDER type: TOP_TABFOLDER
box: 10 10 455 345 box: 0 0 455 345
boxtype: FL_FLAT_BOX boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1 colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_TOP_LEFT alignment: FL_ALIGN_TOP_LEFT
@ -1369,5 +1497,51 @@ name: tabfolder_outer
callback: callback:
argument: argument:
=============== FORM ===============
Name: form_outputs_general
Width: 450
Height: 320
Number of Objects: 2
--------------------
class: FL_BOX
type: FLAT_BOX
box: 0 0 450 320
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
--------------------
class: FL_COUNTER
type: SIMPLE_COUNTER
box: 295 50 120 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_BLUE
alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Ascii line length|#A
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: counter_line_len
callback: C_FormBaseInputCB
argument: 0
bounds: 0 120
precision: 0
value: 75
sstep: 1
============================== ==============================
create_the_forms create_the_forms

4
src/frontends/xforms/forms/form_print.fd
View File

@ -544,11 +544,11 @@ alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Unsorted|#U label: Collated|#C
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
name: radio_unsorted name: radio_collated
callback: C_FormBaseInputCB callback: C_FormBaseInputCB
argument: 0 argument: 0