As-gui Sources: comparison as

-:33c357ca63ac
+:8a63cfa62e4f
 //
 //  OSSP asgui - Accounting system graphical user interface
-//  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
+//  Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/)
-//  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>
+//  Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com>
-//  Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com>
+//  Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com>
-//  Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH
+//  Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH
 //
 //  This file is part of OSSP asgui, an accounting system graphical user
-//  interface which can be found at http://www.ossp.org/pkg/tool/asgui/.
+//  interface which can be found at http://asgui.europalab.com/.
 //
 //  Permission to use, copy, modify, and distribute this software for
 //  any purpose with or without fee is hereby granted, provided that
 //  the above copyright notice and this permission notice appear in all
 //  copies.
 //  SUCH DAMAGE.
 //
 //  as_slot.cpp: ISO C++ implementation
 //
+#define QT3_SUPPORT
 // system headers
 #include <memory>
 #include <cstring>
 // Qt headers
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qcombobox.h>
 #include <qclipboard.h>
 #include <qmenudata.h>
 #include <qdatastream.h>
 #include <qstatusbar.h>
 #include <qaction.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 // Qt style headers
 #include <qcdestyle.h>
-#include <qsgistyle.h>
+#include <qcleanlooksstyle.h>
+#include <qcommonstyle.h>
 #include <qmotifstyle.h>
-#include <qmotifplusstyle.h>
+#include <qplastiquestyle.h>
-#include <qplatinumstyle.h>
+#include <qwindowscestyle.h>
+#include <qwindowsmobilestyle.h>
 #include <qwindowsstyle.h>
+#include <qwindowsvistastyle.h>
+#include <qwindowsxpstyle.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QCloseEvent>
+#include <Q3TextStream>
+#include <Q3MemArray>
+#include <Q3Action>
 // User interface
 #include "as_const.h"           // Application constants
 #include "as_except.h"          // Exception classes
 #include "as_tableitem.h"       // For our custom table items
 QString Selection;          // Will receive the clipboard text
 QClipboard *pClip = NULL;   // Will reference the global clipboard
 pClip = QApplication::clipboard();                  // Prime the clips
 Selection = pClip->text(QClipboard::Clipboard);     // Windows and Unix
-nRows = Selection.contains(QChar('\n'));            // How many rows
+nRows = Selection.count(QChar('\n'));               // How many rows
-if (Selection != NULL && nRows > 0) { // Ignore empty clipboards
+if (Selection.isNull() && nRows > 0) { // Ignore empty clipboards
 this->addEntry(nRows);                          // Reuse slot
 setRowdata(Selection);                          // Use accessor
 // Update line numbers for this new row and all subsequent rows
 for (int nIter = m_pMaintable->currentRow(); nIter < m_pMaintable->numRows(); nIter++)
 //
 // Append a blank row entry
 //
 void Titraqform::addEntry(int nRows)
 {
-QTableSelection Select; // Highlighted text
+Q3TableSelection Select; // Highlighted text
 int nTotal = 0;         // Total row select
 int nCurrent = 0;       // Current row
 std::auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
 // Decide how many rows to add
 for (int nIter = 0; nIter < nTotal; nIter++) {
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXSTATUS, QString(QChar('W')));
 m_pMaintable->setPixmap(Select.topRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm));
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
 pGuid->genId();
-m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, pGuid->getString());
+m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString()));
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXCRC, "0"); // 0 = invalid entry
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXREV, "0"); // Entry not revised
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate));
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXSTART, "00:00");
 m_pMaintable->setText(Select.topRow() + nIter, TITRAQ_IDXFINISH, "00:00");
 for (int nIter = 1; nIter <= nTotal; nIter++) {
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXSTATUS, QString(QChar('W')));
 m_pMaintable->setPixmap(Select.bottomRow() + nIter, TITRAQ_IDXSTATUS, QPixmap(s_kpcStatwarn_xpm));
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXUSER, m_pPrefs->getString(TITRAQ_PREFUSER, TITRAQ_DEFUSER));
 pGuid->genId();
-m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, pGuid->getString());
+m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXGUID, QString::fromStdString(pGuid->getString()));
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXCRC, "0");
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXREV, "0");
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXDATE, QDate::currentDate().toString(Qt::ISODate));
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXSTART, "00:00");
 m_pMaintable->setText(Select.bottomRow() + nIter, TITRAQ_IDXFINISH, "00:00");
 //
 // Delete a row entry
 //
 void Titraqform::delEntry(int nRows)
 {
-QTableSelection Select = m_pMaintable->selection(0);    // Highlighted text
+Q3TableSelection Select = m_pMaintable->selection(0);    // Highlighted text
 int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total row select
-QMemArray<int> Rowselect(nTotal);                       // Row array
+Q3MemArray<int> Rowselect(nTotal);                       // Row array
 // Calculate rows to delete from selection highlight
 for (int nIter = 0; nIter < nTotal; ++nIter)
 Rowselect[nIter] = Select.topRow() + nIter;
 QString Openas = m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR);
 if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
 Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
 // This dialog asks which file the user wants to open
-QString Filestring = QFileDialog::getOpenFileName(Openas,
+QString Filestring = Q3FileDialog::getOpenFileName(Openas,
 trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"),
 this, trUtf8("ChooserDialog"), trUtf8("Choose a file to open"), NULL, false);
 // We might have a filename to work on, so do something with it
 if (!Filestring.isEmpty()) {
 QString Openas = m_pPrefs->getString(TITRAQ_PREFASDIR, TITRAQ_DEFASDIR);
 if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
 Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
 // And then get the name of the selected file to save to
-QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
+QString Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
 if (!Filestring.isEmpty()) {
 if (QFile::exists(Filestring)) {
 nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE)
 + ' ' + asgui_version.v_short, trUtf8(TITRAQ_OVERWRITE),
 trUtf8("&Yes"), trUtf8("&No"), NULL, 1, 1);
 if (Openas.startsWith(TITRAQ_HOMEDIRTOK))
 Openas = QDir::homeDirPath() + Openas.remove(0, QString(TITRAQ_HOMEDIRTOK).length() - 1);
 nResult = 1;            // We loop on this dialog only if an indecisive user
 while (nResult > 0) {   // is hesitant to overwrite a file over and over again
-QString Filestring = QFileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
+QString Filestring = Q3FileDialog::getSaveFileName(Openas, trUtf8("Accounting Data (*.as);;Text files (*.txt);;All Files (*)"), this, trUtf8("ChooserDialog"), trUtf8("Choose a file to save"), NULL, false);
 if (!Filestring.isEmpty()) {
 if (QFile::exists(Filestring)) {
 nResult = QMessageBox::warning(this, QString(TITRAQ_APPTITLE)
 + ' ' + asgui_version.v_short, trUtf8(TITRAQ_OVERWRITE),
 trUtf8("&Yes"), trUtf8("&No"), NULL, 1, 1);
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXSTATCOL), true);
 m_pStatusedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTATCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show line numbers column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXLCOL), true);
 m_pLineedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXLCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show users column
 m_pUseredit->show();
 }
 // Make sure switch take place right away and sizes are handled
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXUCOL));
 }
 //
 // View menu show GUIDs column
 //
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXGCOL), true);
 m_pGuidedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXGCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show CRC column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXCCOL), true);
 m_pCrcedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXCCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show Rev column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXREVCOL), true);
 m_pRevedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREVCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show dates column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXDCOL), true);
 m_pDateedit->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXDCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show start time column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL), true);
 m_pStarttime->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXSTARTCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show finish time column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXFCOL), true);
 m_pEndtime->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXFCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show Amounts column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXACOL), true);
 m_pAmount->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXACOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show tasks column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXTCOL), true);
 m_pTasks->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXTCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // View menu show Remarks column
 m_pColspopup->setItemChecked(m_pColspopup->idAt(TITRAQ_IDXREMCOL), true);
 m_pRemark->show();
 }
 // Make sure switch take place right away and sizes are handled
-m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL));
+//m_pColspopup->updateItem(m_pColspopup->idAt(TITRAQ_IDXREMCOL));
 this->updSizes(TITRAQ_IDXALLCTRLS, 0, 0); // Update size of this and next
 }
 //
 // Generate a local formatted report
 return;
 }
 // Fill account log object(s) to marshall and transmit
 int nRow = m_pMaintable->currentRow();
-QTableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
+Q3TableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
 int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total rows selected
 // Remember, CORBA::stri_dup creates smart pointers
 for (int nIter = 0; nIter < nTotal; nIter++) {
 Singlerow.szUser   = CORBA::string_dup(m_pMaintable->text(Select.topRow() + nIter, TITRAQ_IDXUSER));
 QString Endpoint;
 Endpoint = TITRAQ_PREFIXHTTP + m_pPrefs->getString(TITRAQ_PREFSOAPHOST, TITRAQ_DEFSOAPHOST);
 SOAPProxy Proxy(Endpoint.ascii());
 // Fill account log object(s) to marshall and transmit
-QTableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
+Q3TableSelection Select = m_pMaintable->selection(0);    // Capture selected rows
 int nTotal = Select.bottomRow() - Select.topRow() + 1;  // Total rows selected
 // Iterate through the selection of row entries to transmit
 for (int nRowiter = 0; nRowiter < nTotal; nRowiter++) {
 QString Syncthis = m_pMaintable->text(Select.topRow() + nRowiter, TITRAQ_IDXUSER);
 m_pPrefs->setNumber(TITRAQ_PREFFRAMEWIDTH, (long)this->width());
 m_pPrefs->setNumber(TITRAQ_PREFFRAMEHEIGHT, (long)this->height());
 // Remember main window layout and doc positions
 QString Laystring;
-QTextStream Laystream(&Laystring, IO_WriteOnly);
+Q3TextStream Laystream(&Laystring, QIODevice::WriteOnly);
-Laystream << *this; // Persist the main window
+//Laystream << *this; // Persist the main window
 m_pPrefs->setString(TITRAQ_PREFFRAMELAY, Laystring);
 }
 //
 // Get help on Titraq functionality
 // Get the selected style which can be more complicated due to mapping...
 if (pPrefpanel->getStyle() == TITRAQ_STRCDE) {
 m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLECDE);
 qApp->setStyle(new QCDEStyle);
 }
-else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) {
+//else if (pPrefpanel->getStyle() == TITRAQ_STRSGI) {    // Not supported
-m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI);
+//    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLESGI);
-qApp->setStyle(new QSGIStyle);
+//    qApp->setStyle(new QSGIStyle);
-}
+//}
 else if (pPrefpanel->getStyle() == TITRAQ_STRMOTIF) {
 m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMOTIF);
 qApp->setStyle(new QMotifStyle);
 }
-else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) {
+//else if (pPrefpanel->getStyle() == TITRAQ_STRMPLUS) {  // Not supported
-m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS);
+//    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMPLUS);
-qApp->setStyle(new QMotifPlusStyle);
+//    qApp->setStyle(new QMotifPlusStyle);
-}
+//}
-else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) {
+//else if (pPrefpanel->getStyle() == TITRAQ_STRPLAT) {  // Not supported
-m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT);
+//    m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEPLAT);
-qApp->setStyle(new QPlatinumStyle);
+//    qApp->setStyle(new QPlatinumStyle);
-}
+//}
 else if (pPrefpanel->getStyle() == TITRAQ_STRMSOFT) {
 m_pPrefs->setNumber(TITRAQ_PREFSTYLE, TITRAQ_STYLEMSOFT);
 qApp->setStyle(new QWindowsStyle);
 }
 else // My personal favourite ;-)

As-gui Sources / file comparison

comparison: as_slot.cpp

as_slot.cpp