[Lmuse-cvs-traffic] muse/muse/widgets bigtime.cpp,1.12,1.13 genset.cpp,1.19,1.20

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/muse/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10758/muse/widgets

Modified Files:
	bigtime.cpp genset.cpp 
Log Message:
updates


Index: bigtime.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/bigtime.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bigtime.cpp	25 Nov 2005 19:45:47 -0000	1.12
--- bigtime.cpp	17 Jan 2006 17:18:07 -0000	1.13
***************
*** 20,24 ****
     : QWidget(parent)
        {
! //TD  Qt::WType_TopLevel | Qt::WStyle_StaysOnTop)
  
        barLabel   = new QLabel(this);
--- 20,24 ----
     : QWidget(parent)
        {
! 	setWindowFlags(Qt::WindowStaysOnTopHint);
  
        barLabel   = new QLabel(this);

Index: genset.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/genset.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** genset.cpp	31 Dec 2005 11:36:19 -0000	1.19
--- genset.cpp	17 Jan 2006 17:18:07 -0000	1.20
***************
*** 118,123 ****
        mixerH2->setValue(config.mixer2.geometry.height());
  
!       setMixerCurrent1->setEnabled(mixer1);
!       setMixerCurrent1->setEnabled(mixer2);
  
        setBigtimeCurrent->setEnabled(muse->bigtimeWindow());
--- 118,123 ----
        mixerH2->setValue(config.mixer2.geometry.height());
  
!       setMixerCurrent1->setEnabled(muse->mixer1Window());
!       setMixerCurrent1->setEnabled(muse->mixer2Window());
  
        setBigtimeCurrent->setEnabled(muse->bigtimeWindow());
***************
*** 227,236 ****
              w->move(config.geometryTransport.topLeft());
              }
!       w = mixer1;
        if (w) {
              w->resize(config.mixer1.geometry.size());
              w->move(config.mixer1.geometry.topLeft());
              }
!       w = mixer2;
        if (w) {
              w->resize(config.mixer2.geometry.size());
--- 227,236 ----
              w->move(config.geometryTransport.topLeft());
              }
!       w = muse->mixer1Window();
        if (w) {
              w->resize(config.mixer1.geometry.size());
              w->move(config.mixer1.geometry.topLeft());
              }
!       w = muse->mixer2Window();
        if (w) {
              w->resize(config.mixer2.geometry.size());
***************
*** 275,279 ****
  void GlobalSettingsConfig::mixerCurrent1()
        {
!       QWidget* w = mixer1;
        if (!w)
              return;
--- 275,279 ----
  void GlobalSettingsConfig::mixerCurrent1()
        {
!       QWidget* w = muse->mixer1Window();
        if (!w)
              return;
***************
*** 291,295 ****
  void GlobalSettingsConfig::mixerCurrent2()
        {
!       QWidget* w = mixer2;
        if (!w)
              return;
--- 291,295 ----
  void GlobalSettingsConfig::mixerCurrent2()
        {
!       QWidget* w = muse->mixer2Window();
        if (!w)
              return;