]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormDocument.C
Swap two printer related help messages.
[lyx.git] / src / frontends / xforms / FormDocument.C
index ba93d354219c2e99d6c1f2922e2c800c65293465..b144834f81f986e5e7b8d1a036d0d9f372b05045 100644 (file)
@@ -1,6 +1,13 @@
-/* form_document.C
- * FormDocument Interface Class Implementation
- */
+/* This file is part of
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *      
+ *           Copyright 2000 The LyX Team.
+ *
+ *           @author Jürgen Vigna
+ *
+ *======================================================*/
 
 #include <config.h>
 
 #endif
 
 #include "lyx_gui_misc.h"
-#include "gettext.h"
 #include FORMS_H_LOCATION
 #include XPM_H_LOCATION
 
 #include "FormDocument.h"
 #include "form_document.h"
-#include "xform_macros.h"
 #include "Dialogs.h"
 #include "layout.h"
 #include "combox.h"
 #include "buffer.h"
 #include "Liason.h"
 #include "CutAndPaste.h"
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::slot;
-#endif
+#include "bufferview_funcs.h"
 
 #ifdef CXX_WORKING_NAMESPACES
 using Liason::setMinibuffer;
 #endif
 
-C_RETURNCB(FormDocument,  WMHideCB)
-C_GENERICCB(FormDocument, InputCB)
-C_GENERICCB(FormDocument, OKCB)
-C_GENERICCB(FormDocument, ApplyCB)
-C_GENERICCB(FormDocument, CancelCB)
+#define USE_CLASS_COMBO 1
 
 FormDocument::FormDocument(LyXView * lv, Dialogs * d)
-       : dialog_(0), paper_(0), class_(0), language_(0), options_(0),
-         bullets_(0), lv_(lv), d_(d), u_(0), h_(0),
-         status(POPUP_UNMODIFIED) 
+       : FormBaseBD(lv, d, _("Document Layout"),
+                    new NoRepeatedApplyReadOnlyPolicy),
+         dialog_(0), paper_(0), class_(0), language_(0), options_(0),
+         bullets_(0), current_bullet_panel(0), current_bullet_depth(0),
+         fbullet(0), combo_language(0), combo_doc_class(0)
 {
     // let the popup be shown
     // This is a permanent connection so we won't bother
     // storing a copy because we won't be disconnecting.
     d->showLayoutDocument.connect(slot(this, &FormDocument::show));
-    current_bullet_depth = 0;
-    current_bullet_panel = 0;
 }
 
+
 FormDocument::~FormDocument()
 {
-    free();
+#ifdef USE_CLASS_COMBO
+    delete combo_doc_class;
+#endif
+    delete class_;
+    delete paper_;
+    delete combo_language;
+    delete language_;
+    delete options_;
+    delete bullets_;
+    delete dialog_;
+}
+
+
+void FormDocument::redraw()
+{
+       if( form() && form()->visible )
+               fl_redraw_form( form() );
+       else
+               return;
+
+       FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder);
+       if (outer_form && outer_form->visible)
+               fl_redraw_form( outer_form );
+}
+
+
+FL_FORM * FormDocument::form() const
+{
+    if (dialog_) return dialog_->form;
+    return 0;
 }
 
+
 void FormDocument::build()
 {
     int n;
@@ -71,6 +100,17 @@ void FormDocument::build()
     // the tabbed folder
     dialog_ = build_tabbed_document();
 
+    // Manage the restore, ok, apply, restore and cancel/close buttons
+    bc_.setOK(dialog_->button_ok);
+    bc_.setApply(dialog_->button_apply);
+    bc_.setCancel(dialog_->button_cancel);
+    bc_.setUndoAll(dialog_->button_restore);
+    bc_.refresh();
+
+    // Workaround dumb xforms sizing bug
+    minw_ = form()->w;
+    minh_ = form()->h;
+
     // the document paper form
     paper_ = build_doc_paper();
     fl_addto_choice(paper_->choice_papersize2,
@@ -81,35 +121,90 @@ void FormDocument::build()
                      "| A4 small Margins (only portrait) "
                      "| A4 very small Margins (only portrait) "
                      "| A4 very wide margins (only portrait) "));
-    fl_set_input_return(paper_->input_custom_width, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_custom_height, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_top_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_left_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_right_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_head_height, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_head_sep, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_foot_skip, FL_RETURN_ALWAYS);
+    fl_set_input_return(paper_->input_custom_width, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_custom_height, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_top_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_left_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_right_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_head_height, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_head_sep, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_foot_skip, FL_RETURN_CHANGED);
+
+    bc_.addReadOnly (paper_->choice_paperpackage);
+    bc_.addReadOnly (paper_->greoup_radio_orientation);
+    bc_.addReadOnly (paper_->radio_portrait);
+    bc_.addReadOnly (paper_->radio_landscape);
+    bc_.addReadOnly (paper_->choice_papersize2);
+    bc_.addReadOnly (paper_->push_use_geometry);
+    bc_.addReadOnly (paper_->input_custom_width);
+    bc_.addReadOnly (paper_->input_custom_height);
+    bc_.addReadOnly (paper_->input_top_margin);
+    bc_.addReadOnly (paper_->input_bottom_margin);
+    bc_.addReadOnly (paper_->input_left_margin);
+    bc_.addReadOnly (paper_->input_right_margin);
+    bc_.addReadOnly (paper_->input_head_height);
+    bc_.addReadOnly (paper_->input_head_sep);
+    bc_.addReadOnly (paper_->input_foot_skip);
 
     // the document class form
     class_ = build_doc_class();
+
+    FL_OBJECT * obj;
+#ifdef USE_CLASS_COMBO
+    // The language is a combo-box and has to be inserted manually
+    obj = class_->choice_doc_class;
+    fl_addto_form(class_->form);
+    combo_doc_class = new Combox(FL_COMBOX_DROPLIST);
+    combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 400,
+                        dialog_->tabbed_folder);
+    combo_doc_class->shortcut("#C",1);
+    combo_doc_class->setcallback(ComboInputCB, this);
+    fl_end_form();
+    for (LyXTextClassList::const_iterator cit = textclasslist.begin();
+        cit != textclasslist.end(); ++cit)
+    {
+       combo_doc_class->addto((*cit).description());
+    }
+#else
     fl_clear_choice(class_->choice_doc_class);
     for (LyXTextClassList::const_iterator cit = textclasslist.begin();
         cit != textclasslist.end(); ++cit)
     {
        fl_addto_choice(class_->choice_doc_class,(*cit).description().c_str());
     }
+#endif
     fl_addto_choice(class_->choice_doc_spacing,
                    _(" Single | OneHalf | Double | Other "));
     fl_addto_choice(class_->choice_doc_fontsize, "default|10|11|12");
-    for (n=0; tex_fonts[n][0]; ++n) {
+   for (n=0; tex_fonts[n][0]; ++n) {
        fl_addto_choice(class_->choice_doc_fonts,tex_fonts[n]);
     }
     fl_addto_choice(class_->choice_doc_pagestyle,
                    "default|empty|plain|headings|fancy");
     fl_addto_choice(class_->choice_doc_skip,
                    _(" Smallskip | Medskip | Bigskip | Length "));
-    fl_set_input_return(class_->input_doc_skip, FL_RETURN_ALWAYS);
+    fl_set_input_return(class_->input_doc_extra, FL_RETURN_CHANGED);
+    fl_set_input_return(class_->input_doc_skip, FL_RETURN_CHANGED);
+    fl_set_input_return(class_->input_doc_spacing, FL_RETURN_CHANGED);
+
+    bc_.addReadOnly (class_->radio_doc_indent);
+    bc_.addReadOnly (class_->radio_doc_skip);
+#ifndef USE_CLASS_COMBO
+    bc_.addReadOnly (class_->choice_doc_class);
+#endif
+    bc_.addReadOnly (class_->choice_doc_pagestyle);
+    bc_.addReadOnly (class_->choice_doc_fonts);
+    bc_.addReadOnly (class_->choice_doc_fontsize);
+    bc_.addReadOnly (class_->radio_doc_sides_one);
+    bc_.addReadOnly (class_->radio_doc_sides_two);
+    bc_.addReadOnly (class_->radio_doc_columns_one);
+    bc_.addReadOnly (class_->radio_doc_columns_two);
+    bc_.addReadOnly (class_->input_doc_extra);
+    bc_.addReadOnly (class_->input_doc_skip);
+    bc_.addReadOnly (class_->choice_doc_skip);
+    bc_.addReadOnly (class_->choice_doc_spacing);
+    bc_.addReadOnly (class_->input_doc_spacing);
 
     // the document language form
     language_ = build_doc_language();
@@ -118,25 +213,33 @@ void FormDocument::build()
                    "|koi8-r|koi8-u|cp866|cp1251|iso88595");
 
     // The language is a combo-box and has to be inserted manually
-    FL_OBJECT * obj = language_->choice_language;
-    fl_addto_form(language_->form_doc_language);
+    obj = language_->choice_language;
+    fl_addto_form(language_->form);
     combo_language = new Combox(FL_COMBOX_DROPLIST);
-    combo_language->add(obj->x, obj->y, obj->w, obj->h, 200);
+    combo_language->add(obj->x, obj->y, obj->w, obj->h, 400,
+                       dialog_->tabbed_folder);
     combo_language->shortcut("#L",1);
+    combo_language->setcallback(ComboInputCB, this);
     fl_end_form();
     // "default" is not part of the languages array any more.
+#ifdef DO_USE_DEFAULT_LANGUAGE
     combo_language->addto("default");
-    for(Languages::const_iterator cit = languages.begin();
+#endif
+    for (Languages::const_iterator cit = languages.begin();
        cit != languages.end(); ++cit) {
-       combo_language->addto((*cit).second.lang().c_str());
+       combo_language->addto((*cit).second.lang());
     }
 
     fl_addto_choice(language_->choice_quotes_language,
                    _(" ``text'' | ''text'' | ,,text`` | ,,text'' |"
                      " «text» | »text« "));
 
+    bc_.addReadOnly (language_->choice_language);
+    bc_.addReadOnly (language_->choice_inputenc);
+
     // the document options form
     options_ = build_doc_options();
+    fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
     fl_set_counter_bounds(options_->slider_secnumdepth,-2,5);
     fl_set_counter_bounds(options_->slider_tocdepth,-1,5);
     fl_set_counter_step(options_->slider_secnumdepth,1,1);
@@ -146,7 +249,13 @@ void FormDocument::build()
     for (n=0; tex_graphics[n][0]; ++n) {
        fl_addto_choice(options_->choice_postscript_driver, tex_graphics[n]);
     }
-    
+
+    bc_.addReadOnly (options_->slider_secnumdepth);
+    bc_.addReadOnly (options_->slider_tocdepth);
+    bc_.addReadOnly (options_->check_use_amsmath);
+    bc_.addReadOnly (options_->input_float_placement);
+    bc_.addReadOnly (options_->choice_postscript_driver);
+
     // the document bullets form
     bullets_ = build_doc_bullet();
     fl_addto_choice(bullets_->choice_bullet_size,
@@ -156,18 +265,20 @@ void FormDocument::build()
     fl_set_input_return(bullets_->input_bullet_latex, FL_RETURN_CHANGED);
     fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
 
-    fl_set_form_atclose(dialog_->form_tabbed_document,
-                       FormDocument::WMHideCB, 0);
+    bc_.addReadOnly (bullets_->bmtable_bullet_panel);
+    bc_.addReadOnly (bullets_->choice_bullet_size);
+    bc_.addReadOnly (bullets_->input_bullet_latex);
+
     fl_addto_tabfolder(dialog_->tabbed_folder,_("Document"),
-                      class_->form_doc_class);
+                      class_->form);
     fl_addto_tabfolder(dialog_->tabbed_folder,_("Paper"),
-                       paper_->form_doc_paper);
+                       paper_->form);
     fl_addto_tabfolder(dialog_->tabbed_folder,_("Language"),
-                       language_->form_doc_language);
+                       language_->form);
     fl_addto_tabfolder(dialog_->tabbed_folder,_("Extra"),
-                       options_->form_doc_options);
+                       options_->form);
     fbullet = fl_addto_tabfolder(dialog_->tabbed_folder,_("Bullets"),
-                                bullets_->form_doc_bullet);
+                                bullets_->form);
     if ((XpmVersion < 4) || (XpmVersion == 4 && XpmRevision < 7)) {
            lyxerr << _("Your version of libXpm is older than 4.7.\n"
                        "The `bullet' tab of the document popup "
@@ -177,43 +288,13 @@ void FormDocument::build()
     }
 }
 
-void FormDocument::show()
-{
-    if (!dialog_)
-       build();
-
-    update();  // make sure its up-to-date
-    if (dialog_->form_tabbed_document->visible) {
-        fl_raise_form(dialog_->form_tabbed_document);
-    } else {
-        fl_show_form(dialog_->form_tabbed_document,
-                     FL_PLACE_MOUSE | FL_FREE_SIZE,
-                     FL_TRANSIENT, _("Document Layout"));
-       u_ = d_->updateBufferDependent.connect(
-           slot(this, &FormDocument::update));
-       h_ = d_->hideBufferDependent.connect(
-           slot(this, &FormDocument::hide));
-    }
-}
-
-void FormDocument::hide()
-{
-    if (dialog_->form_tabbed_document->visible) {
-        fl_hide_form(dialog_->form_tabbed_document);
-        u_.disconnect();
-        h_.disconnect();
-    }
-}
 
 void FormDocument::apply()
 {
     if (!lv_->view()->available() || !dialog_)
        return;
 
-    bool
-       redo;
-
-    redo = class_apply();
+    bool redo = class_apply();
     paper_apply();
     redo = language_apply() || redo;
     redo = options_apply() || redo;
@@ -227,6 +308,94 @@ void FormDocument::apply()
 }
 
 
+void FormDocument::cancel()
+{
+    // this avoids confusion when reopening
+    BufferParams & param = lv_->buffer()->params;
+    param.temp_bullets[0] = param.user_defined_bullets[0];
+    param.temp_bullets[1] = param.user_defined_bullets[1];
+    param.temp_bullets[2] = param.user_defined_bullets[2];
+    param.temp_bullets[3] = param.user_defined_bullets[3];
+    hide();
+}
+
+
+void FormDocument::update()
+{
+    if (!dialog_)
+        return;
+
+    checkReadOnly();
+
+    BufferParams const & params = lv_->buffer()->params;
+
+    class_update(params);
+    paper_update(params);
+    language_update(params);
+    options_update(params);
+    bullets_update(params);
+}
+
+
+bool FormDocument::input( FL_OBJECT * ob, long data )
+{
+       State cb = static_cast<State>( data );
+
+       switch (cb) {
+       case CHECKCHOICECLASS:
+               CheckChoiceClass(ob, 0);
+               break;
+       case CHOICEBULLETSIZE:
+               ChoiceBulletSize(ob, 0);
+               break;
+       case INPUTBULLETLATEX:
+               InputBulletLaTeX(ob, 0);
+               break;
+       case BULLETDEPTH1:
+       case BULLETDEPTH2:
+       case BULLETDEPTH3:
+       case BULLETDEPTH4:
+               BulletDepth(ob, cb);
+               break;
+       case BULLETPANEL1:
+       case BULLETPANEL2:
+       case BULLETPANEL3:
+       case BULLETPANEL4:
+       case BULLETPANEL5:
+       case BULLETPANEL6:
+               BulletPanel(ob, cb);
+               break;
+       case BULLETBMTABLE:
+               BulletBMTable(ob, 0);
+               break;
+       default:
+               break;
+       }
+       
+       switch (data) {
+       case INPUT:
+       case CHECKCHOICECLASS:
+       case CHOICEBULLETSIZE:
+       case INPUTBULLETLATEX:
+       case BULLETBMTABLE:
+               return CheckDocumentInput(ob, 0);
+       default:
+               break;
+       }
+
+       return true;
+}
+
+
+void FormDocument::ComboInputCB(int, void * v, Combox * combox)
+{
+    FormDocument * pre = static_cast<FormDocument*>(v);
+    if (combox == pre->combo_doc_class)
+       pre->CheckChoiceClass(0, 0);
+    pre->bc_.valid(pre->CheckDocumentInput(0,0));
+}
+
+
 bool FormDocument::class_apply()
 {
        bool redo = false;
@@ -241,8 +410,12 @@ bool FormDocument::class_apply()
        params.fonts = fl_get_choice_text(class_->choice_doc_fonts);
        params.fontsize = fl_get_choice_text(class_->choice_doc_fontsize);
        params.pagestyle = fl_get_choice_text(class_->choice_doc_pagestyle);
-   
-       unsigned int new_class = fl_get_choice(class_->choice_doc_class) - 1;
+
+#ifdef USE_CLASS_COMBO   
+       unsigned int const new_class = combo_doc_class->get() - 1;
+#else
+       unsigned int const new_class = fl_get_choice(class_->choice_doc_class) - 1;
+#endif
        if (params.textclass != new_class) {
                // try to load new_class
                if (textclasslist.Load(new_class)) {
@@ -271,11 +444,15 @@ bool FormDocument::class_apply()
                        WriteAlert(_("Conversion Errors!"),
                                   _("Errors loading new document class."),
                                   _("Reverting to original document class."));
+#ifdef USE_CLASS_COMBO
+                       combo_doc_class->select(int(params.textclass) + 1);
+#else
                        fl_set_choice(class_->choice_doc_class,
                                      params.textclass + 1);
+#endif
                }
        }
-       char tmpsep = params.paragraph_separation;
+       BufferParams::PARSEP tmpsep = params.paragraph_separation;
        if (fl_get_button(class_->radio_doc_indent))
                params.paragraph_separation = BufferParams::PARSEP_INDENT;
        else
@@ -316,7 +493,7 @@ bool FormDocument::class_apply()
                params.sides = LyXTextClass::OneSide;
        
        Spacing tmpSpacing = params.spacing;
-       switch(fl_get_choice(class_->choice_doc_spacing)) {
+       switch (fl_get_choice(class_->choice_doc_spacing)) {
        case 1:
                lyxerr[Debug::INFO] << "Spacing: SINGLE\n";
                params.spacing.set(Spacing::Single);
@@ -343,13 +520,15 @@ bool FormDocument::class_apply()
        return redo;
 }
 
+
 void FormDocument::paper_apply()
 {
-    BufferParams
-       &params = lv_->buffer()->params;
+    BufferParams & params = lv_->buffer()->params;
     
-    params.papersize2 = fl_get_choice(paper_->choice_papersize2)-1;
-    params.paperpackage = fl_get_choice(paper_->choice_paperpackage)-1;
+    params.papersize2 =
+           static_cast<char>(fl_get_choice(paper_->choice_papersize2)-1);
+    params.paperpackage =
+           static_cast<char>(fl_get_choice(paper_->choice_paperpackage)-1);
     params.use_geometry = fl_get_button(paper_->push_use_geometry);
     if (fl_get_button(paper_->radio_landscape))
        params.orientation = BufferParams::ORIENTATION_LANDSCAPE;
@@ -367,15 +546,14 @@ void FormDocument::paper_apply()
     lv_->buffer()->setPaperStuff();
 }
 
+
 bool FormDocument::language_apply()
 {
-    BufferParams
-       &params = lv_->buffer()->params;
-    InsetQuotes::quote_language
-       lga = InsetQuotes::EnglishQ;
+    BufferParams & params = lv_->buffer()->params;
+    InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
     bool redo = false;
 
-    switch(fl_get_choice(language_->choice_quotes_language) - 1) {
+    switch (fl_get_choice(language_->choice_quotes_language) - 1) {
     case 0:
        lga = InsetQuotes::EnglishQ;
        break;
@@ -401,14 +579,10 @@ bool FormDocument::language_apply()
     else
        params.quotes_times = InsetQuotes::DoubleQ;
 
-    Language const * old_language = params.language_info;
-    params.language = combo_language->getline();
-    Languages::iterator lit = languages.find(params.language);
-
-    Language const * new_language;
-    if (lit != languages.end()) 
-       new_language = &(*lit).second;
-    else
+    Language const * old_language = params.language;
+    Language const * new_language = 
+           languages.getLanguage(combo_language->getline());
+    if (!new_language)
        new_language = default_language;
 
     if (old_language != new_language
@@ -418,18 +592,17 @@ bool FormDocument::language_apply()
     if (old_language != new_language) {
        redo = true;
     }
-    params.language_info = new_language;
+    params.language = new_language;
     params.inputenc = fl_get_choice_text(language_->choice_inputenc);
 
     return redo;
 }
 
+
 bool FormDocument::options_apply()
 {
-    BufferParams
-       &params = lv_->buffer()->params;
-    bool
-       redo = false;
+    BufferParams & params = lv_->buffer()->params;
+    bool redo = false;
 
     params.graphicsDriver =
        fl_get_choice_text(options_->choice_postscript_driver);
@@ -448,6 +621,7 @@ bool FormDocument::options_apply()
     return redo;
 }
 
+
 void FormDocument::bullets_apply()
 {
     /* update the bullet settings */
@@ -460,47 +634,21 @@ void FormDocument::bullets_apply()
     param.user_defined_bullets[3] = param.temp_bullets[3];
 }
 
-void FormDocument::cancel()
-{
-    // this avoids confusion when reopening
-    BufferParams & param = lv_->buffer()->params;
-    param.temp_bullets[0] = param.user_defined_bullets[0];
-    param.temp_bullets[1] = param.user_defined_bullets[1];
-    param.temp_bullets[2] = param.user_defined_bullets[2];
-    param.temp_bullets[3] = param.user_defined_bullets[3];
-}
 
-void FormDocument::update()
-{
-    if (!dialog_)
-        return;
-    fl_hide_object(dialog_->text_warning);
-    EnableDocumentLayout();
-    if (lv_->buffer()->isReadonly()) {
-       DisableDocumentLayout();
-       fl_set_object_label(dialog_->text_warning,
-                           _("Document is read-only."
-                             " No changes to layout permitted."));
-       fl_show_object(dialog_->text_warning);
-    }
-    class_update();
-    paper_update();
-    language_update();
-    options_update();
-    bullets_update();
-}
-
-void FormDocument::class_update()
+void FormDocument::class_update(BufferParams const & params)
 {
     if (!class_)
         return;
-    BufferParams
-       const & params = lv_->buffer()->params;
-    LyXTextClass
-       const & tclass = textclasslist.TextClass(params.textclass);
-       
+
+    LyXTextClass const & tclass = textclasslist.TextClass(params.textclass);
+
+#ifdef USE_CLASS_COMBO
+    combo_doc_class->select_text(
+       textclasslist.DescOfClass(params.textclass));
+#else  
     fl_set_choice_text(class_->choice_doc_class, 
                       textclasslist.DescOfClass(params.textclass).c_str());
+#endif
     fl_set_choice_text(class_->choice_doc_fonts, params.fonts.c_str());
     fl_clear_choice(class_->choice_doc_fontsize);
     fl_addto_choice(class_->choice_doc_fontsize, "default");
@@ -541,7 +689,7 @@ void FormDocument::class_update()
     }
     fl_set_button(class_->radio_doc_sides_one, 0);
     fl_set_button(class_->radio_doc_sides_two, 0);
-    if (params.sides == 2)
+    if (params.sides == LyXTextClass::TwoSides)
        fl_set_button(class_->radio_doc_sides_two, 1);
     else
        fl_set_button(class_->radio_doc_sides_one, 1);
@@ -581,15 +729,13 @@ void FormDocument::class_update()
        fl_set_input(class_->input_doc_extra, "");
 }
 
-void FormDocument::language_update()
+
+void FormDocument::language_update(BufferParams const & params)
 {
     if (!language_)
         return;
 
-    BufferParams
-       &params = lv_->buffer()->params;
-
-    combo_language->select_text(params.language.c_str());
+    combo_language->select_text(params.language->lang());
     fl_set_choice_text(language_->choice_inputenc, params.inputenc.c_str());
     fl_set_choice(language_->choice_quotes_language, params.quotes_language + 1);
     fl_set_button(language_->radio_single, 0);
@@ -600,14 +746,12 @@ void FormDocument::language_update()
        fl_set_button(language_->radio_double, 1);
 }
 
-void FormDocument::options_update()
+
+void FormDocument::options_update(BufferParams const & params)
 {
     if (!options_)
         return;
 
-    BufferParams
-       &params = lv_->buffer()->params;
-
     fl_set_choice_text(options_->choice_postscript_driver,
                       params.graphicsDriver.c_str());
     fl_set_button(options_->check_use_amsmath, params.use_amsmath);
@@ -620,12 +764,11 @@ void FormDocument::options_update()
        fl_set_input(options_->input_float_placement, "");
 }
 
-void FormDocument::paper_update()
+
+void FormDocument::paper_update(BufferParams const & params)
 {
     if (!paper_)
         return;
-    BufferParams
-       &params = lv_->buffer()->params;
 
     fl_set_choice(paper_->choice_papersize2, params.papersize2 + 1);
     fl_set_choice(paper_->choice_paperpackage, params.paperpackage + 1);
@@ -645,10 +788,11 @@ void FormDocument::paper_update()
     fl_set_input(paper_->input_head_height, params.headheight.c_str());
     fl_set_input(paper_->input_head_sep, params.headsep.c_str());
     fl_set_input(paper_->input_foot_skip, params.footskip.c_str());
-    fl_set_focus_object(paper_->form_doc_paper, paper_->choice_papersize2);
+    fl_set_focus_object(paper_->form, paper_->choice_papersize2);
 }
 
-void FormDocument::bullets_update()
+
+void FormDocument::bullets_update(BufferParams const & params)
 {
     if (!bullets_ || ((XpmVersion<4) || (XpmVersion==4 && XpmRevision<7)))
         return;
@@ -661,102 +805,36 @@ void FormDocument::bullets_update()
        fl_activate_object(fbullet);
        fl_set_object_lcol(fbullet, FL_BLACK);
     }
-    if (lv_->buffer()->isReadonly()) {
-       fl_deactivate_object (bullets_->bmtable_bullet_panel);
-       fl_deactivate_object (bullets_->choice_bullet_size);
-       fl_deactivate_object (bullets_->input_bullet_latex);
-    } else {
-       fl_activate_object (bullets_->bmtable_bullet_panel);
-       fl_activate_object (bullets_->choice_bullet_size);
-       fl_activate_object (bullets_->input_bullet_latex);
-    }
-
-    BufferParams
-       &params = lv_->buffer()->params;
 
     fl_set_button(bullets_->radio_bullet_depth_1, 1);
     fl_set_input(bullets_->input_bullet_latex,
-                params.user_defined_bullets[0].c_str());
+                params.user_defined_bullets[0].getText().c_str());
     fl_set_choice(bullets_->choice_bullet_size,
                  params.user_defined_bullets[0].getSize() + 2);
 }
 
-void FormDocument::free()
-{
-    if (dialog_) {
-        hide();
-        if (class_) {
-            fl_free_form(class_->form_doc_class);
-            delete class_;
-            class_ = 0;
-        }
-        if (paper_) {
-            fl_free_form(paper_->form_doc_paper);
-            delete paper_;
-            paper_ = 0;
-        }
-        if (language_) {
-           delete combo_language;
-            fl_free_form(language_->form_doc_language);
-            delete language_;
-            language_ = 0;
-        }
-        if (options_) {
-            fl_free_form(options_->form_doc_options);
-            delete options_;
-            options_ = 0;
-        }
-        if (bullets_) {
-            fl_free_form(bullets_->form_doc_bullet);
-            delete bullets_;
-            bullets_ = 0;
-        }
-        fl_free_form(dialog_->form_tabbed_document);
-        delete dialog_;
-        dialog_ = 0;
-    }
-}
 
-int FormDocument::WMHideCB(FL_FORM * form, void *)
+void FormDocument::checkReadOnly()
 {
-    // Ensure that the signals (u and h) are disconnected even if the
-    // window manager is used to close the popup.
-    FormDocument * pre = (FormDocument*)form->u_vdata;
-    pre->hide();
-    return FL_CANCEL;
-}
-
-void FormDocument::CancelCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->cancel();
-    pre->hide();
-}
-
-void FormDocument::ApplyCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->apply();
+    if (bc_.readOnly(lv_->buffer()->isReadonly())) {
+       combo_doc_class->deactivate();
+       combo_language->deactivate();
+       fl_set_object_label(dialog_->text_warning,
+                           _("Document is read-only."
+                             " No changes to layout permitted."));
+       fl_show_object(dialog_->text_warning);
+    } else {
+       combo_doc_class->activate();
+       combo_language->activate();
+       fl_hide_object(dialog_->text_warning);
+    }  
 }
 
-void FormDocument::OKCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->apply();
-    pre->hide();
-}
-
-void FormDocument::InputCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->CheckDocumentInput(ob,0);
-}
 
 void FormDocument::checkMarginValues()
 {
-    int allEmpty;
-    
-    allEmpty = (!strlen(fl_get_input(paper_->input_top_margin)) &&
+#if 0
+    int const allEmpty = (!strlen(fl_get_input(paper_->input_top_margin)) &&
                !strlen(fl_get_input(paper_->input_bottom_margin)) &&
                !strlen(fl_get_input(paper_->input_left_margin)) &&
                !strlen(fl_get_input(paper_->input_right_margin)) &&
@@ -767,16 +845,17 @@ void FormDocument::checkMarginValues()
                !strlen(fl_get_input(paper_->input_custom_height)));
     if (!allEmpty)
        fl_set_button(paper_->push_use_geometry, 1);
+#endif
 }
 
-void FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
+
+bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
 {
     string str;
-    char val;
+    int val;
     bool ok = true;
     char const * input;
     
-    ActivateDocumentButtons();
     checkMarginValues();
     if (ob == paper_->choice_papersize2) {
        val = fl_get_choice(paper_->choice_papersize2)-1;
@@ -851,20 +930,14 @@ void FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
     else if (fl_get_choice(class_->choice_doc_skip) != 4)
        fl_set_input (class_->input_doc_skip, "");
 
-    fprintf(stderr,"%d\n",fl_get_choice(class_->choice_doc_spacing));
+    input = fl_get_input(class_->input_doc_spacing);
     if ((fl_get_choice(class_->choice_doc_spacing) == 4) && !*input)
        ok = false;
     else  if (fl_get_choice(class_->choice_doc_spacing) != 4)
        fl_set_input (class_->input_doc_spacing, "");
-    if (!ok)
-       DeactivateDocumentButtons();
+    return ok;
 }
 
-void FormDocument::ChoiceBulletSizeCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->ChoiceBulletSize(ob,0);
-}
 
 void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/ )
 {
@@ -873,14 +946,9 @@ void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/ )
     // convert from 1-6 range to -1-4 
     param.temp_bullets[current_bullet_depth].setSize(fl_get_choice(ob) - 2);
     fl_set_input(bullets_->input_bullet_latex,
-                param.temp_bullets[current_bullet_depth].c_str());
+                param.temp_bullets[current_bullet_depth].getText().c_str());
 }
 
-void FormDocument::InputBulletLaTeXCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->InputBulletLaTeX(ob,0);
-}
 
 void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
 {
@@ -890,13 +958,8 @@ void FormDocument::InputBulletLaTeX(FL_OBJECT *, long)
        setText(fl_get_input(bullets_->input_bullet_latex));
 }
 
-void FormDocument::BulletDepthCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->BulletDepth(ob,0);
-}
 
-void FormDocument::BulletDepth(FL_OBJECT * ob, long data)
+void FormDocument::BulletDepth(FL_OBJECT * ob, State cb)
 {
     /* Should I do the following:                                 */
     /*  1. change to the panel that the current bullet belongs in */
@@ -908,55 +971,74 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, long data)
     /* maybe try to support the others later                      */
     BufferParams & param = lv_->buffer()->params;
 
+    int data = 0;
+    if (cb == BULLETDEPTH1 )
+           data = 0;
+    else if (cb == BULLETDEPTH2 )
+           data = 1;
+    else if (cb == BULLETDEPTH3 )
+           data = 2;
+    else if (cb == BULLETDEPTH4 )
+           data = 3;
+
     switch (fl_get_button_numb(ob)) {
     case 3:
-       // right mouse button resets to default
+           // right mouse button resets to default
        param.temp_bullets[data] = ITEMIZE_DEFAULTS[data];
     default:
        current_bullet_depth = data;
        fl_set_input(bullets_->input_bullet_latex,
-                    param.temp_bullets[data].c_str());
+                    param.temp_bullets[data].getText().c_str());
        fl_set_choice(bullets_->choice_bullet_size,
                      param.temp_bullets[data].getSize() + 2);
     }
 }
 
-void FormDocument::BulletPanelCB(FL_OBJECT * ob, long data)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->BulletPanel(ob,data);
-}
 
-void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, long data)
+void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb)
 {
     /* Here we have to change the background pixmap to that selected */
     /* by the user. (eg. standard.xpm, psnfss1.xpm etc...)           */
     
+    int data = 0;
+    if (cb == BULLETPANEL1 )
+           data = 0;
+    else if (cb == BULLETPANEL2 )
+           data = 1;
+    else if (cb == BULLETPANEL3 )
+           data = 2;
+    else if (cb == BULLETPANEL4 )
+           data = 3;
+    else if (cb == BULLETPANEL5 )
+           data = 4;
+    else if (cb == BULLETPANEL6 )
+           data = 5;
+
     if (data != current_bullet_panel) {
-       fl_freeze_form(bullets_->form_doc_bullet);
+       fl_freeze_form(bullets_->form);
        current_bullet_panel = data;
 
        /* free the current pixmap */
        fl_free_bmtable_pixmap(bullets_->bmtable_bullet_panel);
        string new_panel;
-       switch (data) {
+       switch (cb) {
            /* display the new one */
-       case 0 :
+       case BULLETPANEL1 :
            new_panel = "standard";
            break;
-       case 1 :
+       case BULLETPANEL2 :
            new_panel = "amssymb";
            break;
-       case 2 :
+       case BULLETPANEL3 :
            new_panel = "psnfss1";
            break;
-       case 3 :
+       case BULLETPANEL4 :
            new_panel = "psnfss2";
            break;
-       case 4 :
+       case BULLETPANEL5 :
            new_panel = "psnfss3";
            break;
-       case 5 :
+       case BULLETPANEL6 :
            new_panel = "psnfss4";
            break;
        default :
@@ -968,17 +1050,12 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, long data)
        }
        new_panel += ".xpm";
        fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
-                                  LibFileSearch("images", new_panel.c_str()).c_str());
+                                  LibFileSearch("images", new_panel).c_str());
        fl_redraw_object(bullets_->bmtable_bullet_panel);
-       fl_unfreeze_form(bullets_->form_doc_bullet);
+       fl_unfreeze_form(bullets_->form);
     }
 }
 
-void FormDocument::BulletBMTableCB(FL_OBJECT * ob, long)
-{
-    FormDocument * pre = (FormDocument*)ob->form->u_vdata;
-    pre->BulletBMTable(ob,0);
-}
 
 void FormDocument::BulletBMTable(FL_OBJECT * ob, long /*data*/ )
 {
@@ -994,123 +1071,58 @@ void FormDocument::BulletBMTable(FL_OBJECT * ob, long /*data*/ )
     param.temp_bullets[current_bullet_depth].setFont(current_bullet_panel);
     param.temp_bullets[current_bullet_depth].setCharacter(bmtable_button);
     fl_set_input(bullets_->input_bullet_latex,
-                param.temp_bullets[current_bullet_depth].c_str());
+                param.temp_bullets[current_bullet_depth].getText().c_str());
 }
 
-void FormDocument::DeactivateDocumentButtons()
-{
-    fl_deactivate_object(dialog_->button_ok);
-    fl_deactivate_object(dialog_->button_apply);
-    fl_set_object_lcol(dialog_->button_ok, FL_INACTIVE);
-    fl_set_object_lcol(dialog_->button_apply, FL_INACTIVE);
-}
 
-void FormDocument::ActivateDocumentButtons()
+void FormDocument::CheckChoiceClass(FL_OBJECT * ob, long)
 {
-    fl_activate_object(dialog_->button_ok);
-    fl_activate_object(dialog_->button_apply);
-    fl_set_object_lcol(dialog_->button_ok, FL_BLACK);
-    fl_set_object_lcol(dialog_->button_apply, FL_BLACK);
-}
+    if (!ob)
+       ob = class_->choice_doc_class;
 
-void FormDocument::EnableDocumentLayout()
-{
-        ActivateDocumentButtons ();
-       fl_activate_object (class_->radio_doc_indent);
-       fl_activate_object (class_->radio_doc_skip);
-       fl_activate_object (class_->choice_doc_class);
-       fl_activate_object (class_->choice_doc_pagestyle);
-       fl_activate_object (class_->choice_doc_fonts);
-       fl_activate_object (class_->choice_doc_fontsize);
-       fl_activate_object (class_->radio_doc_sides_one);
-       fl_activate_object (class_->radio_doc_sides_two);
-       fl_activate_object (class_->radio_doc_columns_one);
-       fl_activate_object (class_->radio_doc_columns_two);
-       fl_activate_object (class_->input_doc_extra);
-       fl_activate_object (class_->input_doc_skip);
-       fl_activate_object (class_->choice_doc_skip);
-       fl_activate_object (class_->choice_doc_spacing);
-       fl_activate_object (class_->input_doc_spacing);
-
-       fl_activate_object (language_->choice_language);
-       combo_language->activate();
-       fl_activate_object (language_->choice_language);
-       fl_activate_object (language_->choice_inputenc);
-
-       fl_activate_object (options_->slider_secnumdepth);
-       fl_activate_object (options_->slider_tocdepth);
-       fl_activate_object (options_->check_use_amsmath);
-       fl_activate_object (options_->input_float_placement);
-       fl_activate_object (options_->choice_postscript_driver);
-
-        fl_activate_object (paper_->choice_paperpackage);
-       fl_activate_object (paper_->greoup_radio_orientation);
-       fl_activate_object (paper_->radio_portrait);
-       fl_activate_object (paper_->radio_landscape);
-       fl_activate_object (paper_->choice_papersize2);
-       fl_activate_object (paper_->push_use_geometry);
-       fl_activate_object (paper_->input_custom_width);
-       fl_activate_object (paper_->input_custom_height);
-       fl_activate_object (paper_->input_top_margin);
-       fl_activate_object (paper_->input_bottom_margin);
-       fl_activate_object (paper_->input_left_margin);
-       fl_activate_object (paper_->input_right_margin);
-       fl_activate_object (paper_->input_head_height);
-       fl_activate_object (paper_->input_head_sep);
-       fl_activate_object (paper_->input_foot_skip);
-}
+    ProhibitInput(lv_->view());
 
-void FormDocument::DisableDocumentLayout()
-{
-        DeactivateDocumentButtons ();
-       fl_deactivate_object (class_->radio_doc_indent);
-       fl_deactivate_object (class_->radio_doc_skip);
-       fl_deactivate_object (class_->choice_doc_class);
-       fl_deactivate_object (class_->choice_doc_pagestyle);
-       fl_deactivate_object (class_->choice_doc_fonts);
-       fl_deactivate_object (class_->choice_doc_fontsize);
-       fl_deactivate_object (class_->radio_doc_sides_one);
-       fl_deactivate_object (class_->radio_doc_sides_two);
-       fl_deactivate_object (class_->radio_doc_columns_one);
-       fl_deactivate_object (class_->radio_doc_columns_two);
-       fl_deactivate_object (class_->input_doc_extra);
-       fl_deactivate_object (class_->input_doc_skip);
-       fl_deactivate_object (class_->choice_doc_skip);
-       fl_deactivate_object (class_->choice_doc_spacing);
-       fl_deactivate_object (class_->input_doc_spacing);
-
-       fl_deactivate_object (language_->choice_language);
-       combo_language->deactivate();
-       fl_deactivate_object (language_->choice_inputenc);
-
-       fl_deactivate_object (options_->slider_secnumdepth);
-       fl_deactivate_object (options_->slider_tocdepth);
-       fl_deactivate_object (options_->check_use_amsmath);
-       fl_deactivate_object (options_->input_float_placement);
-       fl_deactivate_object (options_->choice_postscript_driver);
-
-        fl_deactivate_object (paper_->choice_paperpackage);
-       fl_deactivate_object (paper_->greoup_radio_orientation);
-       fl_deactivate_object (paper_->radio_portrait);
-       fl_deactivate_object (paper_->radio_landscape);
-       fl_deactivate_object (paper_->choice_papersize2);
-       fl_deactivate_object (paper_->push_use_geometry);
-       fl_deactivate_object (paper_->input_custom_width);
-       fl_deactivate_object (paper_->input_custom_height);
-       fl_deactivate_object (paper_->input_top_margin);
-       fl_deactivate_object (paper_->input_bottom_margin);
-       fl_deactivate_object (paper_->input_left_margin);
-       fl_deactivate_object (paper_->input_right_margin);
-       fl_deactivate_object (paper_->input_head_height);
-       fl_deactivate_object (paper_->input_head_sep);
-       fl_deactivate_object (paper_->input_foot_skip);
+#ifdef USE_CLASS_COMBO
+    int tc = combo_doc_class->get() - 1;
+    string tct = combo_doc_class->getline();
+#else
+    int tc = fl_get_choice(ob) - 1;
+    string tct = fl_get_choice_text(ob);
+#endif
+    if (textclasslist.Load(tc)) {
+       if (AskQuestion(_("Should I set some parameters to"), tct,
+                       _("the defaults of this document class?"))) {
+           BufferParams & params = lv_->buffer()->params;
+
+           params.textclass = tc;
+           params.useClassDefaults();
+           UpdateLayoutDocument(params);
+       }
+    } else {
+       // unable to load new style
+       WriteAlert(_("Conversion Errors!"),
+                  _("Unable to switch to new document class."),
+                  _("Reverting to original document class."));
+#ifdef USE_CLASS_COMBO
+       combo_doc_class->select(int(lv_->buffer()->params.textclass) + 1);
+#else
+       fl_set_choice(class_->choice_doc_class, 
+                     lv_->buffer()->params.textclass + 1);
+#endif
+    }
+    AllowInput(lv_->view());
 }
 
-void FormDocument::SetDocumentClassChoice(vector<string> const & choices)
+
+void FormDocument::UpdateLayoutDocument(BufferParams const & params)
 {
-       vector<string>::const_iterator cit = choices.begin();
+    if (!dialog_)
+        return;
 
-       fl_clear_choice(class_->choice_doc_class);
-       for (; cit != choices.end(); ++cit)
-               fl_addto_choice(class_->choice_doc_class,(*cit).c_str());
+    checkReadOnly();
+    class_update(params);
+    paper_update(params);
+    language_update(params);
+    options_update(params);
+    bullets_update(params);
 }