Index: ossp-pkg/as/as-gui/as_assist.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_assist.cpp,v
rcsdiff -q -kk '-r1.58' '-r1.59' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_assist.cpp,v' 2>/dev/null
--- as_assist.cpp	2002/12/12 12:45:46	1.58
+++ as_assist.cpp	2002/12/12 13:20:43	1.59
@@ -493,11 +493,16 @@
     m_pTablehead = m_pMaintable->horizontalHeader();
     m_pMaintable->setHScrollBarMode(QScrollView::AlwaysOff);
     m_pTablehead->setLabel(TITRAQ_IDXSTATUS, QObject::trUtf8("Stat"), 32);
+    m_pMaintable->setColumnReadOnly (TITRAQ_IDXSTATUS, true);
     m_pTablehead->setLabel(TITRAQ_IDXLINE, QObject::trUtf8("Line"), 32);
+    m_pMaintable->setColumnReadOnly (TITRAQ_IDXLINE, true);
     m_pTablehead->setLabel(TITRAQ_IDXUSER, QObject::trUtf8("User"), 32);
     m_pTablehead->setLabel(TITRAQ_IDXGUID, QObject::trUtf8("GUID"), 36);
+    m_pMaintable->setColumnReadOnly (TITRAQ_IDXGUID, true);
     m_pTablehead->setLabel(TITRAQ_IDXCRC, QObject::trUtf8("CRC"), 32);
+    m_pMaintable->setColumnReadOnly (TITRAQ_IDXCRC, true);
     m_pTablehead->setLabel(TITRAQ_IDXREV, QObject::trUtf8("Rev"), 32);
+    m_pMaintable->setColumnReadOnly (TITRAQ_IDXREV, true);
     m_pTablehead->setLabel(TITRAQ_IDXDATE, QObject::trUtf8("Date"), 94);
     m_pTablehead->setLabel(TITRAQ_IDXSTART, QObject::trUtf8("Begin"), 80);
     m_pTablehead->setLabel(TITRAQ_IDXFINISH, QObject::trUtf8("End"), 80);
@@ -584,7 +589,7 @@
     m_pGuidedit->setFrameShape(QLineEdit::LineEditPanel);
     m_pGuidedit->setFrameShadow(QLineEdit::Sunken);
     m_pGuidedit->setFrame(true);
-    m_pGuidedit->setReadOnly(false);
+    m_pGuidedit->setReadOnly(true);
     QToolTip::add(m_pGuidedit, trUtf8("GUID"));
     m_pEditlayout->addWidget(m_pGuidedit);  // Finally add the GUID edit
 
@@ -602,7 +607,7 @@
     m_pCrcedit->setFrameShape(QLineEdit::LineEditPanel);
     m_pCrcedit->setFrameShadow(QLineEdit::Sunken);
     m_pCrcedit->setFrame(true);
-    m_pCrcedit->setReadOnly(false);
+    m_pCrcedit->setReadOnly(true);
     QToolTip::add(m_pCrcedit, trUtf8("CRC"));
     m_pEditlayout->addWidget(m_pCrcedit);  // Finally add the CRC edit
 
@@ -620,7 +625,7 @@
     m_pRevedit->setFrameShape(QLineEdit::LineEditPanel);
     m_pRevedit->setFrameShadow(QLineEdit::Sunken);
     m_pRevedit->setFrame(true);
-    m_pRevedit->setReadOnly(false);
+    m_pRevedit->setReadOnly(true);
     QToolTip::add(m_pRevedit, trUtf8("Revision"));
     m_pEditlayout->addWidget(m_pRevedit);  // Finally add the revision edit
 
@@ -758,7 +763,13 @@
     // Start edit controls off at right size
     this->updSizes(TITRAQ_IDXALLCTRLS, -1, -1);
 
-    // Signals
+    // Signals sent between table cells and corresponding edit control widgets
+    connect(m_pStatusedit, SIGNAL(textChanged(const QString &)), this, SLOT(updateStatus(const QString &)));
+    connect(m_pLineedit, SIGNAL(textChanged(const QString &)), this, SLOT(updateLine(const QString &)));
+    connect(m_pUseredit, SIGNAL(textChanged(const QString &)), this, SLOT(updateUser(const QString &)));
+    connect(m_pGuidedit, SIGNAL(textChanged(const QString &)), this, SLOT(updateGuid(const QString &)));
+    connect(m_pCrcedit, SIGNAL(textChanged(const QString &)), this, SLOT(updateCrc(const QString &)));
+    connect(m_pRevedit, SIGNAL(textChanged(const QString &)), this, SLOT(updateRev(const QString &)));
     connect(m_pDateedit, SIGNAL(valueChanged(const QDate &)), this, SLOT(updateDate(const QDate &)));
     connect(m_pStarttime, SIGNAL(valueChanged(const QTime &)), this, SLOT(updateStart(const QTime &)));
     connect(m_pEndtime, SIGNAL(valueChanged(const QTime &)), this, SLOT(updateFinish(const QTime &)));
@@ -793,7 +804,7 @@
         showFinishcol();
     if (!m_pPrefs->getBool(TITRAQ_PREFACOL, TITRAQ_DEFACOL))
         showAmountcol();
-    if (!m_pPrefs->getBool(TITRAQ_PREFFCOL, TITRAQ_DEFFCOL))
+    if (!m_pPrefs->getBool(TITRAQ_PREFTCOL, TITRAQ_DEFTCOL))
         showTaskcol();
     if (!m_pPrefs->getBool(TITRAQ_PREFREMCOL, TITRAQ_DEFREMCOL))
         showRemarkcol();
Index: ossp-pkg/as/as-gui/as_gui.h
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_gui.h,v
rcsdiff -q -kk '-r1.49' '-r1.50' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_gui.h,v' 2>/dev/null
--- as_gui.h	2002/12/12 12:45:46	1.49
+++ as_gui.h	2002/12/12 13:20:43	1.50
@@ -136,6 +136,12 @@
     void updEdit(int, int);             // Update edit controls
     void updSizes(int, int, int);       // Update edit sizes
     void dataChanged(int, int);         // Timesheet data changed
+    void updateStatus(const QString &); // Update status column
+    void updateLine(const QString &);   // Update line number column
+    void updateUser(const QString &);   // Update user column
+    void updateGuid(const QString &);   // Update GUID column
+    void updateCrc(const QString &);    // Update CRC column
+    void updateRev(const QString &);    // Update rev column
     void updateDate(const QDate &);     // Update date column
     void updateStart(const QTime &);    // Update start column
     void updateFinish(const QTime &);   // Update finish column
Index: ossp-pkg/as/as-gui/as_slot.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v
rcsdiff -q -kk '-r1.50' '-r1.51' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v' 2>/dev/null
--- as_slot.cpp	2002/12/12 12:45:46	1.50
+++ as_slot.cpp	2002/12/12 13:20:43	1.51
@@ -518,6 +518,12 @@
 //    QRegExp Shorten("/(\\w+)$");    // For stripping prefix off the current task
 
     // Field strings to check for validity and process
+    QString Textstat(m_pMaintable->text(nRow, TITRAQ_IDXSTATUS));
+    QString Textline(m_pMaintable->text(nRow, TITRAQ_IDXLINE));
+    QString Textuser(m_pMaintable->text(nRow, TITRAQ_IDXUSER));
+    QString Textguid(m_pMaintable->text(nRow, TITRAQ_IDXGUID));
+    QString Textcrc(m_pMaintable->text(nRow, TITRAQ_IDXCRC));
+    QString Textrev(m_pMaintable->text(nRow, TITRAQ_IDXREV));
     QString Textdate(m_pMaintable->text(nRow, TITRAQ_IDXDATE));
     QString Textstart(m_pMaintable->text(nRow, TITRAQ_IDXSTART));
     QString Textfinish(m_pMaintable->text(nRow, TITRAQ_IDXFINISH));
@@ -528,18 +534,26 @@
     // Reset the edition state member
     m_pMaintable->setEdition();
 
+    if (!Textstat.isEmpty())
+        m_pStatusedit->setText(Textstat);
+    if (!Textline.isEmpty())
+        m_pLineedit->setText(Textline);
+    if (!Textuser.isEmpty())
+        m_pUseredit->setText(Textuser);
+    if (!Textguid.isEmpty())
+        m_pGuidedit->setText(Textguid);
+    if (!Textcrc.isEmpty())
+        m_pCrcedit->setText(Textcrc);
+    if (!Textrev.isEmpty())
+        m_pRevedit->setText(Textrev);
     if (!Textdate.isEmpty())
         m_pDateedit->setDate(QDate::fromString(Textdate, Qt::ISODate));
-
     if (!Textstart.isEmpty())
         m_pStarttime->setTime(QTime::fromString(Textstart, Qt::ISODate));
-
     if (!Textfinish.isEmpty())
         m_pEndtime->setTime(QTime::fromString(Textfinish, Qt::ISODate));
-
     if (!Textamount.isNull())
         m_pAmount->setText(Textamount);
-
     if (!Texttask.isNull()) { // Process task combo box to compress text length
 //        Texttask.remove(0, Shorten.search(Texttask) + 1); // Strip leading slash
         m_pTasks->setCurrentText(Texttask);
@@ -550,6 +564,54 @@
 }
 
 //
+// Update the current status column item
+//
+void Titraqform::updateStatus(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXSTATUS, Instring);
+}
+
+//
+// Update the current line number column item
+//
+void Titraqform::updateLine(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXLINE, Instring);
+}
+
+//
+// Update the current user column item
+//
+void Titraqform::updateUser(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXUSER, Instring);
+}
+
+//
+// Update the current GUID column item
+//
+void Titraqform::updateGuid(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXGUID, Instring);
+}
+
+//
+// Update the current CRC column item
+//
+void Titraqform::updateCrc(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXCRC, Instring);
+}
+
+//
+// Update the current rev column item
+//
+void Titraqform::updateRev(const QString &Instring)
+{
+    m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXREV, Instring);
+}
+
+//
 // Update the current date column item
 //
 void Titraqform::updateDate(const QDate &Dateup)