[Alsamodular-commits] qmidiarp/src arpwidget.cpp, 1.51, 1.52 lfowidget.cpp, 1.40, 1.41 slider.cpp, 1.13, 1.14

[Frank <em...@us...>]

Update of /cvsroot/alsamodular/qmidiarp/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23622/src

Modified Files:
	arpwidget.cpp lfowidget.cpp slider.cpp 
Log Message:
- minor layout tweaks

Index: lfowidget.cpp
===================================================================
RCS file: /cvsroot/alsamodular/qmidiarp/src/lfowidget.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** lfowidget.cpp	14 Nov 2010 13:29:49 -0000	1.40
--- lfowidget.cpp	29 Nov 2010 19:23:59 -0000	1.41
***************
*** 273,281 ****
      paramBoxLayout->addWidget(freqBoxLabel, 1, 0);
      paramBoxLayout->addWidget(freqBox, 1, 1);
!     paramBoxLayout->addWidget(resBoxLabel, 2, 0);
!     paramBoxLayout->addWidget(resBox, 2, 1);
!     paramBoxLayout->addWidget(sizeBoxLabel, 3, 0);
!     paramBoxLayout->addWidget(sizeBox, 3, 1);
!     paramBoxLayout->setRowStretch(4, 1);
      
      if (compactStyle) {
--- 273,281 ----
      paramBoxLayout->addWidget(freqBoxLabel, 1, 0);
      paramBoxLayout->addWidget(freqBox, 1, 1);
!     paramBoxLayout->addWidget(resBoxLabel, 0, 2);
!     paramBoxLayout->addWidget(resBox, 0, 3);
!     paramBoxLayout->addWidget(sizeBoxLabel, 1, 2);
!     paramBoxLayout->addWidget(sizeBox, 1, 3);
!     paramBoxLayout->setColumnStretch(4, 4);
      
      if (compactStyle) {
***************
*** 285,291 ****
             
      QGridLayout* waveBoxLayout = new QGridLayout;
!     waveBoxLayout->addWidget(screen, 0, 0, 1, 2);
      waveBoxLayout->addLayout(paramBoxLayout, 1, 0);
!     waveBoxLayout->addLayout(sliderLayout, 1, 1);
      if (compactStyle) {
          waveBoxLayout->setSpacing(1);
--- 285,291 ----
             
      QGridLayout* waveBoxLayout = new QGridLayout;
!     waveBoxLayout->addWidget(screen, 0, 0);
      waveBoxLayout->addLayout(paramBoxLayout, 1, 0);
!     waveBoxLayout->addLayout(sliderLayout, 2, 0);
      if (compactStyle) {
          waveBoxLayout->setSpacing(1);
***************
*** 708,712 ****
  void LfoWidget::updateWaveForm(int val)
  {
! 	if (val > 5) return;
      midiWorker->updateWaveForm(val);
      midiWorker->getData(&lfoData);
--- 708,712 ----
  void LfoWidget::updateWaveForm(int val)
  {
!     if (val > 5) return;
      midiWorker->updateWaveForm(val);
      midiWorker->getData(&lfoData);
***************
*** 721,725 ****
  void LfoWidget::updateFreq(int val)
  {
! 	if (val > 10) return;
      midiWorker->freq = lfoFreqValues[val];
      midiWorker->getData(&lfoData);
--- 721,725 ----
  void LfoWidget::updateFreq(int val)
  {
!     if (val > 10) return;
      midiWorker->freq = lfoFreqValues[val];
      midiWorker->getData(&lfoData);

Index: arpwidget.cpp
===================================================================
RCS file: /cvsroot/alsamodular/qmidiarp/src/arpwidget.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** arpwidget.cpp	27 Nov 2010 18:11:11 -0000	1.51
--- arpwidget.cpp	29 Nov 2010 19:23:59 -0000	1.52
***************
*** 246,252 ****
  
      patternPresetLayout->addWidget(patternPresetBox);
-     patternPresetLayout->addStretch(2);
      patternPresetLayout->addWidget(repeatPatternThroughChord);  
      patternPresetLayout->addWidget(latchModeButton);
  
      patternText = new QLineEdit(patternBox); 
--- 246,252 ----
  
      patternPresetLayout->addWidget(patternPresetBox);
      patternPresetLayout->addWidget(repeatPatternThroughChord);  
      patternPresetLayout->addWidget(latchModeButton);
+     patternPresetLayout->addStretch(2);
  
      patternText = new QLineEdit(patternBox); 

Index: slider.cpp
===================================================================
RCS file: /cvsroot/alsamodular/qmidiarp/src/slider.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** slider.cpp	24 Jan 2010 10:22:05 -0000	1.13
--- slider.cpp	29 Nov 2010 19:23:59 -0000	1.14
***************
*** 17,25 ****
      if (orientation == Qt::Vertical) {
          slider->setMinimumHeight(150);
-         //slider->setMaximumWidth(20);
      }
      else {
          slider->setMinimumWidth(150);
-         //slider->setMaximumHeight(20);
      }
      connect(slider, SIGNAL(valueChanged(int)), this, SLOT(updateSpinBox(int)));
--- 17,23 ----
***************
*** 29,33 ****
      sliderSpin->setValue(value);
      sliderSpin->setKeyboardTracking(false);
-     //sliderSpin->setMaximumHeight(20);
      connect(sliderSpin, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int)));
  
--- 27,30 ----
***************
*** 35,43 ****
      sliderLabel->setText(label);
      sliderLabel->setBuddy(sliderSpin);
! 
      QBoxLayout *sliderLayout = new QBoxLayout(QBoxLayout::LeftToRight,this);
      sliderLayout->setMargin(0);
      sliderLayout->addWidget(sliderLabel);
-     sliderLayout->addStretch();
      sliderLayout->addWidget(slider);
      sliderLayout->addSpacing(2);
--- 32,39 ----
      sliderLabel->setText(label);
      sliderLabel->setBuddy(sliderSpin);
!     sliderLabel->setMinimumWidth(4*sliderLabel->fontMetrics().maxWidth());
      QBoxLayout *sliderLayout = new QBoxLayout(QBoxLayout::LeftToRight,this);
      sliderLayout->setMargin(0);
      sliderLayout->addWidget(sliderLabel);
      sliderLayout->addWidget(slider);
      sliderLayout->addSpacing(2);