--- as_gui.cpp 2003/01/28 16:41:15 1.35
+++ as_gui.cpp 2003/01/28 17:33:55 1.36
@@ -41,8 +41,6 @@
Titraqform::Titraqform(QWidget *pParent, const char *kszName, WFlags Flags) :
QMainWindow(pParent, kszName, Flags)
{
- int nUnhandled; // Holds the number of unhandled command line arguments
-
// Early initializations
m_pFiletools = NULL;
m_pEdittools = NULL;
@@ -53,6 +51,7 @@
// Atenzione! Order is very important in the following sequence.
// FIXME: Reorganize this procedural mess into self contained objects
try {
+ int nUnhandled; // Holds number of unhandled cmd args
setupPrefs(); // Load general preferences
setupActions(); // Create and initialize actions
setupMenubar(); // Create and initialize menu bar
@@ -63,7 +62,9 @@
setupEditlay(); // Create and initialize edit controls
setupColumns(); // Prepare columns for viewing, sorting
enableIface(false); // Start things off in a empty state
- nUnhandled = setupCmdargs(); // Parse the command line, and init file
+
+ nUnhandled = setupCmdargs(); // Parse the command line, and init file
+ setupInitdata(nUnhandled); // Possibly open an inital event data file
}
catch (Genexcept& Genex) {
Genex.reportErr();
@@ -87,10 +88,6 @@
// // Lock down window size
// setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,
// (QSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth()));
-
- // Logic left over from setupCmdargs to help decide what our cmd parsing did
- if (nUnhandled == 0) // Args handled, no initial file
- m_pStatbar->message(trUtf8("Ready")); // Signal a ready condition
}
//
|
