anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented new Layout-Document in GUII and a few small fixes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@965 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2000-08-11 14:42:20 +00:00
parent 077ea832b5
commit b7a16fc402
19 changed files with 3650 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog
View File

@ -1,3 +1,35 @@
2000-08-11 Juergen Vigna <jug@sad.it>
* src/insets/insetgraphics.C (InsetGraphics): changing init
order because of warnings.
* src/frontends/xforms/forms/makefile: adding patching .C with
.C.patch files.
* src/frontends/xforms/forms/fdfix.sh: changing patching file .c
from .C.patch to .c.patch
* src/frontends/xforms/FormCommand.C (FormCommand): changing init
order because of warning.
* src/frontends/xforms/Dialogs.C (Dialogs): added FormDialog
* src/frontends/Liason.C (setMinibuffer): new helper function
* src/frontends/Dialogs.h (class Dialogs): inserting showLayoutDocument
* src/lyxfunc.C (Dispatch): calling new Document-Layout
* lib/ui/default.ui: commented out PaperLayout entry
* src/frontends/xforms/form_document.[Ch]: new added files
* src/frontends/xforms/FormDocument.[Ch]: ditto
* src/frontends/xforms/forms/form_document.fd: ditto
* src/frontends/xforms/forms/form_document.C.patch: ditto
2000-08-10 Juergen Vigna <jug@sad.it>
* src/insets/insetgraphics.C (draw): fixed access to 0 cacheHandle.

2
lib/ui/default.ui
View File

@ -145,7 +145,7 @@ Menuset
Menu "layout"
Item "Character...|C" "layout-character"
Item "Paragraph...|P" "layout-paragraph"
Item "Paper...|a" "layout-paper"
# Item "Paper...|a" "layout-paper"
Item "Document...|D" "layout-document"
Item "Table...|T" "layout-table"
OptItem "Tabular...|a" "layout-tabular"

4
src/frontends/Dialogs.h
View File

@ -91,8 +91,6 @@ public:
Signal0<void> updateCharacter; // allow update as cursor moves
///
Signal0<void> showParagraph;
///
Signal0<void> showDocument;
/// Do we really have to push this?
Signal1<void, vector<string> const &> SetDocumentClassChoice;
///
@ -104,6 +102,8 @@ public:
///
Signal0<void> showPreferences;
///
Signal0<void> showLayoutDocument;
///
Signal1<void, InsetGraphics *> showGraphics;
///
Signal1<void, InsetInclude *> showInclude;

7
src/frontends/Liason.C
View File

@ -15,6 +15,7 @@
#endif
#include "Liason.h"
#include "LyXView.h"
#include "BufferView.h"
#include "buffer.h"
#include "lyxrc.h"
@ -23,6 +24,7 @@
#include "support/lstrings.h"
#include "support/filetools.h"
#include "support/path.h"
#include "minibuffer.h"
extern LyXRC lyxrc;
extern bool RunScript(Buffer * buffer, bool wait, string const & command,
@ -208,6 +210,11 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
return result;
}
void setMinibuffer(LyXView * lv, char const * msg)
{
lv->getMiniBuffer()->Set(msg);
}
#ifdef CXX_WORKING_NAMESPACES
}
#endif

4
src/frontends/Liason.h
View File

@ -32,6 +32,8 @@
class PrinterParams;
class Buffer;
class LyXView;
class BufferParams;
/** Temporary namespace to hold the various frontend functions
until XTL and the compilers of the world are ready for something more
@ -52,6 +54,8 @@ namespace Liason
PrinterParams getPrinterParams(Buffer *);
/// print the current buffer
bool printBuffer(Buffer *, PrinterParams const &);
/// set the minibuffer
void setMinibuffer(LyXView *, char const * msg);
//@}
#ifdef CXX_WORKING_NAMESPACES

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

@ -4,6 +4,7 @@
#include "Dialogs.h"
#include "FormCitation.h"
#include "FormCopyright.h"
#include "FormDocument.h"
#include "FormGraphics.h"
#include "FormIndex.h"
#include "FormPreferences.h"
@ -22,6 +23,7 @@ Dialogs::Dialogs(LyXView * lv)
{
dialogs_.push_back(new FormCitation(lv, this));
dialogs_.push_back(new FormCopyright(lv, this));
dialogs_.push_back(new FormDocument(lv, this));
dialogs_.push_back(new FormGraphics(lv, this));
dialogs_.push_back(new FormIndex(lv, this));
dialogs_.push_back(new FormPreferences(lv, this));

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

@ -29,8 +29,8 @@ C_GENERICCB(FormCommand, InputCB)
C_GENERICCB(FormCommand, OKCB)
FormCommand::FormCommand(LyXView * lv, Dialogs * d, string const & t)
: lv_(lv), d_(d), u_(0), h_(0), ih_(0),
inset_(0), dialogIsOpen(false), title(t)
: lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0),
dialogIsOpen(false), title(t)
{}

1116
src/frontends/xforms/FormDocument.C Normal file
View File

File diff suppressed because it is too large Load Diff

149
src/frontends/xforms/FormDocument.h Normal file
View File

@ -0,0 +1,149 @@
// -*- C++ -*-
/* form_document.h
* FormDocument Interface Class
*/
#ifndef FORM_DOCUMENT_H
#define FORM_DOCUMENT_H
#include "DialogBase.h"
#include "support/utility.hpp"
#include <vector>
#ifdef __GNUG_
#pragma interface
#endif
class LyXView;
class Dialogs;
class Combox;
struct FD_form_tabbed_document;
struct FD_form_doc_paper;
struct FD_form_doc_class;
struct FD_form_doc_language;
struct FD_form_doc_options;
struct FD_form_doc_bullet;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Connection;
#endif
/** This class provides an XForms implementation of the FormDocument Popup.
The table-layout-form here changes values for latex-tabulars
*/
class FormDocument : public DialogBase, public noncopyable {
public:
/**@name Constructors and Destructors */
//@{
/// #FormDocument x(Communicator ..., Popups ...);#
FormDocument(LyXView *, Dialogs *);
///
~FormDocument();
void SetDocumentClassChoice(vector<string> const & choices);
//@}
/**@name Real per-instance Callback Methods */
//@{
static int WMHideCB(FL_FORM *, void *);
static void OKCB(FL_OBJECT *, long);
static void CancelCB(FL_OBJECT *, long);
static void ApplyCB(FL_OBJECT *, long);
static void InputCB(FL_OBJECT *, long);
//@}
enum EnumPopupStatus {
POPUP_UNMODIFIED,
POPUP_MODIFIED,
POPUP_READONLY
};
private:
void DeactivateDocumentButtons();
void ActivateDocumentButtons();
void EnableDocumentLayout();
void DisableDocumentLayout();
void CheckDocumentInput(FL_OBJECT * ob, long);
void ChoiceBulletSize(FL_OBJECT * ob, long);
void InputBulletLaTeX(FL_OBJECT * ob, long);
void BulletDepth(FL_OBJECT * ob, long);
void BulletPanel(FL_OBJECT * ob, long);
void BulletBMTable(FL_OBJECT * ob, long);
void checkMarginValues();
/**@name Real per-instance Callback Methods */
//@{
static void DocumentInputCB(FL_OBJECT * ob, long);
static void ChoiceBulletSizeCB(FL_OBJECT * ob, long);
static void InputBulletLaTeXCB(FL_OBJECT * ob, long);
static void BulletDepthCB(FL_OBJECT * ob, long);
static void BulletPanelCB(FL_OBJECT * ob, long);
static void BulletBMTableCB(FL_OBJECT * ob, long);
//@}
/**@name Slot Methods */
//@{
/// Create the popup if necessary, update it and display it.
void show();
/// Hide the popup.
void hide();
/// Update the popup.
void update();
void paper_update();
void class_update();
void language_update();
void options_update();
void bullets_update();
/// Apply from popup
void apply();
void paper_apply();
bool class_apply();
bool language_apply();
bool options_apply();
void bullets_apply();
/// Cancel from popup
void cancel();
//@}
/// Build the popup
void build();
///
/// Explicitly free the popup.
void free();
/// Typedefinitions from the fdesign produced Header file
FD_form_tabbed_document * build_tabbed_document();
FD_form_doc_paper * build_doc_paper();
FD_form_doc_class * build_doc_class();
FD_form_doc_language * build_doc_language();
FD_form_doc_options * build_doc_options();
FD_form_doc_bullet * build_doc_bullet();
/**@name Private Data */
//@{
/// Real GUI implementation.
FD_form_tabbed_document * dialog_;
FD_form_doc_paper * paper_;
FD_form_doc_class * class_;
FD_form_doc_language * language_;
FD_form_doc_options * options_;
FD_form_doc_bullet * bullets_;
/// Which LyXView do we belong to?
LyXView * lv_;
Dialogs * d_;
/// Update connection.
Connection u_;
/// Hide connection.
Connection h_;
/// has form contents changed? Used to control OK/Apply
EnumPopupStatus status;
//@}
int
ActCell, Confirmed,
current_bullet_panel, current_bullet_depth;
///
FL_OBJECT * fbullet;
///
Combox * combo_language;
};
#endif

4
src/frontends/xforms/Makefile.am
View File

@ -22,6 +22,10 @@ libxforms_la_SOURCES = \
FormCopyright.h \
form_copyright.C \
form_copyright.h \
FormDocument.C \
FormDocument.h \
form_document.C \
form_document.h \
FormGraphics.C \
FormGraphics.h \
form_graphics.C \

416
src/frontends/xforms/form_document.C Normal file
View File

@ -0,0 +1,416 @@
// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
#include <config.h>
#include "lyx_gui_misc.h"
#include "gettext.h"
/* Form definition file generated with fdesign. */
#include FORMS_H_LOCATION
#include <stdlib.h>
#include "form_document.h"
#include "FormDocument.h"
#include "bmtable.h"
#include "support/filetools.h"
FD_form_tabbed_document * FormDocument::build_tabbed_document()
{
FL_OBJECT *obj;
FD_form_tabbed_document *fdui = new FD_form_tabbed_document;
fdui->form_tabbed_document = fl_bgn_form(FL_NO_BOX, 465, 450);
fdui->form_tabbed_document->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 450, "");
fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
fl_set_object_resize(obj, FL_RESIZE_ALL);
obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_("Cancel|^[")));
fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, CancelCB, 0);
fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 410, 100, 30, idex(_("Apply|#A")));
fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, ApplyCB, 0);
fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 410, 100, 30, _("OK"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, OKCB, 0);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 20, 380, 435, 30, "");
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_end_form();
fdui->form_tabbed_document->fdui = fdui;
return fdui;
}
/*---------------------------------------*/
FD_form_doc_paper * FormDocument::build_doc_paper()
{
FL_OBJECT *obj;
FD_form_doc_paper *fdui = new FD_form_doc_paper;
fdui->form_doc_paper = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_paper->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 85, 200, 100, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 15, 140, 30, idex(_("Special:|#S")));
fl_set_button_shortcut(obj, scex(_("Special:|#S")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 205, 200, 130, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 165, 190, 170, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
obj = fl_add_text(FL_NORMAL_TEXT, 20, 155, 70, 20, _("Margins"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
obj = fl_add_text(FL_NORMAL_TEXT, 240, 195, 160, 20, _("Foot/Head Margins"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 440, 360, 10, 10, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 440, 350, 10, 10, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 85, 190, 70, "");
fl_set_object_color(obj, FL_COL1, FL_COL1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
obj = fl_add_text(FL_NORMAL_TEXT, 20, 75, 95, 20, _("Orientation"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fdui->greoup_radio_orientation = fl_bgn_group();
fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 90, 120, 30, idex(_("Portrait|#o")));
fl_set_button_shortcut(obj, scex(_("Portrait|#o")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 120, 30, idex(_("Landscape|#L")));
fl_set_button_shortcut(obj, scex(_("Landscape|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();
fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 15, 160, 30, idex(_("Papersize:|#P")));
fl_set_button_shortcut(obj, scex(_("Papersize:|#P")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
obj = fl_add_text(FL_NORMAL_TEXT, 240, 75, 150, 20, _("Custom Papersize"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fdui->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 45, 170, 30, idex(_("Use Geometry Package|#U")));
fl_set_button_shortcut(obj, scex(_("Use Geometry Package|#U")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 330, 100, 90, 30, idex(_("Width:|#W")));
fl_set_button_shortcut(obj, scex(_("Width:|#W")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_("Height:|#H")));
fl_set_button_shortcut(obj, scex(_("Height:|#H")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 175, 90, 30, idex(_("Top:|#T")));
fl_set_button_shortcut(obj, scex(_("Top:|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 215, 90, 30, idex(_("Bottom:|#B")));
fl_set_button_shortcut(obj, scex(_("Bottom:|#B")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 255, 90, 30, idex(_("Left:|#e")));
fl_set_button_shortcut(obj, scex(_("Left:|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 295, 90, 30, idex(_("Right:|#R")));
fl_set_button_shortcut(obj, scex(_("Right:|#R")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 215, 90, 30, idex(_("Headheight:|#i")));
fl_set_button_shortcut(obj, scex(_("Headheight:|#i")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 255, 90, 30, idex(_("Headsep:|#d")));
fl_set_button_shortcut(obj, scex(_("Headsep:|#d")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 295, 90, 30, idex(_("Footskip:|#F")));
fl_set_button_shortcut(obj, scex(_("Footskip:|#F")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 360, 420, 20, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fl_end_form();
fdui->form_doc_paper->fdui = fdui;
return fdui;
}
/*---------------------------------------*/
FD_form_doc_class * FormDocument::build_doc_class()
{
FL_OBJECT *obj;
FD_form_doc_class *fdui = new FD_form_doc_class;
fdui->form_doc_class = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_class->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 200, 120, 80, _("Separation"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 110, 120, 70, _("Columns"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 20, 120, 70, _("Sides"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_BOLD_STYLE);
fdui->choice_doc_fonts = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 100, 160, 30, idex(_("Fonts:|#F")));
fl_set_button_shortcut(obj, scex(_("Fonts:|#F")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->choice_doc_fontsize = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 140, 160, 30, idex(_("Font Size:|#O")));
fl_set_button_shortcut(obj, scex(_("Font Size:|#O")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_("Class:|#C")));
fl_set_button_shortcut(obj, scex(_("Class:|#C")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 60, 160, 30, idex(_("Pagestyle:|#P")));
fl_set_button_shortcut(obj, scex(_("Pagestyle:|#P")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->choice_doc_spacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 290, 160, 30, idex(_("Spacing|#g")));
fl_set_button_shortcut(obj, scex(_("Spacing|#g")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->input_doc_extra = obj = fl_add_input(FL_NORMAL_INPUT, 120, 185, 160, 30, idex(_("Extra Options:|#X")));
fl_set_button_shortcut(obj, scex(_("Extra Options:|#X")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->input_doc_skip = obj = fl_add_input(FL_NORMAL_INPUT, 220, 225, 60, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->choice_doc_skip = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 225, 90, 30, idex(_("Default Skip:|#u")));
fl_set_button_shortcut(obj, scex(_("Default Skip:|#u")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fdui->group_doc_sides = fl_bgn_group();
fdui->radio_doc_sides_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_("One|#n")));
fl_set_button_shortcut(obj, scex(_("One|#n")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_doc_sides_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_("Two|#T")));
fl_set_button_shortcut(obj, scex(_("Two|#T")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();
fdui->group_doc_columns = fl_bgn_group();
fdui->radio_doc_columns_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_("One|#e")));
fl_set_button_shortcut(obj, scex(_("One|#e")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_doc_columns_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_("Two|#w")));
fl_set_button_shortcut(obj, scex(_("Two|#w")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();
fdui->group_doc_sep = fl_bgn_group();
fdui->radio_doc_indent = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 210, 110, 30, idex(_("Indent|#I")));
fl_set_button_shortcut(obj, scex(_("Indent|#I")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_doc_skip = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 240, 110, 30, idex(_("Skip|#K")));
fl_set_button_shortcut(obj, scex(_("Skip|#K")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_button(obj, 1);
fl_end_group();
fdui->input_doc_spacing = obj = fl_add_input(FL_NORMAL_INPUT, 300, 290, 120, 30, "");
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_callback(obj, InputCB, 0);
fl_end_form();
fdui->form_doc_class->fdui = fdui;
return fdui;
}
/*---------------------------------------*/
FD_form_doc_language * FormDocument::build_doc_language()
{
FL_OBJECT *obj;
FD_form_doc_language *fdui = new FD_form_doc_language;
fdui->form_doc_language = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_language->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 40, 120, 290, 110, _("Quote Style "));
fdui->choice_inputenc = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 70, 190, 30, idex(_("Encoding:|#D")));
fl_set_button_shortcut(obj, scex(_("Encoding:|#D")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->choice_quotes_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 140, 190, 30, idex(_("Type:|#T")));
fl_set_button_shortcut(obj, scex(_("Type:|#T")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_bgn_group();
fdui->radio_single = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_("Single|#S")));
fl_set_button_shortcut(obj, scex(_("Single|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->radio_double = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_("Double|#D")));
fl_set_button_shortcut(obj, scex(_("Double|#D")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_group();
fdui->choice_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 35, 190, 30, idex(_("Language:|#L")));
fl_set_button_shortcut(obj, scex(_("Language:|#L")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form();
fdui->form_doc_language->fdui = fdui;
return fdui;
}
/*---------------------------------------*/
FD_form_doc_options * FormDocument::build_doc_options()
{
FL_OBJECT *obj;
FD_form_doc_options *fdui = new FD_form_doc_options;
fdui->form_doc_options = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_options->u_vdata = this;
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
fdui->input_float_placement = obj = fl_add_input(FL_NORMAL_INPUT, 155, 60, 120, 30, idex(_("Float Placement:|#L")));
fl_set_button_shortcut(obj, scex(_("Float Placement:|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->slider_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 155, 110, 80, 30, _("Section number depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fdui->slider_tocdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 155, 150, 80, 30, _("Table of contents depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT);
fdui->choice_postscript_driver = obj = fl_add_choice(FL_NORMAL_CHOICE, 155, 205, 190, 30, idex(_("PS Driver:|#S")));
fl_set_button_shortcut(obj, scex(_("PS Driver:|#S")), 1);
fl_set_object_boxtype(obj, FL_FRAME_BOX);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fdui->check_use_amsmath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 250, 200, 30, idex(_("Use AMS Math|#M")));
fl_set_button_shortcut(obj, scex(_("Use AMS Math|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_end_form();
fdui->form_doc_options->fdui = fdui;
return fdui;
}
/*---------------------------------------*/
FD_form_doc_bullet * FormDocument::build_doc_bullet()
{
FL_OBJECT *obj;
FD_form_doc_bullet *fdui = new FD_form_doc_bullet;
fdui->form_doc_bullet = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_bullet->u_vdata = this;
fl_set_border_width(-1);
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
fl_set_border_width(-3);
fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
fl_set_object_callback(obj, BulletBMTableCB, 0);
fl_set_object_lcol(obj, FL_BLUE);
fl_set_object_boxtype(obj, FL_UP_BOX);
fl_set_bmtable_pixmap_file(obj, 6, 6,
LibFileSearch("images", "standard.xpm").c_str());
fl_set_border_width(-1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, "");
fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_("Size|#z")));
fl_set_button_shortcut(obj, scex(_("Size|#z")), 1);
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, ChoiceBulletSizeCB, 0);
fdui->input_bullet_latex = obj = fl_add_input(FL_NORMAL_INPUT, 80, 300, 275, 30, idex(_("LaTeX|#L")));
fl_set_button_shortcut(obj, scex(_("LaTeX|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_FIXED_STYLE);
fl_set_input_return(obj, FL_RETURN_CHANGED);
fl_set_input_maxchars(obj, 80);
fl_set_object_callback(obj, InputBulletLaTeXCB, 0);
fdui->radio_bullet_depth = fl_bgn_group();
fdui->radio_bullet_depth_1 = obj = fl_add_button(FL_RADIO_BUTTON, 105, 35, 55, 40, idex(_("1|#1")));
fl_set_button_shortcut(obj, scex(_("1|#1")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, BulletDepthCB, 0);
fl_set_button(obj, 1);
fdui->radio_bullet_depth_2 = obj = fl_add_button(FL_RADIO_BUTTON, 165, 35, 55, 40, idex(_("2|#2")));
fl_set_button_shortcut(obj, scex(_("2|#2")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, BulletDepthCB, 1);
fdui->radio_bullet_depth_3 = obj = fl_add_button(FL_RADIO_BUTTON, 225, 35, 55, 40, idex(_("3|#3")));
fl_set_button_shortcut(obj, scex(_("3|#3")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, BulletDepthCB, 2);
fdui->radio_bullet_depth_4 = obj = fl_add_button(FL_RADIO_BUTTON, 285, 35, 55, 40, idex(_("4|#4")));
fl_set_button_shortcut(obj, scex(_("4|#4")), 1);
fl_set_object_lsize(obj, FL_LARGE_SIZE);
fl_set_object_callback(obj, BulletDepthCB, 3);
fl_end_group();
obj = fl_add_text(FL_NORMAL_TEXT, 105, 10, 85, 20, _("Bullet Depth"));
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
fdui->radio_bullet_panel = fl_bgn_group();
fdui->radio_bullet_panel_standard = obj = fl_add_button(FL_RADIO_BUTTON, 15, 105, 65, 30, idex(_("Standard|#S")));
fl_set_button_shortcut(obj, scex(_("Standard|#S")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 0);
fl_set_button(obj, 1);
fdui->radio_bullet_panel_maths = obj = fl_add_button(FL_RADIO_BUTTON, 15, 135, 65, 30, idex(_("Maths|#M")));
fl_set_button_shortcut(obj, scex(_("Maths|#M")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 1);
fdui->radio_bullet_panel_ding2 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 195, 65, 30, idex(_("Ding 2|#i")));
fl_set_button_shortcut(obj, scex(_("Ding 2|#i")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 3);
fdui->radio_bullet_panel_ding3 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 225, 65, 30, idex(_("Ding 3|#n")));
fl_set_button_shortcut(obj, scex(_("Ding 3|#n")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 4);
fdui->radio_bullet_panel_ding4 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 255, 65, 30, idex(_("Ding 4|#g")));
fl_set_button_shortcut(obj, scex(_("Ding 4|#g")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 5);
fdui->radio_bullet_panel_ding1 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 165, 65, 30, idex(_("Ding 1|#D")));
fl_set_button_shortcut(obj, scex(_("Ding 1|#D")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_resize(obj, FL_RESIZE_NONE);
fl_set_object_callback(obj, BulletPanelCB, 2);
fl_end_group();
fl_end_form();
fdui->form_doc_bullet->fdui = fdui;
return fdui;
}
/*---------------------------------------*/

112
src/frontends/xforms/form_document.h Normal file
View File

@ -0,0 +1,112 @@
/** Header file generated with fdesign on Fri Aug 11 15:45:35 2000.**/
#ifndef FD_form_tabbed_document_h_
#define FD_form_tabbed_document_h_
/** Callbacks, globals and object handlers **/
extern "C" void CancelCB(FL_OBJECT *, long);
extern "C" void ApplyCB(FL_OBJECT *, long);
extern "C" void OKCB(FL_OBJECT *, long);
extern "C" void InputCB(FL_OBJECT *, long);
extern "C" void InputCB(FL_OBJECT *, long);
extern "C" void ChoiceBulletSizeCB(FL_OBJECT *, long);
extern "C" void InputBulletLaTeXCB(FL_OBJECT *, long);
extern "C" void BulletDepthCB(FL_OBJECT *, long);
extern "C" void BulletPanelCB(FL_OBJECT *, long);
/**** Forms and Objects ****/
struct FD_form_tabbed_document {
FL_FORM *form_tabbed_document;
FL_OBJECT *tabbed_folder;
FL_OBJECT *button_apply;
FL_OBJECT *button_ok;
FL_OBJECT *text_warning;
};
struct FD_form_doc_paper {
FL_FORM *form_doc_paper;
FL_OBJECT *choice_paperpackage;
FL_OBJECT *greoup_radio_orientation;
FL_OBJECT *radio_portrait;
FL_OBJECT *radio_landscape;
FL_OBJECT *choice_papersize2;
FL_OBJECT *push_use_geometry;
FL_OBJECT *input_custom_width;
FL_OBJECT *input_custom_height;
FL_OBJECT *input_top_margin;
FL_OBJECT *input_bottom_margin;
FL_OBJECT *input_left_margin;
FL_OBJECT *input_right_margin;
FL_OBJECT *input_head_height;
FL_OBJECT *input_head_sep;
FL_OBJECT *input_foot_skip;
FL_OBJECT *text_warning;
};
struct FD_form_doc_class {
FL_FORM *form_doc_class;
FL_OBJECT *choice_doc_fonts;
FL_OBJECT *choice_doc_fontsize;
FL_OBJECT *choice_doc_class;
FL_OBJECT *choice_doc_pagestyle;
FL_OBJECT *choice_doc_spacing;
FL_OBJECT *input_doc_extra;
FL_OBJECT *input_doc_skip;
FL_OBJECT *choice_doc_skip;
FL_OBJECT *group_doc_sides;
FL_OBJECT *radio_doc_sides_one;
FL_OBJECT *radio_doc_sides_two;
FL_OBJECT *group_doc_columns;
FL_OBJECT *radio_doc_columns_one;
FL_OBJECT *radio_doc_columns_two;
FL_OBJECT *group_doc_sep;
FL_OBJECT *radio_doc_indent;
FL_OBJECT *radio_doc_skip;
FL_OBJECT *input_doc_spacing;
};
struct FD_form_doc_language {
FL_FORM *form_doc_language;
FL_OBJECT *choice_inputenc;
FL_OBJECT *choice_quotes_language;
FL_OBJECT *radio_single;
FL_OBJECT *radio_double;
FL_OBJECT *choice_language;
};
struct FD_form_doc_options {
FL_FORM *form_doc_options;
FL_OBJECT *input_float_placement;
FL_OBJECT *slider_secnumdepth;
FL_OBJECT *slider_tocdepth;
FL_OBJECT *choice_postscript_driver;
FL_OBJECT *check_use_amsmath;
};
struct FD_form_doc_bullet {
FL_FORM *form_doc_bullet;
FL_OBJECT *bmtable_bullet_panel;
FL_OBJECT *choice_bullet_size;
FL_OBJECT *input_bullet_latex;
FL_OBJECT *radio_bullet_depth;
FL_OBJECT *radio_bullet_depth_1;
FL_OBJECT *radio_bullet_depth_2;
FL_OBJECT *radio_bullet_depth_3;
FL_OBJECT *radio_bullet_depth_4;
FL_OBJECT *radio_bullet_panel;
FL_OBJECT *radio_bullet_panel_standard;
FL_OBJECT *radio_bullet_panel_maths;
FL_OBJECT *radio_bullet_panel_ding2;
FL_OBJECT *radio_bullet_panel_ding3;
FL_OBJECT *radio_bullet_panel_ding4;
FL_OBJECT *radio_bullet_panel_ding1;
};
#endif /* FD_form_tabbed_document_h_ */

8
src/frontends/xforms/forms/fdfix.sh
View File

@ -21,10 +21,10 @@ if [ ! -f $1 ]; then
exit 1
fi
# If there is a patch for the outputfile patch the input file with it.
if [ -f "$2.patch" ]; then
echo "Patching $1 with $2.patch"
patch -s $1 < "$2.patch"
# If there is a patch for the inputfile patch the input file with it.
if [ -f "$1.patch" ]; then
echo "Patching $1 with $1.patch"
patch -s $1 < "$1.patch"
fi
echo "// File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext" > $2

40
src/frontends/xforms/forms/form_document.C.patch Normal file
View File

@ -0,0 +1,40 @@
--- form_document.C.old Fri Aug 11 15:30:33 2000
+++ form_document.C Fri Aug 11 15:32:41 2000
@@ -9,6 +9,8 @@
#include <stdlib.h>
#include "form_document.h"
#include "FormDocument.h"
+#include "bmtable.h"
+#include "support/filetools.h"
FD_form_tabbed_document * FormDocument::build_tabbed_document()
{
@@ -321,10 +323,16 @@
fdui->form_doc_bullet = fl_bgn_form(FL_NO_BOX, 440, 345);
fdui->form_doc_bullet->u_vdata = this;
+ fl_set_border_width(-1);
obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 345, "");
- fdui->bmtable_bullet_panel = obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 90, 105, 260, 180, "");
- fl_set_object_boxtype(obj, FL_NO_BOX);
- fl_set_pixmapbutton_file(obj, _("/nfs/sinco/source/lyx/lyx-devel/lib/images/psnfss2.xpm"));
+ fl_set_border_width(-3);
+ fdui->bmtable_bullet_panel = obj = fl_add_bmtable(1, 90, 105, 265, 180, "");
+ fl_set_object_callback(obj, BulletBMTableCB, 0);
+ fl_set_object_lcol(obj, FL_BLUE);
+ fl_set_object_boxtype(obj, FL_UP_BOX);
+ fl_set_bmtable_pixmap_file(obj, 6, 6,
+ LibFileSearch("images", "standard.xpm").c_str());
+ fl_set_border_width(-1);
obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, "");
fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_("Size|#z")));
fl_set_button_shortcut(obj, scex(_("Size|#z")), 1);
@@ -336,6 +344,8 @@
fl_set_button_shortcut(obj, scex(_("LaTeX|#L")), 1);
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
fl_set_object_lstyle(obj, FL_FIXED_STYLE);
+ fl_set_input_return(obj, FL_RETURN_CHANGED);
+ fl_set_input_maxchars(obj, 80);
fl_set_object_callback(obj, InputBulletLaTeXCB, 0);
fdui->radio_bullet_depth = fl_bgn_group();

1744
src/frontends/xforms/forms/form_document.fd Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/frontends/xforms/forms/makefile
View File

@ -21,6 +21,7 @@ FDESIGN = fdesign
SRCS := form_citation.fd \
form_copyright.fd \
form_document.fd \
form_graphics.fd \
form_index.fd \
form_preferences.fd \
@ -47,6 +48,7 @@ d: c $(COBJS)
# Modify the header files using the instructions in fdfixh.sed
e: c
@echo "Modifying header files using the instructions in fdfixh.sed";\
for hfil in *.h ; do \
if [ -f "$$hfil.patch" ] ; then \
(echo "Patching $$hfil with $$hfil.patch" ; \
@ -64,6 +66,10 @@ updatesrc: d e
.c.C:
${SHELL} ./fdfix.sh $< $@
rm $<
@if [ -f "$@.patch" ] ; then \
(echo "Patching $@ with $@.patch" ; \
patch -s $@ < $@.patch) \
fi;
clean:
rm -f *.[hcC] *.bak

2
src/insets/insetgraphics.C
View File

@ -189,7 +189,7 @@ InsetGraphics::InsetGraphics()
,keepaspectratio(false), scale(0.0), clip(false), draft(false)
,cacheHandle(0)
#endif
: pixmapInitialized(false),cacheHandle(0)
: cacheHandle(0), pixmapInitialized(false)
{}
InsetGraphics::~InsetGraphics()

8
src/insets/insetgraphics.h
View File

@ -106,10 +106,10 @@ private:
/// The graphics cache handle.
GraphicsCacheItem * cacheHandle;
/// The pixmap
mutable Pixmap pixmap;
/// is the pixmap initialized?
mutable bool pixmapInitialized;
/// The pixmap
mutable Pixmap pixmap;
/// is the pixmap initialized?
mutable bool pixmapInitialized;
InsetGraphicsParams params;

4
src/lyxfunc.C
View File

@ -1286,7 +1286,11 @@ string LyXFunc::Dispatch(int ac,
break;
case LFUN_LAYOUT_DOCUMENT:
#ifdef USE_OLD_LAYOUT
MenuLayoutDocument();
#else
owner->getDialogs()->showLayoutDocument();
#endif
break;
case LFUN_LAYOUT_PARAGRAPH: