|
Check-in Number:
|
2845 | |
| Date: |
2002-Nov-19 00:34:17 (local)
2002-Nov-18 23:34:17 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Put this pig to bed, after some more restructuring, handling improvements,
and display optimization. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/as/as-gui/as_assist.cpp 1.1 -> 1.2
--- as_assist.cpp 2002/11/18 22:31:12 1.1
+++ as_assist.cpp 2002/11/18 23:34:17 1.2
@@ -10,6 +10,8 @@
// User interface
#include "titraq.h"
#include "titrex.h" // Exception classes
+
+// Icon pixel maps
#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[]
@@ -64,6 +66,9 @@
pFilepopup->insertSeparator();
m_pFilequitact->addTo(pFilepopup);
+ // Pad spacing to force help menu to appear far right
+ m_pMenubar->insertSeparator();
+
// Construct and populate the help menu with subitems
QPopupMenu *pHelppopup = new QPopupMenu(this);
if (pHelppopup == NULL) // Sanity check
@@ -192,17 +197,7 @@
}
//
-// Construct the status bar
-//
-void Titraqform::setupStatusbar(void)
-{
- m_pStatbar = statusBar(); // Grab status bar owned by QMainWindow
- if (m_pStatbar == NULL) // Sanity check
- throw Genexcept("Main window status bar nonexistant.");
-}
-
-//
-// Construct the central widget
+// Construct the central frame
//
void Titraqform::setupCentralwidget(void)
{
@@ -228,6 +223,16 @@
}
//
+// Construct the status bar
+//
+void Titraqform::setupStatusbar(void)
+{
+ m_pStatbar = statusBar(); // Grab status bar owned by QMainWindow
+ if (m_pStatbar == NULL) // Sanity check
+ throw Genexcept("Main window status bar nonexistant.");
+}
+
+//
// Construct the table
//
void Titraqform::setupTable(void)
@@ -331,7 +336,7 @@
// m_pMaintable->setItem(i, 4, pTasks);
// }
- m_pPackagelayout->addWidget(m_pMaintable); // Finally add the damn table
+ m_pPackagelayout->addWidget(m_pMaintable); // Finally add the damn table
}
//
@@ -349,7 +354,7 @@
m_pStatus->setFrame(true);
m_pStatus->setReadOnly(true);
QToolTip::add(m_pStatus, trUtf8("Status Line"));
- m_pPackagelayout->addWidget(m_pStatus);
+ m_pPackagelayout->addWidget(m_pStatus); // Finally add the status bar
// Whatsthis info for the output line
const char *kszStatouttext = trUtf8("<p><img source=\"ossplogo\"> "
|
|
ossp-pkg/as/as-gui/as_gui.cpp 1.14 -> 1.15
--- as_gui.cpp 2002/11/18 22:38:04 1.14
+++ as_gui.cpp 2002/11/18 23:34:17 1.15
@@ -42,8 +42,8 @@
setupActions();
setupMenubar();
setupFiletools();
- setupStatusbar();
setupCentralwidget();
+ setupStatusbar();
setupTable();
setupOutput();
setupButtons();
|
|
ossp-pkg/as/as-gui/as_gui.h 1.10 -> 1.11
--- as_gui.h 2002/11/18 22:31:12 1.10
+++ as_gui.h 2002/11/18 23:34:17 1.11
@@ -104,10 +104,11 @@
void setupMenubar(void); // Menu bar
void setupFiletools(void); // Tool bar
void setupStatusbar(void); // Status bar
- void setupCentralwidget(void); // Frame widget
+ void setupCentralwidget(void); // Assemble main Frame widget
void setupTable(void); // Table widget
void setupOutput(void); // Output widget
void setupButtons(void); // Push button widgets
+ void setupPieces(void); // Assemble widget pieces
};
#endif // TITRAQMWIN_H
|
|
