|
Check-in Number:
|
4101 | |
| Date: |
2003-Mar-05 21:27:34 (local)
2003-Mar-05 20:27:34 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Use the new documentation contents in the help panel class to fill the HTML
help browser window. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/as_const.h 1.60 -> 1.61
--- as_const.h 2003/02/28 17:13:25 1.60
+++ as_const.h 2003/03/05 20:27:34 1.61
@@ -205,6 +205,7 @@
#define TITRAQ_SEPARATORTOK " "
#define TITRAQ_HOMEDIRTOK "~/"
#define TITRAQ_FEXTENSION ".as"
+#define TITRAQ_REFHELP "as-gui.html"
#define TITRAQ_DATAPATTERN "%!AS-EVENTS-"
#define TITRAQ_SAVEFIRST "The timesheet contains unsaved changes.\nDo you want to save the changes or discard them?"
#define TITRAQ_OVERWRITE "A file already exists with the chosen name.\nDo you want to overwrite it with new data?"
|
|
ossp-pkg/as/as-gui/as_helpanel.cpp 1.1 -> 1.2
--- as_helpanel.cpp 2003/02/27 13:57:09 1.1
+++ as_helpanel.cpp 2003/03/05 20:27:34 1.2
@@ -48,7 +48,7 @@
// The dialog will by default be modal, unless you set 'bModal' to
// false to construct a modeless dialog.
//
-Helpanel::Helpanel(QWidget *pParent, const char *kszName, bool bModal, WFlags Flags)
+Helpanel::Helpanel(const QString &kSource, QWidget *pParent, const char *kszName, bool bModal, WFlags Flags)
: QDialog(pParent, kszName, bModal, Flags)
{
// Boilerplate code to initialize the panel
@@ -65,6 +65,7 @@
// Groupbox and its text display
m_pBrowser = new QTextBrowser(this, "Helpbrowser");
+ m_pBrowser->setSource(QString(TITRAQ_DOCDIR) + QChar('/') + kSource);
m_pBrowser->setReadOnly(true);
m_pBrowser->setFocus();
|
|
ossp-pkg/as/as-gui/as_helpanel.h 1.1 -> 1.2
--- as_helpanel.h 2003/02/27 13:57:09 1.1
+++ as_helpanel.h 2003/03/05 20:27:34 1.2
@@ -48,7 +48,7 @@
Q_OBJECT
public:
- Helpanel(QWidget *pParent = 0, const char *kszName = 0,
+ Helpanel(const QString &, QWidget *pParent = 0, const char *kszName = 0,
bool bModal = true, WFlags Flags = 0);
// ~Helpanel(void); // No need to destroy widgets, because qt does it for us
|
|
ossp-pkg/as/as-gui/as_slot.cpp 1.136 -> 1.137
--- as_slot.cpp 2003/02/28 18:07:42 1.136
+++ as_slot.cpp 2003/03/05 20:27:34 1.137
@@ -1869,7 +1869,7 @@
void Titraqform::helpContents(void)
{
try { // Create and execute a new help contents window
- std::auto_ptr<AS::Helpanel> pHelpcont(new AS::Helpanel(this, "Helpanel"));
+ std::auto_ptr<AS::Helpanel> pHelpcont(new AS::Helpanel(TITRAQ_REFHELP, this, "Helpanel"));
pHelpcont->exec();
delete pHelpcont.release(); // Technically unnecessary, smart pointer
}
@@ -1886,10 +1886,10 @@
{
QString Namever = QString(TITRAQ_APPTITLE) + ' ' + asgui_version.v_short;
QMessageBox *pCwmsg = new QMessageBox(Namever,
- QObject::trUtf8("AS-GUI is a time and task-based\n"
+ QObject::trUtf8("The as-gui is a time and task-based\n"
"accounting system that acts as both a\n"
"work-like punch card and time tracker.\n"
- "Development of AS-GUI is sponsored by\n"
+ "Development of as-gui is sponsored by\n"
"Cable & Wireless Deutschland GmbH."),
QMessageBox::NoIcon, QMessageBox::Ok | QMessageBox::Default,
QMessageBox::NoButton, QMessageBox::NoButton,
|
|
