Index: ossp-pkg/as/as-gui/README RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/README,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/README,v' 2>/dev/null --- README 2002/12/05 18:16:49 1.6 +++ README 2002/12/13 11:46:38 1.7 @@ -6,7 +6,7 @@ |___/ OSSP asgui -- Accounting system graphical user interface - Version 0.5.2 (05-Dec-2002) + Version 0.5.3 (12-Dec-2002) ABSTRACT Index: ossp-pkg/as/as-gui/TODO RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/TODO,v rcsdiff -q -kk '-r1.40' '-r1.41' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/TODO,v' 2>/dev/null --- TODO 2002/12/12 21:24:07 1.40 +++ TODO 2002/12/13 11:46:38 1.41 @@ -40,6 +40,7 @@ IDs in as_const.h much better choosing, so they make sense Preserve main window geo and dock pos with << operators Make edit control window dockable anywhere +Give configure a location to place and look for conf file Beim Editmodus --------------- Index: ossp-pkg/as/as-gui/as_dataop.cpp RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_dataop.cpp,v rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_dataop.cpp,v' 2>/dev/null --- as_dataop.cpp 2002/12/12 18:48:16 1.19 +++ as_dataop.cpp 2002/12/13 11:46:38 1.20 @@ -42,6 +42,8 @@ #include "as_gfx/staterr.xpm" // static const char *s_kpcStaterror_xpm[] #include "as_gfx/statwrn.xpm" // static const char *s_kpcStatwarn_xpm[] +#include + // // Convenience method to load accounting data from a file // @@ -71,6 +73,10 @@ QString Line; // Used for linewise editing and whitespace eating QString Bitbucket; // Used for null device until we find a better way + QPixmap Statokay(s_kpcStatokay_xpm); + QPixmap Statwarn(s_kpcStatwarn_xpm); + QPixmap Staterror(s_kpcStaterror_xpm); + // Strip out extra line feeds at stream start while (Line.isEmpty() && !Tstream.atEnd()) Line = Tstream.readLine(); @@ -157,13 +163,19 @@ Asline.skipWhiteSpace(); // Remove whitespaces Remark = Asline.read(); // Copy the remark field + + // Get rid of surrounding double quotes + QRegExp Quoted("\"(.*)\"$"); + Quoted.search(Remark); + Remark = Quoted.cap(Quoted.numCaptures()); + if (!Remark.isEmpty()) m_pMaintable->setText(nIter, TITRAQ_IDXREMARK, Remark); if (bValid) // Show a bitmap to signal valid or error state - m_pMaintable->setPixmap(nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatokay_xpm)); + m_pMaintable->setPixmap(nIter, TITRAQ_IDXSTATUS, Statokay); else - m_pMaintable->setPixmap(nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStaterror_xpm)); + m_pMaintable->setPixmap(nIter, TITRAQ_IDXSTATUS, Staterror); // Insert a line number dynamically m_pMaintable->setText(nIter, TITRAQ_IDXLINE, (QString::number(nIter)).rightJustify(4, QChar('0'))); @@ -259,7 +271,7 @@ Strsearch = QRegExp::escape(Tempfield); // Incoming string escaped Stripper.search(Strsearch); Tempfield.truncate(Stripper.pos()); - Tstream << trUtf8(" ") << Tempfield; // Save remark field text + Tstream << trUtf8(" \"") << Tempfield << trUtf8("\""); // Save remark field text } Tstream << endl; // Append a newline 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.55' '-r1.56' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v' 2>/dev/null --- as_slot.cpp 2002/12/12 21:13:29 1.55 +++ as_slot.cpp 2002/12/13 11:46:38 1.56 @@ -32,9 +32,9 @@ // Qt headers #include #include -#include #include #include +//#include // User interface #include "as_gui.h" // Main classes Index: ossp-pkg/as/as-gui/as_version.cpp RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_version.cpp,v rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_version.cpp,v' 2>/dev/null --- as_version.cpp 2002/12/05 18:16:49 1.4 +++ as_version.cpp 2002/12/13 11:46:38 1.5 @@ -8,7 +8,7 @@ #ifndef _AS_VERSION_CPP_ #define _AS_VERSION_CPP_ -#define ASGUI_VERSION 0x005202 +#define ASGUI_VERSION 0x005203 typedef struct { const int v_hex; @@ -32,13 +32,13 @@ #undef _AS_VERSION_CPP_AS_HEADER_ asgui_version_t asgui_version = { - 0x005202, - "0.5.2", - "0.5.2 (05-Dec-2002)", - "This is OSSP asgui, Version 0.5.2 (05-Dec-2002)", - "OSSP asgui 0.5.2 (05-Dec-2002)", - "OSSP asgui/0.5.2", - "@(#)OSSP asgui 0.5.2 (05-Dec-2002)", + 0x005203, + "0.5.3", + "0.5.3 (12-Dec-2002)", + "This is OSSP asgui, Version 0.5.3 (12-Dec-2002)", + "OSSP asgui 0.5.3 (12-Dec-2002)", + "OSSP asgui/0.5.3", + "@(#)OSSP asgui 0.5.3 (12-Dec-2002)", "$Id$" };