[rkward-cvs] rkward/rkward/dataeditor twintabledatamember.cpp,1.12,1.13 twintablemember.cpp,1.19,1.20 twintablemember.h,1.17,1.18 twintablemetamember.cpp,1.14,1.15
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Mon Apr 10 11:25:52 UTC 2006
Update of /cvsroot/rkward/rkward/rkward/dataeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22722/rkward/dataeditor
Modified Files:
twintabledatamember.cpp twintablemember.cpp twintablemember.h
twintablemetamember.cpp
Log Message:
Some minor fixes/improvements to the data.frame editor
Index: twintablemetamember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemetamember.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** twintablemetamember.cpp 7 Apr 2006 13:43:06 -0000 1.14
--- twintablemetamember.cpp 10 Apr 2006 11:25:49 -0000 1.15
***************
*** 3,7 ****
-------------------
begin : Mon Sep 13 2004
! copyright : (C) 2004 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
--- 3,7 ----
-------------------
begin : Mon Sep 13 2004
! copyright : (C) 2004, 2006 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
Index: twintablemember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemember.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** twintablemember.cpp 7 Apr 2006 13:43:06 -0000 1.19
--- twintablemember.cpp 10 Apr 2006 11:25:49 -0000 1.20
***************
*** 26,31 ****
#include "../debug.h"
- bool TwinTableMember::changing_width = false;
-
TwinTableMember::TwinTableMember (QWidget *parent, TwinTable *table, int trailing_rows, int trailing_cols) : QTable (parent){
twin = 0;
--- 26,29 ----
***************
*** 41,44 ****
--- 39,43 ----
tted = 0;
+ changing_width = false;
connect (this, SIGNAL (currentChanged (int, int)), this, SLOT (currentCellChanged (int, int)));
***************
*** 174,177 ****
--- 173,182 ----
int top_row, left_col, bottom_row, right_col;
getSelectionBoundaries (&top_row, &left_col, &bottom_row, &right_col);
+ // QCString uses (explicit) sharing, so we're not being too wasteful, here
+ return (encodeRange (top_row, left_col, bottom_row, right_col));
+ }
+
+ QCString TwinTableMember::encodeRange (int top_row, int left_col, int bottom_row, int right_col) {
+ RK_TRACE (EDITOR);
QString data;
***************
*** 199,203 ****
for (int row=top_row; row <= bottom_row; ++row) {
for (int col=left_col; col <= right_col; ++col) {
! clearCell (row, col);
}
}
--- 204,208 ----
for (int row=top_row; row <= bottom_row; ++row) {
for (int col=left_col; col <= right_col; ++col) {
! setText (row, col, QString::null);
}
}
***************
*** 289,292 ****
--- 294,307 ----
}
+ void TwinTableMember::keyPressEvent (QKeyEvent *e) {
+ RK_TRACE (EDITOR);
+
+ if ((e->key () == Qt::Key_Delete) || (e->key () == Qt::Key_Backspace)) {
+ blankSelected ();
+ e->accept ();
+ } else {
+ QTable::keyPressEvent (e);
+ }
+ }
#include "twintablemember.moc"
Index: twintablemember.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintablemember.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** twintablemember.h 7 Apr 2006 13:43:06 -0000 1.17
--- twintablemember.h 10 Apr 2006 11:25:49 -0000 1.18
***************
*** 80,86 ****
/** needed to detect right mouse clicks in the header and tab-keypresses in the CellEditor */
bool eventFilter (QObject *object, QEvent *event);
! /** actually simply calls QTable::keyPressEvent (). Reimplemented only to allow CellEditor access to this function */
! void keyPressEvent (QKeyEvent *e) { QTable::keyPressEvent (e); };
QCString encodeSelection ();
/** blanks out the currently selected cells (or the currently active cell, if there is no selection) */
void blankSelected ();
--- 80,87 ----
/** needed to detect right mouse clicks in the header and tab-keypresses in the CellEditor */
bool eventFilter (QObject *object, QEvent *event);
! /** reimplemented to delete cell contents on DEL and BACKSPACE. Placed in public, here, so CellEditor can have access */
! void keyPressEvent (QKeyEvent *e);
QCString encodeSelection ();
+ QCString encodeRange (int top_row, int left_col, int bottom_row, int right_col);
/** blanks out the currently selected cells (or the currently active cell, if there is no selection) */
void blankSelected ();
***************
*** 100,107 ****
/** reimplemented form QTable not to use QTableItems. This one has no effect */
void insertWidget (int, int, QWidget *) {};
- friend class RKwardDoc;
TwinTableMember *twin;
TwinTable *table;
! static bool changing_width;
int trailing_rows;
int trailing_cols;
--- 101,107 ----
/** reimplemented form QTable not to use QTableItems. This one has no effect */
void insertWidget (int, int, QWidget *) {};
TwinTableMember *twin;
TwinTable *table;
! bool changing_width;
int trailing_rows;
int trailing_cols;
Index: twintabledatamember.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/twintabledatamember.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** twintabledatamember.cpp 7 Apr 2006 13:43:06 -0000 1.12
--- twintabledatamember.cpp 10 Apr 2006 11:25:49 -0000 1.13
***************
*** 3,7 ****
-------------------
begin : Mon Sep 13 2004
! copyright : (C) 2004 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
--- 3,7 ----
-------------------
begin : Mon Sep 13 2004
! copyright : (C) 2004, 2006 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
More information about the rkward-tracker
mailing list