1.1 --- a/as_assist.cpp Fri Nov 28 14:20:00 2008 +0100 1.2 +++ b/as_assist.cpp Fri Dec 05 23:14:02 2008 +0100 1.3 @@ -1,12 +1,12 @@ 1.4 // 1.5 // OSSP asgui - Accounting system graphical user interface 1.6 -// Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/) 1.7 -// Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com> 1.8 -// Copyright (c) 2002-2004 Michael Schloh von Bennewitz <michael@schloh.com> 1.9 -// Copyright (c) 2002-2004 Cable & Wireless Telecommunications Services GmbH 1.10 +// Copyright (c) 2002-2008 The OSSP Project (http://www.ossp.org/) 1.11 +// Copyright (c) 2002-2008 Ralf S. Engelschall <rse@engelschall.com> 1.12 +// Copyright (c) 2002-2008 Michael Schloh von Bennewitz <michael@schloh.com> 1.13 +// Copyright (c) 2002-2008 Cable & Wireless Telecommunications Services GmbH 1.14 // 1.15 // This file is part of OSSP asgui, an accounting system graphical user 1.16 -// interface which can be found at http://www.ossp.org/pkg/tool/asgui/. 1.17 +// interface which can be found at http://asgui.europalab.com/. 1.18 // 1.19 // Permission to use, copy, modify, and distribute this software for 1.20 // any purpose with or without fee is hereby granted, provided that 1.21 @@ -29,21 +29,29 @@ 1.22 // as_assist.cpp: ISO C++ implementation 1.23 // 1.24 1.25 +#define QT3_SUPPORT 1.26 + 1.27 +#include <Qt3Support> 1.28 + 1.29 // Qt style headers 1.30 #include <qcdestyle.h> 1.31 -#include <qsgistyle.h> 1.32 +#include <qcleanlooksstyle.h> 1.33 +#include <qcommonstyle.h> 1.34 #include <qmotifstyle.h> 1.35 -#include <qmotifplusstyle.h> 1.36 -#include <qplatinumstyle.h> 1.37 +#include <qplastiquestyle.h> 1.38 +#include <qwindowscestyle.h> 1.39 +#include <qwindowsmobilestyle.h> 1.40 #include <qwindowsstyle.h> 1.41 +#include <qwindowsvistastyle.h> 1.42 +#include <qwindowsxpstyle.h> 1.43 1.44 // Qt general headers 1.45 #include <qtooltip.h> 1.46 -#include <qwhatsthis.h> 1.47 +#include <q3whatsthis.h> 1.48 #include <qstringlist.h> 1.49 -#include <qpopupmenu.h> 1.50 +#include <q3popupmenu.h> 1.51 #include <qcombobox.h> 1.52 -#include <qlistbox.h> 1.53 +#include <q3listbox.h> 1.54 #include <qstatusbar.h> 1.55 #include <qmenubar.h> 1.56 #include <qcursor.h> 1.57 @@ -51,6 +59,14 @@ 1.58 #include <qrect.h> 1.59 #include <qdir.h> 1.60 1.61 +//Added by qt3to4: 1.62 +#include <QLabel> 1.63 +#include <QPixmap> 1.64 +#include <Q3TextStream> 1.65 +#include <Q3HBoxLayout> 1.66 +#include <Q3VBoxLayout> 1.67 +#include <Q3Frame> 1.68 + 1.69 // User interface 1.70 #include "as_amount.h" // AmountBox class 1.71 #include "as_user.h" // User class 1.72 @@ -97,8 +113,8 @@ 1.73 { 1.74 // Can't bootstrap until we know who is using our tool, so find out 1.75 User Localuser = User(); 1.76 - QString Username = Localuser.getName(); 1.77 - QString Homedir = Localuser.getHomedir(); 1.78 + QString Username = QString::fromStdString(Localuser.getName()); 1.79 + QString Homedir = QString::fromStdString(Localuser.getHomedir()); 1.80 1.81 // Bootstrap a user preferences object from operating system info 1.82 m_pPrefs = new Preferences(Homedir + QChar('/') + 1.83 @@ -141,7 +157,7 @@ 1.84 m_pPrefs->setNumber(TITRAQ_PREFDARKGREEN, TITRAQ_DEFDARKGREEN); 1.85 m_pPrefs->setNumber(TITRAQ_PREFDARKBLUE, TITRAQ_DEFDARKBLUE); 1.86 m_pPrefs->flush(); // Write the new conf file 1.87 - QTextStream cerr(stderr, IO_WriteOnly); 1.88 + Q3TextStream cerr(stderr, QIODevice::WriteOnly); 1.89 cerr << trUtf8("Created new preferences file ") << Homedir << QChar('/') 1.90 << QString::fromLocal8Bit(TITRAQ_PREFNAME) << endl; 1.91 } 1.92 @@ -151,18 +167,18 @@ 1.93 case TITRAQ_STYLECDE: 1.94 qApp->setStyle(new QCDEStyle); 1.95 break; 1.96 - case TITRAQ_STYLESGI: 1.97 - qApp->setStyle(new QSGIStyle); 1.98 - break; 1.99 + //case TITRAQ_STYLESGI: // SGI Style is unsupported 1.100 + // qApp->setStyle(new QSGIStyle); 1.101 + // break; 1.102 case TITRAQ_STYLEMOTIF: 1.103 qApp->setStyle(new QMotifStyle); 1.104 break; 1.105 - case TITRAQ_STYLEMPLUS: 1.106 - qApp->setStyle(new QMotifPlusStyle); 1.107 - break; 1.108 - case TITRAQ_STYLEPLAT: 1.109 - qApp->setStyle(new QPlatinumStyle); 1.110 - break; 1.111 + //case TITRAQ_STYLEMPLUS: // MotifPlus Style is unsupported 1.112 + // qApp->setStyle(new QMotifPlusStyle); 1.113 + // break; 1.114 + //case TITRAQ_STYLEPLAT: // Platinum Style is unsupported 1.115 + // qApp->setStyle(new QPlatinumStyle); 1.116 + // break; 1.117 case TITRAQ_STYLEMSOFT: 1.118 qApp->setStyle(new QWindowsStyle); 1.119 break; 1.120 @@ -177,47 +193,47 @@ 1.121 // 1.122 void Titraqform::setupActions(void) 1.123 { 1.124 - QIconSet Saveiset, Cutiset, Copyiset, Pasteiset; 1.125 - QIconSet Rowaddiset, Rowdeliset, Refreshiset; 1.126 - QIconSet Synciset, Reportiset; 1.127 + QIcon Saveiset, Cutiset, Copyiset, Pasteiset; 1.128 + QIcon Rowaddiset, Rowdeliset, Refreshiset; 1.129 + QIcon Synciset, Reportiset; 1.130 1.131 // Construct iconsets to use later for multistate action images 1.132 - Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIconSet::Automatic, QIconSet::Normal); 1.133 - Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.134 - Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIconSet::Automatic, QIconSet::Normal); 1.135 - Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.136 - Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIconSet::Automatic, QIconSet::Normal); 1.137 - Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.138 - Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIconSet::Automatic, QIconSet::Normal); 1.139 - Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.140 - Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIconSet::Automatic, QIconSet::Normal); 1.141 - Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.142 - Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIconSet::Automatic, QIconSet::Normal); 1.143 - Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.144 - Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIconSet::Automatic, QIconSet::Normal); 1.145 - Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.146 - Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIconSet::Automatic, QIconSet::Normal); 1.147 - Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.148 - Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIconSet::Automatic, QIconSet::Normal); 1.149 - Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIconSet::Automatic, QIconSet::Disabled); 1.150 + Saveiset.setPixmap(QPixmap(s_kpcFilesave_xpm), QIcon::Automatic, QIcon::Normal); 1.151 + Saveiset.setPixmap(QPixmap(s_kpcDfilesave_xpm), QIcon::Automatic, QIcon::Disabled); 1.152 + Cutiset.setPixmap(QPixmap(s_kpcCut_xpm), QIcon::Automatic, QIcon::Normal); 1.153 + Cutiset.setPixmap(QPixmap(s_kpcDcut_xpm), QIcon::Automatic, QIcon::Disabled); 1.154 + Copyiset.setPixmap(QPixmap(s_kpcCopy_xpm), QIcon::Automatic, QIcon::Normal); 1.155 + Copyiset.setPixmap(QPixmap(s_kpcDcopy_xpm), QIcon::Automatic, QIcon::Disabled); 1.156 + Pasteiset.setPixmap(QPixmap(s_kpcPaste_xpm), QIcon::Automatic, QIcon::Normal); 1.157 + Pasteiset.setPixmap(QPixmap(s_kpcDpaste_xpm), QIcon::Automatic, QIcon::Disabled); 1.158 + Rowaddiset.setPixmap(QPixmap(s_kpcRowadd_xpm), QIcon::Automatic, QIcon::Normal); 1.159 + Rowaddiset.setPixmap(QPixmap(s_kpcDrowadd_xpm), QIcon::Automatic, QIcon::Disabled); 1.160 + Rowdeliset.setPixmap(QPixmap(s_kpcRowdel_xpm), QIcon::Automatic, QIcon::Normal); 1.161 + Rowdeliset.setPixmap(QPixmap(s_kpcDrowdel_xpm), QIcon::Automatic, QIcon::Disabled); 1.162 + Refreshiset.setPixmap(QPixmap(s_kpcRefresh_xpm), QIcon::Automatic, QIcon::Normal); 1.163 + Refreshiset.setPixmap(QPixmap(s_kpcDrefresh_xpm), QIcon::Automatic, QIcon::Disabled); 1.164 + Synciset.setPixmap(QPixmap(s_kpcSync_xpm), QIcon::Automatic, QIcon::Normal); 1.165 + Synciset.setPixmap(QPixmap(s_kpcDsync_xpm), QIcon::Automatic, QIcon::Disabled); 1.166 + Reportiset.setPixmap(QPixmap(s_kpcReport_xpm), QIcon::Automatic, QIcon::Normal); 1.167 + Reportiset.setPixmap(QPixmap(s_kpcDreport_xpm), QIcon::Automatic, QIcon::Disabled); 1.168 1.169 // First associate the graphics with MIME types 1.170 - QMimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm)); 1.171 - QMimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm)); 1.172 - QMimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm)); 1.173 - QMimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm)); 1.174 - QMimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm)); 1.175 - QMimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm)); 1.176 - QMimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm)); 1.177 - QMimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm)); 1.178 - QMimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm)); 1.179 - QMimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm)); 1.180 - QMimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm)); 1.181 - QMimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm)); 1.182 - QMimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm)); 1.183 + Q3MimeSourceFactory::defaultFactory()->setPixmap("osspicon", QPixmap(s_kpcOsspicon_xpm)); 1.184 + Q3MimeSourceFactory::defaultFactory()->setPixmap("filenew", QPixmap(s_kpcFilenew_xpm)); 1.185 + Q3MimeSourceFactory::defaultFactory()->setPixmap("fileopen", QPixmap(s_kpcFileopen_xpm)); 1.186 + Q3MimeSourceFactory::defaultFactory()->setPixmap("filesave", QPixmap(s_kpcFilesave_xpm)); 1.187 + Q3MimeSourceFactory::defaultFactory()->setPixmap("cut", QPixmap(s_kpcCut_xpm)); 1.188 + Q3MimeSourceFactory::defaultFactory()->setPixmap("copy", QPixmap(s_kpcCopy_xpm)); 1.189 + Q3MimeSourceFactory::defaultFactory()->setPixmap("paste", QPixmap(s_kpcPaste_xpm)); 1.190 + Q3MimeSourceFactory::defaultFactory()->setPixmap("rowadd", QPixmap(s_kpcRowadd_xpm)); 1.191 + Q3MimeSourceFactory::defaultFactory()->setPixmap("rowdel", QPixmap(s_kpcRowdel_xpm)); 1.192 + Q3MimeSourceFactory::defaultFactory()->setPixmap("refresh", QPixmap(s_kpcRefresh_xpm)); 1.193 + Q3MimeSourceFactory::defaultFactory()->setPixmap("syncrpc", QPixmap(s_kpcSync_xpm)); 1.194 + Q3MimeSourceFactory::defaultFactory()->setPixmap("locreport", QPixmap(s_kpcReport_xpm)); 1.195 + Q3MimeSourceFactory::defaultFactory()->setPixmap("prefs", QPixmap(s_kpcPrefs_xpm)); 1.196 1.197 // File new action 1.198 - m_pFilenewact = new QAction(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), CTRL+Key_N, this, "New"); 1.199 + m_pFilenewact = new Q3Action(trUtf8("New File"), QPixmap(s_kpcFilenew_xpm), trUtf8("&New"), Qt::CTRL+Qt::Key_N, this, "New"); 1.200 if (m_pFilenewact == NULL) // Sanity check 1.201 throw Genexcept("Main window file new action creation failed."); 1.202 connect(m_pFilenewact, SIGNAL(activated()), SLOT(newDoc())); 1.203 @@ -229,7 +245,7 @@ 1.204 m_pFilenewact->setWhatsThis(kszFilenewtext); 1.205 1.206 // File open action 1.207 - m_pFileopenact = new QAction(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), CTRL+Key_O, this, "Open"); 1.208 + m_pFileopenact = new Q3Action(trUtf8("Open File"), QPixmap(s_kpcFileopen_xpm), trUtf8("&Open..."), Qt::CTRL+Qt::Key_O, this, "Open"); 1.209 if (m_pFileopenact == NULL) // Sanity check 1.210 throw Genexcept("Main window file open action creation failed."); 1.211 connect(m_pFileopenact, SIGNAL(activated()), SLOT(openDoc())); 1.212 @@ -241,7 +257,7 @@ 1.213 m_pFileopenact->setWhatsThis(kszFileopentext); 1.214 1.215 // File save current action 1.216 - m_pFilesaveact = new QAction(trUtf8("Save File"), Saveiset, trUtf8("&Save"), CTRL+Key_S, this, "Save"); 1.217 + m_pFilesaveact = new Q3Action(trUtf8("Save File"), Saveiset, trUtf8("&Save"), Qt::CTRL+Qt::Key_S, this, "Save"); 1.218 if (m_pFilesaveact == NULL) // Sanity check 1.219 throw Genexcept("Main window file save action creation failed."); 1.220 connect(m_pFilesaveact, SIGNAL(activated()), SLOT(saveFile())); 1.221 @@ -254,26 +270,26 @@ 1.222 m_pFilesaveact->setWhatsThis(kszFilesavetext); 1.223 1.224 // File save selected action 1.225 - m_pFilesaveasact = new QAction(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs"); 1.226 + m_pFilesaveasact = new Q3Action(trUtf8("Save File As"), trUtf8("Save &As..."), 0, this, "SaveAs"); 1.227 if (m_pFilesaveasact == NULL) // Sanity check 1.228 throw Genexcept("Main window file save as action creation failed."); 1.229 connect(m_pFilesaveasact, SIGNAL(activated()), SLOT(saveAs())); 1.230 m_pFilesaveasact->setWhatsThis(kszFilesavetext); 1.231 1.232 // File close current action 1.233 - m_pFilecloseact = new QAction(trUtf8("Close"), trUtf8("&Close"), CTRL+Key_W, this, "Close"); 1.234 + m_pFilecloseact = new Q3Action(trUtf8("Close"), trUtf8("&Close"), Qt::CTRL+Qt::Key_W, this, "Close"); 1.235 if (m_pFilecloseact == NULL) // Sanity check 1.236 throw Genexcept("Main window file close action creation failed."); 1.237 connect(m_pFilecloseact, SIGNAL(activated()), SLOT(close())); 1.238 1.239 // File quit action 1.240 - m_pFilequitact = new QAction(trUtf8("Exit"), trUtf8("E&xit"), CTRL+Key_Q, this, "Exit"); 1.241 + m_pFilequitact = new Q3Action(trUtf8("Exit"), trUtf8("E&xit"), Qt::CTRL+Qt::Key_Q, this, "Exit"); 1.242 if (m_pFilequitact == NULL) // Sanity check 1.243 throw Genexcept("Main window file quit action creation failed."); 1.244 connect(m_pFilequitact, SIGNAL(activated()), SLOT(quitApp())); 1.245 1.246 // Cut action 1.247 - m_pCutact = new QAction(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), CTRL+Key_X, this, "Cut"); 1.248 + m_pCutact = new Q3Action(trUtf8("Cut"), Cutiset, trUtf8("&Cut"), Qt::CTRL+Qt::Key_X, this, "Cut"); 1.249 if (m_pCutact == NULL) // Sanity check 1.250 throw Genexcept("Main window cut edit action creation failed."); 1.251 connect(m_pCutact, SIGNAL(activated()), SLOT(cutEntry())); 1.252 @@ -284,7 +300,7 @@ 1.253 m_pCutact->setWhatsThis(kszCuttext); 1.254 1.255 // Copy action 1.256 - m_pCopyact = new QAction(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), CTRL+Key_C, this, "Copy"); 1.257 + m_pCopyact = new Q3Action(trUtf8("Copy"), Copyiset, trUtf8("&Copy"), Qt::CTRL+Qt::Key_C, this, "Copy"); 1.258 if (m_pCopyact == NULL) // Sanity check 1.259 throw Genexcept("Main window copy edit action creation failed."); 1.260 connect(m_pCopyact, SIGNAL(activated()), SLOT(copyEntry())); 1.261 @@ -295,7 +311,7 @@ 1.262 m_pCopyact->setWhatsThis(kszCopytext); 1.263 1.264 // Paste action 1.265 - m_pPasteact = new QAction(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), CTRL+Key_V, this, "Paste"); 1.266 + m_pPasteact = new Q3Action(trUtf8("Paste"), Pasteiset, trUtf8("&Paste"), Qt::CTRL+Qt::Key_V, this, "Paste"); 1.267 if (m_pPasteact == NULL) // Sanity check 1.268 throw Genexcept("Main window paste edit action creation failed."); 1.269 connect(m_pPasteact, SIGNAL(activated()), SLOT(pasteEntry())); 1.270 @@ -306,7 +322,7 @@ 1.271 m_pPasteact->setWhatsThis(kszPastetext); 1.272 1.273 // Add data row action 1.274 - m_pAddrowact = new QAction(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Key_Insert, this, "Addentry"); 1.275 + m_pAddrowact = new Q3Action(trUtf8("Add Entry"), Rowaddiset, trUtf8("&Add entry"), Qt::Key_Insert, this, "Addentry"); 1.276 if (m_pAddrowact == NULL) // Sanity check 1.277 throw Genexcept("Main window add entry action creation failed."); 1.278 connect(m_pAddrowact, SIGNAL(activated()), SLOT(addEntry())); 1.279 @@ -317,7 +333,7 @@ 1.280 m_pAddrowact->setWhatsThis(kszAddrowtext); 1.281 1.282 // Delete data row action 1.283 - m_pDelrowact = new QAction(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Key_Delete, this, "Delentry"); 1.284 + m_pDelrowact = new Q3Action(trUtf8("Delete Entry"), Rowdeliset, trUtf8("&Delete entry"), Qt::Key_Delete, this, "Delentry"); 1.285 if (m_pDelrowact == NULL) // Sanity check 1.286 throw Genexcept("Main window delete entry action creation failed."); 1.287 connect(m_pDelrowact, SIGNAL(activated()), SLOT(delEntry())); 1.288 @@ -328,7 +344,7 @@ 1.289 m_pDelrowact->setWhatsThis(kszDelrowtext); 1.290 1.291 // Refresh data display action 1.292 - m_pRefreshact = new QAction(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), CTRL+Key_R, this, "Refresh"); 1.293 + m_pRefreshact = new Q3Action(trUtf8("Refresh Display"), Refreshiset, trUtf8("&Refresh display"), Qt::CTRL+Qt::Key_R, this, "Refresh"); 1.294 if (m_pRefreshact == NULL) // Sanity check 1.295 throw Genexcept("Main window refresh action creation failed."); 1.296 connect(m_pRefreshact, SIGNAL(activated()), SLOT(refreshDisplay())); 1.297 @@ -339,7 +355,7 @@ 1.298 m_pRefreshact->setWhatsThis(kszRefreshtext); 1.299 1.300 // Syncronize data with remote server over IIOP or SOAP action 1.301 - m_pSyncact = new QAction(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), CTRL+Key_E, this, "Synchronize"); 1.302 + m_pSyncact = new Q3Action(trUtf8("Synchronize with server"), Synciset, trUtf8("&Synchronize"), Qt::CTRL+Qt::Key_E, this, "Synchronize"); 1.303 if (m_pSyncact == NULL) // Sanity check 1.304 throw Genexcept("Main window synchronize RPC action creation failed."); 1.305 connect(m_pSyncact, SIGNAL(activated()), SLOT(syncIiop())); 1.306 @@ -352,7 +368,7 @@ 1.307 m_pSyncact->setWhatsThis(kszSynctext); 1.308 1.309 // Local report generation action 1.310 - m_pReportact = new QAction(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), CTRL+Key_T, this, "LocalReport"); 1.311 + m_pReportact = new Q3Action(trUtf8("Generate a local report"), Reportiset, trUtf8("&Report"), Qt::CTRL+Qt::Key_T, this, "LocalReport"); 1.312 if (m_pReportact == NULL) // Sanity check 1.313 throw Genexcept("Main window local report action creation failed."); 1.314 connect(m_pReportact, SIGNAL(activated()), SLOT(genReport())); 1.315 @@ -364,7 +380,7 @@ 1.316 m_pReportact->setWhatsThis(kszReporttext); 1.317 1.318 // Offer a formatted preferences panel for intuitive prefs object editing 1.319 - m_pPrefsact = new QAction(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), CTRL+Key_F, this, "Prefspanel"); 1.320 + m_pPrefsact = new Q3Action(trUtf8("Edit the preferences"), QPixmap(s_kpcPrefs_xpm), trUtf8("P&references..."), Qt::CTRL+Qt::Key_F, this, "Prefspanel"); 1.321 if (m_pPrefsact == NULL) // Sanity check 1.322 throw Genexcept("Main window preferences panel action creation failed."); 1.323 connect(m_pPrefsact, SIGNAL(activated()), SLOT(configPrefs())); 1.324 @@ -391,7 +407,7 @@ 1.325 // QToolTip::add(m_pMenubar, QRect(0, 0, 2, 2), trUtf8("Easter Egg")); 1.326 1.327 // Construct and populate the file menu with actions 1.328 - QPopupMenu *pFilepopup = new QPopupMenu(this); 1.329 + Q3PopupMenu *pFilepopup = new Q3PopupMenu(this); 1.330 if (pFilepopup == NULL) // Sanity check 1.331 throw Genexcept("Main window file popup creation failed."); 1.332 m_pMenubar->insertItem(trUtf8("&File"), pFilepopup); 1.333 @@ -406,7 +422,7 @@ 1.334 m_pFilequitact->addTo(pFilepopup); 1.335 1.336 // Construct and populate the edit menu with subitems 1.337 - QPopupMenu *pEditpopup = new QPopupMenu(this); 1.338 + Q3PopupMenu *pEditpopup = new Q3PopupMenu(this); 1.339 if (pEditpopup == NULL) // Sanity check 1.340 throw Genexcept("Main window edit popup creation failed."); 1.341 m_pMenubar->insertItem(trUtf8("&Edit"), pEditpopup); 1.342 @@ -420,9 +436,9 @@ 1.343 m_pPrefsact->addTo(pEditpopup); 1.344 1.345 // Construct the view menu and submenus 1.346 - m_pViewpopup = new QPopupMenu(this); 1.347 - m_pTbarspopup = new QPopupMenu(this); 1.348 - m_pColspopup = new QPopupMenu(this); 1.349 + m_pViewpopup = new Q3PopupMenu(this); 1.350 + m_pTbarspopup = new Q3PopupMenu(this); 1.351 + m_pColspopup = new Q3PopupMenu(this); 1.352 1.353 // Give the new menus krass attributes 1.354 m_pTbarspopup->insertTearOffHandle(); 1.355 @@ -482,7 +498,7 @@ 1.356 m_pColspopup->setItemChecked(nMenuid, true); 1.357 1.358 // Construct and populate the report menu with subitems 1.359 - QPopupMenu *pReportpopup = new QPopupMenu(this); 1.360 + Q3PopupMenu *pReportpopup = new Q3PopupMenu(this); 1.361 if (pReportpopup == NULL) // Sanity check 1.362 throw Genexcept("Main window report popup creation failed."); 1.363 m_pMenubar->insertItem(trUtf8("&Report"), pReportpopup); 1.364 @@ -497,17 +513,17 @@ 1.365 m_pMenubar->insertSeparator(); 1.366 1.367 // Construct and populate the help menu with subitems 1.368 - QPopupMenu *pHelppopup = new QPopupMenu(this); 1.369 + Q3PopupMenu *pHelppopup = new Q3PopupMenu(this); 1.370 if (pHelppopup == NULL) // Sanity check 1.371 throw Genexcept("Main window help popup creation failed."); 1.372 m_pMenubar->insertItem(trUtf8("&Help"), pHelppopup); 1.373 - pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Key_F1); 1.374 + pHelppopup->insertItem(trUtf8("&Contents"), this, SLOT(helpContents()), Qt::Key_F1); 1.375 pHelppopup->insertSeparator(); 1.376 pHelppopup->insertItem(trUtf8("About &as-gui"), this, SLOT(aboutTitraq())); 1.377 pHelppopup->insertItem(trUtf8("About &OSSP"), this, SLOT(aboutOSSP())); 1.378 pHelppopup->insertItem(trUtf8("About &Qt"), this, SLOT(aboutQt())); 1.379 pHelppopup->insertSeparator(); 1.380 - pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), SHIFT+Key_F1); 1.381 + pHelppopup->insertItem(QPixmap(s_kpcWhatsthis_xpm), trUtf8("What's &This"), this, SLOT(whatsThis()), Qt::SHIFT+Qt::Key_F1); 1.382 } 1.383 1.384 // 1.385 @@ -516,23 +532,23 @@ 1.386 void Titraqform::setupToolbars(void) 1.387 { 1.388 // Construct and populate the file tool bar 1.389 - m_pFiletools = new QToolBar("Toolfile", this, DockTop); 1.390 + m_pFiletools = new Q3ToolBar("Toolfile", this, Qt::DockTop); 1.391 if (m_pFiletools == NULL) // Sanity check 1.392 throw Genexcept("File tool bar creation failed."); 1.393 m_pFiletools->setLabel(trUtf8("File Ops")); 1.394 m_pFiletools->setOpaqueMoving(false); 1.395 - m_pFiletools->setCloseMode(QDockWindow::Never); 1.396 + m_pFiletools->setCloseMode(Q3DockWindow::Never); 1.397 m_pFilenewact->addTo(m_pFiletools); 1.398 m_pFileopenact->addTo(m_pFiletools); 1.399 m_pFilesaveact->addTo(m_pFiletools); 1.400 1.401 // Construct and populate the edit tool bar 1.402 - m_pEdittools = new QToolBar("Tooledit", this, DockTop); 1.403 + m_pEdittools = new Q3ToolBar("Tooledit", this, Qt::DockTop); 1.404 if (m_pEdittools == NULL) // Sanity check 1.405 throw Genexcept("Edit tool bar creation failed."); 1.406 m_pEdittools->setLabel(trUtf8("Edit Ops")); 1.407 m_pEdittools->setOpaqueMoving(false); 1.408 - m_pEdittools->setCloseMode(QDockWindow::Never); 1.409 + m_pEdittools->setCloseMode(Q3DockWindow::Never); 1.410 m_pCutact->addTo(m_pEdittools); 1.411 m_pCopyact->addTo(m_pEdittools); 1.412 m_pPasteact->addTo(m_pEdittools); 1.413 @@ -541,33 +557,33 @@ 1.414 m_pDelrowact->addTo(m_pEdittools); 1.415 1.416 // Construct and populate the view tool bar 1.417 - m_pViewtools = new QToolBar("Toolview", this, DockTop); 1.418 + m_pViewtools = new Q3ToolBar("Toolview", this, Qt::DockTop); 1.419 if (m_pViewtools == NULL) // Sanity check 1.420 throw Genexcept("View tool bar creation failed."); 1.421 m_pViewtools->setLabel(trUtf8("View Ops")); 1.422 m_pViewtools->setOpaqueMoving(false); 1.423 - m_pViewtools->setCloseMode(QDockWindow::Never); 1.424 + m_pViewtools->setCloseMode(Q3DockWindow::Never); 1.425 m_pRefreshact->addTo(m_pViewtools); 1.426 m_pReportact->addTo(m_pViewtools); 1.427 m_pSyncact->addTo(m_pViewtools); 1.428 1.429 // Construct and populate the lonely preferences tool bar 1.430 - m_pPrefstools = new QToolBar("Preferences", this, DockTop); 1.431 + m_pPrefstools = new Q3ToolBar("Preferences", this, Qt::DockTop); 1.432 if (m_pPrefstools == NULL) // Sanity check 1.433 throw Genexcept("Prefs tool bar creation failed."); 1.434 m_pPrefstools->setLabel(trUtf8("Preferences editor")); 1.435 m_pPrefstools->setOpaqueMoving(false); 1.436 - m_pPrefstools->setCloseMode(QDockWindow::Never); 1.437 + m_pPrefstools->setCloseMode(Q3DockWindow::Never); 1.438 m_pPrefsact->addTo(m_pPrefstools); 1.439 1.440 // Construct and populate the lonely whatsthis tool bar 1.441 - m_pWhatstools = new QToolBar("Toolwhats", this, DockTop); 1.442 + m_pWhatstools = new Q3ToolBar("Toolwhats", this, Qt::DockTop); 1.443 if (m_pWhatstools == NULL) // Sanity check 1.444 throw Genexcept("Whats this tool bar creation failed."); 1.445 m_pWhatstools->setLabel(trUtf8("Whats this")); 1.446 m_pWhatstools->setOpaqueMoving(false); 1.447 - m_pWhatstools->setCloseMode(QDockWindow::Never); 1.448 - QWhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button 1.449 + m_pWhatstools->setCloseMode(Q3DockWindow::Never); 1.450 + Q3WhatsThis::whatsThisButton(m_pWhatstools); // Preconfigured whats this button 1.451 } 1.452 1.453 // 1.454 @@ -576,17 +592,17 @@ 1.455 void Titraqform::setupCentralwidget(void) 1.456 { 1.457 // Create a central frame and associated layout for QMainWindow 1.458 - m_pCenframe = new QFrame(this, "Centralframe"); 1.459 + m_pCenframe = new Q3Frame(this, "Centralframe"); 1.460 if (m_pCenframe == NULL) // Sanity check 1.461 throw Genexcept("Main window central frame creation failed."); 1.462 - m_pCenframe->setFrameShape(QFrame::StyledPanel); 1.463 - m_pCenframe->setFrameShadow(QFrame::Sunken); 1.464 + m_pCenframe->setFrameShape(Q3Frame::StyledPanel); 1.465 + m_pCenframe->setFrameShadow(Q3Frame::Sunken); 1.466 this->setCentralWidget(m_pCenframe); 1.467 1.468 // Layout controls for table, editing widgets 1.469 - m_pMainlayout = new QVBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout"); // For layouts 1.470 - m_pPackagelayout = new QVBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout"); // For table 1.471 - m_pEditlayout = new QHBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout"); // For edits 1.472 + m_pMainlayout = new Q3VBoxLayout(m_pCenframe, TITRAQ_MARGIN, TITRAQ_SPACING, "Mainlayout"); // For layouts 1.473 + m_pPackagelayout = new Q3VBoxLayout(0, 0, TITRAQ_SPACING, "Packagelayout"); // For table 1.474 + m_pEditlayout = new Q3HBoxLayout(0, 0, TITRAQ_SPACING, "Editlayout"); // For edits 1.475 1.476 // Major sanity check wrapped in one call 1.477 if (!(m_pMainlayout && m_pPackagelayout && m_pEditlayout)) 1.478 @@ -620,8 +636,8 @@ 1.479 m_pMaintable->setDirty(false); // Reset data to clean state 1.480 m_pMaintable->setReadOnly(true); // Table is read only 1.481 m_pMaintable->setColumnMovingEnabled(false); // Ctrl-drag disabled 1.482 - m_pMaintable->setSelectionMode(QTable::MultiRow); // Multi row selection 1.483 - m_pMaintable->setFocusStyle(QTable::FollowStyle); // How cells are drawn 1.484 + m_pMaintable->setSelectionMode(Q3Table::MultiRow); // Multi row selection 1.485 + m_pMaintable->setFocusStyle(Q3Table::FollowStyle); // How cells are drawn 1.486 m_pMaintable->setLeftMargin(0); // Get rid of the vertical header 1.487 m_pMaintable->verticalHeader()->hide(); // by hiding it with a margin of 0 1.488 m_pMaintable->horizontalHeader()->setResizeEnabled(true); 1.489 @@ -636,7 +652,7 @@ 1.490 1.491 // Table header row 1.492 m_pTablehead = m_pMaintable->horizontalHeader(); 1.493 - m_pMaintable->setHScrollBarMode(QScrollView::AlwaysOff); 1.494 + m_pMaintable->setHScrollBarMode(Q3ScrollView::AlwaysOff); 1.495 m_pTablehead->setLabel(TITRAQ_IDXSTATUS, QObject::trUtf8("Stat"), 1.496 m_pPrefs->getNumber(TITRAQ_PREFSTATCOLWIDTH, TITRAQ_DEFSTATCOLWIDTH)); 1.497 m_pMaintable->setColumnReadOnly (TITRAQ_IDXSTATUS, true); 1.498 @@ -696,7 +712,7 @@ 1.499 const char *kszStatustext = "The <em>item status</em> shows a green " 1.500 "symbol for valid entries, a yellow symbol " 1.501 "for warning, and a red symbol for flawed entries."; 1.502 - QWhatsThis::add(m_pStatusedit, kszStatustext); 1.503 + Q3WhatsThis::add(m_pStatusedit, kszStatustext); 1.504 QToolTip::add(m_pStatusedit, trUtf8("Status Indicator")); 1.505 m_pEditlayout->addWidget(m_pStatusedit); // Finally add the item status edit 1.506 1.507 @@ -715,7 +731,7 @@ 1.508 const char *kszLinenotext = "The <em>line number</em> helps identify " 1.509 "an entry when a warning or error message " 1.510 "appears."; 1.511 - QWhatsThis::add(m_pLineedit, kszLinenotext); 1.512 + Q3WhatsThis::add(m_pLineedit, kszLinenotext); 1.513 QToolTip::add(m_pLineedit, trUtf8("Line Number")); 1.514 m_pEditlayout->addWidget(m_pLineedit); // Finally add the line number edit 1.515 1.516 @@ -733,7 +749,7 @@ 1.517 const char *kszUsertext = "Edit the <em>user name</em> by clicking " 1.518 "on this control and typing the user name " 1.519 "you want to account."; 1.520 - QWhatsThis::add(m_pUseredit, kszUsertext); 1.521 + Q3WhatsThis::add(m_pUseredit, kszUsertext); 1.522 QToolTip::add(m_pUseredit, trUtf8("User Name")); 1.523 m_pEditlayout->addWidget(m_pUseredit); // Finally add the user edit 1.524 1.525 @@ -751,7 +767,7 @@ 1.526 const char *kszGuidtext = "Edit the <em>GUID</em> by clicking " 1.527 "on this control and typing the GUID " 1.528 "corresponding to this account item."; 1.529 - QWhatsThis::add(m_pGuidedit, kszGuidtext); 1.530 + Q3WhatsThis::add(m_pGuidedit, kszGuidtext); 1.531 QToolTip::add(m_pGuidedit, trUtf8("GUID")); 1.532 m_pEditlayout->addWidget(m_pGuidedit); // Finally add the GUID edit 1.533 1.534 @@ -769,7 +785,7 @@ 1.535 const char *kszCrctext = "Edit the <em>CRC</em> by clicking " 1.536 "on this control and typing the new " 1.537 "value for this account item."; 1.538 - QWhatsThis::add(m_pCrcedit, kszCrctext); 1.539 + Q3WhatsThis::add(m_pCrcedit, kszCrctext); 1.540 QToolTip::add(m_pCrcedit, trUtf8("CRC")); 1.541 m_pEditlayout->addWidget(m_pCrcedit); // Finally add the CRC edit 1.542 1.543 @@ -787,7 +803,7 @@ 1.544 const char *kszRevtext = "Edit the <em>revision</em> by clicking " 1.545 "on this control and typing the new value " 1.546 "for this account type."; 1.547 - QWhatsThis::add(m_pRevedit, kszRevtext); 1.548 + Q3WhatsThis::add(m_pRevedit, kszRevtext); 1.549 QToolTip::add(m_pRevedit, trUtf8("Revision")); 1.550 m_pEditlayout->addWidget(m_pRevedit); // Finally add the revision edit 1.551 1.552 @@ -797,7 +813,7 @@ 1.553 throw Genexcept("Main window date edit creation failed."); // Spew errors 1.554 1.555 // Configure attributes 1.556 - m_pDateedit->setOrder(QDateEdit::YMD); 1.557 + m_pDateedit->setOrder(Q3DateEdit::YMD); 1.558 m_pDateedit->setAutoAdvance(true); 1.559 m_pDateedit->setSeparator(trUtf8("-")); 1.560 m_pDateedit->setEnabled(false); 1.561 @@ -806,17 +822,17 @@ 1.562 const char *kszDateedit = "Edit the <em>task date</em> by clicking on " 1.563 "the year, month, or day, and then changing their " 1.564 "values with the arrow buttons."; 1.565 - QWhatsThis::add(m_pDateedit, kszDateedit); 1.566 + Q3WhatsThis::add(m_pDateedit, kszDateedit); 1.567 QToolTip::add(m_pDateedit, trUtf8("Task Date")); 1.568 m_pEditlayout->addWidget(m_pDateedit); // Finally add the date editor 1.569 1.570 // Make the start time selector 1.571 - m_pStarttime = new QTimeEdit(m_pCenframe, "StartTime"); 1.572 + m_pStarttime = new Q3TimeEdit(m_pCenframe, "StartTime"); 1.573 if (m_pStarttime == NULL) // Sanity check 1.574 throw Genexcept("Main window start time creation failed."); // Spew errors 1.575 1.576 // Configure attributes 1.577 - m_pStarttime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes); 1.578 + m_pStarttime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes); 1.579 m_pStarttime->setAutoAdvance(true); 1.580 m_pStarttime->setEnabled(false); 1.581 1.582 @@ -824,17 +840,17 @@ 1.583 const char *kszStarttime = "Edit the <em>task starting time</em> by clicking on " 1.584 "the hour and minute, and then changing their " 1.585 "values with the arrow buttons."; 1.586 - QWhatsThis::add(m_pStarttime, kszStarttime); 1.587 + Q3WhatsThis::add(m_pStarttime, kszStarttime); 1.588 QToolTip::add(m_pStarttime, trUtf8("Task Starting Time")); 1.589 m_pEditlayout->addWidget(m_pStarttime); // Finally add the start editor 1.590 1.591 // Make the end time selector 1.592 - m_pEndtime = new QTimeEdit(m_pCenframe, "EndTime"); 1.593 + m_pEndtime = new Q3TimeEdit(m_pCenframe, "EndTime"); 1.594 if (m_pEndtime == NULL) // Sanity check 1.595 throw Genexcept("Main window end time creation failed."); // Spew errors 1.596 1.597 // Configure attributes 1.598 - m_pEndtime->setDisplay(QTimeEdit::Hours | QTimeEdit::Minutes); 1.599 + m_pEndtime->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes); 1.600 m_pEndtime->setAutoAdvance(true); 1.601 m_pEndtime->setEnabled(false); 1.602 1.603 @@ -842,7 +858,7 @@ 1.604 const char *kszEndtime = "Edit the <em>task ending time</em> by clicking on " 1.605 "the hour and minute, and then changing their " 1.606 "values with the arrow buttons."; 1.607 - QWhatsThis::add(m_pEndtime, kszEndtime); 1.608 + Q3WhatsThis::add(m_pEndtime, kszEndtime); 1.609 QToolTip::add(m_pEndtime, trUtf8("Task Ending Time")); 1.610 m_pEditlayout->addWidget(m_pEndtime); // Finally add the end editor 1.611 1.612 @@ -865,7 +881,7 @@ 1.613 const char *kszAmount = "Edit the <em>task amount</em> by clicking on " 1.614 "the amount, and then changing its " 1.615 "value with the arrow buttons."; 1.616 - QWhatsThis::add(m_pAmount, kszAmount); 1.617 + Q3WhatsThis::add(m_pAmount, kszAmount); 1.618 QToolTip::add(m_pAmount, trUtf8("Task Amount")); 1.619 m_pAmount->setEnabled(false); // Don't enable until it's ready 1.620 m_pEditlayout->addWidget(m_pAmount); // Finally add the amount editor 1.621 @@ -883,7 +899,7 @@ 1.622 this->loadAccounts(Filetemp); // Load account helper method 1.623 1.624 // Make the combobox task edit 1.625 - m_pTasks = new QComboBox(true, m_pCenframe, "Tasks"); 1.626 + m_pTasks = new Q3ComboBox(true, m_pCenframe, "Tasks"); 1.627 if (m_pTasks == NULL) // Sanity check 1.628 throw Genexcept("Main window task edit creation failed."); 1.629 m_pTasks->insertStringList(*m_pTaskentries); 1.630 @@ -899,7 +915,7 @@ 1.631 int nPopupwidth = m_pTasks->listBox()->maxItemWidth(); 1.632 nPopupwidth += m_pTasks->listBox()->horizontalScrollBar()->height(); 1.633 m_pTasks->listBox()->setFixedWidth(nPopupwidth); 1.634 - m_pTasks->listBox()->setHScrollBarMode(QScrollView::Auto); 1.635 + m_pTasks->listBox()->setHScrollBarMode(Q3ScrollView::Auto); 1.636 m_pTasks->listBox()->sort(); 1.637 } 1.638 1.639 @@ -907,7 +923,7 @@ 1.640 const char *kszTasktext = "Choose a <em>task account</em> by clicking on " 1.641 "this box, and choosing whichever item most " 1.642 "closely resembles your task."; 1.643 - QWhatsThis::add(m_pTasks, kszTasktext); 1.644 + Q3WhatsThis::add(m_pTasks, kszTasktext); 1.645 QToolTip::add(m_pTasks, trUtf8("Task Selector")); 1.646 m_pEditlayout->addWidget(m_pTasks); // Finally add the task edit 1.647 1.648 @@ -925,7 +941,7 @@ 1.649 const char *kszRemarktext = "Edit the <em>task remarks</em> by clicking on " 1.650 "this line control and typing the remarks you " 1.651 "have about the task."; 1.652 - QWhatsThis::add(m_pRemark, kszRemarktext); 1.653 + Q3WhatsThis::add(m_pRemark, kszRemarktext); 1.654 QToolTip::add(m_pRemark, trUtf8("Remark Line")); 1.655 m_pEditlayout->addWidget(m_pRemark); // Finally add the remark line 1.656