#include "vspace.h"
#include "bmtable.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include "language.h"
#include "LyXView.h"
#include "BufferView.h"
#include "CutAndPaste.h"
#include "bufferview_funcs.h"
#include "xforms_helpers.h"
+#include "debug.h"
using Liason::setMinibuffer;
using SigC::slot;
for (LyXTextClassList::const_iterator cit = textclasslist.begin();
cit != textclasslist.end(); ++cit)
{
- combo_doc_class->addto((*cit).description());
+ combo_doc_class->addto(cit->description());
}
fl_addto_choice(class_->choice_doc_spacing,
for (Languages::const_iterator cit = languages.begin();
cit != languages.end(); ++cit) {
- combo_language->addto((*cit).second.lang());
+ combo_language->addto(cit->second.lang());
}
fl_addto_choice(language_->choice_quotes_language,
" «text» | »text« "));
bc().addReadOnly (language_->choice_inputenc);
+ bc().addReadOnly (language_->choice_quotes_language);
+ bc().addReadOnly (language_->radio_single);
+ bc().addReadOnly (language_->radio_double);
// the document options form
options_.reset(build_doc_options());
for (n=0; tex_graphics[n][0]; ++n) {
fl_addto_choice(options_->choice_postscript_driver, tex_graphics[n]);
}
+ fl_addto_choice(options_->choice_citation_format,
+ _(" Author-year | Numerical "));
- 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);
+ bc_.addReadOnly (options_->slider_secnumdepth);
+ bc_.addReadOnly (options_->slider_tocdepth);
+ bc_.addReadOnly (options_->check_use_amsmath);
+ bc_.addReadOnly (options_->check_use_natbib);
+ bc_.addReadOnly (options_->choice_citation_format);
+ bc_.addReadOnly (options_->input_float_placement);
+ bc_.addReadOnly (options_->choice_postscript_driver);
// the document bullets form
bullets_.reset(build_doc_bullet());
bc().addReadOnly (bullets_->bmtable_bullet_panel);
bc().addReadOnly (bullets_->choice_bullet_size);
bc().addReadOnly (bullets_->input_bullet_latex);
+ bc().addReadOnly (bullets_->radio_bullet_depth);
+ bc().addReadOnly (bullets_->radio_bullet_panel);
fl_addto_tabfolder(dialog_->tabbed_folder,_("Document"),
class_->form);
// successfully loaded
redo = true;
setMinibuffer(lv_, _("Converting document to new document class..."));
- CutAndPaste cap;
- int ret = cap.SwitchLayoutsBetweenClasses(
+ int ret = CutAndPaste::SwitchLayoutsBetweenClasses(
params.textclass, new_class,
lv_->buffer()->paragraph);
if (ret) {
if (old_language != new_language
&& old_language->RightToLeft() == new_language->RightToLeft()
&& !lv_->buffer()->isMultiLingual())
- lv_->buffer()->ChangeLanguage(old_language, new_language);
+ lv_->buffer()->changeLanguage(old_language, new_language);
if (old_language != new_language) {
redo = true;
}
params.graphicsDriver =
fl_get_choice_text(options_->choice_postscript_driver);
params.use_amsmath = fl_get_button(options_->check_use_amsmath);
+ params.use_natbib = fl_get_button(options_->check_use_natbib);
+ params.use_numerical_citations =
+ fl_get_choice(options_->choice_citation_format)-1;
int tmpchar = int(fl_get_counter_value(options_->slider_secnumdepth));
if (params.secnumdepth != tmpchar)
fl_set_choice_text(options_->choice_postscript_driver,
params.graphicsDriver.c_str());
fl_set_button(options_->check_use_amsmath, params.use_amsmath);
+ fl_set_button(options_->check_use_natbib, params.use_natbib);
+ fl_set_choice(options_->choice_citation_format,
+ int(params.use_numerical_citations)+1);
fl_set_counter_value(options_->slider_secnumdepth, params.secnumdepth);
fl_set_counter_value(options_->slider_tocdepth, params.tocdepth);
if (!params.float_placement.empty())
if (!ob)
ob = class_->choice_doc_class;
- ProhibitInput(lv_->view());
+ lv_->prohibitInput();
unsigned int tc = combo_doc_class->get() - 1;
if (textclasslist.Load(tc)) {
_("Reverting to original document class."));
combo_doc_class->select(int(lv_->buffer()->params.textclass) + 1);
}
- AllowInput(lv_->view());
+ lv_->allowInput();
}