try this for distinguishing inner and outer tabs

[lyx.git] / src / frontends / xforms / FormToc.C

diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index 8063ec4a67226cc62734d9f4d442d9e52ab6a111..39805699deb26a2d7eae8a897c48c412df793502 100644 (file)
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -19,18 +19,21 @@
 #endif
 
 
-#include "gettext.h"
 #include "Dialogs.h"
 #include "FormToc.h"
 #include "LyXView.h"
-#include "buffer.h"
 #include "form_toc.h"
 #include "lyxtext.h"
+#include "lyxfunc.h"
+#include "support/lstrings.h"
 
-static vector<Buffer::TocItem> toclist;
-
+// The current code uses the apply() for handling the Update button and the
+// type-of-table selection and cancel() for the close button.  This is a little
+// confusing to the button controller so I've made an IgnorantPolicy to cover
+// this situation since the dialog doesn't care about buttons. ARRae 20001013
 FormToc::FormToc(LyXView * lv, Dialogs * d)
-  : FormCommand(lv, d, _("Table of Contents")), dialog_(0)
+       : FormCommand(lv, d, _("Table of Contents"), new OkCancelPolicy),
+         dialog_(0)
 {
        // let the dialog be shown
        // These are permanent connections so we won't bother
@@ -42,55 +45,60 @@ FormToc::FormToc(LyXView * lv, Dialogs * d)
 
 FormToc::~FormToc()
 {
-       free();
        delete dialog_;
 }
 
 
+FL_FORM * FormToc::form() const
+{
+       if (dialog_ ) return dialog_->form;
+       return 0;
+}
+
+
+void FormToc::disconnect()
+{
+       toclist.clear();
+       FormCommand::disconnect();
+}
+
+
 void FormToc::build()
 {
        dialog_ = build_toc();
-       fl_addto_choice(dialog_->type,
+
+       fl_addto_choice(dialog_->choice_toc_type,
                        _(" TOC | LOF | LOT | LOA "));
-}
 
+       // Don't need to limit size of this dialog
+       // (but fixing min size is a GOOD thing).
+       // Workaround dumb xforms sizing bug
+       minw_ = form()->w;
+       minh_ = form()->h;
 
-FL_FORM * const FormToc::form() const
-{
-       if( dialog_ && dialog_->form_toc )
-               return dialog_->form_toc;
-       else
-               return 0;
+        // Manage the cancel/close button
+       bc_.setCancel(dialog_->button_cancel);
+       bc_.refresh();
 }
 
 
 void FormToc::update()
 {
-       static int ow = -1, oh;
-               
-       if (ow < 0) {
-               ow = form()->w;
-               oh = form()->h;
-
-               fl_set_form_minsize(form(), ow, oh);
-               fl_set_form_maxsize(form(), 2*ow, oh);
-       }
-
        Buffer::TocType type;
 
-       if( params.getCmdName() == "tableofcontents" )
+       if (params.getCmdName() == "tableofcontents" )
                type = Buffer::TOC_TOC;
 
-       else if( params.getCmdName() == "listofalgorithms" )
+       else if (params.getCmdName() == "listofalgorithms" )
                type = Buffer::TOC_LOA;
 
-       else if( params.getCmdName() == "listoffigures" )
+       else if (params.getCmdName() == "listoffigures" )
                type = Buffer::TOC_LOF;
 
        else
                type = Buffer::TOC_LOT;
        
-       fl_set_choice( dialog_->type, type+1 );
+       fl_set_choice( dialog_->choice_toc_type, type+1 );
 
        updateToc();
 }
@@ -100,14 +108,15 @@ void FormToc::updateToc()
 {
        if (!lv_->view()->available()) {
                toclist.clear();
-               fl_clear_browser( dialog_->browser );
-               fl_add_browser_line( dialog_->browser, _("*** No Document ***"));
+               fl_clear_browser( dialog_->browser_toc );
+               fl_add_browser_line( dialog_->browser_toc,
+                                    _("*** No Document ***"));
                return;
        }
 
        vector<vector<Buffer::TocItem> > tmp =
                lv_->view()->buffer()->getTocList();
-       int type = fl_get_choice( dialog_->type ) - 1;
+       int type = fl_get_choice( dialog_->choice_toc_type ) - 1;
 
        // Check if all elements are the same.
        if (toclist.size() == tmp[type].size()) {
@@ -126,36 +135,33 @@ void FormToc::updateToc()
        int topline = 0;
        int line = 0;
        if (buffer == lv_->view()->buffer()) {
-               topline = fl_get_browser_topline( dialog_->browser );
-               line = fl_get_browser( dialog_->browser );
+               topline = fl_get_browser_topline( dialog_->browser_toc );
+               line = fl_get_browser( dialog_->browser_toc );
        } else
                buffer = lv_->view()->buffer();
 
-       fl_clear_browser( dialog_->browser );
+       fl_clear_browser( dialog_->browser_toc );
 
        for (vector<Buffer::TocItem>::const_iterator it = toclist.begin();
             it != toclist.end(); ++it)
-               fl_add_browser_line( dialog_->browser,
-                                    (string(4*(*it).depth,' ')+(*it).str).c_str());
+               fl_add_browser_line( dialog_->browser_toc,
+                                    (string(4 * (*it).depth, ' ')
+                                     + (*it).str).c_str());
 
-       fl_set_browser_topline( dialog_->browser, topline );
-       fl_select_browser_line( dialog_->browser, line );
+       fl_set_browser_topline( dialog_->browser_toc, topline );
+       fl_select_browser_line( dialog_->browser_toc, line );
 }
 
  
-void FormToc::apply()
+bool FormToc::input(FL_OBJECT *, long)
 {
-       if (!lv_->view()->available())
-               return;
-
        updateToc();
 
-       unsigned int choice = fl_get_browser( dialog_->browser );
+       unsigned int const choice = fl_get_browser( dialog_->browser_toc );
        if (0 < choice && choice - 1 < toclist.size()) {
-               lv_->view()->beforeChange();
-               lv_->view()->text->SetCursor( lv_->view(), toclist[choice-1].par, 0 );
-               lv_->view()->text->sel_cursor = 
-                       lv_->view()->text->cursor;
-               lv_->view()->update(BufferView::SELECT|BufferView::FITCUR);
+               string const tmp = tostr(toclist[choice-1].par->id());
+               lv_->getLyXFunc()->Dispatch(LFUN_GOTO_PARAGRAPH, tmp);
        }
+
+       return true;
 }