#include "support/convert.h"
#include "support/debug.h"
#include "support/gettext.h"
-#include "support/FileName.h"
#include "support/lassert.h"
+#include "support/TempFile.h"
#include "frontends/Application.h"
#include "frontends/FontMetrics.h"
#include "frontends/WorkAreaManager.h"
#include <QContextMenuEvent>
+#if (QT_VERSION < 0x050000)
#include <QInputContext>
+#endif
+#include <QDrag>
#include <QHelpEvent>
-#ifdef Q_WS_MACX
-#include <QMacStyle>
+#ifdef Q_OS_MAC
+#include <QProxyStyle>
#endif
#include <QMainWindow>
+#include <QMimeData>
#include <QMenu>
#include <QPainter>
#include <QPalette>
#include <QPixmapCache>
#include <QScrollBar>
+#include <QStyleOption>
+#include <QStylePainter>
#include <QTimer>
#include <QToolButton>
#include <QToolTip>
#include "support/bind.h"
#include <cmath>
+#include <iostream>
int const TabIndicatorWidth = 3;
class CursorWidget {
public:
- CursorWidget() {
+ CursorWidget() : rtl_(false), l_shape_(false), completable_(false),
+ show_(false), x_(0), cursor_width_(0)
+ {
recomputeWidth();
}
GuiWorkArea::Private::Private(GuiWorkArea * parent)
-: p(parent), screen_(0), buffer_view_(0), lyx_view_(0), cursor_visible_(false),
-need_resize_(false), schedule_redraw_(false), preedit_lines_(1),
-completer_(new GuiCompleter(p, p))
+: p(parent), screen_(0), buffer_view_(0), lyx_view_(0),
+ cursor_visible_(false), cursor_(0),
+ need_resize_(false), schedule_redraw_(false), preedit_lines_(1),
+ pixel_ratio_(1.0),
+ completer_(new GuiCompleter(p, p)), dialog_mode_(false),
+ read_only_(false), clean_(true), externally_modified_(false)
{
}
: d(new Private(this))
{
setGuiView(gv);
+ buffer.params().display_pixel_ratio = theGuiApp()->pixelRatio();
setBuffer(buffer);
init();
}
+double GuiWorkArea::pixelRatio() const
+{
+#if QT_VERSION >= 0x050000
+ return qt_scale_factor * devicePixelRatio();
+#else
+ return 1.0;
+#endif
+}
+
+
void GuiWorkArea::init()
{
// Setup the signals
if (buffer.text().paragraphs().size() > 4)
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
QTimer::singleShot(50, this, SLOT(fixVerticalScrollBar()));
+ Q_EMIT bufferViewChanged();
}
}
+// Keep in sync with GuiWorkArea::processKeySym below
+bool GuiWorkArea::queryKeySym(KeySymbol const & key, KeyModifier mod) const
+{
+ return guiApp->queryKeySym(key, mod);
+}
+
+
+// Keep in sync with GuiWorkArea::queryKeySym above
void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod)
{
if (d->lyx_view_->isFullScreen() && d->lyx_view_->menuBar()->isVisible()
}
-void GuiWorkArea::Private::dispatch(FuncRequest const & cmd0, KeyModifier mod)
+void GuiWorkArea::Private::dispatch(FuncRequest const & cmd)
{
// Handle drag&drop
- if (cmd0.action() == LFUN_FILE_OPEN) {
+ if (cmd.action() == LFUN_FILE_OPEN) {
DispatchResult dr;
- lyx_view_->dispatch(cmd0, dr);
+ lyx_view_->dispatch(cmd, dr);
return;
}
- FuncRequest cmd;
-
- if (cmd0.action() == LFUN_MOUSE_PRESS) {
- if (mod == ShiftModifier)
- cmd = FuncRequest(cmd0, "region-select");
- else if (mod == ControlModifier)
- cmd = FuncRequest(cmd0, "paragraph-select");
- else
- cmd = cmd0;
- }
- else
- cmd = cmd0;
-
bool const notJustMovingTheMouse =
cmd.action() != LFUN_MOUSE_MOTION || cmd.button() != mouse_button::none;
&& !completer_->inlineVisible();
cursor_visible_ = true;
cursor_->recomputeWidth();
+
+ //int cur_x = buffer_view_->getPos(cur).x_;
+ // We may have decided to slide the cursor row so that cursor
+ // is visible.
+ p.x_ -= buffer_view_->horizScrollOffset();
+
showCursor(p.x_, p.y_, h, l_shape, isrtl, completable);
}
void GuiWorkArea::Private::updateScrollbar()
{
ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
- // WARNING: don't touch at the scrollbar value like this:
- // verticalScrollBar()->setValue(scroll_.position);
- // because this would cause a recursive signal/slot calling with
- // GuiWorkArea::scrollTo
+ // Block signals to prevent setRange() and setSliderPosition from causing
+ // recursive calls via the signal valueChanged. (#10311)
+ QSignalBlocker blocker(p->verticalScrollBar());
p->verticalScrollBar()->setRange(scroll_.min, scroll_.max);
p->verticalScrollBar()->setPageStep(scroll_.page_step);
p->verticalScrollBar()->setSingleStep(scroll_.single_step);
- p->verticalScrollBar()->setSliderPosition(scroll_.position);
+ p->verticalScrollBar()->setSliderPosition(0);
}
}
// Show the cursor immediately after any operation.
startBlinkingCursor();
+ // FIXME QT5
+#ifdef Q_WS_X11
QApplication::syncX();
+#endif
}
QPoint pos = helpEvent->pos();
if (pos.x() < viewport()->width()) {
QString s = toqstr(d->buffer_view_->toolTip(pos.x(), pos.y()));
- QToolTip::showText(helpEvent->globalPos(), s);
+ QToolTip::showText(helpEvent->globalPos(), formatToolTip(s,35));
}
else
QToolTip::hideText();
return true;
}
- case QEvent::ShortcutOverride: {
+ case QEvent::ShortcutOverride:
+ // keyPressEvent is ShortcutOverride-aware and only accepts the event in
+ // this case
+ keyPressEvent(static_cast<QKeyEvent *>(e));
+ return e->isAccepted();
+
+ case QEvent::KeyPress: {
// We catch this event in order to catch the Tab or Shift+Tab key press
// which are otherwise reserved to focus switching between controls
// within a dialog.
if (d->dc_event_.active && d->dc_event_ == *e) {
d->dc_event_.active = false;
FuncRequest cmd(LFUN_MOUSE_TRIPLE, e->x(), e->y(),
- q_button_state(e->button()));
+ q_button_state(e->button()), q_key_state(e->modifiers()));
d->dispatch(cmd);
e->accept();
return;
}
+#if (QT_VERSION < 0x050000) && !defined(__HAIKU__)
inputContext()->reset();
+#endif
FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
- q_button_state(e->button()));
- d->dispatch(cmd, q_key_state(e->modifiers()));
+ q_button_state(e->button()), q_key_state(e->modifiers()));
+ d->dispatch(cmd);
// Save the context menu on mouse press, because also the mouse
// cursor is set on mouse press. Afterwards, we can either release
d->synthetic_mouse_event_.timeout.stop();
FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
- q_button_state(e->button()));
+ q_button_state(e->button()), q_key_state(e->modifiers()));
d->dispatch(cmd);
e->accept();
}
// we kill the triple click if we move
doubleClickTimeout();
FuncRequest cmd(LFUN_MOUSE_MOTION, e->x(), e->y(),
- q_motion_state(e->buttons()));
+ q_motion_state(e->buttons()), q_key_state(e->modifiers()));
e->accept();
int const lines = qApp->wheelScrollLines();
int const page_step = verticalScrollBar()->pageStep();
// Test if the wheel mouse is set to one screen at a time.
- int scroll_value = lines > page_step
- ? page_step : lines * verticalScrollBar()->singleStep();
+ // This is according to
+ // https://doc.qt.io/qt-5/qapplication.html#wheelScrollLines-prop
+ int scroll_value =
+ min(lines * verticalScrollBar()->singleStep(), page_step);
// Take into account the rotation and the user preferences.
scroll_value = int(scroll_value * delta * lyxrc.mouse_wheel_speed);
d->buffer_view_->scroll(up ? -step : step);
d->buffer_view_->updateMetrics();
} else {
- d->buffer_view_->scrollDocView(value + up ? -step : step, false);
+ d->buffer_view_->scrollDocView(value + (up ? -step : step), false);
}
// In which paragraph do we have to set the cursor ?
break;
yy += h;
}
-
+
// Find the position of the cursor
bool bound;
int x = d->synthetic_mouse_event_.cmd.x();
- pos_type const pos = rit->pos() + tm.getColumnNearX(pit, *rit, x, bound);
+ pos_type const pos = tm.getPosNearX(*rit, x, bound);
// Set the cursor
cur.pit() = pit;
void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
{
+ // this is also called for ShortcutOverride events. In this case, one must
+ // not act but simply accept the event explicitly.
+ bool const act = (ev->type() != QEvent::ShortcutOverride);
+
// Do not process here some keys if dialog_mode_ is set
if (d->dialog_mode_
&& (ev->modifiers() == Qt::NoModifier
switch (ev->key()) {
case Qt::Key_Enter:
case Qt::Key_Return:
- d->completer_->activate();
+ if (act)
+ d->completer_->activate();
ev->accept();
return;
}
// do nothing if there are other events
// (the auto repeated events come too fast)
// it looks like this is only needed on X11
-#ifdef Q_WS_X11
- if (qApp->hasPendingEvents() && ev->isAutoRepeat()) {
+#if defined(Q_WS_X11) || defined(QPA_XCB)
+ // FIXME: this is a weird way to implement event compression. Also, this is
+ // broken with IBus.
+ if (act && qApp->hasPendingEvents() && ev->isAutoRepeat()) {
switch (ev->key()) {
case Qt::Key_PageDown:
case Qt::Key_PageUp:
}
#endif
- KeyModifier m = q_key_state(ev->modifiers());
+ KeyModifier const m = q_key_state(ev->modifiers());
std::string str;
if (m & ShiftModifier)
str += "Alt-";
if (m & MetaModifier)
str += "Meta-";
-
- LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
- << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key()
- << " keyState: " << str);
+
+ if (act)
+ LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
+ << " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key()
+ << " keyState: " << str);
KeySymbol sym;
setKeySymbol(&sym, ev);
if (sym.isOK()) {
- processKeySym(sym, q_key_state(ev->modifiers()));
- ev->accept();
+ if (act) {
+ processKeySym(sym, m);
+ ev->accept();
+ } else
+ ev->setAccepted(queryKeySym(sym, m));
} else {
ev->ignore();
}
{
d->dc_event_ = DoubleClick(ev);
QTimer::singleShot(QApplication::doubleClickInterval(), this,
- SLOT(doubleClickTimeout()));
- FuncRequest cmd(LFUN_MOUSE_DOUBLE,
- ev->x(), ev->y(),
- q_button_state(ev->button()));
+ SLOT(doubleClickTimeout()));
+ FuncRequest cmd(LFUN_MOUSE_DOUBLE, ev->x(), ev->y(),
+ q_button_state(ev->button()), q_key_state(ev->modifiers()));
d->dispatch(cmd);
ev->accept();
}
void GuiWorkArea::paintEvent(QPaintEvent * ev)
{
- QRect const rc = ev->rect();
+ QRectF const rc = ev->rect();
// LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x()
// << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height());
- if (d->need_resize_) {
+ if (d->needResize()) {
d->resetScreen();
d->resizeBufferView();
if (d->cursor_visible_) {
}
QPainter pain(viewport());
+ double const pr = pixelRatio();
+ QRectF const rcs = QRectF(rc.x() * pr, rc.y() * pr, rc.width() * pr, rc.height() * pr);
+
if (lyxrc.use_qimage) {
- pain.drawImage(rc, static_cast<QImage const &>(*d->screen_), rc);
+ QImage const & image = static_cast<QImage const &>(*d->screen_);
+ pain.drawImage(rc, image, rcs);
} else {
- pain.drawPixmap(rc, static_cast<QPixmap const &>(*d->screen_), rc);
+ QPixmap const & pixmap = static_cast<QPixmap const &>(*d->screen_);
+ pain.drawPixmap(rc, pixmap, rcs);
}
d->cursor_->draw(pain);
ev->accept();
void GuiWorkArea::Private::updateScreen()
{
- GuiPainter pain(screen_);
+ GuiPainter pain(screen_, p->pixelRatio());
buffer_view_->draw(pain);
}
stopBlinkingCursor();
// last_width : for checking if last preedit string was/wasn't empty.
+ // FIXME THREAD && FIXME
+ // We could have more than one work area, right?
static bool last_width = false;
if (!last_width && preedit_string.empty()) {
// if last_width is last length of preedit string.
return;
}
- GuiPainter pain(d->screen_);
+ GuiPainter pain(d->screen_, pixelRatio());
d->buffer_view_->updateMetrics();
d->buffer_view_->draw(pain);
+ // FIXME: shall we use real_current_font here? (see #10478)
FontInfo font = d->buffer_view_->cursor().getFont().fontInfo();
FontMetrics const & fm = theFontMetrics(font);
int height = fm.maxHeight();
void GuiWorkArea::updateWindowTitle()
{
- docstring maximize_title;
- docstring minimize_title;
-
- Buffer const & buf = d->buffer_view_->buffer();
- FileName const file_name = buf.fileName();
- if (!file_name.empty()) {
- maximize_title = file_name.displayName(130);
- minimize_title = from_utf8(file_name.onlyFileName());
- if (buf.lyxvc().inUse()) {
- if (buf.lyxvc().locking())
- maximize_title += _(" (version control, locking)");
- else
- maximize_title += _(" (version control)");
- }
- if (!buf.isClean()) {
- maximize_title += _(" (changed)");
- minimize_title += char_type('*');
- }
- if (buf.isReadonly())
- maximize_title += _(" (read only)");
- }
-
- QString const new_title = toqstr(maximize_title);
- if (new_title != windowTitle()) {
- QWidget::setWindowTitle(new_title);
- QWidget::setWindowIconText(toqstr(minimize_title));
- titleChanged(this);
+ Buffer const & buf = bufferView().buffer();
+ if (buf.fileName() != d->file_name_
+ || buf.isReadonly() != d->read_only_
+ || buf.lyxvc().vcstatus() != d->vc_status_
+ || buf.isClean() != d->clean_
+ || buf.notifiesExternalModification() != d->externally_modified_) {
+ d->file_name_ = buf.fileName();
+ d->read_only_ = buf.isReadonly();
+ d->vc_status_ = buf.lyxvc().vcstatus();
+ d->clean_ = buf.isClean();
+ d->externally_modified_ = buf.notifiesExternalModification();
+ Q_EMIT titleChanged(this);
}
}
EmbeddedWorkArea::EmbeddedWorkArea(QWidget * w): GuiWorkArea(w)
{
- buffer_ = theBufferList().newBuffer(
- support::FileName::tempName().absFileName() + "_embedded.internal");
+ support::TempFile tempfile("embedded.internal");
+ tempfile.setAutoRemove(false);
+ buffer_ = theBufferList().newInternalBuffer(tempfile.name().absFileName());
buffer_->setUnnamed(true);
buffer_->setFullyLoaded(true);
setBuffer(*buffer_);
//
////////////////////////////////////////////////////////////////////
-#ifdef Q_WS_MACX
-class NoTabFrameMacStyle : public QMacStyle {
+#ifdef Q_OS_MAC
+class NoTabFrameMacStyle : public QProxyStyle {
public:
///
QRect subElementRect(SubElement element, const QStyleOption * option,
const QWidget * widget = 0) const
{
- QRect rect = QMacStyle::subElementRect(element, option, widget);
+ QRect rect = QProxyStyle::subElementRect(element, option, widget);
bool noBar = static_cast<QTabWidget const *>(widget)->count() <= 1;
// The Qt Mac style puts the contents into a 3 pixel wide box
TabWorkArea::TabWorkArea(QWidget * parent)
- : QTabWidget(parent), clicked_tab_(-1)
+ : QTabWidget(parent), clicked_tab_(-1), midpressed_tab_(-1)
{
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
setStyle(&noTabFrameMacStyle);
#endif
-#if QT_VERSION < 0x040500
- lyxrc.single_close_tab_button = true;
-#endif
QPalette pal = palette();
pal.setColor(QPalette::Active, QPalette::Button,
closeBufferButton = new QToolButton(this);
closeBufferButton->setPalette(pal);
// FIXME: rename the icon to closebuffer.png
- closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "png")));
+ closeBufferButton->setIcon(QIcon(getPixmap("images/", "closetab", "svgz,png")));
closeBufferButton->setText("Close File");
closeBufferButton->setAutoRaise(true);
closeBufferButton->setCursor(Qt::ArrowCursor);
tb->setContextMenuPolicy(Qt::CustomContextMenu);
connect(tb, SIGNAL(customContextMenuRequested(const QPoint &)),
this, SLOT(showContextMenu(const QPoint &)));
-#if QT_VERSION >= 0x040500
connect(tb, SIGNAL(tabCloseRequested(int)),
this, SLOT(closeTab(int)));
-#endif
setUsesScrollButtons(true);
}
+void TabWorkArea::mousePressEvent(QMouseEvent *me)
+{
+ if (me->button() == Qt::MidButton)
+ midpressed_tab_ = tabBar()->tabAt(me->pos());
+ else
+ QTabWidget::mousePressEvent(me);
+}
+
+
+void TabWorkArea::mouseReleaseEvent(QMouseEvent *me)
+{
+ if (me->button() == Qt::MidButton) {
+ int const midreleased_tab = tabBar()->tabAt(me->pos());
+ if (midpressed_tab_ == midreleased_tab && posIsTab(me->pos()))
+ closeTab(midreleased_tab);
+ } else
+ QTabWidget::mouseReleaseEvent(me);
+}
+
+
+void TabWorkArea::paintEvent(QPaintEvent * event)
+{
+ if (tabBar()->isVisible()) {
+ QTabWidget::paintEvent(event);
+ } else {
+ // Prevent the selected tab to influence the
+ // painting of the frame of the tab widget.
+ // This is needed for gtk style in Qt.
+ QStylePainter p(this);
+#if QT_VERSION < 0x050000
+ QStyleOptionTabWidgetFrameV2 opt;
+#else
+ QStyleOptionTabWidgetFrame opt;
+#endif
+ initStyleOption(&opt);
+ opt.rect = style()->subElementRect(QStyle::SE_TabWidgetTabPane,
+ &opt, this);
+ opt.selectedTabRect = QRect();
+ p.drawPrimitive(QStyle::PE_FrameTabWidget, opt);
+ }
+}
+
+
+bool TabWorkArea::posIsTab(QPoint position)
+{
+ // tabAt returns -1 if tab does not covers position
+ return tabBar()->tabAt(position) > -1;
+}
+
+
void TabWorkArea::mouseDoubleClickEvent(QMouseEvent * event)
{
if (event->button() != Qt::LeftButton)
return;
+ // this code chunk is unnecessary because it seems the event only makes
+ // it this far if it is not on a tab. I'm not sure why this is (maybe
+ // it is handled and ended in DragTabBar?), and thus I'm not sure if
+ // this is true in all cases and if it will be true in the future so I
+ // leave this code for now. (skostysh, 2016-07-21)
+ //
// return early if double click on existing tabs
- for (int i = 0; i < count(); ++i)
- if (tabBar()->tabRect(i).contains(event->pos()))
- return;
+ if (posIsTab(event->pos()))
+ return;
dispatch(FuncRequest(LFUN_BUFFER_NEW));
}
tabBar()->setEnabled(show);
tabBar()->setVisible(show);
closeBufferButton->setVisible(show && lyxrc.single_close_tab_button);
-#if QT_VERSION >= 0x040500
setTabsClosable(!lyxrc.single_close_tab_button);
-#endif
}
return 0;
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget());
- LASSERT(wa, /**/);
+ LATTEST(wa);
return wa;
}
{
while (count()) {
GuiWorkArea * wa = workArea(0);
- LASSERT(wa, /**/);
+ LASSERT(wa, return);
removeTab(0);
delete wa;
}
bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area)
{
- LASSERT(work_area, /**/);
+ LASSERT(work_area, return false);
int index = indexOf(work_area);
if (index == -1)
return false;
wa = currentWorkArea();
else {
wa = workArea(clicked_tab_);
- LASSERT(wa, /**/);
+ LASSERT(wa, return);
}
wa->view().closeWorkArea(wa);
}
wa = currentWorkArea();
else {
wa = workArea(clicked_tab_);
- LASSERT(wa, /**/);
+ LASSERT(wa, return);
}
wa->view().hideWorkArea(wa);
}
wa = currentWorkArea();
else {
wa = workArea(index);
- LASSERT(wa, /**/);
+ LASSERT(wa, return);
}
wa->view().closeWorkArea(wa);
}
class DisplayPath {
public:
/// make vector happy
- DisplayPath() {}
+ DisplayPath() : tab_(-1), dottedPrefix_(false) {}
///
DisplayPath(int tab, FileName const & filename)
: tab_(tab)
if (!dotted) {
if (dottedPrefix_ && !prefix_.isEmpty())
- prefix_ += ".../";
+ prefix_ += ellipsisSlash_;
prefix_ += postfix_.front() + "/";
}
dottedPrefix_ = dotted && !prefix_.isEmpty();
return filename_;
bool dots = dottedPrefix_ || !postfix_.isEmpty();
- return prefix_ + (dots ? ".../" : "") + filename_;
+ return prefix_ + (dots ? ellipsisSlash_ : "") + filename_;
}
///
QString forecastPathString() const
return displayString();
return prefix_
- + (dottedPrefix_ ? ".../" : "")
+ + (dottedPrefix_ ? ellipsisSlash_ : "")
+ postfix_.front() + "/";
}
///
int tab() const { return tab_; }
private:
+ /// ".../"
+ static QString const ellipsisSlash_;
///
QString prefix_;
///
};
+QString const DisplayPath::ellipsisSlash_ = QString(QChar(0x2026)) + "/";
+
+
///
bool operator<(DisplayPath const & a, DisplayPath const & b)
{
// that it makes the path more unique.
somethingChanged = true;
It sit = segStart;
+ // this is ok for the reason mentioned in the previous comment.
+ // coverity[INVALIDATE_ITERATOR]
QString dspString = sit->forecastPathString();
LYXERR(Debug::GUI, "first forecast found for "
<< sit->abs() << " => " << dspString);
for (It it = paths.begin(); it != paths.end(); ++it) {
int const tab_index = it->tab();
Buffer const & buf = workArea(tab_index)->bufferView().buffer();
- QString tab_text = it->displayString();
+ QString tab_text = it->displayString().replace("&", "&&");
if (!buf.fileName().empty() && !buf.isClean())
tab_text += "*";
+ QString tab_tooltip = it->abs();
+ if (buf.isReadonly()) {
+ setTabIcon(tab_index, QIcon(getPixmap("images/", "emblem-readonly", "svgz,png")));
+ tab_tooltip = qt_("%1 (read only)").arg(tab_tooltip);
+ } else
+ setTabIcon(tab_index, QIcon());
+ if (buf.notifiesExternalModification()) {
+ QString const warn = qt_("%1 (modified externally)");
+ tab_tooltip = warn.arg(tab_tooltip);
+ tab_text += QChar(0x26a0);
+ }
setTabText(tab_index, tab_text);
- setTabToolTip(tab_index, it->abs());
+ setTabToolTip(tab_index, tab_tooltip);
}
}
// show tab popup
QMenu popup;
- popup.addAction(QIcon(getPixmap("images/", "hidetab", "png")),
+ popup.addAction(QIcon(getPixmap("images/", "hidetab", "svgz,png")),
qt_("Hide tab"), this, SLOT(hideCurrentTab()));
- popup.addAction(QIcon(getPixmap("images/", "closetab", "png")),
+ popup.addAction(QIcon(getPixmap("images/", "closetab", "svgz,png")),
qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
popup.exec(tabBar()->mapToGlobal(pos));
: QTabBar(parent)
{
setAcceptDrops(true);
-#if QT_VERSION >= 0x040500
setTabsClosable(!lyxrc.single_close_tab_button);
-#endif
}
-#if QT_VERSION < 0x040300
-int DragTabBar::tabAt(QPoint const & position) const
-{
- const int max = count();
- for (int i = 0; i < max; ++i) {
- if (tabRect(i).contains(position))
- return i;
- }
- return -1;
-}
-#endif
-
-
void DragTabBar::mousePressEvent(QMouseEvent * event)
{
if (event->button() == Qt::LeftButton)
mimeData->setData("action", "tab-reordering") ;
drag->setMimeData(mimeData);
-#if QT_VERSION >= 0x040300
// get tab pixmap as cursor
QRect r = tabRect(tab);
QPixmap pixmap(r.size());
render(&pixmap, - r.topLeft());
drag->setPixmap(pixmap);
drag->exec();
-#else
- drag->start(Qt::MoveAction);
-#endif
-
}