|
Check-in Number:
|
3964 | |
| Date: |
2003-Jan-30 15:36:00 (local)
2003-Jan-30 14:36:00 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Day date section focus is the default value, and happily removed a hackful
zero date placeholder. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/ChangeLog 1.17 -> 1.18
--- ChangeLog 2003/01/29 17:05:31 1.17
+++ ChangeLog 2003/01/30 14:36:00 1.18
@@ -1,5 +1,8 @@
Geschichte des OSSP titraq in Vorwaerts Cronordnung
+030130 Made day date section focus the default value
+ Remove hackful zero date value, replace with current date
+
030129 Fixed the autoscroll before show bug, causing wrong data position
030128 Added missing MIME icon entries for synciiop and syncsoap
|
|
ossp-pkg/as/as-gui/as_assist.cpp 1.88 -> 1.89
--- as_assist.cpp 2003/01/29 17:05:31 1.88
+++ as_assist.cpp 2003/01/30 14:36:00 1.89
@@ -778,8 +778,7 @@
m_pEditlayout->addWidget(m_pRevedit); // Finally add the revision edit
// Make the date selector
- m_pDateedit = new QDateEdit(m_pCenframe, "Date");
- m_pDatezero = new QDate(m_pDateedit->date()); // Hack to store empty date
+ m_pDateedit = new Daydatedit(QDate::currentDate(), m_pCenframe, "Date");
if (m_pDateedit == NULL) // Sanity check
throw Genexcept("Main window date edit creation failed."); // Spew errors
@@ -996,8 +995,10 @@
void Titraqform::enableIface(bool bTurned)
{
// FIXME: Does not belong here, so relocate
- if (!bTurned)
+ if (!bTurned) // Turn off the interface
m_pMaintable->setNumRows(0); // Remove table data
+ else // Turn on the interface
+ m_pDateedit->setDayfocus(); // Default focus is on day
// Enable or disable the widgets
m_pMaintable->setEnabled(bTurned);
|
|
ossp-pkg/as/as-gui/as_const.h 1.37 -> 1.38
--- as_const.h 2003/01/28 16:44:39 1.37
+++ as_const.h 2003/01/30 14:36:01 1.38
@@ -131,7 +131,6 @@
#define TITRAQ_DEFSORTDIR true
// Other string constants
-#define TITRAQ_DATEZERO "0000-00-00"
#define TITRAQ_SEPARATORTOK " "
#define TITRAQ_HOMEDIRTOK "~/"
#define TITRAQ_FEXTENSION ".as"
|
|
ossp-pkg/as/as-gui/as_gui.h 1.65 -> 1.66
--- as_gui.h 2003/01/29 17:05:31 1.65
+++ as_gui.h 2003/01/30 14:36:01 1.66
@@ -57,6 +57,7 @@
#include "as_pref.h" // For class Preferences
#include "as_amount.h" // For class AmountBox
#include "as_table.h" // For class TiTable
+#include "as_datedit.h" // For class Daydatedit
// Intentional no operation
#define TITRAQ_NOP ((void)0)
@@ -137,14 +138,13 @@
QStringList *m_pTaskentries;
// Edition widgets
- QDate *m_pDatezero; // Hack to store empty date
QLabel *m_pStatusedit; // Control to show entry status
QLineEdit *m_pLineedit; // Control to line number
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
+ Daydatedit *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
|
|
ossp-pkg/as/as-gui/as_slot.cpp 1.92 -> 1.93
--- as_slot.cpp 2003/01/28 17:33:55 1.92
+++ as_slot.cpp 2003/01/30 14:36:01 1.93
@@ -35,7 +35,6 @@
#include <qclipboard.h>
#include <qmenudata.h>
#include <qdatastream.h>
-//#include <qregexp.h>
// User interface
#include "as_gui.h" // Main classes
@@ -43,6 +42,7 @@
#include "as_tableitem.h" // For our custom table items
#include "as_generic.h" // Generic classes
#include "as_uuid.h" // UUID classes
+#include "as_datedit.h" // Derived from QDateEdit
// RPC headers
#ifdef HAVE_ESOAP
@@ -732,7 +732,7 @@
if (!Textdate.isEmpty())
m_pDateedit->setDate(QDate::fromString(Textdate, Qt::ISODate));
else
- m_pDateedit->setDate(*m_pDatezero);
+ m_pDateedit->setDate(QDate::currentDate());
if (!Textstart.isEmpty())
m_pStarttime->setTime(QTime::fromString(Textstart, Qt::ISODate));
else
@@ -841,9 +841,6 @@
//
void Titraqform::updateDate(const QDate &Dateup)
{
- if (Dateup == *m_pDatezero) // Complete the already nasty hack
- m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXDATE, trUtf8(TITRAQ_DATEZERO));
- else
m_pMaintable->setText(m_pMaintable->currentRow(), TITRAQ_IDXDATE, Dateup.toString("yyyy.MM.dd"));
}
|
|
