#include "GuiView.h"
#include "KeySymbol.h"
#include "Language.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "LyXRC.h"
#include "LyXVC.h"
-#include "MetricsInfo.h"
#include "qt_helpers.h"
#include "Text.h"
+#include "TextMetrics.h"
#include "version.h"
#include "graphics/GraphicsImage.h"
#include <QToolTip>
#include <QMenuBar>
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <cmath>
-#ifdef Q_WS_X11
-#include <QX11Info>
-extern "C" int XEventsQueued(Display *display, int mode);
-#endif
-
#ifdef Q_WS_WIN
int const CursorWidth = 2;
#else
// This is a 'heartbeat' generating synthetic mouse move events when the
// cursor is at the top or bottom edge of the viewport. One scroll per 0.2 s
SyntheticMouseEvent::SyntheticMouseEvent()
- : timeout(200), restart_timeout(true),
- x_old(-1), y_old(-1), min_scrollbar_old(-1.0), max_scrollbar_old(-1.0)
+ : timeout(200), restart_timeout(true)
{}
: buffer_view_(0), lyx_view_(0),
cursor_visible_(false),
need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1), completer_(new GuiCompleter(this))
+ preedit_lines_(1), completer_(new GuiCompleter(this, this)),
+ context_target_pos_()
{
}
GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv)
- : buffer_view_(0), lyx_view_(0),
+ : buffer_view_(0), read_only_(buffer.isReadonly()), lyx_view_(0),
cursor_visible_(false),
need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1), completer_(new GuiCompleter(this))
+ preedit_lines_(1), completer_(new GuiCompleter(this, this)),
+ context_target_pos_()
{
setGuiView(gv);
setBuffer(buffer);
setFocusPolicy(Qt::StrongFocus);
- viewport()->setCursor(Qt::IBeamCursor);
+ setCursorShape(Qt::IBeamCursor);
synthetic_mouse_event_.timeout.timeout.connect(
- boost::bind(&GuiWorkArea::generateSyntheticMouseEvent,
+ bind(&GuiWorkArea::generateSyntheticMouseEvent,
this));
// Initialize the vertical Scroll Bar
delete buffer_view_;
delete cursor_;
// Completer has a QObject parent and is thus automatically destroyed.
+ // See #4758.
// delete completer_;
}
+Qt::CursorShape GuiWorkArea::cursorShape() const
+{
+ return viewport()->cursor().shape();
+}
+
+
+void GuiWorkArea::setCursorShape(Qt::CursorShape shape)
+{
+ viewport()->setCursor(shape);
+}
+
+
+void GuiWorkArea::updateCursorShape()
+{
+ setCursorShape(buffer_view_->clickableInset()
+ ? Qt::PointingHandCursor : Qt::IBeamCursor);
+}
+
+
void GuiWorkArea::setGuiView(GuiView & gv)
{
lyx_view_ = &gv;
void GuiWorkArea::setBuffer(Buffer & buffer)
{
delete buffer_view_;
- buffer_view_ = new BufferView(buffer),
+ buffer_view_ = new BufferView(buffer);
buffer.workAreaManager().add(this);
// HACK: Prevents an additional redraw when the scrollbar pops up
void GuiWorkArea::startBlinkingCursor()
{
+ // do not show the cursor if the view is busy
+ if (view().busy())
+ return;
+
+ Point p;
+ int h = 0;
+ buffer_view_->cursorPosAndHeight(p, h);
+ // Don't start blinking if the cursor isn't on screen.
+ if (!buffer_view_->cursorInView(p, h))
+ return;
+
showCursor();
+
//we're not supposed to cache this value.
int const time = QApplication::cursorFlashTime() / 2;
if (time <= 0)
}
-void GuiWorkArea::redraw()
+void GuiWorkArea::redraw(bool update_metrics)
{
if (!isVisible())
// No need to redraw in this case.
// No need to do anything if this is the current view. The BufferView
// metrics are already up to date.
- if (lyx_view_ != guiApp->currentView()
+ if (update_metrics || lyx_view_ != guiApp->currentView()
|| lyx_view_->currentWorkArea() != this) {
// FIXME: it would be nice to optimize for the off-screen case.
+ buffer_view_->cursor().fixIfBroken();
buffer_view_->updateMetrics();
buffer_view_->cursor().fixIfBroken();
}
if (lyxerr.debugging(Debug::WORKAREA))
buffer_view_->coordCache().dump();
+
+ setReadOnly(buffer_view_->buffer().isReadonly());
+
+ updateCursorShape();
}
// we better stop the blinking cursor...
// the cursor gets restarted in GuiView::restartCursor()
stopBlinkingCursor();
-
- theLyXFunc().setLyXView(lyx_view_);
- theLyXFunc().processKeySym(key, mod);
+ guiApp->processKeySym(key, mod);
}
void GuiWorkArea::dispatch(FuncRequest const & cmd0, KeyModifier mod)
{
// Handle drag&drop
- if (cmd0.action == LFUN_FILE_OPEN) {
- lyx_view_->dispatch(cmd0);
+ if (cmd0.action() == LFUN_FILE_OPEN) {
+ DispatchResult dr;
+ lyx_view_->dispatch(cmd0, dr);
return;
}
- theLyXFunc().setLyXView(lyx_view_);
-
FuncRequest cmd;
- if (cmd0.action == LFUN_MOUSE_PRESS) {
+ if (cmd0.action() == LFUN_MOUSE_PRESS) {
if (mod == ShiftModifier)
cmd = FuncRequest(cmd0, "region-select");
else if (mod == ControlModifier)
cmd = cmd0;
bool const notJustMovingTheMouse =
- cmd.action != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none;
+ cmd.action() != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none;
// In order to avoid bad surprise in the middle of an operation, we better stop
// the blinking cursor.
buffer_view_->mouseEventDispatch(cmd);
// Skip these when selecting
- if (cmd.action != LFUN_MOUSE_MOTION) {
+ if (cmd.action() != LFUN_MOUSE_MOTION) {
completer_->updateVisibility(false, false);
lyx_view_->updateDialogs();
lyx_view_->updateStatusBar();
// Show the cursor immediately after any operation
startBlinkingCursor();
}
+
+ updateCursorShape();
}
if (cursor_visible_)
return;
+ Point p;
+ int h = 0;
+ buffer_view_->cursorPosAndHeight(p, h);
+ if (!buffer_view_->cursorInView(p, h))
+ return;
+
// RTL or not RTL
bool l_shape = false;
Font const & realfont = buffer_view_->cursor().real_current_font;
if (realfont.language() == latex_language)
l_shape = false;
- Point p;
- int h = 0;
- buffer_view_->cursorPosAndHeight(p, h);
// show cursor on screen
Cursor & cur = buffer_view_->cursor();
bool completable = cur.inset().showCompletionCursor()
&& completer_->completionAvailable()
&& !completer_->popupVisible()
&& !completer_->inlineVisible();
- if (buffer_view_->cursorInView(p, h)) {
- cursor_visible_ = true;
- showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
- }
+ cursor_visible_ = true;
+ showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
}
void GuiWorkArea::scrollTo(int value)
{
stopBlinkingCursor();
- buffer_view_->scrollDocView(value);
+ buffer_view_->scrollDocView(value, true);
if (lyxrc.cursor_follows_scrollbar) {
buffer_view_->setCursorFromScrollbar();
// which are otherwise reserved to focus switching between controls
// within a dialog.
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
- if ((ke->key() != Qt::Key_Tab && ke->key() != Qt::Key_Backtab)
- || ke->modifiers() & Qt::ControlModifier)
- return QAbstractScrollArea::event(e);
- keyPressEvent(ke);
- return true;
+ if ((ke->key() == Qt::Key_Tab && ke->modifiers() == Qt::NoModifier)
+ || (ke->key() == Qt::Key_Backtab && (
+ ke->modifiers() == Qt::ShiftModifier
+ || ke->modifiers() == Qt::NoModifier))) {
+ keyPressEvent(ke);
+ return true;
+ }
+ return QAbstractScrollArea::event(e);
}
default:
void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
{
- QPoint pos = e->pos();
+ QPoint pos;
+ if (e->reason() == QContextMenuEvent::Mouse)
+ // the position is set on mouse press
+ pos = context_target_pos_;
+ else
+ pos = e->pos();
Cursor const & cur = buffer_view_->cursor();
if (e->reason() == QContextMenuEvent::Keyboard && cur.inTexted()) {
// Do not access the context menu of math right in front of before
void GuiWorkArea::focusInEvent(QFocusEvent * e)
{
- /*
- LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << std::endl);
- GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
- if (old_gwa)
- old_gwa->stopBlinkingCursor();
- lyx_view_->setCurrentWorkArea(this);
- */
-
+ LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << endl);
if (lyx_view_->currentWorkArea() != this)
lyx_view_->setCurrentWorkArea(this);
void GuiWorkArea::focusOutEvent(QFocusEvent * e)
{
- LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << std::endl);
+ LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << endl);
stopBlinkingCursor();
QAbstractScrollArea::focusOutEvent(e);
}
return;
}
+ if (e->button() == Qt::RightButton)
+ context_target_pos_ = e->pos();
+
inputContext()->reset();
FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
e->accept();
// If we're above or below the work area...
- if (e->y() <= 20 || e->y() >= viewport()->height() - 20) {
+ if ((e->y() <= 20 || e->y() >= viewport()->height() - 20)
+ && e->buttons() == mouse_button::button1) {
// Make sure only a synthetic event can cause a page scroll,
// so they come at a steady rate:
if (e->y() <= 20)
// _Force_ a scroll up:
- cmd.y = -40;
+ cmd.set_y(e->y() - 21);
else
- cmd.y = viewport()->height();
+ cmd.set_y(e->y() + 21);
// Store the event, to be handled when the timeout expires.
synthetic_mouse_event_.cmd = cmd;
- if (synthetic_mouse_event_.timeout.running())
+ if (synthetic_mouse_event_.timeout.running()) {
// Discard the event. Note that it _may_ be handled
// when the timeout expires if
// synthetic_mouse_event_.cmd has not been overwritten.
// occurred after the one used to start the timeout
// in the first place.
return;
-
+ }
+
synthetic_mouse_event_.restart_timeout = true;
synthetic_mouse_event_.timeout.start();
// Fall through to handle this event...
synthetic_mouse_event_.restart_timeout = false;
return;
}
-
- // Has anything changed on-screen since the last QMouseEvent
- // was received?
- if (e->x() == synthetic_mouse_event_.x_old
- && e->y() == synthetic_mouse_event_.y_old
- && synthetic_mouse_event_.min_scrollbar_old == verticalScrollBar()->minimum()
- && synthetic_mouse_event_.max_scrollbar_old == verticalScrollBar()->maximum()) {
- // Nothing changed on-screen since the last QMouseEvent.
- return;
- }
-
- // Yes something has changed. Store the params used to check this.
- synthetic_mouse_event_.x_old = e->x();
- synthetic_mouse_event_.y_old = e->y();
- synthetic_mouse_event_.min_scrollbar_old = verticalScrollBar()->minimum();
- synthetic_mouse_event_.max_scrollbar_old = verticalScrollBar()->maximum();
-
- // ... and dispatch the event to the LyX core.
dispatch(cmd);
}
{
// Wheel rotation by one notch results in a delta() of 120 (see
// documentation of QWheelEvent)
- int const delta = ev->delta() / 120;
- if (ev->modifiers() & Qt::ControlModifier) {
- docstring arg = convert<docstring>(5 * delta);
+ double const delta = ev->delta() / 120.0;
+ bool zoom = false;
+ switch (lyxrc.scroll_wheel_zoom) {
+ case LyXRC::SCROLL_WHEEL_ZOOM_CTRL:
+ zoom = ev->modifiers() & Qt::ControlModifier;
+ zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::AltModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_SHIFT:
+ zoom = ev->modifiers() & Qt::ShiftModifier;
+ zoom &= !(ev->modifiers() & (Qt::ControlModifier | Qt::AltModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_ALT:
+ zoom = ev->modifiers() & Qt::AltModifier;
+ zoom &= !(ev->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier));
+ break;
+ case LyXRC::SCROLL_WHEEL_ZOOM_OFF:
+ break;
+ }
+ if (zoom) {
+ docstring arg = convert<docstring>(int(5 * delta));
lyx::dispatch(FuncRequest(LFUN_BUFFER_ZOOM_IN, arg));
return;
}
int scroll_value = lines > page_step
? page_step : lines * verticalScrollBar()->singleStep();
- // Take into account the rotation.
- scroll_value *= delta;
-
- // Take into account user preference.
- scroll_value *= lyxrc.mouse_wheel_speed;
+ // Take into account the rotation and the user preferences.
+ scroll_value = int(scroll_value * delta * lyxrc.mouse_wheel_speed);
LYXERR(Debug::SCROLLING, "wheelScrollLines = " << lines
<< " delta = " << delta << " scroll_value = " << scroll_value
<< " page_step = " << page_step);
void GuiWorkArea::generateSyntheticMouseEvent()
{
+ int const e_y = synthetic_mouse_event_.cmd.y();
+ int const wh = buffer_view_->workHeight();
+ bool const up = e_y < 0;
+ bool const down = e_y > wh;
+
// Set things off to generate the _next_ 'pseudo' event.
- if (synthetic_mouse_event_.restart_timeout)
+ int step = 50;
+ if (synthetic_mouse_event_.restart_timeout) {
+ // This is some magic formulae to determine the speed
+ // of scrolling related to the position of the mouse.
+ int time = 200;
+ if (up || down) {
+ int dist = up ? -e_y : e_y - wh;
+ time = max(min(200, 250000 / (dist * dist)), 1) ;
+
+ if (time < 40) {
+ step = 80000 / (time * time);
+ time = 40;
+ }
+ }
+ synthetic_mouse_event_.timeout.setTimeout(time);
synthetic_mouse_event_.timeout.start();
+ }
+
+ // Can we scroll further ?
+ int const value = verticalScrollBar()->value();
+ if (value == verticalScrollBar()->maximum()
+ || value == verticalScrollBar()->minimum()) {
+ synthetic_mouse_event_.timeout.stop();
+ return;
+ }
+
+ // Scroll
+ if (step <= 2 * wh) {
+ buffer_view_->scroll(up ? -step : step);
+ buffer_view_->updateMetrics();
+ } else {
+ buffer_view_->scrollDocView(value + up ? -step : step, false);
+ }
+
+ // In which paragraph do we have to set the cursor ?
+ Cursor & cur = buffer_view_->cursor();
+ TextMetrics const & tm = buffer_view_->textMetrics(cur.text());
+
+ pair<pit_type, const ParagraphMetrics *> p = up ? tm.first() : tm.last();
+ ParagraphMetrics const & pm = *p.second;
+ pit_type const pit = p.first;
- // Has anything changed on-screen since the last timeout signal
- // was received?
- int const min_scrollbar = verticalScrollBar()->minimum();
- int const max_scrollbar = verticalScrollBar()->maximum();
- if (min_scrollbar == synthetic_mouse_event_.min_scrollbar_old
- && max_scrollbar == synthetic_mouse_event_.max_scrollbar_old) {
+ if (pm.rows().empty())
return;
+
+ // Find the row at which we set the cursor.
+ RowList::const_iterator rit = pm.rows().begin();
+ RowList::const_iterator rlast = pm.rows().end();
+ int yy = pm.position() - pm.ascent();
+ for (--rlast; rit != rlast; ++rit) {
+ int h = rit->height();
+ if ((up && yy + h > 0)
+ || (!up && yy + h > wh - defaultRowHeight()))
+ break;
+ yy += h;
}
- // Yes it has. Store the params used to check this.
- synthetic_mouse_event_.min_scrollbar_old = min_scrollbar;
- synthetic_mouse_event_.max_scrollbar_old = max_scrollbar;
- // ... and dispatch the event to the LyX core.
- dispatch(synthetic_mouse_event_.cmd);
+
+ // Find the position of the cursor
+ bool bound;
+ int x = synthetic_mouse_event_.cmd.x();
+ pos_type const pos = rit->pos() + tm.getColumnNearX(pit, *rit, x, bound);
+
+ // Set the cursor
+ cur.pit() = pit;
+ cur.pos() = pos;
+ cur.boundary(bound);
+
+ buffer_view_->buffer().changed(false);
+ return;
}
// do nothing if there are other events
// (the auto repeated events come too fast)
- // \todo FIXME: remove hard coded Qt keys, process the key binding
+ // it looks like this is only needed on X11
#ifdef Q_WS_X11
- if (XEventsQueued(QX11Info::display(), 0) > 1 && ev->isAutoRepeat()
- && (Qt::Key_PageDown || Qt::Key_PageUp)) {
- LYXERR(Debug::KEY, "system is busy: scroll key event ignored");
+ if (qApp->hasPendingEvents() && ev->isAutoRepeat()) {
+ LYXERR(Debug::KEY, "system is busy: keyPress event ignored");
ev->ignore();
return;
}
if (need_resize_) {
screen_ = QPixmap(viewport()->width(), viewport()->height());
resizeBufferView();
- hideCursor();
- showCursor();
+ if (cursor_visible_) {
+ hideCursor();
+ showCursor();
+ }
}
QPainter pain(viewport());
maximize_title = fileName.displayName(30);
minimize_title = from_utf8(fileName.onlyFileName());
if (buf.lyxvc().inUse()) {
- if (buf.lyxvc().locker().empty())
- maximize_title += _(" (version control)");
- else
+ if (buf.lyxvc().locking())
maximize_title += _(" (version control, locking)");
+ else
+ maximize_title += _(" (version control)");
}
if (!buf.isClean()) {
maximize_title += _(" (changed)");
}
-void GuiWorkArea::setReadOnly(bool)
+void GuiWorkArea::setReadOnly(bool read_only)
{
+ if (read_only_ == read_only)
+ return;
+ read_only_ = read_only;
updateWindowTitle();
if (this == lyx_view_->currentWorkArea())
lyx_view_->updateDialogs();
EmbeddedWorkArea::EmbeddedWorkArea(QWidget * w): GuiWorkArea(w)
{
buffer_ = theBufferList().newBuffer(
- support::FileName::tempName().absFilename() + "_embedded.internal");
+ support::FileName::tempName().absFileName() + "_embedded.internal");
buffer_->setUnnamed(true);
buffer_->setFullyLoaded(true);
setBuffer(*buffer_);
EmbeddedWorkArea::~EmbeddedWorkArea()
{
// No need to destroy buffer and bufferview here, because it is done
- // in theBuffeerList() destruction loop at application exit
+ // in theBufferList() destruction loop at application exit
}
}
+QSize EmbeddedWorkArea::sizeHint () const
+{
+ // FIXME(?):
+ // GuiWorkArea sets the size to the screen's viewport
+ // by returning a value this gets overridden
+ // EmbeddedWorkArea is now sized to fit in the layout
+ // of the parent, and has a minimum size set in GuiWorkArea
+ // which is what we return here
+ return QSize(100, 70);
+}
+
+
void EmbeddedWorkArea::disable()
{
stopBlinkingCursor();
if (view().currentWorkArea() != this)
return;
- LASSERT(view().currentMainWorkArea(), /* */);
+ // No problem if currentMainWorkArea() is 0 (setCurrentWorkArea()
+ // tolerates it and shows the background logo), what happens if
+ // an EmbeddedWorkArea is closed after closing all document WAs
view().setCurrentWorkArea(view().currentMainWorkArea());
}
#ifdef Q_WS_MACX
setStyle(&noTabFrameMacStyle);
#endif
+#if QT_VERSION < 0x040500
+ lyxrc.single_close_tab_button = true;
+#endif
QPalette pal = palette();
pal.setColor(QPalette::Active, QPalette::Button,
QObject::connect(this, SIGNAL(currentChanged(int)),
this, SLOT(on_currentTabChanged(int)));
-#if QT_VERSION < 0x040500
closeBufferButton = new QToolButton(this);
closeBufferButton->setPalette(pal);
// FIXME: rename the icon to closebuffer.png
QObject::connect(closeBufferButton, SIGNAL(clicked()),
this, SLOT(closeCurrentBuffer()));
setCornerWidget(closeBufferButton, Qt::TopRightCorner);
-#endif
// setup drag'n'drop
QTabBar* tb = new DragTabBar;
this, SLOT(showContextMenu(const QPoint &)));
#if QT_VERSION >= 0x040500
connect(tb, SIGNAL(tabCloseRequested(int)),
- tb, SLOT(on_tabCloseRequested(int)));
+ this, SLOT(closeTab(int)));
#endif
setUsesScrollButtons(true);
}
+void TabWorkArea::mouseDoubleClickEvent(QMouseEvent * event)
+{
+ if (event->button() != Qt::LeftButton)
+ return;
+
+ // return early if double click on existing tabs
+ for (int i = 0; i < count(); ++i)
+ if (tabBar()->tabRect(i).contains(event->pos()))
+ return;
+
+ dispatch(FuncRequest(LFUN_BUFFER_NEW));
+}
+
+
void TabWorkArea::setFullScreen(bool full_screen)
{
for (int i = 0; i != count(); ++i) {
- if (GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i)))
+ if (GuiWorkArea * wa = workArea(i))
wa->setFullScreen(full_screen);
}
{
tabBar()->setEnabled(show);
tabBar()->setVisible(show);
-#if QT_VERSION < 0x040500
- closeBufferButton->setVisible(show);
+ closeBufferButton->setVisible(show && lyxrc.single_close_tab_button);
+#if QT_VERSION >= 0x040500
+ setTabsClosable(!lyxrc.single_close_tab_button);
#endif
}
}
+GuiWorkArea * TabWorkArea::workArea(int index)
+{
+ return dynamic_cast<GuiWorkArea *>(widget(index));
+}
+
+
GuiWorkArea * TabWorkArea::workArea(Buffer & buffer)
{
+ // FIXME: this method doesn't work if we have more than work area
+ // showing the same buffer.
for (int i = 0; i != count(); ++i) {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * wa = workArea(i);
LASSERT(wa, return 0);
if (&wa->bufferView().buffer() == &buffer)
return wa;
void TabWorkArea::closeAll()
{
while (count()) {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
+ GuiWorkArea * wa = workArea(0);
LASSERT(wa, /**/);
removeTab(0);
delete wa;
// returns e.g. on application destruction
if (i == -1)
return;
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * wa = workArea(i);
LASSERT(wa, return);
- BufferView & bv = wa->bufferView();
- bv.cursor().fixIfBroken();
- bv.updateMetrics();
wa->setUpdatesEnabled(true);
- wa->redraw();
+ wa->redraw(true);
wa->setFocus();
///
currentWorkAreaChanged(wa);
LYXERR(Debug::GUI, "currentTabChanged " << i
- << "File" << bv.buffer().absFileName());
+ << " File: " << wa->bufferView().buffer().absFileName());
}
void TabWorkArea::closeCurrentBuffer()
{
- if (clicked_tab_ != -1)
- setCurrentIndex(clicked_tab_);
- else
- // Before dispatching the LFUN we should be sure this
- // is the current workarea.
- currentWorkAreaChanged(currentWorkArea());
-
- lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
+ GuiWorkArea * wa;
+ if (clicked_tab_ == -1)
+ wa = currentWorkArea();
+ else {
+ wa = workArea(clicked_tab_);
+ LASSERT(wa, /**/);
+ }
+ wa->view().closeWorkArea(wa);
}
-void TabWorkArea::closeCurrentTab()
+void TabWorkArea::hideCurrentTab()
{
+ GuiWorkArea * wa;
if (clicked_tab_ == -1)
- removeWorkArea(currentWorkArea());
+ wa = currentWorkArea();
else {
- GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
+ wa = workArea(clicked_tab_);
LASSERT(wa, /**/);
- removeWorkArea(wa);
}
+ wa->view().hideWorkArea(wa);
}
+
+void TabWorkArea::closeTab(int index)
+{
+ on_currentTabChanged(index);
+ GuiWorkArea * wa;
+ if (index == -1)
+ wa = currentWorkArea();
+ else {
+ wa = workArea(index);
+ LASSERT(wa, /**/);
+ }
+ wa->view().closeWorkArea(wa);
+}
+
+
///
class DisplayPath {
public:
DisplayPath(int tab, FileName const & filename)
: tab_(tab)
{
- filename_ = toqstr(filename.onlyFileNameWithoutExt());
+ filename_ = (filename.extension() == "lyx") ?
+ toqstr(filename.onlyFileNameWithoutExt())
+ : toqstr(filename.onlyFileName());
postfix_ = toqstr(filename.absoluteFilePath()).
split("/", QString::SkipEmptyParts);
postfix_.pop_back();
// collect full names first: path into postfix, empty prefix and
// filename without extension
for (size_t i = 0; i < n; ++i) {
- GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(i));
+ GuiWorkArea * i_wa = workArea(i);
FileName const fn = i_wa->bufferView().buffer().fileName();
paths.push_back(DisplayPath(i, fn));
}
// set new tab titles
for (It it = paths.begin(); it != paths.end(); ++it) {
- GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(it->tab()));
+ GuiWorkArea * i_wa = workArea(it->tab());
Buffer & buf = i_wa->bufferView().buffer();
if (!buf.fileName().empty() && !buf.isClean())
setTabText(it->tab(), it->displayString() + "*");
// show tab popup
QMenu popup;
popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")),
- qt_("Hide tab"), this, SLOT(closeCurrentTab()));
+ qt_("Hide tab"), this, SLOT(hideCurrentTab()));
popup.addAction(QIcon(getPixmap("images/", "closetab", "png")),
qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
popup.exec(tabBar()->mapToGlobal(pos));
{
setAcceptDrops(true);
#if QT_VERSION >= 0x040500
- setTabsClosable(true);
+ setTabsClosable(!lyxrc.single_close_tab_button);
#endif
}
-void DragTabBar::on_tabCloseRequested(int index)
-{
- setCurrentIndex(index);
- lyx::dispatch(FuncRequest(LFUN_BUFFER_CLOSE));
-}
-
-
#if QT_VERSION < 0x040300
int DragTabBar::tabAt(QPoint const & position) const
{
projects / lyx.git / blobdiff