#include "GuiWorkArea.h"
+#include "ColorCache.h"
+#include "FontLoader.h"
+#include "Menus.h"
+
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Font.h"
#include "FuncRequest.h"
#include "GuiApplication.h"
+#include "GuiCompleter.h"
#include "GuiKeySymbol.h"
#include "GuiPainter.h"
#include "GuiView.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "qt_helpers.h"
+#include "Text.h"
#include "version.h"
#include "graphics/GraphicsImage.h"
#include <QContextMenuEvent>
#include <QInputContext>
#include <QHelpEvent>
-#ifdef Q_WS_MAC
+#ifdef Q_WS_MACX
#include <QMacStyle>
#endif
#include <QMainWindow>
#include <QTimer>
#include <QToolButton>
#include <QToolTip>
+#include <QMenuBar>
#include <boost/bind.hpp>
: buffer_view_(new BufferView(buffer)), lyx_view_(&lv),
cursor_visible_(false),
need_resize_(false), schedule_redraw_(false),
- preedit_lines_(1), completer_(this)
+ preedit_lines_(1), completer_(new GuiCompleter(this))
{
buffer.workAreaManager().add(this);
// Setup the signals
if (time > 0) {
cursor_timeout_.setInterval(time);
cursor_timeout_.start();
- } else
+ } else {
// let's initialize this just to be safe
cursor_timeout_.setInterval(500);
+ }
screen_ = QPixmap(viewport()->width(), viewport()->height());
cursor_ = new frontend::CursorWidget();
cursor_->hide();
+ // HACK: Prevents an additional redraw when the scrollbar pops up
+ // which regularily happens on documents with more than one page.
+ // The policy should be set to "Qt::ScrollBarAsNeeded" soon.
+ // Since we have no geometry information yet, we assume that
+ // a document needs a scrollbar if there is more then four
+ // paragraph in the outermost text.
+ if (buffer.text().paragraphs().size() > 4)
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+ QTimer::singleShot(50, this, SLOT(fixVerticalScrollBar()));
+
+
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setAcceptDrops(true);
setMouseTracking(true);
}
+void GuiWorkArea::fixVerticalScrollBar()
+{
+ if (!isFullScreen())
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+}
+
+
void GuiWorkArea::close()
{
lyx_view_->removeWorkArea(this);
void GuiWorkArea::processKeySym(KeySymbol const & key, KeyModifier mod)
{
+ if (lyx_view_->isFullScreen() && lyx_view_->menuBar()->isVisible()) {
+ // FIXME HACK: we should not have to do this here. See related comment
+ // in GuiView::event() (QEvent::ShortcutOverride)
+ lyx_view_->menuBar()->hide();
+ }
+
// In order to avoid bad surprise in the middle of an operation,
// we better stop the blinking cursor...
// the cursor gets restarted in GuiView::restartCursor()
theLyXFunc().setLyXView(lyx_view_);
theLyXFunc().processKeySym(key, mod);
-
}
// Skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
- completer_.updateVisibility(false, false);
- lyx_view_->updateLayoutList();
- lyx_view_->updateToolbars();
+ completer_->updateVisibility(false, false);
+ lyx_view_->updateDialogs();
}
// GUI tweaks except with mouse motion with no button pressed.
// show cursor on screen
bool completable = cur.inset().showCompletionCursor()
- && completer_.completionAvailable()
- && !completer_.popupVisible()
- && !completer_.inlineVisible();
+ && completer_->completionAvailable()
+ && !completer_->popupVisible()
+ && !completer_->inlineVisible();
if (cursorInView) {
cursor_visible_ = true;
showCursor(x, y, h, l_shape, isrtl, completable);
{
ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
+ // Block the scrollbar signal to prevent recursive signal/slot calling.
+ verticalScrollBar()->blockSignals(true);
verticalScrollBar()->setRange(scroll_.min, scroll_.max);
verticalScrollBar()->setPageStep(scroll_.page_step);
verticalScrollBar()->setSingleStep(scroll_.single_step);
- // Block the scrollbar signal to prevent recursive signal/slot calling.
- verticalScrollBar()->blockSignals(true);
verticalScrollBar()->setValue(scroll_.position);
verticalScrollBar()->setSliderPosition(scroll_.position);
verticalScrollBar()->blockSignals(false);
void GuiWorkArea::keyPressEvent(QKeyEvent * ev)
{
// intercept some keys if completion popup is visible
- if (completer_.popupVisible()) {
+ if (completer_->popupVisible()) {
switch (ev->key()) {
case Qt::Key_Enter:
case Qt::Key_Return:
- completer_.activate();
+ completer_->activate();
ev->accept();
return;
}
// intercept keys for the completion
if (ev->key() == Qt::Key_Tab) {
- completer_.tab();
+ completer_->tab();
ev->accept();
return;
}
- if (completer_.popupVisible() && ev->key() == Qt::Key_Escape) {
- completer_.hidePopup();
+ if (completer_->popupVisible() && ev->key() == Qt::Key_Escape) {
+ completer_->hidePopup();
ev->accept();
return;
}
- if (completer_.inlineVisible() && ev->key() == Qt::Key_Escape) {
- completer_.hideInline();
+ if (completer_->inlineVisible() && ev->key() == Qt::Key_Escape) {
+ completer_->hideInline();
ev->accept();
return;
}
}
#endif
- LYXERR(Debug::KEY, " count: " << ev->count()
- << " text: " << fromqstr(ev->text())
+ LYXERR(Debug::KEY, " count: " << ev->count() << " text: " << ev->text()
<< " isAutoRepeat: " << ev->isAutoRepeat() << " key: " << ev->key());
KeySymbol sym;
if (!commit_string.isEmpty()) {
- LYXERR(Debug::KEY, "preeditString: " << fromqstr(e->preeditString())
- << " commitString: " << fromqstr(e->commitString()));
+ LYXERR(Debug::KEY, "preeditString: " << e->preeditString()
+ << " commitString: " << e->commitString());
int key = 0;
{
updateWindowTitle();
if (this == lyx_view_->currentWorkArea())
- lyx_view_->updateBufferDependent(false);
+ lyx_view_->updateDialogs();
}
public:
///
QRect subElementRect(SubElement element, const QStyleOption * option,
- const QWidget * widget = 0 ) const
+ const QWidget * widget = 0) const
{
QRect rect = QMacStyle::subElementRect(element, option, widget);
bool noBar = static_cast<QTabWidget const *>(widget)->count() <= 1;
QTabBar* tb = new DragTabBar;
connect(tb, SIGNAL(tabMoveRequested(int, int)),
this, SLOT(moveTab(int, int)));
+ tb->setElideMode(Qt::ElideNone);
setTabBar(tb);
// make us responsible for the context menu of the tabbar
return 0;
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget());
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
return wa;
}
{
for (int i = 0; i != count(); ++i) {
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
- BOOST_ASSERT(wa);
+ LASSERT(wa, return 0);
if (&wa->bufferView().buffer() == &buffer)
return wa;
}
{
while (count()) {
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
removeTab(0);
delete wa;
}
bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area)
{
- BOOST_ASSERT(work_area);
+ LASSERT(work_area, /**/);
int index = indexOf(work_area);
if (index == -1)
return false;
showBar(count() > 0);
addTab(wa, wa->windowTitle());
QObject::connect(wa, SIGNAL(titleChanged(GuiWorkArea *)),
- this, SLOT(updateTabText(GuiWorkArea *)));
+ this, SLOT(updateTabTexts()));
if (currentWorkArea() && currentWorkArea()->isFullScreen())
setFullScreen(true);
else
// Hide tabbar if there's only one tab.
showBar(count() > 1);
+ updateTabTexts();
+
return wa;
}
bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
{
- BOOST_ASSERT(work_area);
+ LASSERT(work_area, return false);
int index = indexOf(work_area);
if (index == -1)
return false;
if (count()) {
// make sure the next work area is enabled.
currentWidget()->setUpdatesEnabled(true);
- if ((currentWorkArea() && currentWorkArea()->isFullScreen()))
+ if (currentWorkArea() && currentWorkArea()->isFullScreen())
setFullScreen(true);
else
// Hide tabbar if there's only one tab.
showBar(count() > 1);
- } else
+ } else {
lastWorkAreaRemoved();
+ }
+
+ updateTabTexts();
return true;
}
void TabWorkArea::on_currentTabChanged(int i)
{
+ // returns e.g. on application destruction
+ if (i == -1)
+ return;
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
- BOOST_ASSERT(wa);
+ LASSERT(wa, return);
BufferView & bv = wa->bufferView();
bv.cursor().fixIfBroken();
bv.updateMetrics();
removeWorkArea(currentWorkArea());
else {
GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_));
- BOOST_ASSERT(wa);
+ LASSERT(wa, /**/);
removeWorkArea(wa);
}
}
+///
+class DisplayPath {
+public:
+ /// make vector happy
+ DisplayPath() {}
+ ///
+ DisplayPath(int tab, FileName const & filename)
+ : tab_(tab)
+ {
+ filename_ = toqstr(filename.onlyFileNameWithoutExt());
+ postfix_ = toqstr(filename.absoluteFilePath()).
+ split("/", QString::SkipEmptyParts);
+ postfix_.pop_back();
+ abs_ = toqstr(filename.absoluteFilePath());
+ dottedPrefix_ = false;
+ }
+
+ /// Absolute path for debugging.
+ QString abs() const
+ {
+ return abs_;
+ }
+ /// Add the first segment from the postfix or three dots to the prefix.
+ /// Merge multiple dot tripples. In fact dots are added lazily, i.e. only
+ /// when really needed.
+ void shiftPathSegment(bool dotted)
+ {
+ if (postfix_.count() <= 0)
+ return;
+
+ if (!dotted) {
+ if (dottedPrefix_ && !prefix_.isEmpty())
+ prefix_ += ".../";
+ prefix_ += postfix_.front() + "/";
+ }
+ dottedPrefix_ = dotted && !prefix_.isEmpty();
+ postfix_.pop_front();
+ }
+ ///
+ QString displayString() const
+ {
+ if (prefix_.isEmpty())
+ return filename_;
+
+ bool dots = dottedPrefix_ || !postfix_.isEmpty();
+ return prefix_ + (dots ? ".../" : "") + filename_;
+ }
+ ///
+ QString forecastPathString() const
+ {
+ if (postfix_.count() == 0)
+ return displayString();
+
+ return prefix_
+ + (dottedPrefix_ ? ".../" : "")
+ + postfix_.front() + "/";
+ }
+ ///
+ bool final() const { return postfix_.empty(); }
+ ///
+ int tab() const { return tab_; }
+
+private:
+ ///
+ QString prefix_;
+ ///
+ QStringList postfix_;
+ ///
+ QString filename_;
+ ///
+ QString abs_;
+ ///
+ int tab_;
+ ///
+ bool dottedPrefix_;
+};
+
+
+///
+bool operator<(DisplayPath const & a, DisplayPath const & b)
+{
+ return a.displayString() < b.displayString();
+}
+
+///
+bool operator==(DisplayPath const & a, DisplayPath const & b)
+{
+ return a.displayString() == b.displayString();
+}
+
-void TabWorkArea::updateTabText(GuiWorkArea * wa)
+void TabWorkArea::updateTabTexts()
{
- int const i = indexOf(wa);
- if (i < 0)
+ size_t n = count();
+ if (n == 0)
return;
- setTabText(i, wa->windowTitle());
+ std::list<DisplayPath> paths;
+ typedef std::list<DisplayPath>::iterator It;
+
+ // 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));
+ FileName const fn = i_wa->bufferView().buffer().fileName();
+ paths.push_back(DisplayPath(i, fn));
+ }
+
+ // go through path segments and see if it helps to make the path more unique
+ bool somethingChanged = true;
+ bool allFinal = false;
+ while (somethingChanged && !allFinal) {
+ // adding path segments changes order
+ paths.sort();
+
+ LYXERR(Debug::GUI, "updateTabTexts() iteration start");
+ somethingChanged = false;
+ allFinal = true;
+
+ // find segments which are not unique (i.e. non-atomic)
+ It it = paths.begin();
+ It segStart = it;
+ QString segString = it->displayString();
+ for (; it != paths.end(); ++it) {
+ // look to the next item
+ It next = it;
+ ++next;
+
+ // final?
+ allFinal = allFinal && it->final();
+
+ LYXERR(Debug::GUI, "it = " << it->abs()
+ << " => " << it->displayString());
+
+ // still the same segment?
+ QString nextString;
+ if ((next != paths.end()
+ && (nextString = next->displayString()) == segString))
+ continue;
+ LYXERR(Debug::GUI, "segment ended");
+
+ // only a trivial one with one element?
+ if (it == segStart) {
+ // start new segment
+ segStart = next;
+ segString = nextString;
+ continue;
+ }
+
+ // we found a non-atomic segment segStart <= sit <= it < next.
+ // Shift path segments and hope for the best
+ // that it makes the path more unique.
+ somethingChanged = true;
+ It sit = segStart;
+ QString dspString = sit->forecastPathString();
+ LYXERR(Debug::GUI, "first forecast found for "
+ << sit->abs() << " => " << dspString);
+ ++sit;
+ bool moreUnique = false;
+ for (; sit != next; ++sit) {
+ if (sit->forecastPathString() != dspString) {
+ LYXERR(Debug::GUI, "different forecast found for "
+ << sit->abs() << " => " << sit->forecastPathString());
+ moreUnique = true;
+ break;
+ }
+ LYXERR(Debug::GUI, "same forecast found for "
+ << sit->abs() << " => " << dspString);
+ }
+
+ // if the path segment helped, add it. Otherwise add dots
+ bool dots = !moreUnique;
+ LYXERR(Debug::GUI, "using dots = " << dots);
+ for (sit = segStart; sit != next; ++sit) {
+ sit->shiftPathSegment(dots);
+ LYXERR(Debug::GUI, "shifting "
+ << sit->abs() << " => " << sit->displayString());
+ }
+
+ // start new segment
+ segStart = next;
+ segString = nextString;
+ }
+ }
+
+ // set new tab titles
+ for (It it = paths.begin(); it != paths.end(); ++it) {
+ GuiWorkArea * i_wa = dynamic_cast<GuiWorkArea *>(widget(it->tab()));
+ Buffer & buf = i_wa->bufferView().buffer();
+ if (!buf.fileName().empty() && !buf.isClean())
+ setTabText(it->tab(), it->displayString() + "*");
+ else
+ setTabText(it->tab(), it->displayString());
+ }
}
{
// which tab?
clicked_tab_ = static_cast<DragTabBar *>(tabBar())->tabAt(pos);
- if (clicked_tab_ != -1) {
- // show tab popup
- QMenu popup;
- popup.addAction(QIcon(":/images/hidetab.png"),
- qt_("Hide tab"), this, SLOT(closeCurrentTab()));
- popup.addAction(QIcon(":/images/closetab.png"),
- qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
- popup.exec(tabBar()->mapToGlobal(pos));
-
- clicked_tab_ = -1;
- }
+ if (clicked_tab_ == -1)
+ return;
+
+ // show tab popup
+ QMenu popup;
+ popup.addAction(QIcon(":/images/hidetab.png"),
+ qt_("Hide tab"), this, SLOT(closeCurrentTab()));
+ popup.addAction(QIcon(":/images/closetab.png"),
+ qt_("Close tab"), this, SLOT(closeCurrentBuffer()));
+ popup.exec(tabBar()->mapToGlobal(pos));
+
+ clicked_tab_ = -1;
}
projects / lyx.git / blobdiff