mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
updated no.po, textcache fix and oneliner from Garst
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@702 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
4370ed4fd8
commit
c3ac97d951
@ -1,3 +1,11 @@
|
||||
2000-04-27 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/lyx_gui.C (create_forms): small oneliner from Garst to have
|
||||
unnumbered parts.
|
||||
|
||||
* src/lyx_cb.C (ScreenApplyCB): clear the textcache so that the
|
||||
documents will be reformatted upon reentry.
|
||||
|
||||
2000-04-27 Juergen Vigna <jug@sad.it>
|
||||
|
||||
* src/CutAndPaste.C (pasteSelection): last paragraph was not returned
|
||||
|
||||
@ -31,7 +31,6 @@ src/insets/form_graphics.C
|
||||
src/insets/form_url.C
|
||||
src/insets/insetbib.C
|
||||
src/insets/inset.C
|
||||
src/insets/inseteditor.C
|
||||
src/insets/inseterror.C
|
||||
src/insets/insetert.C
|
||||
src/insets/insetfoot.C
|
||||
|
||||
103
po/no.po
103
po/no.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: lyx 1.1.5\n"
|
||||
"POT-Creation-Date: 2000-04-26 17:59+0200\n"
|
||||
"PO-Revision-Date: 2000-03-22 05:28+01:00\n"
|
||||
"PO-Revision-Date: 2000-04-26 22:15+02:00\n"
|
||||
"Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
|
||||
"Language-Team: norsk <no@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -250,7 +250,6 @@ msgstr "' er skrivebeskyttet."
|
||||
#. Ask if the file should be checked out for
|
||||
#. viewing/editing, if so: load it.
|
||||
#: src/bufferlist.C:469
|
||||
#, fuzzy
|
||||
msgid "Do you want to retrieve file under version control?"
|
||||
msgstr "Vil du hente in filen som er under versionskontroll?"
|
||||
|
||||
@ -364,27 +363,24 @@ msgid ", Depth: "
|
||||
msgstr ", Dybde: "
|
||||
|
||||
#: src/bufferview_funcs.C:257
|
||||
#, fuzzy
|
||||
msgid ", Spacing: "
|
||||
msgstr "Mellomrom"
|
||||
msgstr ", Linjeavstand: "
|
||||
|
||||
#: src/bufferview_funcs.C:260
|
||||
#, fuzzy
|
||||
msgid "Single"
|
||||
msgstr "Enkel:|#E"
|
||||
msgstr "Enkel"
|
||||
|
||||
#: src/bufferview_funcs.C:263
|
||||
msgid "Onehalf"
|
||||
msgstr ""
|
||||
msgstr "Halvannen"
|
||||
|
||||
#: src/bufferview_funcs.C:266
|
||||
#, fuzzy
|
||||
msgid "Double"
|
||||
msgstr "Dobbel|#D"
|
||||
msgstr "Dobbel"
|
||||
|
||||
#: src/bufferview_funcs.C:269
|
||||
msgid "Other ("
|
||||
msgstr ""
|
||||
msgstr "Annet ("
|
||||
|
||||
#: src/BufferView_pimpl.C:219
|
||||
msgid "Formatting document..."
|
||||
@ -1175,9 +1171,8 @@ msgid "Ref: "
|
||||
msgstr "Ref: "
|
||||
|
||||
#: src/insets/insettabular.C:163
|
||||
#, fuzzy
|
||||
msgid "Opened Tabular Inset"
|
||||
msgstr "Åpnet ERT inset"
|
||||
msgstr "Åpnet tabellinset"
|
||||
|
||||
#: src/insets/insettabular.C:925 src/text.C:2199
|
||||
msgid "Multicolumns can only be horizontally."
|
||||
@ -1188,9 +1183,8 @@ msgid "Opened Text Inset"
|
||||
msgstr "Åpnet text inset"
|
||||
|
||||
#: src/insets/insettext.C:1479
|
||||
#, fuzzy
|
||||
msgid "Cannot include more than one paragraph!"
|
||||
msgstr "En tabell celle kan ikke inkludere med enn ett avsnitt!"
|
||||
msgstr "Kan ikke inkludere mer enn ett avsnitt!"
|
||||
|
||||
#: src/insets/insettoc.C:20 src/lyxfunc.C:838
|
||||
msgid "Table of Contents"
|
||||
@ -1980,7 +1974,7 @@ msgstr "notis ramme"
|
||||
|
||||
#: src/LColor.C:59
|
||||
msgid "depth bar"
|
||||
msgstr ""
|
||||
msgstr "dybdemarkør"
|
||||
|
||||
#: src/LColor.C:60
|
||||
msgid "command-inset"
|
||||
@ -2083,14 +2077,12 @@ msgid "table line"
|
||||
msgstr "tabell linje"
|
||||
|
||||
#: src/LColor.C:86
|
||||
#, fuzzy
|
||||
msgid "tabular line"
|
||||
msgstr "tabell linje"
|
||||
msgstr "tabell-linje"
|
||||
|
||||
#: src/LColor.C:88
|
||||
#, fuzzy
|
||||
msgid "tabularonoff line"
|
||||
msgstr "tabell linje"
|
||||
msgstr "stiplet tabell-linje"
|
||||
|
||||
#: src/LColor.C:90
|
||||
msgid "bottom area"
|
||||
@ -2473,9 +2465,8 @@ msgid "Math mode"
|
||||
msgstr "Matte modus"
|
||||
|
||||
#: src/LyXAction.C:296
|
||||
#, fuzzy
|
||||
msgid "Insert a new Number Inset"
|
||||
msgstr "Sett inn ny tekstinset"
|
||||
msgstr "Sett inn ny nummerinset"
|
||||
|
||||
#: src/LyXAction.C:299
|
||||
msgid "Go one paragraph down"
|
||||
@ -2514,9 +2505,8 @@ msgid "Insert Table"
|
||||
msgstr "Sett inn tabell"
|
||||
|
||||
#: src/LyXAction.C:344
|
||||
#, fuzzy
|
||||
msgid "Insert a new Tabular Inset"
|
||||
msgstr "Sett inn ERT"
|
||||
msgstr "Sett inn Tabell"
|
||||
|
||||
#: src/LyXAction.C:345
|
||||
msgid "Toggle TeX style"
|
||||
@ -3215,9 +3205,8 @@ msgid "Mark on"
|
||||
msgstr "Merke på"
|
||||
|
||||
#: src/lyxfunc.C:2020
|
||||
#, fuzzy
|
||||
msgid "Unknown spacing argument: "
|
||||
msgstr "Mangler argument"
|
||||
msgstr "Ukjent argument til linjeavstand: "
|
||||
|
||||
#: src/lyxfunc.C:2258
|
||||
msgid "Push-toolbar needs argument > 0"
|
||||
@ -4855,15 +4844,11 @@ msgid "No Documents Open!%t"
|
||||
msgstr "Ingen dokumeter åpne!%t"
|
||||
|
||||
#: src/menus.C:1631
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference "
|
||||
"Manual|FAQ|Table of Contents|Known Bugs|LaTeX Configuration%l|Copyright and "
|
||||
"Warranty...|Credits...|Version..."
|
||||
msgstr ""
|
||||
"Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference "
|
||||
"Manual|Known Bugs|LaTeX Configuration%l|Copyright and "
|
||||
"Warranty...|Credits...|Version..."
|
||||
msgstr "Introduction|Tutorial|User's Guide|Extended Features|Customization|Reference Manual|FAQ|Table of Contents|Known Bugs|LaTeX Configuration%l|Copyright and Warranty...|Credits...|Version..."
|
||||
|
||||
#: src/menus.C:1645
|
||||
msgid "HM|Ii#I#i"
|
||||
@ -4890,14 +4875,12 @@ msgid "HM|Rr#R#r"
|
||||
msgstr "HM|Rr#R#r"
|
||||
|
||||
#: src/menus.C:1651
|
||||
#, fuzzy
|
||||
msgid "HM|Ff#F#f"
|
||||
msgstr "FM|Ff#f#F"
|
||||
msgstr "HM|Ff#F#f"
|
||||
|
||||
#: src/menus.C:1652
|
||||
#, fuzzy
|
||||
msgid "HM|aA#a#A"
|
||||
msgstr "EM|hH#h#H"
|
||||
msgstr "HM|aH#a#H"
|
||||
|
||||
#: src/menus.C:1653
|
||||
msgid "HM|Kk#K#k"
|
||||
@ -5242,17 +5225,16 @@ msgid "unknown"
|
||||
msgstr "ukjent"
|
||||
|
||||
#: src/table.C:995
|
||||
#, fuzzy
|
||||
msgid "Warning:"
|
||||
msgstr "Advarsel!"
|
||||
msgstr "Advarsel:"
|
||||
|
||||
#: src/table.C:996
|
||||
msgid "Tabular format < 5 is not supported anymore\n"
|
||||
msgstr ""
|
||||
msgstr "Tabell format < 5 er ikke lenger støttet\n"
|
||||
|
||||
#: src/table.C:997
|
||||
msgid "Get an older version of LyX (< 1.1.x) for conversion!"
|
||||
msgstr ""
|
||||
msgstr "Bruk en eldre versjon av LyX (< 1.1.x) til konvertering!"
|
||||
|
||||
#: src/TableLayout.C:232
|
||||
msgid "Table Extra Form"
|
||||
@ -5338,48 +5320,3 @@ msgstr "Kan ikke klippe tabell."
|
||||
#: src/text.C:4517
|
||||
msgid "Float would include float!"
|
||||
msgstr "Float ville inkludert float!"
|
||||
|
||||
#~ msgid "Error: Cannot open temporary file:"
|
||||
#~ msgstr "Kan ikke åpne temporær fil:"
|
||||
|
||||
#~ msgid "tiny"
|
||||
#~ msgstr "bitteliten"
|
||||
|
||||
#~ msgid "smallest"
|
||||
#~ msgstr "minst"
|
||||
|
||||
#~ msgid "smaller"
|
||||
#~ msgstr "mindre"
|
||||
|
||||
#~ msgid "small"
|
||||
#~ msgstr "liten"
|
||||
|
||||
#~ msgid "normal"
|
||||
#~ msgstr "normal"
|
||||
|
||||
#~ msgid "large"
|
||||
#~ msgstr "stor"
|
||||
|
||||
#~ msgid "larger"
|
||||
#~ msgstr "større"
|
||||
|
||||
#~ msgid "largest"
|
||||
#~ msgstr "størst"
|
||||
|
||||
#~ msgid "huge"
|
||||
#~ msgstr "enorm"
|
||||
|
||||
#~ msgid "huger"
|
||||
#~ msgstr "gigantisk"
|
||||
|
||||
#~ msgid "increase"
|
||||
#~ msgstr "øk"
|
||||
|
||||
#~ msgid "decrease"
|
||||
#~ msgstr "minsk"
|
||||
|
||||
#~ msgid "Error: Could not change to directory: "
|
||||
#~ msgstr "Feil: Kunne ikke bytte til folde: "
|
||||
|
||||
#~ msgid "Error: Dir already popped: "
|
||||
#~ msgstr "Feil: Området er allerede poppet: "
|
||||
|
||||
@ -129,27 +129,6 @@ extern "C" {
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
// Callback for scrollbar up button
|
||||
void BufferView::upCB(long time, int button)
|
||||
{
|
||||
if (pimpl_->buffer_ == 0) return;
|
||||
|
||||
switch (button) {
|
||||
case 3:
|
||||
pimpl_->scrollUpOnePage();
|
||||
break;
|
||||
case 2:
|
||||
pimpl_->scrollDownOnePage();
|
||||
break;
|
||||
default:
|
||||
pimpl_->scrollUp(time);
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void BufferView::enterView()
|
||||
{
|
||||
pimpl_->enterView();
|
||||
@ -169,15 +148,6 @@ void BufferView::scrollCB(double value)
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
// Callback for scrollbar down button
|
||||
void BufferView::downCB(long time, int button)
|
||||
{
|
||||
pimpl_->downCB(time, button);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void BufferView::workAreaMotionNotify(int x, int y, unsigned int state)
|
||||
{
|
||||
pimpl_->workAreaMotionNotify(x, y, state);
|
||||
|
||||
@ -192,12 +192,6 @@ public:
|
||||
bool active() const;
|
||||
///
|
||||
bool belowMouse() const;
|
||||
#if 0
|
||||
/// A callback for the up arrow in the scrollbar.
|
||||
void upCB(long time, int button);
|
||||
/// A callback for the down arrow in the scrollbar.
|
||||
void downCB(long time, int button);
|
||||
#endif
|
||||
/// A callback for the slider in the scrollbar.
|
||||
void scrollCB(double);
|
||||
|
||||
|
||||
@ -435,27 +435,6 @@ void BufferView::Pimpl::scrollCB(double value)
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
// Callback for scrollbar down button
|
||||
void BufferView::Pimpl::downCB(long time, int button)
|
||||
{
|
||||
if (buffer_ == 0) return;
|
||||
|
||||
switch (button) {
|
||||
case 2:
|
||||
scrollUpOnePage();
|
||||
break;
|
||||
case 3:
|
||||
scrollDownOnePage();
|
||||
break;
|
||||
default:
|
||||
scrollDown(time);
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
int BufferView::Pimpl::scrollUp(long time)
|
||||
{
|
||||
if (buffer_ == 0) return 0;
|
||||
@ -513,46 +492,6 @@ int BufferView::Pimpl::scrollDown(long time)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
void BufferView::Pimpl::scrollUpOnePage()
|
||||
{
|
||||
if (buffer_ == 0) return;
|
||||
if (!screen) return;
|
||||
|
||||
long y = screen->first;
|
||||
|
||||
if (!y) return;
|
||||
|
||||
Row * row = bv_->text->GetRowNearY(y);
|
||||
|
||||
y = y - workarea->height() + row->height;
|
||||
|
||||
workarea->setScrollbarValue(y);
|
||||
|
||||
bv_->scrollCB(y);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
void BufferView::Pimpl::scrollDownOnePage()
|
||||
{
|
||||
if (buffer_ == 0) return;
|
||||
if (!screen) return;
|
||||
|
||||
long y = screen->first;
|
||||
|
||||
if (y > bv_->text->height - workarea->height())
|
||||
return;
|
||||
|
||||
y += workarea->height();
|
||||
bv_->text->GetRowNearY(y);
|
||||
|
||||
workarea->setScrollbarValue(y);
|
||||
|
||||
bv_->scrollCB(y);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void BufferView::Pimpl::workAreaMotionNotify(int x, int y, unsigned int state)
|
||||
{
|
||||
|
||||
@ -52,18 +52,6 @@ struct BufferView::Pimpl {
|
||||
void updateScrollbar();
|
||||
///
|
||||
void scrollCB(double value);
|
||||
#if 0
|
||||
///
|
||||
void downCB(long time, int button);
|
||||
#endif
|
||||
#if 0
|
||||
///
|
||||
void scrollUpOnePage();
|
||||
#endif
|
||||
#if 0
|
||||
///
|
||||
void scrollDownOnePage();
|
||||
#endif
|
||||
///
|
||||
void create_view();
|
||||
///
|
||||
|
||||
147
src/WorkArea.C
147
src/WorkArea.C
@ -16,10 +16,6 @@
|
||||
#endif
|
||||
|
||||
#include "WorkArea.h"
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
#include "up.xpm"
|
||||
#include "down.xpm"
|
||||
#endif
|
||||
#include "debug.h"
|
||||
#include "support/lstrings.h"
|
||||
#include "BufferView.h"
|
||||
@ -40,17 +36,6 @@ void waitForX()
|
||||
|
||||
extern "C" {
|
||||
// Just a bunch of C wrappers around static members of WorkArea
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
void C_WorkArea_up_cb(FL_OBJECT * ob, long buf)
|
||||
{
|
||||
WorkArea::up_cb(ob, buf);
|
||||
}
|
||||
|
||||
void C_WorkArea_down_cb(FL_OBJECT * ob, long buf)
|
||||
{
|
||||
WorkArea::down_cb(ob, buf);
|
||||
}
|
||||
#endif
|
||||
void C_WorkArea_scroll_cb(FL_OBJECT * ob, long buf)
|
||||
{
|
||||
WorkArea::scroll_cb(ob, buf);
|
||||
@ -106,82 +91,14 @@ WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
|
||||
// THE SCROLLBAR
|
||||
//
|
||||
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
scrollbar = obj = fl_add_scrollbar(FL_VERT_SCROLLBAR,
|
||||
xpos + width - 15,
|
||||
ypos, 17, height, "");
|
||||
fl_set_object_boxtype(obj, FL_UP_BOX);
|
||||
//fl_set_object_color(obj, FL_MCOL, FL_BLUE);
|
||||
fl_set_object_resize(obj, FL_RESIZE_ALL);
|
||||
fl_set_object_gravity(obj, NorthEastGravity, SouthEastGravity);
|
||||
obj->u_vdata = this;
|
||||
fl_set_object_callback(obj, C_WorkArea_scroll_cb, 0);
|
||||
#else
|
||||
// up - scrollbar button
|
||||
fl_set_border_width(-1);
|
||||
|
||||
if (lyxerr.debugging())
|
||||
lyxerr << "\tup button: +"
|
||||
<< xpos + width - 15 << '+' << ypos << ' '
|
||||
<< 15 << 'x' << 15 << endl;
|
||||
button_up = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
|
||||
xpos + width - 15,
|
||||
ypos,
|
||||
15, 15, "");
|
||||
fl_set_object_boxtype(obj,FL_UP_BOX);
|
||||
fl_set_object_color(obj,FL_MCOL,FL_BLUE);
|
||||
fl_set_object_resize(obj, FL_RESIZE_ALL);
|
||||
fl_set_object_gravity(obj,NorthEastGravity, NorthEastGravity);
|
||||
obj->u_vdata = this;
|
||||
fl_set_object_callback(obj,C_WorkArea_up_cb, 0);
|
||||
fl_set_pixmapbutton_data(obj, const_cast<char**>(up_xpm));
|
||||
|
||||
// Remove the blue feedback rectangle
|
||||
fl_set_pixmapbutton_focus_outline(obj,0);
|
||||
|
||||
// the scrollbar slider
|
||||
fl_set_border_width(-bw);
|
||||
|
||||
if (lyxerr.debugging())
|
||||
lyxerr << "\tscrollbar slider: +"
|
||||
<< xpos + width - 15 << '+' << ypos + 15 << ' '
|
||||
<< 15 << 'x' << height - 30 << endl;
|
||||
scrollbar = obj = fl_add_slider(FL_VERT_SLIDER,
|
||||
xpos + width - 15,
|
||||
ypos + 15,
|
||||
15, height - 30, "");
|
||||
fl_set_object_color(obj,FL_COL1,FL_MCOL);
|
||||
fl_set_object_boxtype(obj, FL_UP_BOX);
|
||||
fl_set_object_resize(obj, FL_RESIZE_ALL);
|
||||
fl_set_object_gravity(obj, NorthEastGravity, SouthEastGravity);
|
||||
obj->u_vdata = this;
|
||||
fl_set_object_callback(obj, C_WorkArea_scroll_cb, 0);
|
||||
fl_set_slider_precision(obj, 0);
|
||||
|
||||
// down - scrollbar button
|
||||
fl_set_border_width(-1);
|
||||
|
||||
if (lyxerr.debugging())
|
||||
lyxerr << "\tdown button: +"
|
||||
<< xpos + width - 15 << '+'
|
||||
<< ypos + height - 15 << ' '
|
||||
<< 15 << 'x' << 15 << endl;
|
||||
button_down = obj = fl_add_pixmapbutton(FL_TOUCH_BUTTON,
|
||||
xpos + width - 15,
|
||||
ypos + height - 15,
|
||||
15, 15, "");
|
||||
fl_set_object_boxtype(obj,FL_UP_BOX);
|
||||
fl_set_object_color(obj,FL_MCOL,FL_BLUE);
|
||||
fl_set_object_resize(obj, FL_RESIZE_ALL);
|
||||
fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
|
||||
obj->u_vdata = this;
|
||||
fl_set_object_callback(obj, C_WorkArea_down_cb, 0);
|
||||
fl_set_pixmapbutton_data(obj, const_cast<char**>(down_xpm));
|
||||
|
||||
fl_set_border_width(-bw);
|
||||
// Remove the blue feedback rectangle
|
||||
fl_set_pixmapbutton_focus_outline(obj,0);
|
||||
#endif
|
||||
|
||||
///
|
||||
/// The free object
|
||||
@ -189,9 +106,6 @@ WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
|
||||
// Create the workarea pixmap
|
||||
createPixmap(width - 15 - 2 * bw, height - 2 * bw);
|
||||
|
||||
// setup the painter
|
||||
//painter_.setDisplay(fl_display);
|
||||
|
||||
// We add this object as late as possible to avoit problems
|
||||
// with drawing.
|
||||
if (lyxerr.debugging())
|
||||
@ -256,23 +170,9 @@ void WorkArea::resize(int xpos, int ypos, int width, int height)
|
||||
//
|
||||
// THE SCROLLBAR
|
||||
//
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_set_object_geometry(scrollbar, xpos + width - 15,
|
||||
ypos, 17, height);
|
||||
#else
|
||||
// up - scrollbar button
|
||||
fl_set_object_geometry(button_up, xpos + width - 15,
|
||||
ypos,
|
||||
15, 15);
|
||||
// the scrollbar slider
|
||||
fl_set_object_geometry(scrollbar, xpos + width - 15,
|
||||
ypos + 15,
|
||||
15, height - 30);
|
||||
// down - scrollbar button
|
||||
fl_set_object_geometry(button_down, xpos + width - 15,
|
||||
ypos + height - 15,
|
||||
15, 15);
|
||||
#endif
|
||||
|
||||
// Create the workarea pixmap
|
||||
createPixmap(width - 15 - 2 * bw, height - 2 * bw);
|
||||
|
||||
@ -330,72 +230,31 @@ void WorkArea::setFocus() const
|
||||
|
||||
void WorkArea::setScrollbar(double pos, double length_fraction) const
|
||||
{
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_set_scrollbar_value(scrollbar, pos);
|
||||
fl_set_scrollbar_size(scrollbar, scrollbar->h * length_fraction);
|
||||
#else
|
||||
fl_set_slider_value(scrollbar, pos);
|
||||
fl_set_slider_size(scrollbar, scrollbar->h * length_fraction);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void WorkArea::setScrollbarBounds(double l1, double l2) const
|
||||
{
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_set_scrollbar_bounds(scrollbar, l1, l2);
|
||||
#else
|
||||
fl_set_slider_bounds(scrollbar, l1, l2);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void WorkArea::setScrollbarIncrements(double inc) const
|
||||
{
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_set_scrollbar_increment(scrollbar, work_area->h - inc, inc);
|
||||
#else
|
||||
fl_set_slider_increment(scrollbar, work_area->h - inc, inc);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
void WorkArea::up_cb(FL_OBJECT * ob, long)
|
||||
{
|
||||
WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
|
||||
XEvent const * ev2 = fl_last_event();
|
||||
static long time = 0;
|
||||
ev2 = fl_last_event();
|
||||
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
|
||||
time = 0;
|
||||
area->owner->upCB(time++, fl_get_button_numb(ob));
|
||||
}
|
||||
|
||||
|
||||
void WorkArea::down_cb(FL_OBJECT * ob, long)
|
||||
{
|
||||
WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
|
||||
XEvent const * ev2 = fl_last_event();
|
||||
static long time = 0;
|
||||
if (ev2->type == ButtonPress || ev2->type == ButtonRelease)
|
||||
time = 0;
|
||||
area->owner->downCB(time++, fl_get_button_numb(ob));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// Callback for scrollbar slider
|
||||
void WorkArea::scroll_cb(FL_OBJECT * ob, long)
|
||||
{
|
||||
WorkArea * area = static_cast<WorkArea*>(ob->u_vdata);
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
// If we really want the accellerating scroll we can do that
|
||||
// from here. IMHO that is a waste of effort since we already
|
||||
// have other ways to move fast around in the document. (Lgb)
|
||||
area->owner->scrollCB(fl_get_scrollbar_value(ob));
|
||||
#else
|
||||
area->owner->scrollCB(fl_get_slider_value(ob));
|
||||
#endif
|
||||
waitForX();
|
||||
}
|
||||
|
||||
@ -445,11 +304,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
|
||||
if (!ev || ! area->scrollbar) break;
|
||||
if (ev->xmotion.x != x_old ||
|
||||
ev->xmotion.y != y_old ||
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_get_scrollbar_value(area->scrollbar) != scrollbar_value_old
|
||||
#else
|
||||
fl_get_slider_value(area->scrollbar) != scrollbar_value_old
|
||||
#endif
|
||||
) {
|
||||
lyxerr.debug() << "Workarea event: MOUSE" << endl;
|
||||
area->owner->workAreaMotionNotify(ev->xmotion.x - ob->x,
|
||||
|
||||
@ -23,8 +23,6 @@
|
||||
|
||||
class BufferView;
|
||||
|
||||
#define USE_FL_SCROLLBAR 1
|
||||
|
||||
class WorkArea {
|
||||
public:
|
||||
///
|
||||
@ -49,10 +47,6 @@ public:
|
||||
void redraw() const {
|
||||
fl_redraw_object(work_area);
|
||||
fl_redraw_object(scrollbar);
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
fl_redraw_object(button_down);
|
||||
fl_redraw_object(button_up);
|
||||
#endif
|
||||
}
|
||||
///
|
||||
void setFocus() const;
|
||||
@ -72,11 +66,7 @@ public:
|
||||
void setScrollbar(double pos, double length_fraction) const;
|
||||
///
|
||||
void setScrollbarValue(double y) const {
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
fl_set_scrollbar_value(scrollbar, y);
|
||||
#else
|
||||
fl_set_slider_value(scrollbar, y);
|
||||
#endif
|
||||
}
|
||||
///
|
||||
void setScrollbarBounds(double, double) const;
|
||||
@ -84,39 +74,20 @@ public:
|
||||
void setScrollbarIncrements(double inc) const;
|
||||
///
|
||||
double getScrollbarValue() const {
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
return fl_get_scrollbar_value(scrollbar);
|
||||
#else
|
||||
return fl_get_slider_value(scrollbar);
|
||||
#endif
|
||||
}
|
||||
#ifdef USE_FL_SCROLLBAR
|
||||
///
|
||||
std::pair<float, float> getScrollbarBounds() const {
|
||||
std::pair<float, float> p;
|
||||
fl_get_scrollbar_bounds(scrollbar, &p.first, &p.second);
|
||||
return p;
|
||||
}
|
||||
#else
|
||||
///
|
||||
std::pair<double, double> getScrollbarBounds() const {
|
||||
std::pair<double, double> p;
|
||||
fl_get_slider_bounds(scrollbar, &p.first, &p.second);
|
||||
return p;
|
||||
}
|
||||
#endif
|
||||
///
|
||||
Pixmap getPixmap() const { return workareapixmap; }
|
||||
/// xforms callback
|
||||
static int work_area_handler(FL_OBJECT *, int event,
|
||||
FL_Coord, FL_Coord,
|
||||
int /*key*/, void * xev);
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
/// xforms callback
|
||||
static void up_cb(FL_OBJECT *, long);
|
||||
/// xforms callback
|
||||
static void down_cb(FL_OBJECT *, long);
|
||||
#endif
|
||||
/// xforms callback
|
||||
static void scroll_cb(FL_OBJECT *, long);
|
||||
private:
|
||||
@ -128,12 +99,6 @@ private:
|
||||
FL_OBJECT * work_area;
|
||||
///
|
||||
FL_OBJECT * scrollbar;
|
||||
#ifndef USE_FL_SCROLLBAR
|
||||
///
|
||||
FL_OBJECT * button_down;
|
||||
///
|
||||
FL_OBJECT * button_up;
|
||||
#endif
|
||||
///
|
||||
BufferView * owner;
|
||||
/// The pixmap overlay on the workarea
|
||||
|
||||
12
src/lyx_cb.C
12
src/lyx_cb.C
@ -45,6 +45,7 @@
|
||||
#include "lyxrc.h"
|
||||
#include "lyxtext.h"
|
||||
#include "CutAndPaste.h"
|
||||
#include "TextCache.h"
|
||||
|
||||
using std::ifstream;
|
||||
using std::copy;
|
||||
@ -3033,10 +3034,17 @@ extern "C" void ScreenApplyCB(FL_OBJECT *, long)
|
||||
lyxrc.font_norm = fl_get_input(fd_form_screen->input_font_norm);
|
||||
lyxrc.zoom = atoi(fl_get_input(fd_form_screen->intinput_size));
|
||||
fontloader.update();
|
||||
|
||||
|
||||
// Of course we should only to the resize and the textcahce.clear
|
||||
// if values really changed...but not very important right now. (Lgb)
|
||||
|
||||
// All buffers will need resize
|
||||
bufferlist.resize();
|
||||
|
||||
// We also need to empty the textcache so that
|
||||
// the buffer will be formatted correctly after
|
||||
// a zoom change.
|
||||
textcache.clear();
|
||||
|
||||
current_view->owner()->getMiniBuffer()->Set(_("Screen options set"));
|
||||
}
|
||||
|
||||
|
||||
@ -410,7 +410,7 @@ void LyXGUI::create_forms()
|
||||
fl_addto_choice(fd_form_document->choice_spacing,
|
||||
_(" Single | OneHalf | Double | Other "));
|
||||
|
||||
fl_set_counter_bounds(fd_form_document->slider_secnumdepth,-1, 5);
|
||||
fl_set_counter_bounds(fd_form_document->slider_secnumdepth,-2, 5);
|
||||
fl_set_counter_bounds(fd_form_document->slider_tocdepth,-1, 5);
|
||||
fl_set_counter_step(fd_form_document->slider_secnumdepth, 1, 1);
|
||||
fl_set_counter_step(fd_form_document->slider_tocdepth, 1, 1);
|
||||
|
||||
@ -120,12 +120,6 @@ private:
|
||||
int cursor_pixmap_w;
|
||||
///
|
||||
int cursor_pixmap_h;
|
||||
#if 0
|
||||
///
|
||||
long screen_refresh_y;
|
||||
///
|
||||
Row * screen_refresh_row;
|
||||
#endif
|
||||
///
|
||||
GC gc_copy;
|
||||
};
|
||||
|
||||
@ -52,9 +52,6 @@ LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
|
||||
|
||||
/* the cursor isnt yet visible */
|
||||
cursor_visible = false;
|
||||
#if 0
|
||||
screen_refresh_y = -1;
|
||||
#endif
|
||||
cursor_pixmap = 0;
|
||||
cursor_pixmap_x = 0;
|
||||
cursor_pixmap_y = 0;
|
||||
@ -69,9 +66,6 @@ LyXScreen::LyXScreen(WorkArea & o, LyXText * text_ptr)
|
||||
void LyXScreen::Redraw()
|
||||
{
|
||||
DrawFromTo(0, owner.height());
|
||||
#if 0
|
||||
screen_refresh_y = -1;
|
||||
#endif
|
||||
expose(0, 0, owner.workWidth(), owner.height());
|
||||
if (cursor_visible) {
|
||||
cursor_visible = false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user