+2000-11-02 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+
+ * lib/ui/default.ui: change Item to OptItem in import menu.
+ Comment out fax stuff.
+
+ * lib/configure.m4: comment out fax-related stuff.
+
+2000-10-31 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * src/frontends/xforms/xform_helpers.[Ch]: new files. Repository for
+ useful xforms helper functions. At present contains only formatted().
+ Input a string and it returns it with line breaks so that in fits
+ inside the label.
+
+ * src/frontends/xforms/Makefile.am: add new files.
+
+ * src/lyxrc.[Ch] (getDescription): new name for getFeedback.
+ * src/lyxrc.C (getDescription): Removed '\n's from strings. Corrected
+ punctuation.
+
+ * src/frontends/xforms/FormPreferences.[Ch]:
+ * src/frontends/xforms/forms/form_preferences.fd: No new functionality
+ but lots of little clean ups. Removed enum State. Make use of
+ formatted(). Constify lots of methods. Perhaps best of all: removed
+ requirement for that horrible reinterpret_cast from pointer to long in
+ feedbackPost().
+
2000-11-02 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/lyxlookup.C: include FORMS_H_LOCATION to get at FL_REVISION,
fi
-# Search a Fax handling program
-echo $ac_n "checking for a fax driver""... $ac_c"
-echo "$ac_t""(sendfax faxsend fax)"
-FAX=
-for ac_prog in sendfax faxsend fax
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog ; ac_word=$2
-if test -n "$ac_word"; then
- echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -x $ac_dir/$ac_word; then
- FAX="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
-
- if test -n "$FAX"; then
- ac_result=yes
- else
- ac_result=no
- fi
-
- echo "$ac_t""$ac_result"
- test -n "$FAX" && break
-fi
-done
-
-if test -z "$FAX" ; then
- FAX=none
-fi
-
-if test $FAX = sendfax ; then
- fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'"
-elif test $FAX = faxsend ; then
- fax_command="faxsend '\$\$Phone' '\$\$FName'"
-elif test $FAX = fax ; then
- fax_command="fax send '\$\$Phone' '\$\$FName'"
-else
- fax_command="none"
-fi
# Search for LinuxDoc support
echo $ac_n "checking for SGML-tools 1.x (LinuxDoc)""... $ac_c"
\\ascii_roff_command "$ascii_roff_command"
\\chktex_command "$chktex_command"
\\spell_command "$SPELL"
-\\fax_command "$fax_command"
\\print_spool_command "$print_spool_command"
\\print_spool_printerprefix "$print_spool_printerprefix"
\\font_encoding "$chk_fontenc"
# Search for a spellchecker
SEARCH_PROG([for a spell-checker], SPELL,ispell)
-# Search a Fax handling program
-SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax)
-if test $FAX = sendfax ; then
- fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'"
-elif test $FAX = faxsend ; then
- fax_command="faxsend '\$\$Phone' '\$\$FName'"
-elif test $FAX = fax ; then
- fax_command="fax send '\$\$Phone' '\$\$FName'"
-else
- fax_command="none"
-fi
+dnl # Search a Fax handling program
+dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax)
+dnl if test $FAX = sendfax ; then
+dnl fax_command="sendfax -n -h '\$\$Host' -c '\$\$Comment' -x '\$\$Enterprise' -d '\$\$Name'@'\$\$Phone' '\$\$FName'"
+dnl elif test $FAX = faxsend ; then
+dnl fax_command="faxsend '\$\$Phone' '\$\$FName'"
+dnl elif test $FAX = fax ; then
+dnl fax_command="fax send '\$\$Phone' '\$\$FName'"
+dnl else
+dnl fax_command="none"
+dnl fi
# Search for LinuxDoc support
SEARCH_PROG([for SGML-tools 1.x (LinuxDoc)], LINUXDOC, sgml2lyx)
\\ascii_roff_command "$ascii_roff_command"
\\chktex_command "$chktex_command"
\\spell_command "$SPELL"
-\\fax_command "$fax_command"
+dnl \\fax_command "$fax_command"
\\print_spool_command "$print_spool_command"
\\print_spool_printerprefix "$print_spool_printerprefix"
\\font_encoding "$chk_fontenc"
OptItem "Build program|B" "build-program"
Separator
Item "Print...|P" "buffer-print"
- Item "Fax...|F" "buffer-fax"
+# Item "Fax...|F" "buffer-fax"
Submenu "Import|I" "import"
Submenu "Export|E" "export"
Separator
End
Menu "import"
- Item "LaTeX|L" "buffer-import latex"
- Item "Ascii text as lines|A" "buffer-import text"
- Item "Ascii text as paragraphs|p" "buffer-import textparagraph"
- Item "HTML|H" "buffer-import html"
- Item "Noweb|N" "buffer-import literate"
- Item "LinuxDoc|D" "buffer-import linuxdoc"
+ OptItem "LaTeX|L" "buffer-import latex"
+ OptItem "Ascii text as lines|A" "buffer-import text"
+ OptItem "Ascii text as paragraphs|p" "buffer-import textparagraph"
+ OptItem "HTML|H" "buffer-import html"
+ OptItem "Noweb|N" "buffer-import literate"
+ OptItem "LinuxDoc|D" "buffer-import linuxdoc"
End
Menu "export"
#include "support/FileInfo.h"
#include "support/filetools.h"
#include "lyx_gui_misc.h"
+#include "xform_helpers.h" // formatted()
#include "xform_macros.h"
#ifdef SIGC_CXX_NAMESPACES
usage_tab_(0), colours_(0), inputs_misc_(0), interface_(0),
language_(0), lnf_misc_(0), outputs_misc_(0), paths_(0), printer_(0),
screen_fonts_(0), spellchecker_(0),
- combo_default_lang(0), combo_kbmap_1(0), combo_kbmap_2(0)
+ combo_default_lang(0), combo_kbmap_1(0), combo_kbmap_2(0),
+ feedbackObj(0)
{
// let the dialog be shown
// This is a permanent connection so we won't bother
void FormPreferences::feedback( FL_OBJECT * ob )
{
- if( ob->form->fdui == colours_ )
- feedbackColours( ob );
- if( ob->form->fdui == inputs_misc_ )
- feedbackInputsMisc( ob );
- if( ob->form->fdui == interface_ )
- feedbackInterface( ob );
- if( ob->form->fdui == language_ )
- feedbackLanguage( ob );
- if( ob->form->fdui == lnf_misc_ )
- feedbackLnFmisc( ob );
- if( ob->form->fdui == outputs_misc_ )
- feedbackOutputsMisc( ob );
- if( ob->form->fdui == paths_ )
- feedbackPaths( ob );
- if( ob->form->fdui == printer_ )
- feedbackPrinter( ob );
- if( ob->form->fdui == screen_fonts_ )
- feedbackScreenFonts( ob );
- if( ob->form->fdui == spellchecker_ )
- feedbackSpellChecker( ob );
-}
-
-
-bool FormPreferences::input(FL_OBJECT * ob, long data)
+ string str;
+
+ if( ob->form->fdui == colours_ ) {
+ str = feedbackColours( ob );
+ } else if( ob->form->fdui == inputs_misc_ ) {
+ str = feedbackInputsMisc( ob );
+ } else if( ob->form->fdui == interface_ ) {
+ str = feedbackInterface( ob );
+ } else if( ob->form->fdui == language_ ) {
+ str = feedbackLanguage( ob );
+ } else if( ob->form->fdui == lnf_misc_ ) {
+ str = feedbackLnFmisc( ob );
+ } else if( ob->form->fdui == outputs_misc_ ) {
+ str = feedbackOutputsMisc( ob );
+ } else if( ob->form->fdui == paths_ ) {
+ str = feedbackPaths( ob );
+ } else if( ob->form->fdui == printer_ ) {
+ str = feedbackPrinter( ob );
+ } else if( ob->form->fdui == screen_fonts_ ) {
+ str = feedbackScreenFonts( ob );
+ } else if( ob->form->fdui == spellchecker_ ) {
+ str = feedbackSpellChecker( ob );
+ }
+
+ str = formatted( str, dialog_->text_warning->w-10,
+ FL_SMALL_SIZE, FL_NORMAL_STYLE );
+
+ fl_set_object_label(dialog_->text_warning, str.c_str());
+ fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+}
+
+
+bool FormPreferences::input(FL_OBJECT * ob, long)
{
bool activate = true;
// some totally ridiculous value somewhere. Change activate to suit.
// comments before each test describe what is _valid_
- State cb = static_cast<State>( data );
- switch( cb ) {
- case LANGUAGE:
+ if( ob->form->fdui == language_ ) {
if( ! inputLanguage( ob ) )
activate = false;
- break;
-
- case PATHS:
+ } else if( ob->form->fdui == paths_ ) {
if( ! inputPaths( ob ) )
activate = false;
- break;
-
- case SCREENFONTS:
+ } else if( ob->form->fdui == screen_fonts_ ) {
if( ! inputScreenFonts() )
activate = false;
- break;
-
- case SPELLCHECKER:
+ } else if( ob->form->fdui == spellchecker_ ) {
if( ! inputSpellChecker( ob ) )
activate = false;
- break;
-
- default:
- break;
}
return activate;
}
-void FormPreferences::applyColours()
+void FormPreferences::applyColours() const
{
}
}
-void FormPreferences::feedbackColours( FL_OBJECT const * const )
+string FormPreferences::feedbackColours( FL_OBJECT const * const ) const
{
+ return string();
}
}
-void FormPreferences::applyInputsMisc()
+void FormPreferences::applyInputsMisc() const
{
lyxrc.date_insert_format = fl_get_input(inputs_misc_->input_date_format);
}
}
-void FormPreferences::feedbackInputsMisc( FL_OBJECT const * const ob )
+string FormPreferences::feedbackInputsMisc( FL_OBJECT const * const ob ) const
{
string str;
if( ob == inputs_misc_->input_date_format )
- str = lyxrc.getFeedback( LyXRC::RC_DATE_INSERT_FORMAT );
+ str = lyxrc.getDescription( LyXRC::RC_DATE_INSERT_FORMAT );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
}
-void FormPreferences::applyInterface()
+void FormPreferences::applyInterface() const
{
lyxrc.popup_font_name =
fl_get_input(interface_->input_popup_font);
-void FormPreferences::feedbackInterface( FL_OBJECT const * const ob )
+string FormPreferences::feedbackInterface( FL_OBJECT const * const ob ) const
{
string str;
if( ob == interface_->input_popup_font )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_POPUP );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_POPUP );
else if ( ob == interface_->input_menu_font )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_MENU );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_MENU );
else if ( ob == interface_->input_popup_encoding )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_ENCODING_MENU );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_ENCODING_MENU );
else if ( ob == interface_->input_bind_file )
- str = lyxrc.getFeedback( LyXRC::RC_BINDFILE );
+ str = lyxrc.getDescription( LyXRC::RC_BINDFILE );
else if ( ob == interface_->input_ui_file )
- str = lyxrc.getFeedback( LyXRC::RC_UIFILE );
+ str = lyxrc.getDescription( LyXRC::RC_UIFILE );
else if ( ob == interface_->check_override_x_dead_keys )
- str = lyxrc.getFeedback( LyXRC::RC_OVERRIDE_X_DEADKEYS );
+ str = lyxrc.getDescription( LyXRC::RC_OVERRIDE_X_DEADKEYS );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
}
-void FormPreferences::applyLanguage()
+void FormPreferences::applyLanguage() const
{
lyxrc.default_language = combo_default_lang->getline();
setPostHandler( language_->input_package );
setPostHandler( language_->check_use_kbmap );
- // these 3 should be replaced by the appropriate combox call
- // setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_default_lang) );
- // setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_kbmap_1) );
- // setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_kbmap_2) );
+ // This is safe, as nothing is done to the pointer, other than
+ // to use its address in a block-if statement.
+ //setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_default_lang) );
+ //setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_kbmap_1) );
+ //setPostHandler( reinterpret_cast<FL_OBJECT *>(combo_kbmap_2) );
setPostHandler( language_->check_rtl_support );
setPostHandler( language_->check_mark_foreign );
}
-void FormPreferences::addLanguages( Combox & combo )
+void FormPreferences::addLanguages( Combox & combo ) const
{
for(Languages::const_iterator cit = languages.begin();
cit != languages.end(); cit++) {
}
-void FormPreferences::feedbackLanguage( FL_OBJECT const * const ob )
+string FormPreferences::feedbackLanguage( FL_OBJECT const * const ob ) const
{
string str;
if( reinterpret_cast<Combox const *>(ob) == combo_default_lang )
- str = lyxrc.getFeedback( LyXRC::RC_DEFAULT_LANGUAGE );
+ str = lyxrc.getDescription( LyXRC::RC_DEFAULT_LANGUAGE );
else if( ob == language_->check_use_kbmap )
- str = lyxrc.getFeedback( LyXRC::RC_KBMAP );
+ str = lyxrc.getDescription( LyXRC::RC_KBMAP );
else if( reinterpret_cast<Combox const *>(ob) == combo_kbmap_1)
- str = lyxrc.getFeedback( LyXRC::RC_KBMAP_PRIMARY );
+ str = lyxrc.getDescription( LyXRC::RC_KBMAP_PRIMARY );
else if( reinterpret_cast<Combox const *>(ob) == combo_kbmap_2 )
- str = lyxrc.getFeedback( LyXRC::RC_KBMAP_SECONDARY );
+ str = lyxrc.getDescription( LyXRC::RC_KBMAP_SECONDARY );
else if( ob == language_->check_rtl_support )
- str = lyxrc.getFeedback( LyXRC::RC_RTL_SUPPORT );
+ str = lyxrc.getDescription( LyXRC::RC_RTL_SUPPORT );
else if( ob == language_->check_auto_begin )
- str = lyxrc.getFeedback( LyXRC::RC_LANGUAGE_AUTO_BEGIN );
+ str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_AUTO_BEGIN );
else if( ob == language_->check_auto_end )
- str = lyxrc.getFeedback( LyXRC::RC_LANGUAGE_AUTO_END );
+ str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_AUTO_END );
else if( ob == language_->check_mark_foreign )
- str = lyxrc.getFeedback( LyXRC::RC_MARK_FOREIGN_LANGUAGE );
+ str = lyxrc.getDescription( LyXRC::RC_MARK_FOREIGN_LANGUAGE );
else if( ob == language_->input_package )
- str = lyxrc.getFeedback( LyXRC::RC_LANGUAGE_PACKAGE );
+ str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_PACKAGE );
else if( ob == language_->input_command_begin )
- str = lyxrc.getFeedback( LyXRC::RC_LANGUAGE_COMMAND_BEGIN );
+ str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_COMMAND_BEGIN );
else if( ob == language_->input_command_end )
- str = lyxrc.getFeedback( LyXRC::RC_LANGUAGE_COMMAND_END );
+ str = lyxrc.getDescription( LyXRC::RC_LANGUAGE_COMMAND_END );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
}
-void FormPreferences::applyLnFmisc()
+void FormPreferences::applyLnFmisc() const
{
lyxrc.show_banner = fl_get_button(lnf_misc_->check_banner);
lyxrc.auto_region_delete = fl_get_button(lnf_misc_->
}
-void FormPreferences::feedbackLnFmisc( FL_OBJECT const * const ob )
+string FormPreferences::feedbackLnFmisc( FL_OBJECT const * const ob ) const
{
string str;
if( ob == lnf_misc_->check_banner )
- str = lyxrc.getFeedback( LyXRC::RC_SHOW_BANNER );
+ str = lyxrc.getDescription( LyXRC::RC_SHOW_BANNER );
else if( ob == lnf_misc_->check_auto_region_delete )
- str = lyxrc.getFeedback( LyXRC::RC_AUTOREGIONDELETE );
+ str = lyxrc.getDescription( LyXRC::RC_AUTOREGIONDELETE );
else if( ob == lnf_misc_->check_exit_confirm )
- str = lyxrc.getFeedback( LyXRC::RC_EXIT_CONFIRMATION );
+ str = lyxrc.getDescription( LyXRC::RC_EXIT_CONFIRMATION );
else if( ob == lnf_misc_->check_display_shortcuts )
- str = lyxrc.getFeedback( LyXRC::RC_DISPLAY_SHORTCUTS );
+ str = lyxrc.getDescription( LyXRC::RC_DISPLAY_SHORTCUTS );
else if( ob == lnf_misc_->check_ask_new_file )
- str = lyxrc.getFeedback( LyXRC::RC_NEW_ASK_FILENAME );
+ str = lyxrc.getDescription( LyXRC::RC_NEW_ASK_FILENAME );
else if( ob == lnf_misc_->check_cursor_follows_scrollbar )
- str = lyxrc.getFeedback( LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR );
+ str = lyxrc.getDescription( LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR );
else if( ob == lnf_misc_->counter_autosave )
- str = lyxrc.getFeedback( LyXRC::RC_AUTOSAVE );
+ str = lyxrc.getDescription( LyXRC::RC_AUTOSAVE );
else if( ob == lnf_misc_->counter_wm_jump )
- str = lyxrc.getFeedback( LyXRC::RC_WHEEL_JUMP );
+ str = lyxrc.getDescription( LyXRC::RC_WHEEL_JUMP );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
void FormPreferences::updateLnFmisc()
}
-void FormPreferences::applyOutputsMisc()
+void FormPreferences::applyOutputsMisc() const
{
lyxrc.ascii_linelen = static_cast<unsigned int>
(fl_get_counter_value(outputs_misc_->counter_line_len));
}
-void FormPreferences::feedbackOutputsMisc(FL_OBJECT const * const ob )
+string FormPreferences::feedbackOutputsMisc(FL_OBJECT const * const ob ) const
{
string str;
if( ob == outputs_misc_->counter_line_len )
- str = lyxrc.getFeedback( LyXRC::RC_ASCII_LINELEN );
+ str = lyxrc.getDescription( LyXRC::RC_ASCII_LINELEN );
else if( ob == outputs_misc_->input_tex_encoding )
- str = lyxrc.getFeedback( LyXRC::RC_FONT_ENCODING );
+ str = lyxrc.getDescription( LyXRC::RC_FONT_ENCODING );
else if( ob == outputs_misc_->input_ascii_roff )
- str = lyxrc.getFeedback( LyXRC::RC_ASCIIROFF_COMMAND );
+ str = lyxrc.getDescription( LyXRC::RC_ASCIIROFF_COMMAND );
else if( ob == outputs_misc_->input_checktex )
- str = lyxrc.getFeedback( LyXRC::RC_CHKTEX_COMMAND );
+ str = lyxrc.getDescription( LyXRC::RC_CHKTEX_COMMAND );
else if( ob == outputs_misc_->choice_default_papersize )
- str = lyxrc.getFeedback( LyXRC::RC_DEFAULT_PAPERSIZE );
+ str = lyxrc.getDescription( LyXRC::RC_DEFAULT_PAPERSIZE );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
}
-void FormPreferences::feedbackPaths( FL_OBJECT const * const ob )
+string FormPreferences::feedbackPaths( FL_OBJECT const * const ob ) const
{
string str;
+
if( ob == paths_->input_default_path )
- str = lyxrc.getFeedback( LyXRC::RC_DOCUMENTPATH );
+ str = lyxrc.getDescription( LyXRC::RC_DOCUMENTPATH );
else if ( ob == paths_->input_template_path )
- str = lyxrc.getFeedback( LyXRC::RC_TEMPLATEPATH );
+ str = lyxrc.getDescription( LyXRC::RC_TEMPLATEPATH );
else if ( ob == paths_->check_use_temp_dir )
- str = lyxrc.getFeedback( LyXRC::RC_USETEMPDIR );
+ str = lyxrc.getDescription( LyXRC::RC_USETEMPDIR );
else if ( ob == paths_->input_temp_dir )
- str = lyxrc.getFeedback( LyXRC::RC_TEMPDIRPATH );
+ str = lyxrc.getDescription( LyXRC::RC_TEMPDIRPATH );
else if ( ob == paths_->check_last_files )
- str = lyxrc.getFeedback( LyXRC::RC_CHECKLASTFILES );
+ str = lyxrc.getDescription( LyXRC::RC_CHECKLASTFILES );
else if ( ob == paths_->input_lastfiles )
- str = lyxrc.getFeedback( LyXRC::RC_LASTFILES );
+ str = lyxrc.getDescription( LyXRC::RC_LASTFILES );
else if ( ob == paths_->counter_lastfiles )
- str = lyxrc.getFeedback( LyXRC::RC_NUMLASTFILES );
+ str = lyxrc.getDescription( LyXRC::RC_NUMLASTFILES );
else if ( ob == paths_->check_make_backups )
- str = lyxrc.getFeedback( LyXRC::RC_MAKE_BACKUP );
+ str = lyxrc.getDescription( LyXRC::RC_MAKE_BACKUP );
else if ( ob == paths_->input_backup_path )
- str = lyxrc.getFeedback( LyXRC::RC_BACKUPDIR_PATH );
+ str = lyxrc.getDescription( LyXRC::RC_BACKUPDIR_PATH );
else if ( ob == paths_->input_serverpipe )
- str = lyxrc.getFeedback( LyXRC::RC_SERVERPIPE );
-
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ str = lyxrc.getDescription( LyXRC::RC_SERVERPIPE );
+
+ return str;
}
}
-void FormPreferences::applyPrinter()
+void FormPreferences::applyPrinter() const
{
lyxrc.print_adapt_output = fl_get_button(printer_->check_adapt_output);
lyxrc.print_command = fl_get_input(printer_->input_command);
}
-void FormPreferences::feedbackPrinter( FL_OBJECT const * const ob )
+string FormPreferences::feedbackPrinter( FL_OBJECT const * const ob ) const
{
string str;
if( ob == printer_->input_command )
- str = lyxrc.getFeedback( LyXRC::RC_PRINT_COMMAND );
+ str = lyxrc.getDescription( LyXRC::RC_PRINT_COMMAND );
else if( ob == printer_->check_adapt_output )
- str = lyxrc.getFeedback( LyXRC::RC_PRINT_ADAPTOUTPUT );
+ str = lyxrc.getDescription( LyXRC::RC_PRINT_ADAPTOUTPUT );
else if( ob == printer_->input_to_printer )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTTOPRINTER );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTTOPRINTER );
else if( ob == printer_->input_to_file )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTTOFILE );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTTOFILE );
else if( ob == printer_->input_file_extension )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTFILEEXTENSION );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTFILEEXTENSION );
else if( ob == printer_->input_extra_options )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTEXSTRAOPTIONS );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTEXSTRAOPTIONS );
else if( ob == printer_->input_spool_command )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTSPOOL_COMMAND );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTSPOOL_COMMAND );
else if( ob == printer_->input_spool_prefix )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTSPOOL_PRINTERPREFIX );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTSPOOL_PRINTERPREFIX );
else if( ob == printer_->input_name )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTER );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTER );
else if( ob == printer_->input_even_pages )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTEVENPAGEFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTEVENPAGEFLAG );
else if( ob == printer_->input_odd_pages )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTODDPAGEFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTODDPAGEFLAG );
else if( ob == printer_->input_page_range )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTPAGERANGEFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTPAGERANGEFLAG );
else if( ob == printer_->input_reverse )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTREVERSEFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTREVERSEFLAG );
else if( ob == printer_->input_landscape )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTLANDSCAPEFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTLANDSCAPEFLAG );
else if( ob == printer_->input_copies )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTCOLLCOPIESFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTCOLLCOPIESFLAG );
else if( ob == printer_->input_collated )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTCOPIESFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTCOPIESFLAG );
else if( ob == printer_->input_paper_type )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTPAPERFLAG );
+ str = lyxrc.getDescription( LyXRC::RC_PRINTPAPERFLAG );
else if( ob == printer_->input_paper_size )
- str = lyxrc.getFeedback( LyXRC::RC_PRINTPAPERDIMENSIONFLAG );
-
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ str = lyxrc.getDescription( LyXRC::RC_PRINTPAPERDIMENSIONFLAG );
+
+ return str;
}
}
-void FormPreferences::applyScreenFonts()
+void FormPreferences::applyScreenFonts() const
{
bool changed = false;
}
-void FormPreferences::feedbackScreenFonts(FL_OBJECT const * const ob )
+string FormPreferences::feedbackScreenFonts(FL_OBJECT const * const ob ) const
{
string str;
if( ob == screen_fonts_->input_roman )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_ROMAN );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_ROMAN );
else if( ob == screen_fonts_->input_sans )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_SANS );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SANS );
else if( ob == screen_fonts_->input_typewriter )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_TYPEWRITER );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_TYPEWRITER );
else if( ob == screen_fonts_->check_scalable )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_SCALABLE );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SCALABLE );
else if( ob == screen_fonts_->input_screen_encoding )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_ENCODING );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_ENCODING );
else if( ob == screen_fonts_->counter_zoom )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_ZOOM );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_ZOOM );
else if( ob == screen_fonts_->counter_dpi )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_DPI );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_DPI );
else if( ob == screen_fonts_->input_tiny
|| ob == screen_fonts_->input_script
|| ob == screen_fonts_->input_footnote
|| ob == screen_fonts_->input_normal
|| ob == screen_fonts_->input_huge
|| ob == screen_fonts_->input_huger )
- str = lyxrc.getFeedback( LyXRC::RC_SCREEN_FONT_SIZES );
+ str = lyxrc.getDescription( LyXRC::RC_SCREEN_FONT_SIZES );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
}
-void FormPreferences::feedbackSpellChecker( FL_OBJECT const * const ob )
+string FormPreferences::feedbackSpellChecker( FL_OBJECT const * const ob ) const
{
string str;
+
if( ob == spellchecker_->choice_spell_command )
- str = lyxrc.getFeedback( LyXRC::RC_SPELL_COMMAND );
+ str = lyxrc.getDescription( LyXRC::RC_SPELL_COMMAND );
else if( ob == spellchecker_->check_alt_lang )
- str = lyxrc.getFeedback( LyXRC::RC_USE_ALT_LANG );
+ str = lyxrc.getDescription( LyXRC::RC_USE_ALT_LANG );
else if( ob == spellchecker_->input_alt_lang )
- str = lyxrc.getFeedback( LyXRC::RC_ALT_LANG );
+ str = lyxrc.getDescription( LyXRC::RC_ALT_LANG );
else if( ob == spellchecker_->check_escape_chars )
- str = lyxrc.getFeedback( LyXRC::RC_USE_ESC_CHARS );
+ str = lyxrc.getDescription( LyXRC::RC_USE_ESC_CHARS );
else if( ob == spellchecker_->input_escape_chars )
- str = lyxrc.getFeedback( LyXRC::RC_ESC_CHARS );
+ str = lyxrc.getDescription( LyXRC::RC_ESC_CHARS );
else if( ob == spellchecker_->check_personal_dict )
- str = lyxrc.getFeedback( LyXRC::RC_USE_PERS_DICT );
+ str = lyxrc.getDescription( LyXRC::RC_USE_PERS_DICT );
else if( ob == spellchecker_->input_personal_dict )
- str = lyxrc.getFeedback( LyXRC::RC_PERS_DICT );
+ str = lyxrc.getDescription( LyXRC::RC_PERS_DICT );
else if( ob == spellchecker_->check_compound_words )
- str = lyxrc.getFeedback( LyXRC::RC_ACCEPT_COMPOUND );
+ str = lyxrc.getDescription( LyXRC::RC_ACCEPT_COMPOUND );
else if( ob == spellchecker_->check_input_enc )
- str = lyxrc.getFeedback( LyXRC::RC_USE_INP_ENC );
+ str = lyxrc.getDescription( LyXRC::RC_USE_INP_ENC );
- fl_set_object_label(dialog_->text_warning, str.c_str());
- fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
+ return str;
}
void FormPreferences::ComboLanguageCB(int, void * v, Combox * combox)
{
FormPreferences * pre = static_cast<FormPreferences*>(v);
- pre->bc_.valid( pre->input( reinterpret_cast<FL_OBJECT *>(combox),
- FormPreferences::LANGUAGE ) );
+ // This is safe, as nothing is done to the pointer, other than
+ // to use its address in a block-if statement.
+ pre->bc_.valid( pre->input( reinterpret_cast<FL_OBJECT *>(combox), 0 ));
}
// C functions for the timer callback used to give the user feedback
C_GENERICCB(FormPreferences, FeedbackCB)
-extern "C" int C_FormPreferencesFeedbackPost(FL_OBJECT * ob, int event,
- FL_Coord mx, FL_Coord my,
- int key, void * xev)
+
+void FormPreferences::FeedbackCB(FL_OBJECT * ob, long)
{
FormPreferences * pre =
static_cast<FormPreferences*>(ob->form->u_vdata);
- return pre->FeedbackPost(ob, event, mx, my, key, xev);
+ pre->feedback( pre->feedbackObj );
}
-
-void FormPreferences::FeedbackCB(FL_OBJECT *, long data)
+extern "C" int C_FormPreferencesFeedbackPost(FL_OBJECT * ob, int event,
+ FL_Coord, FL_Coord, int, void *)
{
- FL_OBJECT * ob = reinterpret_cast<FL_OBJECT*>(data);
FormPreferences * pre =
static_cast<FormPreferences*>(ob->form->u_vdata);
- pre->feedback( ob );
+ pre->feedbackPost(ob, event);
+ return 0;
}
+
// post_handler for feedback messages
-int FormPreferences::FeedbackPost(FL_OBJECT *ob, int event,
- FL_Coord, FL_Coord, int, void *)
+void FormPreferences::feedbackPost(FL_OBJECT *ob, int event)
{
- FL_OBJECT * timer_feedback = reinterpret_cast<FL_OBJECT *>(ob->u_cdata);
-
// We do not test for empty help here, since this can never happen
if(event == FL_ENTER){
- fl_set_object_callback(timer_feedback,
+ // Used as a placeholder for ob, so that we don't have to
+ // a horrible reinterpret_cast to long and pass it as an
+ // argument in fl_set_object_callback.
+ feedbackObj = ob;
+ fl_set_object_callback(dialog_->timer_feedback,
C_FormPreferencesFeedbackCB,
- reinterpret_cast<long>(ob));
- fl_set_timer(timer_feedback, 0.5);
+ 0);
+ fl_set_timer(dialog_->timer_feedback, 0.5);
}
else if(event != FL_MOTION){
- fl_set_timer(timer_feedback, 0);
-
- FormPreferences * pre =
- static_cast<FormPreferences*>(ob->form->u_vdata);
-
- fl_set_object_label(pre->dialog_->text_warning, "");
+ fl_set_timer(dialog_->timer_feedback, 0);
+ feedbackObj = 0;
+ fl_set_object_label(dialog_->text_warning, "");
}
- return 0;
}
void FormPreferences::setPostHandler( FL_OBJECT * ob ) const
{
- ob->u_cdata = reinterpret_cast<char *>(dialog_->timer_feedback);
fl_set_object_posthandler(ob, C_FormPreferencesFeedbackPost);
}
///
static void FeedbackCB(FL_OBJECT *, long);
///
- static int FeedbackPost(FL_OBJECT *ob, int, FL_Coord, FL_Coord,
- int, void *);
+ void feedbackPost(FL_OBJECT *, int);
private:
- ///
- enum State {
- ///
- COLOURS,
- ///
- INPUTSMISC,
- ///
- INTERFACE,
- ///
- LANGUAGE,
- ///
- LOOKNFEELMISC,
- ///
- OUTPUTSMISC,
- ///
- PATHS,
- ///
- PRINTER,
- ///
- SCREENFONTS,
- ///
- SPELLCHECKER
- };
-
/// Update the dialog.
virtual void update();
///
/// Build the dialog
virtual void build();
/// control which feedback message is output
- void feedback( FL_OBJECT * ob );
+ void feedback( FL_OBJECT * );
///
virtual FL_FORM * form() const;
///
- void applyColours();
+ void applyColours() const;
///
- void applyInputsMisc();
+ void applyInputsMisc() const;
///
- void applyInterface();
+ void applyInterface() const;
///
- void applyLanguage();
+ void applyLanguage() const;
///
- void applyLnFmisc();
+ void applyLnFmisc() const;
///
- void applyOutputsMisc();
+ void applyOutputsMisc() const;
///
- void applyPaths();
+ void applyPaths(); // not const because calls updatePaths!
///
- void applyPrinter();
+ void applyPrinter() const;
///
- void applyScreenFonts();
+ void applyScreenFonts() const;
///
- void applySpellChecker();
+ void applySpellChecker(); // not const because calls updateSpellChecker!
///
void buildColours();
///
///
void buildLanguage();
///
- void addLanguages( Combox & );
+ void addLanguages( Combox & ) const;
///
void buildLnFmisc();
///
///
void buildSpellchecker();
///
- void feedbackColours(FL_OBJECT const * const);
+ string feedbackColours(FL_OBJECT const * const) const;
///
- void feedbackInputsMisc(FL_OBJECT const * const);
+ string feedbackInputsMisc(FL_OBJECT const * const) const;
///
- void feedbackInterface(FL_OBJECT const * const);
+ string feedbackInterface(FL_OBJECT const * const) const;
///
- void feedbackLanguage(FL_OBJECT const * const);
+ string feedbackLanguage(FL_OBJECT const * const) const;
///
- void feedbackLnFmisc(FL_OBJECT const * const);
+ string feedbackLnFmisc(FL_OBJECT const * const) const;
///
- void feedbackOutputsMisc(FL_OBJECT const * const);
+ string feedbackOutputsMisc(FL_OBJECT const * const) const;
///
- void feedbackPaths(FL_OBJECT const * const);
+ string feedbackPaths(FL_OBJECT const * const) const;
///
- void feedbackPrinter(FL_OBJECT const * const);
+ string feedbackPrinter(FL_OBJECT const * const) const;
///
- void feedbackScreenFonts(FL_OBJECT const * const);
+ string feedbackScreenFonts(FL_OBJECT const * const) const;
///
- void feedbackSpellChecker(FL_OBJECT const * const);
+ string feedbackSpellChecker(FL_OBJECT const * const) const;
///
bool inputLanguage(FL_OBJECT const * const);
///
Combox * combo_kbmap_1;
///
Combox * combo_kbmap_2;
+ ///
+ FL_OBJECT * feedbackObj;
};
#endif
RadioButtonGroup.h \
Toolbar_pimpl.C \
Toolbar_pimpl.h \
- xform_macros.h
+ xform_macros.h \
+ xform_helpers.C \
+ xform_helpers.h
# These still have to be added. Sooner or later. ARRae-20000411
# GUI_defaults.C \
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
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_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_sans = obj = fl_add_input(FL_NORMAL_INPUT, 210, 35, 200, 30, _("Sans Serif"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->counter_zoom = obj = fl_add_counter(FL_SIMPLE_COUNTER, 345, 130, 65, 30, idex(_("Zoom %|#Z")));
fl_set_button_shortcut(obj, scex(_("Zoom %|#Z")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 999);
fl_set_counter_value(obj, 150);
fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 60, 143, 33, 31, _("Use scalable fonts"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 210, 95, 200, 30, _("Encoding"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_script = obj = fl_add_input(FL_FLOAT_INPUT, 200, 199, 70, 30, _("script"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_footnote = obj = fl_add_input(FL_FLOAT_INPUT, 340, 198, 70, 30, _("footnote"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_large = obj = fl_add_input(FL_FLOAT_INPUT, 340, 228, 70, 30, _("large"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_largest = obj = fl_add_input(FL_FLOAT_INPUT, 200, 259, 70, 30, _("largest"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_huge = obj = fl_add_input(FL_FLOAT_INPUT, 340, 258, 70, 30, _("huge"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_normal = obj = fl_add_input(FL_FLOAT_INPUT, 200, 229, 70, 30, _("normal"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->counter_dpi = obj = fl_add_counter(FL_SIMPLE_COUNTER, 345, 162, 65, 30, idex(_("Screen DPI|#D")));
fl_set_button_shortcut(obj, scex(_("Screen DPI|#D")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 999);
fl_set_counter_value(obj, 150);
fl_set_counter_step(obj, 1, 1);
fdui->input_tiny = obj = fl_add_input(FL_FLOAT_INPUT, 60, 198, 70, 30, _("tiny"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_larger = obj = fl_add_input(FL_FLOAT_INPUT, 60, 258, 70, 30, _("larger"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_small = obj = fl_add_input(FL_FLOAT_INPUT, 60, 228, 70, 30, _("small"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_huger = obj = fl_add_input(FL_FLOAT_INPUT, 60, 288, 70, 30, _("huger"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SCREENFONTS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;
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, OUTPUTSMISC);
+ 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);
fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, idex(_("TeX encoding|#T")));
fl_set_button_shortcut(obj, scex(_("TeX encoding|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, OUTPUTSMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 219, 142, 199, 29, idex(_("Default paper size|#p")));
fl_set_button_shortcut(obj, scex(_("Default paper size|#p")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, OUTPUTSMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_ascii_roff = obj = fl_add_input(FL_NORMAL_INPUT, 121, 209, 285, 30, idex(_("ascii roff|#r")));
fl_set_button_shortcut(obj, scex(_("ascii roff|#r")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, OUTPUTSMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_checktex = obj = fl_add_input(FL_NORMAL_INPUT, 121, 250, 285, 30, idex(_("checktex|#c")));
fl_set_button_shortcut(obj, scex(_("checktex|#c")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, OUTPUTSMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 12, 186, 406, 120, _("Outside code interaction"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, idex(_("Use alternative language|#a")));
fl_set_button_shortcut(obj, scex(_("Use alternative language|#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, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, "");
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, idex(_("Use escape characters|#e")));
fl_set_button_shortcut(obj, scex(_("Use escape characters|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, "");
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, idex(_("Use personal dictionary|#d")));
fl_set_button_shortcut(obj, scex(_("Use personal dictionary|#d")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, "");
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, idex(_("Browse...|#B")));
fl_set_button_shortcut(obj, scex(_("Browse...|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, idex(_("Accept compound words|#w")));
fl_set_button_shortcut(obj, scex(_("Accept compound words|#w")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, idex(_("Use input encoding|#i")));
fl_set_button_shortcut(obj, scex(_("Use input encoding|#i")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
- fl_set_object_callback(obj, C_FormBaseInputCB, SPELLCHECKER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;
fdui->input_date_format = obj = fl_add_input(FL_NORMAL_INPUT, 120, 70, 285, 30, idex(_("date format|#f")));
fl_set_button_shortcut(obj, scex(_("date format|#f")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, INPUTSMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;
fdui->input_package = obj = fl_add_input(FL_NORMAL_INPUT, 131, 18, 300, 30, idex(_("Package|#P")));
fl_set_button_shortcut(obj, scex(_("Package|#P")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_default_lang = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 56, 200, 30, idex(_("Default language|#D")));
fl_set_button_shortcut(obj, scex(_("Default language|#D")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_use_kbmap = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 158, 113, 30, 30, idex(_("Keyboard map|#K")));
fl_set_button_shortcut(obj, scex(_("Keyboard map|#K")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_kbmap_1 = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 96, 200, 30, idex(_("1st|#1")));
fl_set_button_shortcut(obj, scex(_("1st|#1")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->choice_kbmap_2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 128, 200, 30, idex(_("2nd|#2")));
fl_set_button_shortcut(obj, scex(_("2nd|#2")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_rtl_support = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 161, 30, 30, idex(_("RtL support|#R")));
fl_set_button_shortcut(obj, scex(_("RtL support|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_mark_foreign = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 187, 30, 30, idex(_("Mark foreign|#M")));
fl_set_button_shortcut(obj, scex(_("Mark foreign|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_auto_begin = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 161, 30, 30, idex(_("Auto begin|#b")));
fl_set_button_shortcut(obj, scex(_("Auto begin|#b")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_auto_end = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 187, 30, 30, idex(_("Auto finish|#f")));
fl_set_button_shortcut(obj, scex(_("Auto finish|#f")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_command_begin = obj = fl_add_input(FL_NORMAL_INPUT, 131, 224, 300, 30, idex(_("Command start|#s")));
fl_set_button_shortcut(obj, scex(_("Command start|#s")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_command_end = obj = fl_add_input(FL_NORMAL_INPUT, 131, 257, 300, 30, idex(_("Command end|#e")));
fl_set_button_shortcut(obj, scex(_("Command end|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, LANGUAGE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;
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_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
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_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
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_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
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_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
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_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 1200);
fl_set_counter_value(obj, 300);
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, LOOKNFEELMISC);
+ 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, LOOKNFEELMISC);
+ 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_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, LOOKNFEELMISC);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 250);
fl_set_counter_value(obj, 100);
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Popup Font"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_menu_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Menu Font"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 178, 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, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_bind_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 178, 80, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 148, 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, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_ui_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 148, 80, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 24, 230, 310, 30, idex(_("Override X-Windows dead-keys|#O")));
fl_set_button_shortcut(obj, scex(_("Override X-Windows dead-keys|#O")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, INTERFACE);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fl_end_form();
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_name = obj = fl_add_input(FL_NORMAL_INPUT, 130, 10, 80, 30, _("name"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PRINTER);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
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_callback(obj, C_FormBaseInputCB, PRINTER);
+ 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();
fdui->input_default_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 10, 170, 30, idex(_("Default path|#p")));
fl_set_button_shortcut(obj, scex(_("Default path|#p")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_document_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->counter_lastfiles = obj = fl_add_counter(FL_SIMPLE_COUNTER, 170, 130, 90, 30, idex(_("Last file count|#L")));
fl_set_button_shortcut(obj, scex(_("Last file count|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_counter_precision(obj, 0);
fl_set_counter_bounds(obj, 0, 9);
fl_set_counter_value(obj, 4);
fdui->input_template_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 40, 170, 30, idex(_("Template path|#T")));
fl_set_button_shortcut(obj, scex(_("Template path|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_template_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 40, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 100, 30, 30, idex(_("Check last files|#C")));
fl_set_button_shortcut(obj, scex(_("Check last files|#C")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fdui->button_temp_dir_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 70, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_lastfiles = obj = fl_add_input(FL_NORMAL_INPUT, 170, 100, 170, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_lastfiles_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 100, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 170, 30, 30, idex(_("Backup path|#B")));
fl_set_button_shortcut(obj, scex(_("Backup path|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fdui->input_backup_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 170, 170, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_backup_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 170, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_serverpipe = obj = fl_add_input(FL_NORMAL_INPUT, 169, 217, 170, 30, idex(_("LyXServer pipe|#S")));
fl_set_button_shortcut(obj, scex(_("LyXServer pipe|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->button_serverpipe_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 339, 217, 90, 30, _("Browse..."));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_temp_dir = obj = fl_add_input(FL_NORMAL_INPUT, 170, 70, 170, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 70, 30, 30, idex(_("Temp dir|#d")));
fl_set_button_shortcut(obj, scex(_("Temp dir|#d")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
- fl_set_object_callback(obj, C_FormBaseInputCB, PATHS);
+ fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_set_button(obj, 1);
fl_end_form();
gravity: FL_NoGravity FL_NoGravity
name: input_roman
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_sans
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_typewriter
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_COUNTER
gravity: FL_NoGravity FL_NoGravity
name: counter_zoom
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
bounds: 0 999
precision: 0
value: 150
gravity: FL_NoGravity FL_NoGravity
name: check_scalable
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: input_screen_encoding
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_script
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_footnote
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_large
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_largest
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_huge
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_normal
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_COUNTER
gravity: FL_NoGravity FL_NoGravity
name: counter_dpi
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
bounds: 0 999
precision: 0
value: 150
gravity: FL_NoGravity FL_NoGravity
name: input_tiny
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_larger
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_small
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_huger
callback: C_FormBaseInputCB
-argument: SCREENFONTS
+argument: 0
=============== FORM ===============
Name: form_outputs_misc
gravity: FL_NoGravity FL_NoGravity
name: counter_line_len
callback: C_FormBaseInputCB
-argument: OUTPUTSMISC
+argument: 0
bounds: 0 120
precision: 0
value: 75
gravity: FL_NoGravity FL_NoGravity
name: input_tex_encoding
callback: C_FormBaseInputCB
-argument: OUTPUTSMISC
+argument: 0
--------------------
class: FL_CHOICE
gravity: FL_NoGravity FL_NoGravity
name: choice_default_papersize
callback: C_FormBaseInputCB
-argument: OUTPUTSMISC
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_ascii_roff
callback: C_FormBaseInputCB
-argument: OUTPUTSMISC
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_checktex
callback: C_FormBaseInputCB
-argument: OUTPUTSMISC
+argument: 0
--------------------
class: FL_LABELFRAME
gravity: FL_NoGravity FL_NoGravity
name: choice_spell_command
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_alt_lang
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_alt_lang
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_escape_chars
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_escape_chars
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_personal_dict
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_personal_dict
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: button_personal_dict
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_compound_words
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_input_enc
callback: C_FormBaseInputCB
-argument: SPELLCHECKER
+argument: 0
=============== FORM ===============
Name: form_inputs_misc
gravity: FL_NoGravity FL_NoGravity
name: input_date_format
callback: C_FormBaseInputCB
-argument: INPUTSMISC
+argument: 0
=============== FORM ===============
Name: form_language
gravity: FL_NoGravity FL_NoGravity
name: input_package
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHOICE
gravity: FL_NoGravity FL_NoGravity
name: choice_default_lang
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_use_kbmap
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHOICE
gravity: FL_NoGravity FL_NoGravity
name: choice_kbmap_1
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHOICE
gravity: FL_NoGravity FL_NoGravity
name: choice_kbmap_2
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_rtl_support
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_mark_foreign
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_auto_begin
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_auto_end
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_command_begin
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_command_end
callback: C_FormBaseInputCB
-argument: LANGUAGE
+argument: 0
=============== FORM ===============
Name: form_colours
gravity: FL_NoGravity FL_NoGravity
name: check_banner
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: check_auto_region_delete
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: check_exit_confirm
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: check_display_shortcuts
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: counter_autosave
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
bounds: 0 1200
precision: 0
value: 300
gravity: FL_NoGravity FL_NoGravity
name: check_ask_new_file
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: check_cursor_follows_scrollbar
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: counter_wm_jump
callback: C_FormBaseInputCB
-argument: LOOKNFEELMISC
+argument: 0
bounds: 0 250
precision: 0
value: 100
gravity: FL_NoGravity FL_NoGravity
name: input_popup_font
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_menu_font
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_popup_encoding
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_bind_file
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: input_ui_file
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_override_x_dead_keys
callback: C_FormBaseInputCB
-argument: INTERFACE
+argument: 0
value: 1
=============== FORM ===============
gravity: FL_NoGravity FL_NoGravity
name: input_command
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_page_range
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_copies
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_reverse
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_to_printer
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_file_extension
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_spool_command
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_paper_type
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_even_pages
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_odd_pages
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_collated
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_landscape
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_to_file
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_extra_options
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_spool_prefix
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_paper_size
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_INPUT
gravity: FL_NoGravity FL_NoGravity
name: input_name
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_adapt_output
callback: C_FormBaseInputCB
-argument: PRINTER
+argument: 0
--------------------
class: FL_LABELFRAME
gravity: FL_NoGravity FL_NoGravity
name: input_default_path
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: counter_lastfiles
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
bounds: 0 9
precision: 0
value: 4
gravity: FL_NoGravity FL_NoGravity
name: input_template_path
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_last_files
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: input_lastfiles
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_make_backups
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
value: 1
--------------------
gravity: FL_NoGravity FL_NoGravity
name: input_backup_path
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: input_serverpipe
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_BUTTON
gravity: FL_NoGravity FL_NoGravity
name: input_temp_dir
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
--------------------
class: FL_CHECKBUTTON
gravity: FL_NoGravity FL_NoGravity
name: check_use_temp_dir
callback: C_FormBaseInputCB
-argument: PATHS
+argument: 0
value: 1
==============================
--- /dev/null
+/** Collection of some useful xform helper functions
+ */
+
+#include <config.h>
+
+#include FORMS_H_LOCATION
+
+#ifdef __GNUG_
+#pragma implementation
+#endif
+
+#include <vector>
+#include "xform_helpers.h"
+
+using std::vector;
+
+// Take a string and add breaks so that it fits into a desired label width, w
+string formatted( string const & sin, int w, int size, int style )
+{
+ string sout;
+ if( sin.empty() ) return sout;
+
+ // break sin up into a vector of individual words
+ vector<string> sentence;
+ string word;
+ for( string::const_iterator sit = sin.begin();
+ sit != sin.end(); ++sit ) {
+ if( (*sit) == ' ' || (*sit) == '\n') {
+ sentence.push_back(word);
+ word.erase();
+ } else {
+ word += (*sit);
+ }
+ }
+ // Flush remaining contents of word
+ if( !word.empty() ) sentence.push_back(word);
+
+ string line, l1;
+ for( vector<string>::const_iterator vit = sentence.begin();
+ vit != sentence.end(); ++vit ) {
+ if( !l1.empty() ) l1 += ' ';
+ l1 += (*vit);
+ int length = fl_get_string_width(style, size, l1.c_str(),
+ int(l1.length()));
+ if( length >= w ) {
+ if( !sout.empty() ) sout += '\n';
+ sout += line;
+ l1 = (*vit);
+ }
+
+ line = l1;
+ }
+ // Flush remaining contents of line
+ if( !line.empty() ) {
+ if( !sout.empty() ) sout += '\n';
+ sout += line;
+ }
+
+ return sout;
+}
--- /dev/null
+#ifndef XFORMHELPERS_H
+#define XFORMHELPERS_H
+
+#ifdef __GNUG_
+#pragma interface
+#endif
+
+#include <config.h>
+#include "LString.h"
+
+// Take a string and add breaks so that it fits into a desired label width, w
+string formatted( string const &label, int w, int size, int style );
+
+#endif
font_norm_type = OTHER_ENCODING;
}
-string LyXRC::getFeedback(LyXRCTags tag)
+string LyXRC::getDescription(LyXRCTags tag)
{
string str;
switch( tag ) {
case RC_FONT_ENCODING:
- str = N_("The font encoding used for the LaTeX2e fontenc package.\nT1 is highly recommended for non-English languages.");
+ str = N_("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
break;
case RC_PRINTER:
- str = N_("The default printer to print on. If none is specified, LyX will\nuse the environment variable PRINTER.");
+ str = N_("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER.");
break;
case RC_PRINT_COMMAND:
- str = N_("Your favorite print program, eg \"dvips\", \"dvilj4\"");
+ str = N_("Your favorite print program, e.g. \"dvips\", \"dvilj4\".");
break;
case RC_PRINTEVENPAGEFLAG:
case RC_PRINTLANDSCAPEFLAG:
case RC_PRINTPAPERFLAG:
case RC_PRINTPAPERDIMENSIONFLAG:
- str = N_("Look at the man page for your favorite print program to learn\nwhich options to use.");
+ str = N_("Look at the man page for your favorite print program to learn which options to use.");
break;
case RC_PRINTTOPRINTER:
break;
case RC_PRINT_ADAPTOUTPUT:
- str = N_("Set to true for LyX to pass the name of the destination printer to your\nprint command.");
+ str = N_("Set to true for LyX to pass the name of the destination printer to your print command.");
break;
case RC_PRINTTOFILE:
break;
case RC_PRINTFILEEXTENSION:
- str = N_("Extension of printer program output file. Usually .ps");
+ str = N_("Extension of printer program output file. Usually \".ps\".");
break;
case RC_PRINTEXSTRAOPTIONS:
- str = N_("Extra options to pass to printing program after everything else,\nbut before the filename of the DVI file to be printed.");
+ str = N_("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed.");
break;
case RC_PRINTSPOOL_COMMAND:
- str = N_("When set, this printer option automatically prints to a file and then calls\na separate print spooling program on that file with the given name\nand arguments.");
+ str = N_("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments.");
break;
case RC_PRINTSPOOL_PRINTERPREFIX:
- str = N_("If you specify a printer name in the print dialog, the following argument\nis prepended along with the printer name after the spool command.");
+ str = N_("If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command.");
break;
case RC_SCREEN_DPI:
- str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX.\nIf that goes wrong, override the setting here.");
+ str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
break;
case RC_SCREEN_ZOOM:
- str = N_("The zoom percentage for screen fonts.\nA setting of 100% will make the fonts roughly the same size as on paper.");
+ str = N_("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
break;
case RC_SCREEN_FONT_SIZES:
break;
case RC_AUTOSAVE:
- str = N_("The time interval between auto-saves (in seconds).\n0 means no auto-save");
+ str = N_("The time interval between auto-saves (in seconds). 0 means no auto-save.");
break;
case RC_DOCUMENTPATH:
break;
case RC_USETEMPDIR:
- str = N_("Specify to use a temporary directory to store temporary TeX output.\nThis directory is deleted when you quit LyX.");
+ str = N_("Specify to use a temporary directory to store temporary TeX output. This directory is deleted when you quit LyX.");
break;
case RC_LASTFILES:
break;
case RC_AUTOREGIONDELETE:
- str = N_("Set to false if you don't want the current selection to be replaced\nautomatically by what you type.");
+ str = N_("Set to false if you don't want the current selection to be replaced automatically by what you type.");
break;
case RC_OVERRIDE_X_DEADKEYS:
- str = N_("Set to true for LyX to take over the handling of the dead keys\n(a.k.a accent keys) that may be defined for your keyboard.");
+ str = N_("Set to true for LyX to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
break;
case RC_SERVERPIPE:
- str = N_("This starts the lyxserver. The pipes get an additional extension\n\".in\" and \".out\". Only for advanced users.");
+ str = N_("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");
break;
case RC_BINDFILE:
- str = N_("Keybindings file. Can either specify an absolute path,\nor LyX will look in its global and local bind/ directories.");
+ str = N_("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories.");
break;
case RC_UIFILE:
- str = N_("The UI (user interface) file. Can either specify an absolute path,\nor LyX will look in its global and local ui/ directories.");
+ str = N_("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
break;
case RC_KBMAP:
case RC_KBMAP_PRIMARY:
case RC_KBMAP_SECONDARY:
- str = N_("Use this to set the correct mapping file for your keyboard.\nYou'll need this if you for instance want to type German documents\non an American keyboard.");
+ str = N_("Use this to set the correct mapping file for your keyboard. You'll need this if you for instance want to type German documents on an American keyboard.");
break;
#if 0
break;
#endif
case RC_ASCIIROFF_COMMAND:
- str = N_("Use to define an external program to render tables in the ASCII output.\nE.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file.\nIf \"none\" is specified, an internal routine is used.");
+ str = N_("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
break;
case RC_ASCII_LINELEN:
- str = N_("This is the maximum line length of an exported ASCII file\n(LaTeX, SGML or plain text).");
+ str = N_("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text).");
break;
case RC_NUMLASTFILES:
break;
case RC_ACCEPT_COMPOUND:
- str = N_("Consider run-together words, such as \"notthe\" for \"not the\",\nas legal words?");
+ str = N_("Consider run-together words, such as \"notthe\" for \"not the\", as legal words?");
break;
case RC_SPELL_COMMAND:
break;
case RC_USE_INP_ENC:
- str = N_("Specify whether to pass the -T input encoding option to ispell.\nEnable this if you can't spellcheck words with international letters\nin them.\nThis may not work with all dictionaries.");
+ str = N_("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries.");
break;
case RC_USE_ALT_LANG:
case RC_ALT_LANG:
- str = N_("Specify an alternate language.\nThe default is to use the language of the document.");
+ str = N_("Specify an alternate language. The default is to use the language of the document.");
break;
case RC_USE_PERS_DICT:
case RC_PERS_DICT:
- str = N_("Specify an alternate personal dictionary file.\nE.g. \".ispell_english\".");
+ str = N_("Specify an alternate personal dictionary file. E.g. \".ispell_english\".");
break;
case RC_USE_ESC_CHARS:
break;
case RC_SCREEN_FONT_SCALABLE:
- str = N_("Allow the use of scalable screen fonts? If false, LyX will use the\nclosest existing size for a match. Use this if the scalable fonts\nlook bad and you have many fixed size fonts.");
+ str = N_("Allow the use of scalable screen fonts? If false, LyX will use the closest existing size for a match. Use this if the scalable fonts look bad and you have many fixed size fonts.");
break;
case RC_CHKTEX_COMMAND:
- str = N_("Define how to run chktex.\nE.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\"\nRefer to the ChkTeX documentation.");
+ str = N_("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation.");
break;
case RC_CURSOR_FOLLOWS_SCROLLBAR:
- str = N_("LyX normally doesn't update the cursor position if you move the scrollbar.\nSet to true if you'd prefer to always have the cursor on screen.");
+ str = N_("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
break;
case RC_EXIT_CONFIRMATION:
- str = N_("Sets whether LyX asks for a second confirmation to exit when you have\nchanged documents.\n(LyX will still ask to save changed documents.)");
+ str = N_("Sets whether LyX asks for a second confirmation to exit when you have changed documents. (LyX will still ask to save changed documents.)");
break;
case RC_DISPLAY_SHORTCUTS:
- str = N_("LyX continously displays names of last command executed,\nalong with a list of defined short-cuts for it in the minibuffer.\nSet to false if LyX seems slow.");
+ str = N_("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow.");
break;
case RC_MAKE_BACKUP:
break;
case RC_BACKUPDIR_PATH:
- str = N_("The path for storing backup files. If it is an empty string,\nLyX will store the backup file in the same directory as the original file.");
+ str = N_("The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file.");
break;
case RC_RTL_SUPPORT:
break;
case RC_MARK_FOREIGN_LANGUAGE:
- str = N_("Use to control the highlighting of words with a language foreign to\nthat of the document.");
+ str = N_("Use to control the highlighting of words with a language foreign to that of the document.");
break;
case RC_LANGUAGE_PACKAGE:
- str = N_("The latex command for loading the language package.\nE.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+ str = N_("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
break;
case RC_LANGUAGE_AUTO_BEGIN:
- str = N_("Use if a language switching command is needed at the beginning\nof the document.");
+ str = N_("Use if a language switching command is needed at the beginning of the document.");
break;
case RC_LANGUAGE_AUTO_END:
- str = N_("Use if a language switching command is needed at the end\nof the document.");
+ str = N_("Use if a language switching command is needed at the end of the document.");
break;
case RC_LANGUAGE_COMMAND_BEGIN:
- str = N_("The latex command for changing from the language of the document\nto another language.\nE.g. \\selectlanguage{$$lang} where $$lang is substituted by the name\nof the second language.");
+ str = N_("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
break;
case RC_LANGUAGE_COMMAND_END:
break;
case RC_DATE_INSERT_FORMAT:
- str = N_("This accepts the normal strftime formats; see man strftime for full details.\nE.g.\"%A, %e. %B %Y\".");
+ str = N_("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
break;
case RC_SHOW_BANNER:
break;
case RC_WHEEL_JUMP:
- str = N_("The wheel movement factor (for mice with wheels or five button mice)");
+ str = N_("The wheel movement factor (for mice with wheels or five button mice).");
break;
case RC_CONVERTER:
break;
case RC_NEW_ASK_FILENAME:
- str = N_("This sets the behaviour if you want to be asked for a filename when\ncreating a new document or wait until you save it and be asked then.");
+ str = N_("This sets the behaviour if you want to be asked for a filename when creating a new document or wait until you save it and be asked then.");
break;
case RC_DEFAULT_LANGUAGE:
///
int ReadBindFile(string const & name = "cua");
///
- static string getFeedback( LyXRCTags );
+ static string getDescription( LyXRCTags );
///
string bind_file;
///
projects / lyx.git / commitdiff