From: <er...@pr...> - 2004-01-30 23:26:17
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6592/krusader/Panel Modified Files: krdetailedviewitem.cpp Log Message: fix: sort by EXT did not obey the 'case sensative sort' flag Index: krdetailedviewitem.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** krdetailedviewitem.cpp 17 Jan 2004 18:38:37 -0000 1.20 --- krdetailedviewitem.cpp 30 Jan 2004 23:24:40 -0000 1.21 *************** *** 207,213 **** --- 207,215 ---- krConfig->setGroup("Look&Feel"); + bool caseSensativeSort = false; if(!krConfig->readBoolEntry("Case Sensative Sort",_CaseSensativeSort)) { text0 = text0.lower(); itext0 = itext0.lower(); + caseSensativeSort = true; } *************** *** 221,242 **** result = QString::compare(num2qstring(size()),num2qstring(other->size())); } else if (col == _view->column(KrDetailedView::DateTime)) { - /*QString dt = dateTime(); - QString dti = other->dateTime(); - QString d = ((dt[6] < '7')? "20" : "19") + - dt[6] + dt[7] + // year - dt[3] + dt[4] + // month - dt[0] + dt[1] + // day - dt[9] + dt[10]+ // hour - dt[12]+ dt[13]; // minute - QString id = ((dti[6] < '7')? "20" : "19") + - dti[6] + dti[7] + // year - dti[3] + dti[4] + // month - dti[0] + dti[1] + // day - dti[9] + dti[10]+ // hour - dti[12]+ dti[13]; // minute - result = QString::compare(d,id);*/ result = (getTime_t() > other->getTime_t() ? 1 : -1); ! } else { ! // Joker for extention and permissions (so far) result = QString::compare(text(col), i->text(col)); } --- 223,233 ---- result = QString::compare(num2qstring(size()),num2qstring(other->size())); } else if (col == _view->column(KrDetailedView::DateTime)) { result = (getTime_t() > other->getTime_t() ? 1 : -1); ! } else if (col == _view->column(KrDetailedView::Extention)) { ! QString e1 = (!caseSensativeSort ? text(col) : text(col).lower()); ! QString e2 = (!caseSensativeSort ? i->text(col) : i->text(col).lower()); ! result = QString::compare(e1, e2); ! } else { ! // Joker result = QString::compare(text(col), i->text(col)); } |