anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 02:28:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes in FormRef.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_1_6@1360 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2001-01-21 20:13:54 +00:00
parent 9da4773a37
commit 94e3081b08
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,8 +1,12 @@
2001-01-21 Dekel Tsur <dekelts@tau.ac.il> 2001-01-21 Dekel Tsur <dekelts@tau.ac.il>
* src/frontends/xforms/FormRef.C (update): Do not update * src/frontends/xforms/FormRef.C (update): Do not update
dialog_->type if inset_ == 0. dialog_->{ref,name,type} if inset_ == 0.
Deactivate the type button when buffer is LinuxDoc/Docbook
(build): Uncomment calls to addReadOnly().
(updateBrowser) Do not disable the update button when there are no
keys.
2001-01-20 Dekel Tsur <dekelts@tau.ac.il> 2001-01-20 Dekel Tsur <dekelts@tau.ac.il>
* lib/languages: Add extra_options field. It is used to fix the ~n * lib/languages: Add extra_options field. It is used to fix the ~n

42
src/frontends/xforms/FormRef.C
View File

@ -85,26 +85,37 @@ void FormRef::build()
bc_.setUndoAll(dialog_->button_restore); bc_.setUndoAll(dialog_->button_restore);
bc_.refresh(); bc_.refresh();
bc_.addReadOnly(dialog_->type); #warning I had to uncomment this so the buttons could be disabled in update() (dekel)
bc_.addReadOnly(dialog_->name); //bc_.addReadOnly(dialog_->type);
//bc_.addReadOnly(dialog_->name);
} }
void FormRef::update() void FormRef::update()
{ {
fl_set_input(dialog_->ref, params.getContents().c_str()); if (inset_) {
fl_set_input(dialog_->name, params.getOptions().c_str()); fl_set_input(dialog_->ref, params.getContents().c_str());
fl_set_input(dialog_->name, params.getOptions().c_str());
if (inset_)
fl_set_choice(dialog_->type, getType()+1); fl_set_choice(dialog_->type, getType()+1);
}
toggle = GOBACK; toggle = GOBACK;
fl_set_object_label(dialog_->button_go, _("Goto reference")); fl_set_object_label(dialog_->button_go, _("Goto reference"));
// Name is irrelevant to LaTeX documents // Name is irrelevant to LaTeX/Literate documents, while
if (lv_->buffer()->isLatex()) { // type is irrelevant to LinuxDoc/DocBook.
if (lv_->buffer()->isLatex() || lv_->buffer()->isLatex()) {
fl_deactivate_object(dialog_->name); fl_deactivate_object(dialog_->name);
fl_set_object_lcol(dialog_->name, FL_INACTIVE); fl_set_object_lcol(dialog_->name, FL_INACTIVE);
fl_activate_object(dialog_->type);
fl_set_object_lcol(dialog_->type, FL_BLACK);
} else {
fl_set_choice(dialog_->type, REF+1);
fl_activate_object(dialog_->name);
fl_set_object_lcol(dialog_->name, FL_BLACK);
fl_deactivate_object(dialog_->type);
fl_set_object_lcol(dialog_->type, FL_INACTIVE);
} }
refs = lv_->buffer()->getLabelList(); refs = lv_->buffer()->getLabelList();
@ -130,29 +141,24 @@ void FormRef::updateBrowser(vector<string> const & akeys) const
_("*** No labels found in document ***")); _("*** No labels found in document ***"));
fl_deactivate_object(dialog_->browser); fl_deactivate_object(dialog_->browser);
fl_deactivate_object(dialog_->button_update);
fl_deactivate_object(dialog_->sort); fl_deactivate_object(dialog_->sort);
fl_set_object_lcol(dialog_->browser, FL_INACTIVE); fl_set_object_lcol(dialog_->browser, FL_INACTIVE);
fl_set_object_lcol(dialog_->button_update, FL_INACTIVE);
fl_set_object_lcol(dialog_->sort, FL_INACTIVE); fl_set_object_lcol(dialog_->sort, FL_INACTIVE);
} else { } else {
fl_set_browser_topline(dialog_->browser, 1);
fl_activate_object(dialog_->browser); fl_activate_object(dialog_->browser);
fl_set_object_lcol(dialog_->browser, FL_BLACK); fl_set_object_lcol(dialog_->browser, FL_BLACK);
fl_activate_object(dialog_->button_update);
fl_set_object_lcol(dialog_->button_update, FL_BLACK);
fl_activate_object(dialog_->sort); fl_activate_object(dialog_->sort);
fl_set_object_lcol(dialog_->sort, FL_BLACK); fl_set_object_lcol(dialog_->sort, FL_BLACK);
string ref = fl_get_input(dialog_->ref); string ref = fl_get_input(dialog_->ref);
vector<string>::const_iterator cit = vector<string>::const_iterator cit =
find(keys.begin(), keys.end(), ref); find(keys.begin(), keys.end(), ref);
if (cit == keys.end())
cit = keys.begin();
if (cit != keys.end()) { int const i = static_cast<int>(cit - keys.begin());
int const i = static_cast<int>(cit - keys.begin()); fl_set_browser_topline(dialog_->browser, max(i-5, 1));
fl_set_browser_topline(dialog_->browser, max(i-5, 1)); fl_select_browser_line(dialog_->browser, i+1);
fl_select_browser_line(dialog_->browser, i+1);
}
} }
} }