mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-28 20:45:47 +00:00
updates and fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@793 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
2f08c88821
commit
1cbc74d5df
20
ChangeLog
20
ChangeLog
@ -1,3 +1,23 @@
|
||||
2000-06-06 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* lib/bind/de_menus.bind: updated
|
||||
|
||||
2000-06-05 Dekel Tsur <dekel@math.tau.ac.il>
|
||||
|
||||
* forms/lyx.fd: Correct gravity for objects in form_toc and form_ref
|
||||
|
||||
2000-06-05 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/bufferlist.C (close): test of buf->getuser() == NULL
|
||||
2000-06-05 Dekel Tsur <dekel@math.tau.ac.il>
|
||||
|
||||
* src/menus.C (Limit_string_length): New function
|
||||
(ShowTocMenu): Limit the number of items/length of items in the
|
||||
LOT/LOF/LOA menus.
|
||||
|
||||
* src/paragraph.C (String): Correct result for a paragraph inside
|
||||
a footnote.
|
||||
|
||||
2000-06-05 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/bufferlist.C (close): test of buf->getuser() == NULL
|
||||
|
||||
28
forms/lyx.fd
28
forms/lyx.fd
@ -492,8 +492,8 @@ size: FL_DEFAULT_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Type|Tt#t
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthEast FL_SouthEast
|
||||
name: toctype
|
||||
callback: TocUpdateCB
|
||||
argument: 0
|
||||
@ -553,7 +553,7 @@ lcol: FL_BLACK
|
||||
label: Update|#U
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthEast FL_SouthEast
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name:
|
||||
callback: RefUpdateCB
|
||||
argument: 0
|
||||
@ -571,7 +571,7 @@ lcol: FL_BLACK
|
||||
label: Close|#C^[
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthEast FL_SouthEast
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name:
|
||||
callback: RefHideCB
|
||||
argument: 0
|
||||
@ -589,7 +589,7 @@ lcol: FL_BLACK
|
||||
label: Insert Reference|#I^M
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: ref
|
||||
callback: RefSelectCB
|
||||
argument: 0
|
||||
@ -607,7 +607,7 @@ lcol: FL_BLACK
|
||||
label: Insert Page Number|#P
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: pageref
|
||||
callback: RefSelectCB
|
||||
argument: 1
|
||||
@ -625,7 +625,7 @@ lcol: FL_BLACK
|
||||
label: Go to Reference|#G
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: gotoref
|
||||
callback: RefSelectCB
|
||||
argument: 5
|
||||
@ -643,7 +643,7 @@ lcol: FL_BLACK
|
||||
label: Name|#N
|
||||
shortcut:
|
||||
resize: FL_RESIZE_X
|
||||
gravity: FL_SouthWest FL_SouthEast
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: ref_name
|
||||
callback:
|
||||
argument:
|
||||
@ -660,8 +660,8 @@ size: FL_NORMAL_SIZE
|
||||
lcol: FL_BLACK
|
||||
label: Sort keys|#S
|
||||
shortcut:
|
||||
resize: FL_RESIZE_ALL
|
||||
gravity: FL_NoGravity FL_NoGravity
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthEast FL_SouthEast
|
||||
name: sort
|
||||
callback: RefUpdateCB
|
||||
argument: 0
|
||||
@ -680,7 +680,7 @@ lcol: FL_BLACK
|
||||
label: Insert vReference|#V
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: vref
|
||||
callback: RefSelectCB
|
||||
argument: 2
|
||||
@ -698,7 +698,7 @@ lcol: FL_BLACK
|
||||
label: Insert vPage Number|#N
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: vpageref
|
||||
callback: RefSelectCB
|
||||
argument: 3
|
||||
@ -716,7 +716,7 @@ lcol: FL_BLACK
|
||||
label: Insert Pretty Ref|#T
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: prettyref
|
||||
callback: RefSelectCB
|
||||
argument: 4
|
||||
@ -734,7 +734,7 @@ lcol: FL_BLACK
|
||||
label: Go Back|#B
|
||||
shortcut:
|
||||
resize: FL_RESIZE_NONE
|
||||
gravity: FL_SouthWest FL_SouthWest
|
||||
gravity: FL_NorthEast FL_NorthEast
|
||||
name: back
|
||||
callback: RefSelectCB
|
||||
argument: 6
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
#
|
||||
\bind "F10 d" "menu-open Datei"
|
||||
\bind "F10 b" "menu-open Bearbeiten"
|
||||
\bind "F10 i" "menu-open Inhalt"
|
||||
\bind "F10 r" "menu-open Referenzen"
|
||||
\bind "F10 l" "menu-open Layout"
|
||||
\bind "F10 e" "menu-open Einfügen"
|
||||
\bind "F10 m" "menu-open Mathematik"
|
||||
@ -61,6 +63,7 @@
|
||||
\bind "M-d m a" "buffer-import ascii"
|
||||
\bind "M-d m t" "buffer-import asciiparagraph"
|
||||
\bind "M-d m n" "buffer-import noweb"
|
||||
\bind "M-d m d" "buffer-import linuxdoc"
|
||||
\bind "M-d e l" "buffer-export latex"
|
||||
\bind "M-d e d" "buffer-export dvi"
|
||||
\bind "M-d e p" "buffer-export postscript"
|
||||
@ -92,6 +95,17 @@
|
||||
\bind "M-b space" "menu-open Bearbeiten"
|
||||
\bind "M-b z" "line-delete-forward"
|
||||
|
||||
#
|
||||
# Menue Inhalt
|
||||
#
|
||||
\bind "M-i" "menu-open Inhalt"
|
||||
|
||||
#
|
||||
# Menue Referenzen
|
||||
#
|
||||
\bind "M-r" "menu-open Referenzen"
|
||||
|
||||
|
||||
#
|
||||
# Menue Layout
|
||||
#
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2000-06-06 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* de.po: updated
|
||||
|
||||
2000-06-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* fi.po: update from Pauli Virtanen
|
||||
|
||||
29
src/lyx.C
29
src/lyx.C
@ -14,8 +14,8 @@ FD_form_title *create_form_form_title(void)
|
||||
FL_OBJECT *obj;
|
||||
FD_form_title *fdui = (FD_form_title *) fl_calloc(1, sizeof(FD_form_title));
|
||||
|
||||
fdui->form_title = fl_bgn_form(FL_NO_BOX, 425, 290);
|
||||
obj = fl_add_box(FL_UP_BOX, 0, 0, 425, 290, "");
|
||||
fdui->form_title = fl_bgn_form(FL_NO_BOX, 420, 290);
|
||||
obj = fl_add_box(FL_UP_BOX, 0, 0, 420, 290, "");
|
||||
fl_set_object_color(obj, FL_BLACK, FL_TOP_BCOL);
|
||||
fdui->timer_title = obj = fl_add_timer(FL_HIDDEN_TIMER, 110, 170, 190, 60, "");
|
||||
fl_set_object_callback(obj, TimerCB, 0);
|
||||
@ -130,8 +130,9 @@ FD_form_toc *create_form_form_toc(void)
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
|
||||
fl_set_object_callback(obj, TocUpdateCB, 0);
|
||||
fdui->toctype = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|Tt#t")));fl_set_button_shortcut(obj,scex(_("Type|Tt#t")),1);
|
||||
fdui->toctype = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|Tt#t")));fl_set_button_shortcut(obj, scex(_("Type|Tt#t")), 1);
|
||||
fl_set_object_boxtype(obj, FL_FRAME_BOX);
|
||||
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
|
||||
fl_set_object_callback(obj, TocUpdateCB, 0);
|
||||
fl_end_form();
|
||||
|
||||
@ -153,46 +154,46 @@ FD_form_ref *create_form_form_ref(void)
|
||||
fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
|
||||
obj = fl_add_button(FL_NORMAL_BUTTON, 480, 60, 100, 30, idex(_("Update|#U")));fl_set_button_shortcut(obj, scex(_("Update|#U")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefUpdateCB, 0);
|
||||
obj = fl_add_button(FL_NORMAL_BUTTON, 480, 100, 100, 30, idex(_("Close|#C^[")));fl_set_button_shortcut(obj, scex(_("Close|#C^[")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefHideCB, 0);
|
||||
fdui->ref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 60, 160, 30, idex(_("Insert Reference|#I^M")));fl_set_button_shortcut(obj, scex(_("Insert Reference|#I^M")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 0);
|
||||
fdui->pageref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 100, 160, 30, idex(_("Insert Page Number|#P")));fl_set_button_shortcut(obj, scex(_("Insert Page Number|#P")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 1);
|
||||
fdui->gotoref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 280, 160, 30, idex(_("Go to Reference|#G")));fl_set_button_shortcut(obj, scex(_("Go to Reference|#G")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 5);
|
||||
fdui->ref_name = obj = fl_add_input(FL_NORMAL_INPUT, 380, 20, 200, 30, idex(_("Name|#N")));fl_set_button_shortcut(obj, scex(_("Name|#N")), 1);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast);
|
||||
fl_set_object_resize(obj, FL_RESIZE_X);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 310, 360, 110, 30, idex(_("Sort keys|#S")));fl_set_button_shortcut(obj, scex(_("Sort keys|#S")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
|
||||
fl_set_object_callback(obj, RefUpdateCB, 0);
|
||||
fl_set_button(obj, 1);
|
||||
fdui->vref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 140, 160, 30, idex(_("Insert vReference|#V")));fl_set_button_shortcut(obj, scex(_("Insert vReference|#V")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 2);
|
||||
fdui->vpageref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 180, 160, 30, idex(_("Insert vPage Number|#N")));fl_set_button_shortcut(obj, scex(_("Insert vPage Number|#N")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 3);
|
||||
fdui->prettyref = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 220, 160, 30, idex(_("Insert Pretty Ref|#T")));fl_set_button_shortcut(obj, scex(_("Insert Pretty Ref|#T")), 1);
|
||||
fl_set_object_lsize(obj, FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj, RefSelectCB, 4);
|
||||
fdui->back = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 320, 160, 30, idex(_("Go Back|#B")));fl_set_button_shortcut(obj,scex(_("Go Back|#B")), 1);
|
||||
fl_set_object_lsize(obj,FL_NORMAL_SIZE);
|
||||
fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
|
||||
fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
|
||||
fl_set_object_callback(obj,RefSelectCB, 6);
|
||||
fl_end_form();
|
||||
|
||||
|
||||
39
src/menus.C
39
src/menus.C
@ -55,6 +55,7 @@
|
||||
using std::vector;
|
||||
using std::endl;
|
||||
using std::max;
|
||||
using std::min;
|
||||
using std::sort;
|
||||
|
||||
extern FD_form_screen * fd_form_screen;
|
||||
@ -1283,21 +1284,27 @@ void Menus::ShowEditMenu(FL_OBJECT * ob, long)
|
||||
}
|
||||
|
||||
vector<int>::size_type const max_number_of_menus = 32;
|
||||
unsigned int const max_number_of_items = 25;
|
||||
|
||||
string Limit_string_length(string const & str) {
|
||||
string::size_type const max_item_length = 45;
|
||||
|
||||
if (str.size() > max_item_length)
|
||||
return str.substr(0, max_item_length-3) + "...";
|
||||
else
|
||||
return str;
|
||||
}
|
||||
|
||||
void Add_to_toc_menu(vector<Buffer::TocItem> const & toclist,
|
||||
unsigned int from, unsigned int to, int depth,
|
||||
int menu, vector<int> & menus, FL_OBJECT * ob)
|
||||
{
|
||||
unsigned int const max_number_of_items = 25;
|
||||
string::size_type const max_item_length = 45;
|
||||
if (to - from <= max_number_of_items) {
|
||||
for (unsigned int i = from; i < to; ++i) {
|
||||
string entry(4 * max(0, toclist[i].depth - depth),' ');
|
||||
entry += toclist[i].str;
|
||||
if (entry.size() > max_item_length)
|
||||
entry = entry.substr(0, max_item_length-3) + "...";
|
||||
entry += "%x";
|
||||
entry += tostr(i + 1);
|
||||
entry = Limit_string_length(entry);
|
||||
entry += "%x" + tostr(i + 1);
|
||||
fl_addtopup(menu, entry.c_str());
|
||||
}
|
||||
} else {
|
||||
@ -1316,8 +1323,7 @@ void Add_to_toc_menu(vector<Buffer::TocItem> const & toclist,
|
||||
|
||||
string entry(4 * max(0, toclist[pos].depth - depth), ' ');
|
||||
entry += toclist[pos].str;
|
||||
if (entry.size() > max_item_length)
|
||||
entry = entry.substr(0, max_item_length-3) + "...";
|
||||
entry = Limit_string_length(entry);
|
||||
|
||||
if (new_pos == pos + 1) {
|
||||
entry += "%x";
|
||||
@ -1372,10 +1378,15 @@ void Menus::ShowTocMenu(FL_OBJECT * ob, long)
|
||||
if (!toclist[j].empty()) {
|
||||
int menu2 = fl_newpup(FL_ObjWin(ob));
|
||||
menus.push_back(menu2);
|
||||
for (unsigned int i = 0; i < toclist[j].size(); ++i)
|
||||
fl_addtopup(menu2,
|
||||
(toclist[j][i].str + "%x"
|
||||
+ tostr(i+1+j*BIG_NUM)).c_str());
|
||||
for (unsigned int i = 0; i < toclist[j].size(); ++i) {
|
||||
if (i > max_number_of_items) {
|
||||
fl_addtopup(menu2, ". . .%d");
|
||||
break;
|
||||
}
|
||||
string entry = Limit_string_length(toclist[j][i].str);
|
||||
entry += "%x" + tostr(i+1+j*BIG_NUM);
|
||||
fl_addtopup(menu2, entry.c_str());
|
||||
}
|
||||
if (j == max_nonempty) {
|
||||
string tmp = _(MenuNames[j-1]);
|
||||
tmp += "%l";
|
||||
@ -1437,8 +1448,8 @@ void Add_to_refs_menu(vector<string> const & label_list, int offset,
|
||||
fl_addtopup(menu, ". . .%d");
|
||||
break;
|
||||
}
|
||||
size_type j = std::min(label_list.size(),
|
||||
i+max_number_of_items2);
|
||||
size_type j = min(label_list.size(),
|
||||
i+max_number_of_items2);
|
||||
|
||||
string entry;
|
||||
if (label_list[i].size() > max_item_length2)
|
||||
|
||||
@ -4314,7 +4314,8 @@ string LyXParagraph::String(bool label)
|
||||
}
|
||||
}
|
||||
|
||||
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
|
||||
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
|
||||
footnoteflag == LyXParagraph::NO_FOOTNOTE)
|
||||
s += NextAfterFootnote()->String(false);
|
||||
|
||||
if (!IsDummy()) {
|
||||
|
||||
@ -662,7 +662,7 @@ bool RunSpellChecker(BufferView * bv)
|
||||
"Check /usr/lib/ispell or set another\n"
|
||||
"dictionary in the Spellchecker Options menu."), "", "");
|
||||
fclose(out);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Put ispell in terse mode to improve speed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user