OSSP CVS Repository

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

Check-in Number: 3868
Date: 2002-Dec-12 22:24:07 (local)
2002-Dec-12 21:24:07 (UTC)
User:ms
Branch:
Comment: Disabled normal view menu item, and other finishes.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/TODO      1.39 -> 1.40     1 inserted, 0 deleted
ossp-pkg/as/as-gui/as_assist.cpp      1.63 -> 1.64     2 inserted, 1 deleted
ossp-pkg/as/as-gui/as_gui.cpp      1.30 -> 1.31     1 inserted, 1 deleted

ossp-pkg/as/as-gui/TODO 1.39 -> 1.40

--- TODO 2002/12/12 20:52:13     1.39
+++ TODO 2002/12/12 21:24:07     1.40
@@ -39,6 +39,7 @@
 Quitting is the same as closing the (only) window
 IDs in as_const.h much better choosing, so they make sense
 Preserve main window geo and dock pos with << operators
+Make edit control window dockable anywhere
 
 Beim Editmodus
 ---------------


ossp-pkg/as/as-gui/as_assist.cpp 1.63 -> 1.64

--- as_assist.cpp        2002/12/12 20:52:13     1.63
+++ as_assist.cpp        2002/12/12 21:24:07     1.64
@@ -331,7 +331,8 @@
 
     // Populate the view menu with subitems
     m_pMenubar->insertItem(trUtf8("&View"), m_pViewpopup);
-    m_pViewpopup->insertItem(trUtf8("&Normal"), this, SLOT(normalView()));
+    nMenuid = m_pViewpopup->insertItem(trUtf8("&Normal"), this, SLOT(normalView()));
+    m_pViewpopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pViewpopup->insertItem(trUtf8("&Editing"), this, SLOT(editingView()));
     m_pViewpopup->setItemEnabled(nMenuid, false);
     nMenuid = m_pViewpopup->insertItem(trUtf8("&Timing"), this, SLOT(timingView()));


ossp-pkg/as/as-gui/as_gui.cpp 1.30 -> 1.31

--- as_gui.cpp   2002/12/12 21:13:29     1.30
+++ as_gui.cpp   2002/12/12 21:24:07     1.31
@@ -71,7 +71,7 @@
     // Rehydrate main window layout and doc positions
     QString Laystring = m_pPrefs->getString(TITRAQ_PREFFRAMELAY, NULL); // FIXME: Handle first case better
     QTextStream Laystream(&Laystring, IO_ReadOnly);
-    Laystream >> *this; // Persist the main window
+    Laystream >> *this;
 
 //    // Lock down window size
 //    setSizePolicy(QSizePolicy((QSizePolicy::SizeType)0,

CVSTrac 2.0.1