OSSP CVS Repository

ossp - Check-in [3854]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 3854
Date: 2002-Dec-10 15:23:58 (local)
2002-Dec-10 14:23:58 (UTC)
User:ms
Branch:
Comment: Now all data fields are in the view table as well.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/as_assist.cpp      1.54 -> 1.55     88 inserted, 6 deleted
ossp-pkg/as/as-gui/as_gui.h      1.44 -> 1.45     15 inserted, 8 deleted
ossp-pkg/as/as-gui/as_slot.cpp      1.45 -> 1.46     53 inserted, 10 deleted
ossp-pkg/as/as-gui/as_assist.cpp 1.54 -> 1.55 

--- as_assist.cpp        2002/12/10 12:06:56     1.54
+++ as_assist.cpp        2002/12/10 14:23:58     1.55
@@ -30,11 +30,11 @@
 //
 
 // For username research
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN32)
 #include <lmcons.h>
 #else
 #include <unistd.h>
-#endif
+#endif // #if defined(Q_OS_WIN32)
 
 // Qt style headers
 #include <qcdestyle.h>
@@ -346,15 +346,19 @@
     m_pTbarspopup->setItemChecked(nMenuid, true);
     m_pViewpopup->insertSeparator();
     m_pViewpopup->insertItem(trUtf8("&Columns"), m_pColspopup);
+    nMenuid = m_pColspopup->insertItem(trUtf8("&Status"), this, SLOT(showStatcol()));
+    m_pColspopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pColspopup->insertItem(trUtf8("&Line"), this, SLOT(showLinecol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
+    nMenuid = m_pColspopup->insertItem(trUtf8("&User"), this, SLOT(showUsercol()));
+    m_pColspopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pColspopup->insertItem(trUtf8("&GUID"), this, SLOT(showGuidcol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
-    nMenuid = m_pColspopup->insertItem(trUtf8("&Date"), this, SLOT(showDatecol()));
+    nMenuid = m_pColspopup->insertItem(trUtf8("&CRC"), this, SLOT(showCrccol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
-    nMenuid = m_pColspopup->insertItem(trUtf8("&User"), this, SLOT(showUsercol()));
+    nMenuid = m_pColspopup->insertItem(trUtf8("&Rev"), this, SLOT(showRevcol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
-    nMenuid = m_pColspopup->insertItem(trUtf8("&Task"), this, SLOT(showTaskcol()));
+    nMenuid = m_pColspopup->insertItem(trUtf8("&Date"), this, SLOT(showDatecol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pColspopup->insertItem(trUtf8("&Start"), this, SLOT(showStartcol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
@@ -362,6 +366,8 @@
     m_pColspopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pColspopup->insertItem(trUtf8("&Amount"), this, SLOT(showAmountcol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
+    nMenuid = m_pColspopup->insertItem(trUtf8("&Task"), this, SLOT(showTaskcol()));
+    m_pColspopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pColspopup->insertItem(trUtf8("&Remark"), this, SLOT(showRemarkcol()));
     m_pColspopup->setItemEnabled(nMenuid, false);
 
@@ -486,6 +492,10 @@
     // Table header row
     m_pTablehead = m_pMaintable->horizontalHeader();
     m_pMaintable->setHScrollBarMode(QScrollView::AlwaysOff);
+    m_pTablehead->setLabel(TITRAQ_IDXUSER, QObject::trUtf8("User"), 32);
+    m_pTablehead->setLabel(TITRAQ_IDXGUID, QObject::trUtf8("GUID"), 36);
+    m_pTablehead->setLabel(TITRAQ_IDXCRC, QObject::trUtf8("CRC"), 32);
+    m_pTablehead->setLabel(TITRAQ_IDXREV, QObject::trUtf8("Rev"), 32);
     m_pTablehead->setLabel(TITRAQ_IDXDATE, QObject::trUtf8("Date"), 90);
     m_pTablehead->setLabel(TITRAQ_IDXSTART, QObject::trUtf8("Begin"), 80);
     m_pTablehead->setLabel(TITRAQ_IDXFINISH, QObject::trUtf8("End"), 80);
@@ -510,6 +520,78 @@
 //    QSpacerItem Pad(TITRAQ_SPACING / 2, 0, QSizePolicy::Fixed);
 //    m_pEditlayout->addWidget(&Pad); // Padd left side of control layout
 
+    // Make the user edit
+    m_pUseredit = new QLineEdit(m_pCenframe, "User");
+    if (m_pUseredit == NULL) // Sanity check
+        throw Genexcept("Main window user edit creation failed.");
+    m_pUseredit->setText(m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
+    m_pUseredit->setFrameShape(QLineEdit::LineEditPanel);
+    m_pUseredit->setFrameShadow(QLineEdit::Sunken);
+    m_pUseredit->setFrame(true);
+    m_pUseredit->setReadOnly(false);
+    QToolTip::add(m_pUseredit, trUtf8("User Name"));
+    m_pEditlayout->addWidget(m_pUseredit);  // Finally add the user edit
+
+    // Whatsthis info for the user edit
+    const char *kszUsertext = "Edit the <em>user name</em> by clicking "
+                              "on this control and typing the user name "
+                              "you want to account.";
+    QWhatsThis::add(m_pUseredit, kszUsertext);
+
+    // Make the GUID edit
+    m_pGuidedit = new QLineEdit(m_pCenframe, "Guid");
+    if (m_pGuidedit == NULL) // Sanity check
+        throw Genexcept("Main window GUID edit creation failed.");
+    m_pGuidedit->setText(trUtf8("."));
+    m_pGuidedit->setFrameShape(QLineEdit::LineEditPanel);
+    m_pGuidedit->setFrameShadow(QLineEdit::Sunken);
+    m_pGuidedit->setFrame(true);
+    m_pGuidedit->setReadOnly(false);
+    QToolTip::add(m_pGuidedit, trUtf8("GUID"));
+    m_pEditlayout->addWidget(m_pGuidedit);  // Finally add the GUID edit
+
+    // Whatsthis info for the GUID edit
+    const char *kszGuidtext = "Edit the <em>GUID</em> by clicking "
+                              "on this control and typing the GUID "
+                              "corresponding to this account item.";
+    QWhatsThis::add(m_pGuidedit, kszGuidtext);
+
+    // Make the CRC edit
+    m_pCrcedit = new QLineEdit(m_pCenframe, "Crc");
+    if (m_pCrcedit == NULL) // Sanity check
+        throw Genexcept("Main window CRC edit creation failed.");
+    m_pCrcedit->setText(trUtf8("."));
+    m_pCrcedit->setFrameShape(QLineEdit::LineEditPanel);
+    m_pCrcedit->setFrameShadow(QLineEdit::Sunken);
+    m_pCrcedit->setFrame(true);
+    m_pCrcedit->setReadOnly(false);
+    QToolTip::add(m_pCrcedit, trUtf8("CRC"));
+    m_pEditlayout->addWidget(m_pCrcedit);  // Finally add the CRC edit
+
+    // Whatsthis info for the CRC edit
+    const char *kszCrctext = "Edit the <em>CRC</em> by clicking "
+                             "on this control and typing the new "
+                             "value for this account item.";
+    QWhatsThis::add(m_pCrcedit, kszCrctext);
+
+    // Make the revision edit
+    m_pRevedit = new QLineEdit(m_pCenframe, "Revision");
+    if (m_pRevedit == NULL) // Sanity check
+        throw Genexcept("Main window revision edit creation failed.");
+    m_pRevedit->setText(trUtf8("."));
+    m_pRevedit->setFrameShape(QLineEdit::LineEditPanel);
+    m_pRevedit->setFrameShadow(QLineEdit::Sunken);
+    m_pRevedit->setFrame(true);
+    m_pRevedit->setReadOnly(false);
+    QToolTip::add(m_pRevedit, trUtf8("Revision"));
+    m_pEditlayout->addWidget(m_pRevedit);  // Finally add the revision edit
+
+    // Whatsthis info for the revision edit
+    const char *kszRevtext = "Edit the <em>revision</em> by clicking "
+                             "on this control and typing the new value "
+                             "for this account type.";
+    QWhatsThis::add(m_pRevedit, kszRevtext);
+
     // Make the date selector
     m_pDateedit = new QDateEdit(m_pCenframe, "Date");
     m_pDatezero = new QDate(m_pDateedit->date());                   // Hack to store empty date
@@ -611,7 +693,7 @@
         m_pTasks->listBox()->setHScrollBarMode(QScrollView::Auto);
 //        m_pTasks->setMinimumWidth(m_pTasks->listBox()->maxItemWidth());
 
-    // Whatsthis info for the remark line
+    // Whatsthis info for the task editor
     const char *kszTasktext = "Choose a <em>task account</em> by clicking on "
                               "this box, and choosing whichever item most "
                               "closely resembles your task.";

ossp-pkg/as/as-gui/as_gui.h 1.44 -> 1.45 

--- as_gui.h     2002/12/10 12:06:56     1.44
+++ as_gui.h     2002/12/10 14:23:58     1.45
@@ -103,12 +103,16 @@
 
     // Edition widgets
     QDate       *m_pDatezero;           // Hack to store empty date
-    QDateEdit   *m_pDateedit;           // Control used to edit dates
-    QTimeEdit   *m_pStarttime;          // Control used to edit start time
-    QTimeEdit   *m_pEndtime;            // Control used to edit finish time
-    AmountBox   *m_pAmount;             // Control used to edit total time
-    QComboBox   *m_pTasks;              // Control used to choose a task
-    QLineEdit   *m_pRemark;             // Control used to edit remark
+    QLineEdit   *m_pUseredit;           // Control to edit user name
+    QLineEdit   *m_pGuidedit;           // Control to edit GUID
+    QLineEdit   *m_pCrcedit;            // Control to edit CRC
+    QLineEdit   *m_pRevedit;            // Control to edit revision
+    QDateEdit   *m_pDateedit;           // Control to edit date
+    QTimeEdit   *m_pStarttime;          // Control to edit start time
+    QTimeEdit   *m_pEndtime;            // Control to edit finish time
+    AmountBox   *m_pAmount;             // Control to edit total time
+    QComboBox   *m_pTasks;              // Control to choose a task
+    QLineEdit   *m_pRemark;             // Control to edit remark
 
 protected slots:
     void cutEntry(void);                // Cut task entries from the list
@@ -143,14 +147,17 @@
     void showFilebar(void);             // View menu show file toolbar
     void showEditbar(void);             // View menu show edit toolbar
     void showWhatsbar(void);            // View menu show whats this toolbar
+    void showStatcol(void);             // View menu show status column
     void showLinecol(void);             // View menu show line numbers column
+    void showUsercol(void);             // View menu show Users column
     void showGuidcol(void);             // View menu show GUIDs column
+    void showCrccol(void);              // View menu show CRC column
+    void showRevcol(void);              // View menu show Rev column
     void showDatecol(void);             // View menu show Dates column
-    void showUsercol(void);             // View menu show Users column
-    void showTaskcol(void);             // View menu show Tasks column
     void showStartcol(void);            // View menu show Start time column
     void showFinishcol(void);           // View menu show Finish time column
     void showAmountcol(void);           // View menu show Amounts column
+    void showTaskcol(void);             // View menu show Tasks column
     void showRemarkcol(void);           // View menu show Remarks column
 
 protected:

ossp-pkg/as/as-gui/as_slot.cpp 1.45 -> 1.46 

--- as_slot.cpp  2002/12/10 12:06:56     1.45
+++ as_slot.cpp  2002/12/10 14:23:58     1.46
@@ -395,15 +395,31 @@
 {
     switch (nSection) {
     case TITRAQ_IDXALLCTRLS:
-        m_pDateedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXDATE) - TITRAQ_SPACING + TITRAQ_SPACING / 2);
+        m_pUseredit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXUSER) - TITRAQ_SPACING + TITRAQ_SPACING / 2);
+        m_pGuidedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXGUID) - TITRAQ_SPACING);
+        m_pCrcedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXCRC) - TITRAQ_SPACING);
+        m_pRevedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXREV) - TITRAQ_SPACING);
+        m_pDateedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXDATE) - TITRAQ_SPACING);
         m_pStarttime->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXSTART) - TITRAQ_SPACING);
         m_pEndtime->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXFINISH) - TITRAQ_SPACING);
         m_pAmount->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXAMOUNT) - TITRAQ_SPACING);
         m_pTasks->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXTASK) - TITRAQ_SPACING);
 //        m_pRemark->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXREMARK) - TITRAQ_SPACING);
         break;
+    case TITRAQ_IDXUSER:
+        m_pUseredit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXUSER) - TITRAQ_SPACING + TITRAQ_SPACING / 2);
+        break;
+    case TITRAQ_IDXGUID:
+        m_pGuidedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXGUID) - TITRAQ_SPACING);
+        break;
+    case TITRAQ_IDXCRC:
+        m_pCrcedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXCRC) - TITRAQ_SPACING);
+        break;
+    case TITRAQ_IDXREV:
+        m_pRevedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXREV) - TITRAQ_SPACING);
+        break;
     case TITRAQ_IDXDATE:
-        m_pDateedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXDATE) - TITRAQ_SPACING + TITRAQ_SPACING / 2);
+        m_pDateedit->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXDATE) - TITRAQ_SPACING);
         break;
     case TITRAQ_IDXSTART:
         m_pStarttime->setFixedWidth(m_pMaintable->horizontalHeader()->sectionSize(TITRAQ_IDXSTART) - TITRAQ_SPACING);
@@ -632,6 +648,15 @@
 }
 
 //
+// View menu show status column
+//
+void Titraqform::showStatcol(void)
+{
+    Prototype Unimp;
+    Unimp.doMbox();
+}
+
+//
 // View menu show line numbers column
 //
 void Titraqform::showLinecol(void)
@@ -641,6 +666,15 @@
 }
 
 //
+// View menu show users column
+//
+void Titraqform::showUsercol(void)
+{
+    Prototype Unimp;
+    Unimp.doMbox();
+}
+
+//
 // View menu show GUIDs column
 //
 void Titraqform::showGuidcol(void)
@@ -650,34 +684,34 @@
 }
 
 //
-// View menu show Dates column
+// View menu show CRC column
 //
-void Titraqform::showDatecol(void)
+void Titraqform::showCrccol(void)
 {
     Prototype Unimp;
     Unimp.doMbox();
 }
 
 //
-// View menu show Users column
+// View menu show Rev column
 //
-void Titraqform::showUsercol(void)
+void Titraqform::showRevcol(void)
 {
     Prototype Unimp;
     Unimp.doMbox();
 }
 
 //
-// View menu show Tasks column
+// View menu show dates column
 //
-void Titraqform::showTaskcol(void)
+void Titraqform::showDatecol(void)
 {
     Prototype Unimp;
     Unimp.doMbox();
 }
 
 //
-// View menu show Start time column
+// View menu show start time column
 //
 void Titraqform::showStartcol(void)
 {
@@ -686,7 +720,7 @@
 }
 
 //
-// View menu show Finish time column
+// View menu show finish time column
 //
 void Titraqform::showFinishcol(void)
 {
@@ -701,6 +735,15 @@
 {
     Prototype Unimp;
     Unimp.doMbox();
+}
+
+//
+// View menu show tasks column
+//
+void Titraqform::showTaskcol(void)
+{
+    Prototype Unimp;
+    Unimp.doMbox();
 }
 
 //

CVSTrac 2.0.1