#include "GuiWorkArea.h"
+#include "ColorCache.h"
+#include "FontLoader.h"
+#include "Menus.h"
+
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include <QTimer>
#include <QToolButton>
#include <QToolTip>
+#include <QMenuBar>
#include <boost/bind.hpp>
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()
// Skip these when selecting
if (cmd.action != LFUN_MOUSE_MOTION) {
completer_->updateVisibility(false, false);
- lyx_view_->updateLayoutList();
- lyx_view_->updateToolbars();
+ lyx_view_->updateDialogs();
}
// GUI tweaks except with mouse motion with no button pressed.
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
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;
}
lastWorkAreaRemoved();
}
+ updateTabTexts();
+
return true;
}
}
}
+///
+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