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

Implemented controller-view split for FormPrint.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1833 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-03-27 10:43:10 +00:00
parent efdf13b330
commit 12bfa2bd34
12 changed files with 291 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,10 @@
2001-03-27 Angus Leeming <a.leeming@ic.ac.uk>
* ControlPrint.[Ch]: new file; controller for the Print popups.
* GUI.h:
* Makefile.am: associated changes.
2001-03-26 Angus Leeming <a.leeming@ic.ac.uk>
* ControlConnections.[Ch]: (docType): new method; returns the type

83
src/frontends/controllers/ControlPrint.C Normal file
View File

@ -0,0 +1,83 @@
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 2001 The LyX Team.
*
*======================================================
*
* \file ControlPrint.C
* \author Angus Leeming, a.leeming@.ac.uk
*/
#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif
#include "ControlPrint.h"
#include "buffer.h"
#include "Dialogs.h"
#include "LyXView.h"
#include "lyxrc.h"
#include "PrinterParams.h"
#include "Liason.h"
#include "lyx_gui_misc.h" // WriteAlert
using Liason::printBuffer;
using Liason::getPrinterParams;
ControlPrint::ControlPrint(LyXView & lv, Dialogs & d)
: ControlDialog<ControlConnectBD>(lv, d)
{
d_.showPrint.connect(SigC::slot(this, &ControlPrint::show));
}
void ControlPrint::apply()
{
if (!lv_.view()->available())
return;
view().apply();
if (!printBuffer(lv_.buffer(), params())) {
WriteAlert(_("Error:"),
_("Unable to print"),
_("Check that your parameters are correct"));
}
}
LyXView * ControlPrint::lv() const
{
return &lv_;
}
PrinterParams & ControlPrint::params() const
{
Assert(params_);
return *params_;
}
void ControlPrint::setParams()
{
if (params_) delete params_;
params_ = new PrinterParams(getPrinterParams(lv_.buffer()));
}
void ControlPrint::clearParams()
{
if (params_) {
delete params_;
params_ = 0;
}
}

49
src/frontends/controllers/ControlPrint.h Normal file
View File

@ -0,0 +1,49 @@
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 2001 The LyX Team.
*
*======================================================
*
* \file ControlPrint.h
* \author Angus Leeming, a.leeming@.ac.uk
*/
#ifndef CONTROLPRINT_H
#define CONTROLPRINT_H
#ifdef __GNUG__
#pragma interface
#endif
#include "ControlDialogs.h"
class PrinterParams;
/** A controller for Print dialogs.
*/
class ControlPrint : public ControlDialog<ControlConnectBD> {
public:
///
ControlPrint(LyXView &, Dialogs &);
/// The file dialog popup requires a LyXView * ???
LyXView * lv() const;
///
PrinterParams & params() const;
private:
/// Get changed parameters and Dispatch them to the kernel.
virtual void apply();
/// set the params before show or update.
virtual void setParams();
/// clean-up on hide.
virtual void clearParams();
///
PrinterParams * params_;
};
#endif // CONTROLPRINT_H

15
src/frontends/controllers/GUI.h
View File

@ -151,6 +151,20 @@ public:
};
/** Specialization for Print dialog
*/
class ControlPrint;
template <class GUIview, class GUIbc>
class GUIPrint :
public GUI<ControlPrint, GUIview, OkApplyCancelPolicy, GUIbc> {
public:
///
GUIPrint(LyXView & lv, Dialogs & d)
: GUI<ControlPrint, GUIview, OkApplyCancelPolicy, GUIbc>(lv, d) {}
};
/** Specialization for Ref dialog
*/
class ControlRef;
@ -222,4 +236,5 @@ public:
: GUI<ControlVCLog, GUIview, OkCancelPolicy, GUIbc>(lv, d) {}
};
#endif // GUI_H

2
src/frontends/controllers/Makefile.am
View File

@ -40,6 +40,8 @@ libcontrollers_la_SOURCES=\
ControlInset.h \
ControlLog.C \
ControlLog.h \
ControlPrint.C \
ControlPrint.h \
ControlRef.C \
ControlRef.h \
ControlSearch.C \

7
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,10 @@
2001-03-27 Angus Leeming <a.leeming@ic.ac.uk>
* FormPrint.[Ch]:
* forms/form_print.fd: implemented controller-view split.
* Dialogs.C: associated changes.
2001-03-26 Angus Leeming <a.leeming@ic.ac.uk>
* FormRef.[Ch]:

8
src/frontends/xforms/Dialogs.C
View File

@ -28,10 +28,11 @@
#include "ControlError.h"
#include "ControlInclude.h"
#include "ControlLog.h"
#include "ControlUrl.h"
#include "ControlPrint.h"
#include "ControlRef.h"
#include "ControlSearch.h"
#include "ControlTabularCreate.h"
#include "ControlUrl.h"
#include "ControlVCLog.h"
#include "GUI.h"
@ -46,6 +47,7 @@
#include "form_credits.h"
#include "form_error.h"
#include "form_include.h"
#include "form_print.h"
#include "form_ref.h"
#include "form_search.h"
#include "form_tabular_create.h"
@ -60,6 +62,7 @@
#include "FormError.h"
#include "FormInclude.h"
#include "FormLog.h"
#include "FormPrint.h"
#include "FormRef.h"
#include "FormSearch.h"
#include "FormTabularCreate.h"
@ -74,7 +77,6 @@
#include "FormParagraph.h"
#include "FormPreamble.h"
#include "FormPreferences.h"
#include "FormPrint.h"
#include "FormSplash.h"
#include "FormTabular.h"
#include "FormToc.h"
@ -97,6 +99,7 @@ Dialogs::Dialogs(LyXView * lv)
add(new GUIError<FormError, xformsBC>(*lv, *this));
add(new GUIInclude<FormInclude, xformsBC>(*lv, *this));
add(new GUILog<FormLog, xformsBC>(*lv, *this));
add(new GUIPrint<FormPrint, xformsBC>(*lv, *this));
add(new GUIRef<FormRef, xformsBC>(*lv, *this));
add(new GUISearch<FormSearch, xformsBC>(*lv, *this));
add(new GUITabularCreate<FormTabularCreate, xformsBC>(*lv, *this));
@ -111,7 +114,6 @@ Dialogs::Dialogs(LyXView * lv)
add(new FormParagraph(lv, this));
add(new FormPreamble(lv, this));
add(new FormPreferences(lv, this));
add(new FormPrint(lv, this));
add(new FormSplash(lv, this));
add(new FormTabular(lv, this));
add(new FormToc(lv, this));

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

@ -1,43 +1,49 @@
/* FormPrint.C
* FormPrint Interface Class Implementation
/*
* \file FormPrint.C
* Copyright 2000-2001 The LyX Team.
* See the file COPYING.
*
* \author Allan Rae, rae@lyx.org
* \author Angus Leeming, a.leeming@.ac.uk
*/
#include <config.h>
#include FORMS_H_LOCATION
#ifdef __GNUG__
#pragma implementation
#endif
#include "xformsBC.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "form_print.h"
#include "input_validators.h"
#include "support/lstrings.h"
#include "lyxrc.h" // needed by PrinterParams
#include "PrinterParams.h"
#include "LyXView.h"
#include "xforms_helpers.h" // for browseFile
/*
#include "LyXView.h"
#include "Dialogs.h"
#include "support/lstrings.h"
#include "lyxrc.h"
#include "PrinterParams.h"
#include "Liason.h"
#include "debug.h"
#include "BufferView.h"
#include "lyx_gui_misc.h" // WriteAlert
#include "xforms_helpers.h" // for browseFile
*/
using Liason::printBuffer;
using Liason::getPrinterParams;
//using Liason::printBuffer;
//using Liason::getPrinterParams;
using std::make_pair;
using SigC::slot;
FormPrint::FormPrint(LyXView * lv, Dialogs * d)
: FormBaseBD(lv, d, _("Print")),
typedef FormCB<ControlPrint, FormDB<FD_form_print> > base_class;
FormPrint::FormPrint(ControlPrint & c)
: base_class(c, _("Print")),
target_(2), order_(2), which_(3)
{
// let the dialog be shown
// This is a permanent connection so we won't bother
// storing a copy because we won't be disconnecting.
d->showPrint.connect(slot(this, &FormPrint::show));
}
{}
void FormPrint::build()
@ -97,20 +103,8 @@ void FormPrint::build()
}
FL_FORM * FormPrint::form() const
{
if (dialog_.get())
return dialog_->form;
return 0;
}
void FormPrint::apply()
{
if (!lv_->view()->available()) {
return;
}
PrinterParams::WhichPages
wp(static_cast<PrinterParams::WhichPages>(which_.getButton()));
@ -128,70 +122,61 @@ void FormPrint::apply()
PrinterParams::Target
t(static_cast<PrinterParams::Target>(target_.getButton()));
// we really should use the return value here I think.
if (!printBuffer(lv_->buffer(),
PrinterParams(t,
string(fl_get_input(dialog_->input_printer)),
string(fl_get_input(dialog_->input_file)),
wp, from, to,
static_cast<bool>(order_.getButton()),
!static_cast<bool>(fl_get_button(dialog_->
radio_collated)),
strToInt(fl_get_input(dialog_->input_count))))) {
WriteAlert(_("Error:"),
_("Unable to print"),
_("Check that your parameters are correct"));
}
PrinterParams const pp(t,
string(fl_get_input(dialog_->input_printer)),
string(fl_get_input(dialog_->input_file)),
wp, from, to,
static_cast<bool>(order_.getButton()),
!static_cast<bool>(fl_get_button(dialog_->radio_collated)),
strToInt(fl_get_input(dialog_->input_count)));
controller().params() = pp;
}
void FormPrint::update()
{
if (dialog_.get()
&& lv_->view()->available()) {
PrinterParams pp(getPrinterParams(lv_->buffer()));
PrinterParams & pp = controller().params();
fl_set_input(dialog_->input_printer, pp.printer_name.c_str());
fl_set_input(dialog_->input_file, pp.file_name.c_str());
fl_set_input(dialog_->input_printer, pp.printer_name.c_str());
fl_set_input(dialog_->input_file, pp.file_name.c_str());
target_.setButton(pp.target);
order_.setButton(pp.reverse_order);
which_.setButton(pp.which_pages);
target_.setButton(pp.target);
order_.setButton(pp.reverse_order);
which_.setButton(pp.which_pages);
// hmmm... maybe a bit weird but maybe not
// we might just be remembering the last
// time this was printed.
if (!pp.from_page.empty()) {
fl_set_input(dialog_->input_from_page,
pp.from_page.c_str());
// we only set the "to" page of a range
// if there's a corresponding "from"
fl_activate_object(dialog_->input_to_page);
if (pp.to_page) {
fl_set_input(dialog_->input_to_page,
tostr(pp.to_page).c_str());
} else {
fl_set_input(dialog_->input_to_page,"");
}
// hmmm... maybe a bit weird but maybe not
// we might just be remembering the last
// time this was printed.
if (!pp.from_page.empty()) {
fl_set_input(dialog_->input_from_page, pp.from_page.c_str());
// we only set the "to" page of a range
// if there's a corresponding "from"
fl_activate_object(dialog_->input_to_page);
if (pp.to_page) {
fl_set_input(dialog_->input_to_page,
tostr(pp.to_page).c_str());
} else {
fl_deactivate_object(dialog_->input_to_page);
fl_set_input(dialog_->input_to_page,"");
fl_set_input(dialog_->input_from_page,"");
}
fl_set_input(dialog_->input_count,
tostr(pp.count_copies).c_str());
bc().valid(true);
} else {
fl_deactivate_object(dialog_->input_to_page);
fl_set_input(dialog_->input_to_page,"");
fl_set_input(dialog_->input_from_page,"");
}
fl_set_input(dialog_->input_count, tostr(pp.count_copies).c_str());
}
// It would be nice if we checked for cases like:
// Print only-odd-pages and from_page == an even number
//
bool FormPrint::input(FL_OBJECT * ob, long)
ButtonPolicy::SMInput FormPrint::input(FL_OBJECT * ob, long)
{
bool activate = true;
ButtonPolicy::SMInput activate = ButtonPolicy::SMI_VALID;
// using a fl_input_filter that only permits numbers no '-' or '+'
// and the user cannot enter a negative number even if they try.
@ -206,13 +191,13 @@ bool FormPrint::input(FL_OBJECT * ob, long)
// values but I'll disable the ok/apply until
// the user fixes it since they may be editting
// one of the fields.
activate = false;
activate = ButtonPolicy::SMI_INVALID;
// set both backgrounds to red?
}
} else if (strlen(fl_get_input(dialog_->input_to_page))) {
// from is empty but to exists so probably editting from
// therefore deactivate ok and apply until form is valid again
activate = false;
activate = ButtonPolicy::SMI_INVALID;
} else {
// both from and to are empty. This is valid so activate
// ok and apply but deactivate to
@ -221,7 +206,7 @@ bool FormPrint::input(FL_OBJECT * ob, long)
if (fl_get_button(dialog_->radio_file)
&& !strlen(fl_get_input(dialog_->input_file))) {
activate = false;
activate = ButtonPolicy::SMI_INVALID;
}
if (ob == dialog_->button_browse) {
@ -232,7 +217,7 @@ bool FormPrint::input(FL_OBJECT * ob, long)
// have a default printer set. Or should have.
// if (fl_get_button(dialog_->radio_printer)
// && !strlen(fl_get_input(dialog_->input_printer))) {
// activate = false;
// activate = ButtonPolicy::SMI_INVALID;
// }
return activate;
}
@ -248,7 +233,7 @@ void FormPrint::browse()
// Show the file browser dialog
string const new_filename =
browseFile(lv_, filename, title, pattern,
browseFile(controller().lv(), filename, title, pattern,
make_pair(string(), string()),
make_pair(string(), string()));

49
src/frontends/xforms/FormPrint.h
View File

@ -1,17 +1,18 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2000 The LyX Team.
* Copyright 1995-2001 The LyX Team.
*
* This file copyright 1999-2000
* Allan Rae
*======================================================*/
/* FormPrint.h
* FormPrint Interface Class
*======================================================
*
* \file FormPrint.h
* \author Allan Rae, rae@lyx.org
* \author Angus Leeming, a.leeming@.ac.uk
*/
#ifndef FORMPRINT_H
@ -23,54 +24,42 @@
#pragma interface
#endif
#include "FormBaseDeprecated.h"
#include "FormBase.h"
#include "RadioButtonGroup.h"
class ControlPrint;
struct FD_form_print;
/** This class provides an XForms implementation of the FormPrint Dialog.
The print dialog allows users to print their documents.
*/
class FormPrint : public FormBaseBD {
class FormPrint : public FormCB<ControlPrint, FormDB<FD_form_print> > {
public:
/// #FormPrint x(LyXView ..., Dialogs ...);#
FormPrint(LyXView *, Dialogs *);
///
FormPrint(ControlPrint &);
private:
/// Pointer to the actual instantiation of the ButtonController.
virtual xformsBC & bc();
/// Update the dialog.
virtual void update();
/// Apply from dialog
virtual void apply();
/// Filter the inputs
virtual bool input(FL_OBJECT *, long);
/// Pointer to the actual instantiation of the xforms form
virtual FL_FORM * form() const;
/// Build the dialog
virtual void build();
/// Update the dialog.
virtual void update();
/// Filter the inputs on callback from xforms
virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
/// Open the file browse dialog.
void browse();
///
/// Fdesign generated method
FD_form_print * build_print();
/// Real GUI implementation.
boost::scoped_ptr<FD_form_print> dialog_;
/// print target
RadioButtonGroup target_;
/// page order
RadioButtonGroup order_;
/// which pages
RadioButtonGroup which_;
/// The ButtonController
ButtonController<OkApplyCancelPolicy, xformsBC> bc_;
};
inline
xformsBC & FormPrint::bc()
{
return bc_;
}
#endif
#endif // FORMPRINT_H

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

@ -27,10 +27,10 @@ FD_form_print * FormPrint::build_print()
obj = fl_add_box(FL_UP_BOX, 0, 0, 340, 390, "");
fdui->input_printer = obj = fl_add_input(FL_NORMAL_INPUT, 90, 225, 230, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_file = obj = fl_add_input(FL_NORMAL_INPUT, 90, 265, 230, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->group_radio_printto = fl_bgn_group();
{
@ -39,33 +39,33 @@ FD_form_print * FormPrint::build_print()
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("File|#F");
fdui->radio_file = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 100, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
fl_set_object_callback(obj, C_FormBaseOKCB, 0);
{
char const * const dummy = N_("Apply|#A");
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 350, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
{
char const * const dummy = N_("Cancel|^[");
fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
fdui->group_radio_pages = fl_bgn_group();
{
@ -74,21 +74,21 @@ FD_form_print * FormPrint::build_print()
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Only Odd Pages|#O");
fdui->radio_odd_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Only Even Pages|#E");
fdui->radio_even_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
@ -99,33 +99,33 @@ FD_form_print * FormPrint::build_print()
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Reverse Order|#R");
fdui->radio_order_reverse = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_group();
fdui->input_from_page = obj = fl_add_input(FL_INT_INPUT, 20, 160, 50, 30, _("Pages:"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fdui->input_count = obj = fl_add_input(FL_INT_INPUT, 190, 160, 130, 30, _("Count:"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Collated|#C");
fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 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"));
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 160, 180, _("Print"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
@ -144,7 +144,7 @@ FD_form_print * FormPrint::build_print()
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
fl_end_form();
fdui->form->fdui = fdui;

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

@ -5,10 +5,10 @@
#define FD_form_print_h_
/** Callbacks, globals and object handlers **/
extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
extern "C" void C_FormBaseInputCB(FL_OBJECT *, long);
extern "C" void C_FormBaseOKCB(FL_OBJECT *, long);
extern "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
/**** Forms and Objects ****/

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

@ -45,7 +45,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_printer
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -63,7 +63,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_file
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -99,7 +99,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_printer
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -117,7 +117,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_file
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -153,7 +153,7 @@ shortcut: ^M
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_ok
callback: C_FormBaseDeprecatedOKCB
callback: C_FormBaseOKCB
argument: 0
--------------------
@ -171,7 +171,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_apply
callback: C_FormBaseDeprecatedApplyCB
callback: C_FormBaseApplyCB
argument: 0
--------------------
@ -189,7 +189,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_cancel
callback: C_FormBaseDeprecatedCancelCB
callback: C_FormBaseCancelCB
argument: 0
--------------------
@ -225,7 +225,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_all_pages
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -243,7 +243,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_odd_pages
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -261,7 +261,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_even_pages
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -315,7 +315,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_order_normal
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -333,7 +333,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_order_reverse
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -369,7 +369,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_from_page
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -387,7 +387,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_count
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -405,7 +405,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: radio_collated
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -423,7 +423,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: input_to_page
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
--------------------
@ -513,7 +513,7 @@ shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: button_browse
callback: C_FormBaseDeprecatedInputCB
callback: C_FormBaseInputCB
argument: 0
==============================