TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rewrite list view movement key handlers in file management mode

Browse Source 
This resolves Bug 1961
(cherry picked from commit 4ffab32f5f)
v3.5.13-sru
Timothy Pearson 10 years ago committed by Slávek Banko
parent 83cdf8affa
commit cdeb154369
1 changed files with 468 additions and 316 deletions
Show Stats Download Patch File Download Diff File

416
kdeui/klistview.cpp
Unescape View File

@ -2,6 +2,7 @@
Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
Copyright (C) 2000 Peter Putzer
Copyright (C) 2014 Timothy Pearson <kb9vqf@pearsoncomputing.net>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@ -92,6 +93,7 @@ public:
tabRename(true),
sortColumn(0),
selectionDirection(0),
selectionRegion(0),
tooltipColumn (0),
selectionMode (Single),
contextMenuKey (KGlobalSettings::contextMenuKey()),
@ -101,7 +103,8 @@ public:
paintCurrent (0),
paintBelow (0),
painting (false),
shadeSortColumn(KGlobalSettings::shadeSortColumn())
shadeSortColumn(KGlobalSettings::shadeSortColumn()),
initialFileManagerItem(0)
{
renameable.append(0);
connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int)));
@ -151,6 +154,7 @@ public:
//+1 means downwards (y increases, -1 means upwards, 0 means not selected), aleXXX
int selectionDirection;
int selectionRegion;
int tooltipColumn;
SelectionModeExt selectionMode;
@ -170,6 +174,8 @@ public:
bool shadeSortColumn:1;
TQColor alternateBackground;
TQListViewItem *initialFileManagerItem;
};
@ -1514,22 +1520,24 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
//don't care whether it's on the keypad or not
int e_state=(e->state() & ~Keypad);
int oldSelectionDirection(d->selectionDirection);
// Handle non-control keypresses
if ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
&& (e->key()!=Key_Meta) && (e->key()!=Key_Alt))
{
if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
&& (e->key()!=Key_Meta) && (e->key()!=Key_Alt)) {
if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove)) {
selectAll(false);
d->selectionRegion = 0;
d->initialFileManagerItem = NULL;
}
d->selectionDirection=0;
d->wasShiftEvent = (e_state == ShiftButton);
};
}
//d->wasShiftEvent = (e_state == ShiftButton);
TQListViewItem* item = currentItem();
if (!item) return;
if (!item) {
return;
}
TQListViewItem* repaintItem1 = item;
TQListViewItem* repaintItem2 = 0L;
@ -1540,8 +1548,9 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
bool shiftOrCtrl((e_state==ControlButton) || (e_state==ShiftButton));
int selectedItems(0);
for (TQListViewItem *tmpItem=firstChild(); tmpItem; tmpItem=tmpItem->nextSibling())
for (TQListViewItem *tmpItem=firstChild(); tmpItem; tmpItem=tmpItem->nextSibling()) {
if (tmpItem->isSelected()) selectedItems++;
}
if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse)))
&& (e_state==Qt::NoButton)
@ -1550,18 +1559,17 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
|| (e->key()==Key_Next)
|| (e->key()==Key_Prior)
|| (e->key()==Key_Home)
|| (e->key()==Key_End)))
{
|| (e->key()==Key_End))) {
d->selectedBySimpleMove=true;
d->selectedUsingMouse=false;
}
else if (selectedItems>1)
else if (selectedItems>1) {
d->selectedBySimpleMove=false;
}
bool emitSelectionChanged(false);
switch (e->key())
{
switch (e->key()) {
case Key_Escape:
selectAll(false);
emitSelectionChanged=true;
@ -1569,120 +1577,178 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
case Key_Space:
//toggle selection of current item
if (d->selectedBySimpleMove)
if (d->selectedBySimpleMove) {
d->selectedBySimpleMove=false;
}
item->setSelected(!item->isSelected());
emitSelectionChanged=true;
break;
case Key_Insert:
//toggle selection of current item and move to the next item
if (d->selectedBySimpleMove)
{
if (d->selectedBySimpleMove) {
d->selectedBySimpleMove=false;
if (!item->isSelected()) item->setSelected(true);
}
else
{
else {
item->setSelected(!item->isSelected());
};
}
nextItem=item->itemBelow();
if (nextItem)
{
if (nextItem) {
repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
}
d->selectionDirection=1;
emitSelectionChanged=true;
break;
case Key_Down:
nextItem=item->itemBelow();
//toggle selection of current item and move to the next item
if (shiftOrCtrl)
{
if (shiftOrCtrl) {
d->selectionDirection=1;
if (d->selectedBySimpleMove)
d->selectedBySimpleMove=false;
else
{
if (oldSelectionDirection!=-1)
{
item->setSelected(!item->isSelected());
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = item;
item->setSelected(true);
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
};
};
d->selectionRegion=1;
}
else if ((d->selectedBySimpleMove) && (nextItem))
{
else {
if (item == d->initialFileManagerItem) {
item->setSelected(true);
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
d->selectionRegion=1;
}
else {
if (d->selectionRegion == 1) {
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
}
else if (d->selectionRegion == -1) {
item->setSelected(false);
emitSelectionChanged=true;
};
}
}
}
}
else if ((d->selectedBySimpleMove) && (nextItem)) {
item->setSelected(false);
emitSelectionChanged=true;
}
if (nextItem)
{
if (d->selectedBySimpleMove)
if (nextItem) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
}
break;
case Key_Up:
nextItem=item->itemAbove();
if (shiftOrCtrl) {
d->selectionDirection=-1;
//move to the prev. item and toggle selection of this one
// => No, can't select the last item, with this. For symmetry, let's
// toggle selection and THEN move up, just like we do in down (David)
if (shiftOrCtrl)
{
if (d->selectedBySimpleMove)
d->selectedBySimpleMove=false;
else
{
if (oldSelectionDirection!=1)
{
item->setSelected(!item->isSelected());
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = item;
item->setSelected(true);
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
};
d->selectionRegion=-1;
}
else {
if (item == d->initialFileManagerItem) {
item->setSelected(true);
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
d->selectionRegion=-1;
}
else if ((d->selectedBySimpleMove) && (nextItem))
{
else {
if (d->selectionRegion == -1) {
if (nextItem) {
nextItem->setSelected(true);
}
emitSelectionChanged=true;
}
else if (d->selectionRegion == 1) {
item->setSelected(false);
emitSelectionChanged=true;
};
}
}
}
}
else if ((d->selectedBySimpleMove) && (nextItem)) {
item->setSelected(false);
emitSelectionChanged=true;
}
if (nextItem)
{
if (d->selectedBySimpleMove)
if (nextItem) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
}
break;
case Key_End:
//move to the last item and toggle selection of all items inbetween
// move to the last item and toggle selection of all items in-between
nextItem=item;
if (d->selectedBySimpleMove)
if (d->selectedBySimpleMove) {
item->setSelected(false);
if (shiftOrCtrl)
}
if (shiftOrCtrl) {
d->selectedBySimpleMove=false;
}
while(nextItem)
{
if (shiftOrCtrl)
nextItem->setSelected(!nextItem->isSelected());
if (!nextItem->itemBelow())
{
if (d->selectedBySimpleMove)
while (nextItem) {
if (shiftOrCtrl) {
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = nextItem;
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=1;
}
else {
if (nextItem == d->initialFileManagerItem) {
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=1;
}
else {
if (d->selectionRegion == 1) {
nextItem->setSelected(true);
emitSelectionChanged=true;
}
else if (d->selectionRegion == -1) {
nextItem->setSelected(false);
emitSelectionChanged=true;
}
}
}
}
if (!nextItem->itemBelow()) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
@ -1693,55 +1759,105 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
break;
case Key_Home:
// move to the first item and toggle selection of all items inbetween
nextItem = firstChild();
visItem = nextItem;
repaintItem2 = visItem;
if (d->selectedBySimpleMove)
// move to the first item and toggle selection of all items in-between
nextItem=item;
if (d->selectedBySimpleMove) {
item->setSelected(false);
if (shiftOrCtrl)
{
}
if (shiftOrCtrl) {
d->selectedBySimpleMove=false;
}
while ( nextItem != item )
{
nextItem->setSelected( !nextItem->isSelected() );
nextItem = nextItem->itemBelow();
while (nextItem) {
if (shiftOrCtrl) {
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = nextItem;
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=-1;
}
item->setSelected( !item->isSelected() );
else {
if (nextItem == d->initialFileManagerItem) {
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=-1;
}
else {
if (d->selectionRegion == -1) {
nextItem->setSelected(true);
emitSelectionChanged=true;
}
else if (d->selectionRegion == 1) {
nextItem->setSelected(false);
emitSelectionChanged=true;
}
}
}
}
if (!nextItem->itemAbove()) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
}
nextItem=nextItem->itemAbove();
}
setCurrentItem( firstChild() );
emitSelectionChanged=true;
break;
case Key_Next:
items=visibleHeight()/item->height();
nextItem=item;
if (d->selectedBySimpleMove)
if (d->selectedBySimpleMove) {
item->setSelected(false);
if (shiftOrCtrl)
{
}
if (shiftOrCtrl) {
d->selectedBySimpleMove=false;
d->selectionDirection=1;
};
for (int i=0; i<items; i++)
{
if (shiftOrCtrl)
nextItem->setSelected(!nextItem->isSelected());
//the end
if ((i==items-1) || (!nextItem->itemBelow()))
}
{
if (shiftOrCtrl)
nextItem->setSelected(!nextItem->isSelected());
if (d->selectedBySimpleMove)
for (int i=0; i<items; i++) {
if (shiftOrCtrl) {
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = nextItem;
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=1;
}
else {
if (nextItem == d->initialFileManagerItem) {
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=1;
}
else {
if (d->selectionRegion == 1) {
nextItem->setSelected(true);
emitSelectionChanged=true;
}
else if (d->selectionRegion == -1) {
if (i==items-1) {
nextItem->setSelected(true);
}
else {
nextItem->setSelected(false);
}
emitSelectionChanged=true;
}
}
}
}
// last item
if ((i==items-1) || (!nextItem->itemBelow())) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
ensureItemVisible(nextItem);
setCurrentItem(nextItem);
update();
if ((shiftOrCtrl) || (d->selectedBySimpleMove))
{
if ((shiftOrCtrl) || (d->selectedBySimpleMove)) {
emit selectionChanged();
}
return;
@ -1753,29 +1869,54 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
case Key_Prior:
items=visibleHeight()/item->height();
nextItem=item;
if (d->selectedBySimpleMove)
if (d->selectedBySimpleMove) {
item->setSelected(false);
if (shiftOrCtrl)
{
}
if (shiftOrCtrl) {
d->selectionDirection=-1;
d->selectedBySimpleMove=false;
};
for (int i=0; i<items; i++)
{
if ((nextItem!=item) &&(shiftOrCtrl))
nextItem->setSelected(!nextItem->isSelected());
//the end
if ((i==items-1) || (!nextItem->itemAbove()))
}
{
if (d->selectedBySimpleMove)
for (int i=0; i<items; i++) {
if (shiftOrCtrl) {
if (!d->initialFileManagerItem) {
d->initialFileManagerItem = nextItem;
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=-1;
}
else {
if (nextItem == d->initialFileManagerItem) {
nextItem->setSelected(true);
emitSelectionChanged=true;
d->selectionRegion=-1;
}
else {
if (d->selectionRegion == -1) {
nextItem->setSelected(true);
emitSelectionChanged=true;
}
else if (d->selectionRegion == 1) {
if (i==items-1) {
nextItem->setSelected(true);
}
else {
nextItem->setSelected(false);
}
emitSelectionChanged=true;
}
}
}
}
// last item
if ((i==items-1) || (!nextItem->itemAbove())) {
if (d->selectedBySimpleMove) {
nextItem->setSelected(true);
}
ensureItemVisible(nextItem);
setCurrentItem(nextItem);
update();
if ((shiftOrCtrl) || (d->selectedBySimpleMove))
{
if ((shiftOrCtrl) || (d->selectedBySimpleMove)) {
emit selectionChanged();
}
return;
@ -1785,59 +1926,70 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
break;
case Key_Minus:
if ( item->isOpen() )
if ( item->isOpen() ) {
setOpen( item, false );
}
break;
case Key_Plus:
if ( !item->isOpen() && (item->isExpandable() || item->childCount()) )
if ( !item->isOpen() && (item->isExpandable() || item->childCount()) ) {
setOpen( item, true );
}
break;
default:
bool realKey = ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
&& (e->key()!=Key_Meta) && (e->key()!=Key_Alt));
bool selectCurrentItem = (d->selectedBySimpleMove) && (item->isSelected());
if (realKey && selectCurrentItem)
if (realKey && selectCurrentItem) {
item->setSelected(false);
}
//this is mainly for the "goto filename beginning with pressed char" feature (aleXXX)
TQListView::SelectionMode oldSelectionMode = selectionMode();
setSelectionMode (TQListView::Multi);
TQListView::keyPressEvent (e);
setSelectionMode (oldSelectionMode);
if (realKey && selectCurrentItem)
{
if (realKey && selectCurrentItem) {
currentItem()->setSelected(true);
emitSelectionChanged=true;
}
repaintItem2=currentItem();
if (realKey)
if (realKey) {
visItem=currentItem();
}
break;
}
if (visItem)
if (visItem) {
ensureItemVisible(visItem);
}
TQRect ir;
if (repaintItem1)
if (repaintItem1) {
ir = ir.unite( itemRect(repaintItem1) );
if (repaintItem2)
}
if (repaintItem2) {
ir = ir.unite( itemRect(repaintItem2) );
}
if ( !ir.isEmpty() )
{ // rectangle to be repainted
if ( ir.x() < 0 )
if ( !ir.isEmpty() ) {
// rectangle to be repainted
if ( ir.x() < 0 ) {
ir.moveBy( -ir.x(), 0 );
}
viewport()->repaint( ir, false );
}
/*if (repaintItem1)
/*if (repaintItem1) {
repaintItem1->repaint();
if (repaintItem2)
repaintItem2->repaint();*/
}
if (repaintItem2) {
repaintItem2->repaint();
}*/
update();
if (emitSelectionChanged)
if (emitSelectionChanged) {
emit selectionChanged();
}
}
void KListView::setSelectionModeExt (SelectionModeExt mode)
{

Write Preview
Loading…
Cancel
Save