Commit 55c55d52 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 6cf47088 e4876723
......@@ -388,15 +388,20 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty
int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget,
QStyleHintReturn *returnData) const
{
int ret = 0;
int ret = d->style->styleHint(hint, option, widget, returnData);
switch (hint) {
// Make project explorer alternate rows all the way
case QStyle::SH_ItemView_PaintAlternatingRowColorsForEmptyArea:
if (widget && widget->property("AlternateEmpty").toBool())
ret = true;
break;
case QStyle::SH_EtchDisabledText:
ret = false; // We really should only enforce this for panel widgets
if (panelWidget(widget))
ret = false;
break;
default:
ret = d->style->styleHint(hint, option, widget, returnData);
break;
}
return ret;
}
......
......@@ -908,11 +908,13 @@ bool FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
moveToFirstNonBlankOnLine();
finishMovement();
} else if (key == 'i') {
recordBeginGroup();
enterInsertMode();
updateMiniBuffer();
if (atEndOfLine())
moveLeft();
} else if (key == 'I') {
recordBeginGroup();
setAnchor();
enterInsertMode();
if (m_gflag)
......@@ -976,13 +978,13 @@ bool FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
} else if (key == 'N') {
search(lastSearchString(), !m_lastSearchForward);
} else if (key == 'o' || key == 'O') {
recordBeginGroup();
recordMove();
enterInsertMode();
moveToFirstNonBlankOnLine();
recordBeginGroup();
int numSpaces = leftDist();
moveUp();
if (key == 'o')
moveDown();
if (key == 'O')
moveUp();
moveToEndOfLine();
recordInsertText("\n");
moveToStartOfLine();
......@@ -990,7 +992,6 @@ bool FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
recordInsertText(QString(indentDist(), ' '));
else
recordInsertText(QString(numSpaces, ' '));
recordEndGroup();
} else if (key == 'p' || key == 'P') {
recordBeginGroup();
QString text = m_registers[m_register];
......@@ -1034,8 +1035,13 @@ bool FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
redo();
} else if (key == 's') {
recordBeginGroup();
m_submode = ChangeSubMode;
setAnchor();
moveRight(qMin(count(), rightDist()));
m_registers[m_register] = recordRemoveSelectedText();
//m_dotCommand = QString("%1s").arg(count());
m_opcount.clear();
m_mvcount.clear();
enterInsertMode();
} else if (key == 't' || key == 'T') {
m_subsubmode = FtSubSubMode;
m_subsubdata = key;
......@@ -2043,7 +2049,6 @@ void FakeVimHandler::Private::enterInsertMode()
EDITOR(setOverwriteMode(false));
m_mode = InsertMode;
m_lastInsertion.clear();
recordBeginGroup();
}
void FakeVimHandler::Private::enterCommandMode()
......
......@@ -73,6 +73,8 @@ public:
setContextMenuPolicy(Qt::CustomContextMenu);
setUniformRowHeights(true);
setTextElideMode(Qt::ElideNone);
setAlternatingRowColors(true);
setProperty("AlternateEmpty", true); // Let Manhattan to override style default
// setExpandsOnDoubleClick(false);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment