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 2191473c4f217a54fc993d9b41c01e1c0058a2bc..39805699deb26a2d7eae8a897c48c412df793502 100644 (file)
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -32,7 +32,7 @@
 // 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"), new IgnorantPolicy),
+       : FormCommand(lv, d, _("Table of Contents"), new OkCancelPolicy),
          dialog_(0)
 {
        // let the dialog be shown
@@ -51,7 +51,7 @@ FormToc::~FormToc()
 
 FL_FORM * FormToc::form() const
 {
-       if ( dialog_ ) return dialog_->form;
+       if (dialog_ ) return dialog_->form;
        return 0;
 }
 
@@ -67,7 +67,7 @@ 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
@@ -75,27 +75,30 @@ void FormToc::build()
        // Workaround dumb xforms sizing bug
        minw_ = form()->w;
        minh_ = form()->h;
+
+        // Manage the cancel/close button
+       bc_.setCancel(dialog_->button_cancel);
+       bc_.refresh();
 }
 
 
-// we can safely ignore the parameter because we can always update
-void FormToc::update(bool)
+void FormToc::update()
 {
        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();
 }
@@ -105,15 +108,15 @@ void FormToc::updateToc()
 {
        if (!lv_->view()->available()) {
                toclist.clear();
-               fl_clear_browser( dialog_->browser );
-               fl_add_browser_line( dialog_->browser,
+               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()) {
@@ -132,34 +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,
+               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 const choice = fl_get_browser( dialog_->browser );
+       unsigned int const choice = fl_get_browser( dialog_->browser_toc );
        if (0 < choice && choice - 1 < toclist.size()) {
                string const tmp = tostr(toclist[choice-1].par->id());
                lv_->getLyXFunc()->Dispatch(LFUN_GOTO_PARAGRAPH, tmp);
        }
+
+       return true;
 }