OSSP CVS Repository

ossp - Check-in [2846]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 2846
Date: 2002-Nov-19 09:17:44 (local)
2002-Nov-19 08:17:44 (UTC)
User:ms
Branch:
Comment: Add CW logo and rework message boxes under the help menu.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/as_assist.cpp      1.2 -> 1.3     2 inserted, 0 deleted
ossp-pkg/as/as-gui/as_gui.h      1.11 -> 1.12     1 inserted, 0 deleted
ossp-pkg/as/as-gui/as_slot.cpp      1.1 -> 1.2     20 inserted, 6 deleted
ossp-pkg/titraq/gfx/cw.xpm      1.2->removed
ossp-pkg/titraq/titassist.cpp      1.2 -> 1.3     2 inserted, 0 deleted
ossp-pkg/titraq/titraq.h      1.11 -> 1.12     1 inserted, 0 deleted
ossp-pkg/titraq/titslot.cpp      1.1 -> 1.2     20 inserted, 6 deleted
ossp-pkg/as/as-gui/as_assist.cpp 1.2 -> 1.3 

--- as_assist.cpp        2002/11/18 23:34:17     1.2
+++ as_assist.cpp        2002/11/19 08:17:44     1.3
@@ -12,6 +12,7 @@
 #include "titrex.h"             // Exception classes
 
 // Icon pixel maps
+#include "gfx/cw.xpm"           // static const char *s_kpcCw_xpm[]
 #include "gfx/ossplogo.xpm"     // static const char *s_kpcOssplogo_xpm[]
 #include "gfx/qtlogo.xpm"       // static const char *s_kpcQtlogo_xpm[]
 #include "gfx/filenew.xpm"      // static const char *s_kpcFilenew_xpm[]
@@ -26,6 +27,7 @@
 void Titraqform::setupIcons(void)
 {
     // Initialize icon images
+    m_pCwicon = new QImage(s_kpcCwlogo_xpm);
     m_pOsspicon = new QImage(s_kpcOssplogo_xpm);
     m_pQticon = new QImage(s_kpcQtlogo_xpm);
     m_pNewicon = new QImage(s_kpcFilenew_xpm);

ossp-pkg/as/as-gui/as_gui.h 1.11 -> 1.12 

--- as_gui.h     2002/11/18 23:34:17     1.11
+++ as_gui.h     2002/11/19 08:17:44     1.12
@@ -43,6 +43,7 @@
     QStringList *m_pTaskentries;
 
     // Reusable graphics
+    QImage      *m_pCwicon;
     QImage      *m_pOsspicon;
     QImage      *m_pQticon;
     QImage      *m_pNewicon;

ossp-pkg/as/as-gui/as_slot.cpp 1.1 -> 1.2 

--- as_slot.cpp  2002/11/18 22:38:04     1.1
+++ as_slot.cpp  2002/11/19 08:17:44     1.2
@@ -172,10 +172,18 @@
 //
 void Titraqform::about(void)
 {
-    QMessageBox::about(this, "OSSP titraq",
-        trUtf8("OSSP titraq is a time and task-based\n"
+    QMessageBox *pCwmsg = new QMessageBox("OSSP titraq",
+        QObject::trUtf8("OSSP titraq is a time and task-based\n"
                "accounting system that acts as both a\n"
-               "nwork-like punch card and time tracker."));
+               "work-like punch card and time tracker.\n"
+               "Development of titraq is sponsored by\n"
+               "Cable & Wireless Deutschland GmbH."),
+        QMessageBox::NoIcon, QMessageBox::Ok | QMessageBox::Default,
+        QMessageBox::NoButton, QMessageBox::NoButton,
+        NULL, "Titraqmessage", true, Qt::WStyle_NormalBorder);
+
+    pCwmsg->setIconPixmap(QPixmap(*m_pCwicon));
+    pCwmsg->exec();
 }
 
 //
@@ -183,13 +191,19 @@
 //
 void Titraqform::aboutOSSP(void)
 {
-    QMessageBox::about(this, "OSSP",
-        trUtf8("The open source software project (OSSP) is\n"
+    QMessageBox *pOsspmsg = new QMessageBox("OSSP titraq",
+        QObject::trUtf8("The open source software project (OSSP) is\n"
                "a collective effort aimed at implementing\n"
                "high-quality Unix software components,\n"
                "ranging from networking, multi-threading\n"
                "and algorithmic libraries to networking\n"
-               "servers and development tools."));
+               "servers and development tools."),
+        QMessageBox::NoIcon, QMessageBox::Ok | QMessageBox::Default,
+        QMessageBox::NoButton, QMessageBox::NoButton,
+        NULL, "Osspmessage", true, Qt::WStyle_NormalBorder);
+
+    pOsspmsg->setIconPixmap(QPixmap(*m_pOsspicon));
+    pOsspmsg->exec();
 }
 
 //

CVSTrac 2.0.1