anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 21:55:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Insets cleanup patch from Angus

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1127 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-10-17 09:14:34 +00:00
parent f3faff0d31
commit 62e038c594
13 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ChangeLog
View File

@ -1,9 +1,40 @@
2000-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
2000-10-17 Angus Leeming <a.leeming@ic.ac.uk>
* lib/CREDITS: clean up
2000-10-16 Angus Leeming <a.leeming@ic.ac.uk>
* src/combox.[Ch] (select): changed argument back to int
* src/combox.C (peek_event): removed num_bytes as it is declared but
never referenced.
* src/frontends/xforms/FormDocument.C (class_apply, bullets_apply):
modified calls to Combox::select() to remove warnings about type
conversion.
* src/insets/insetbutton.C (width): explicit cast to remove warning
about type conversion.
* src/insets/insetcite.C (getScreenLabel): use string::size_type not
size_t.
* src/insets/insettabular.[Ch]: variables inset_pos, sel_pos_start and
sel_pos_end, refering to cursor position are changed to
LyXParagraph::size_type.
* src/insets/insettext.h (cpos): returns LyXParagraph::size_type,
consistent with LyXCursor::pos().
(inset_pos): changed to LyXParagraph::size_type for same reason.
* src/insets/insettext.C (resizeLyXText): changed some temporary
variables refing to cursor position to LyXParagraph::size_type.
2000-10-16 John Levon <moz@compsoc.man.ac.uk>
* src/frontends/kde/<various>: The Great Renaming,
add FormParagraph
2000-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/frontends/support/Makefile.am (EXTRA_DIST): re-fix.
@ -77,7 +108,7 @@
2000-10-13 Dekel Tsur <dekelts@tau.ac.il>
* src/text.C (GetColumnNearX): Fixed disabled code.
2000-10-13 Lars Gullik Bjønnes <larsbj@lyx.org>
* configure.in (CPPFLAGS): add snprintf and vsnprintf to
@ -961,7 +992,7 @@
* src/insets/insetbutton.C (width): Changed to work with no GUI.
* src/insets/insetbib.C (bibitemWidest): ditto.
* src/lyx_gui_misc.C (AskQuestion,AskConfirmation,askForText): ditto.
2000-10-03 Juergen Vigna <jug@sad.it>
* src/BufferView2.C (theLockingInset): removed const because of
@ -1917,7 +1948,7 @@
* src/frontends/xforms/Toolbar_pimpl.C:
* src/lyx_cb.C (LayoutsCB): added Combox * to function call.
2000-09-14 Garst Reese <reese@isn.net>
2000-09-14 Garst Reese <reese@isn.net>
* lib/tex/hollywood.cls changed length of parenthicals to 1.5in
moved usepackage{xxx}'s to beginning of file. Changed left margin
@ -4448,7 +4479,7 @@
* src/lyxrc.C, src/lyxrc.h, src/BufferView_pimpl.C,
lib/lyxrc.example: added option \wheel_jump
2000-07-04 R. Lahaye <lahaye@postech.ac.kr>
2000-07-04 R. Lahaye <lahaye@postech.ac.kr>
* src/lyx_gui.C src/lyx_main.C: add support for -geometry, and
remove support for -width,-height,-xpos and -ypos.

4
lib/CREDITS
View File

@ -114,7 +114,7 @@
@bJohn Levon
@iE-mail moz@compsoc.man.ac.uk
KDE port
@bJose' Matos
@bJosé Matos
@iE-mail: jamatos@novalis.fc.up.pt
linuxdoc sgml support
@bTino Meinen
@ -171,7 +171,7 @@
@bAndre Spiegel
@iE-mail: spiegel@inf.fu-berlin.de
vertical spaces
@bDavid Sua'rez de Lis
@bDavid Suárez de Lis
@iE-mail: excalibor@iname.com
maintaining es.po since v1.0.0 and other small i18n issues
small fixes (some work, others didn't)

22
po/POTFILES.in
View File

@ -24,20 +24,28 @@ src/frontends/gnome/FormRef.C
src/frontends/gnome/FormToc.C
src/frontends/gnome/FormUrl.C
src/frontends/gnome/Menubar_pimpl.C
src/frontends/kde/citationdlg.C
src/frontends/kde/copyrightdlgdata.C
src/frontends/kde/FormCitation.C
src/frontends/kde/formcitationdialog.C
src/frontends/kde/FormCopyright.C
src/frontends/kde/formcopyrightdialogdata.C
src/frontends/kde/FormIndex.C
src/frontends/kde/formindexdialog.C
src/frontends/kde/FormParagraph.C
src/frontends/kde/FormPrint.C
src/frontends/kde/formprintdialogdata.C
src/frontends/kde/FormRef.C
src/frontends/kde/formrefdialog.C
src/frontends/kde/FormToc.C
src/frontends/kde/formtocdialog.C
src/frontends/kde/FormUrl.C
src/frontends/kde/formurldialog.C
src/frontends/kde/indexdlg.C
src/frontends/kde/indexdlgdata.C
src/frontends/kde/paradlg.C
src/frontends/kde/paraextradlg.C
src/frontends/kde/paraextradlgdata.C
src/frontends/kde/parageneraldlg.C
src/frontends/kde/parageneraldlgdata.C
src/frontends/kde/printdlg.C
src/frontends/kde/printdlgdata.C
src/frontends/kde/refdlg.C
src/frontends/kde/tocdlg.C
src/frontends/kde/urldlg.C
src/frontends/xforms/FormBase.h
src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_citation.C

7
src/combox.C
View File

@ -142,7 +142,7 @@ bool Combox::select_text(string const & t)
}
void Combox::select(size_t i)
void Combox::select(int i)
{
if (!browser || !button) return;
if (i > 0 && i <= fl_get_browser_maxline(browser)) sel = i;
@ -391,10 +391,9 @@ int Combox::peek_event(FL_FORM * form, void * xev)
if (static_cast<XEvent*>(xev)->type != KeyPress) return 0;
char s_r[10]; s_r[9] = '\0';
static int num_bytes;
KeySym keysym_return;
num_bytes = XLookupString(&static_cast<XEvent*>(xev)->xkey, s_r, 10,
&keysym_return, 0);
XLookupString(&static_cast<XEvent*>(xev)->xkey, s_r, 10,
&keysym_return, 0);
XFlush(fl_get_display());
switch (keysym_return) {
case XK_Down:

2
src/combox.h
View File

@ -75,7 +75,7 @@ public:
string const getline() const;
/// Select an arbitrary item
void select(size_t);
void select(int);
///
bool select_text(string const &);

4
src/frontends/xforms/FormDocument.C
View File

@ -425,7 +425,7 @@ bool FormDocument::class_apply()
_("Errors loading new document class."),
_("Reverting to original document class."));
#ifdef USE_CLASS_COMBO
combo_doc_class->select(params.textclass + 1);
combo_doc_class->select(int(params.textclass) + 1);
#else
fl_set_choice(class_->choice_doc_class,
params.textclass + 1);
@ -1081,7 +1081,7 @@ void FormDocument::CheckChoiceClass(FL_OBJECT * ob, long)
_("Unable to switch to new document class."),
_("Reverting to original document class."));
#ifdef USE_CLASS_COMBO
combo_doc_class->select(lv_->buffer()->params.textclass + 1);
combo_doc_class->select(int(lv_->buffer()->params.textclass) + 1);
#else
fl_set_choice(class_->choice_doc_class,
lv_->buffer()->params.textclass + 1);

4
src/insets/Makefile.am
View File

@ -72,10 +72,10 @@ libinsets_la_SOURCES = \
insetspecialchar.h \
insettabular.C \
insettabular.h \
insettheorem.C \
insettheorem.h \
insettext.C \
insettext.h \
insettheorem.C \
insettheorem.h \
insettoc.C \
insettoc.h \
inseturl.C \

2
src/insets/insetbutton.C
View File

@ -71,7 +71,7 @@ int InsetButton::width(BufferView * bv, LyXFont const &) const
int width, ascent, descent;
string s = getScreenLabel();
if (!bv)
return s.length();
int(s.length());
if (Editable()) {
bv->painter().buttonText(0, 0, s, font,

4
src/insets/insetcite.C
View File

@ -34,12 +34,12 @@ string const InsetCitation::getScreenLabel() const
// Final comma allows while loop to cover all keys
keys = frontStrip(split(keys, label, ',')) + ",";
size_t const maxSize = 40;
string::size_type const maxSize = 40;
while (contains( keys, "," )) {
string key;
keys = frontStrip(split(keys, key, ','));
size_t size = label.size() + 2 + key.size();
string::size_type size = label.size() + 2 + key.size();
if( size >= maxSize ) {
label += ", ...";
break;

2
src/insets/insettabular.C
View File

@ -660,7 +660,7 @@ void InsetTabular::InsetMotionNotify(BufferView * bv, int x, int y, int button)
}
if (!no_selection) {
HideInsetCursor(bv);
int const old_pos = sel_pos_end;
LyXParagraph::size_type const old_pos = sel_pos_end;
int const old_cell = actcell;
setPos(bv, x, y);

6
src/insets/insettabular.h
View File

@ -241,15 +241,15 @@ private:
///
mutable LyXCursor old_cursor;
///
mutable int inset_pos;
mutable LyXParagraph::size_type inset_pos;
///
mutable unsigned int inset_x;
///
mutable unsigned int inset_y;
///
mutable int sel_pos_start;
mutable LyXParagraph::size_type sel_pos_start;
///
mutable int sel_pos_end;
mutable LyXParagraph::size_type sel_pos_end;
///
mutable int sel_cell_start;
///

8
src/insets/insettext.C
View File

@ -1422,7 +1422,7 @@ int InsetText::cy(BufferView * bv) const
}
int InsetText::cpos(BufferView * bv) const
LyXParagraph::size_type InsetText::cpos(BufferView * bv) const
{
return TEXT(bv)->cursor.pos();
}
@ -1480,9 +1480,9 @@ void InsetText::resizeLyXText(BufferView * bv) const
LyXParagraph * lpar = 0;
LyXParagraph * selstartpar = 0;
LyXParagraph * selendpar = 0;
int pos = 0;
int selstartpos = 0;
int selendpos = 0;
LyXParagraph::size_type pos = 0;
LyXParagraph::size_type selstartpos = 0;
LyXParagraph::size_type selendpos = 0;
int selection = 0;
int mark_set = 0;

4
src/insets/insettext.h
View File

@ -225,7 +225,7 @@ private:
///
int cy(BufferView *) const;
///
int cpos(BufferView *) const;
LyXParagraph::size_type cpos(BufferView *) const;
///
LyXParagraph * cpar(BufferView *) const;
///
@ -254,7 +254,7 @@ private:
///
LyXParagraph * inset_par;
///
int inset_pos;
LyXParagraph::size_type inset_pos;
///
mutable int inset_x;
///