diff options
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/ChangeLog | 2 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrumsgui.cpp | 18 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/ssplugingui.cpp | 4 |
3 files changed, 24 insertions, 0 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index f443b05f..ea8b02cc 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,5 @@ +03.01.2013: + - Fixed SimpleDrums GUI issues on AVLinux (and supposedly other debian based distros) (rj) 01.01.2013: Happy new year! - Fixed playback of drumsounds during editing for new type drum editor (rj) 29.12.2012: diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp index 640ea3b6..c426d547 100644 --- a/muse2/synti/simpledrums2/simpledrumsgui.cpp +++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp @@ -122,6 +122,7 @@ QChannelSlider::QChannelSlider(Qt::Orientation orientation, int ch, QWidget* par : QSlider(orientation, parent) { channel = ch; + setMinimumHeight(50); } void QChannelSlider::sliderChange(SliderChange change) @@ -287,9 +288,16 @@ SimpleSynthGui::SimpleSynthGui() pluginGui->hide(); QVBoxLayout* mainLayout = new QVBoxLayout(this); //, 3); + +// mainLayout->setSpacing(0); +// mainLayout->setMargin(0); QHBoxLayout* channelLayout = new QHBoxLayout; + channelLayout->setSpacing(1); + channelLayout->setMargin(0); mainLayout->addLayout(channelLayout); + + //this->setFixedWidth(SS_GUI_WINDOW_WIDTH); //this->setFixedHeight(SS_GUI_WINDOW_HEIGHT); for (int i=0; i<SS_NR_OF_CHANNELS; i++) { @@ -304,6 +312,9 @@ SimpleSynthGui::SimpleSynthGui() QVBoxLayout* inchnlLayout = new QVBoxLayout(channelButtonGroups[i]); //, 2, 0, "channelinternallayout"); inchnlLayout->setAlignment(Qt::AlignHCenter); + inchnlLayout->setSpacing(1); + inchnlLayout->setMargin(0); + onOff[i] = new QChannelCheckbox(channelButtonGroups[i], i); // onOff[i]->setMinimumSize(SS_ONOFF_WIDTH, SS_ONOFF_HEIGHT); @@ -390,6 +401,9 @@ SimpleSynthGui::SimpleSynthGui() channelLayout->addWidget(masterButtonGroup); QVBoxLayout* mbgLayout = new QVBoxLayout(masterButtonGroup); mbgLayout->setAlignment(Qt::AlignCenter); + mbgLayout->setSpacing(1); + mbgLayout->setMargin(0); + // masterButtonGroup->setMinimumSize(SS_BTNGRP_WIDTH, SS_BTNGRP_HEIGHT); ///masterSlider = new QInvertedSlider(Qt::Vertical, masterButtonGroup); @@ -413,6 +427,8 @@ SimpleSynthGui::SimpleSynthGui() mainLayout->addWidget(mainGroupBox); QGridLayout* mgbLayout = new QGridLayout(mainGroupBox); // , 8, 3, 1); + mgbLayout->setSpacing(1); + mgbLayout->setMargin(0); int i=0; @@ -454,6 +470,8 @@ SimpleSynthGui::SimpleSynthGui() openPluginsButton->setToolTip("Configure LADSPA send effects"); connect(openPluginsButton, SIGNAL(clicked()), SLOT(openPluginButtonClicked())); rbLayout->addWidget(openPluginsButton, 2, 1, Qt::AlignCenter | Qt::AlignVCenter); + rbLayout->setSpacing(0); + rbLayout->setMargin(0); aboutButton = new QPushButton("About SimpleDrums"); connect(aboutButton, SIGNAL(clicked()), SLOT(aboutButtonClicked())); //TD rbLayout->addRowSpacing(3, 20); diff --git a/muse2/synti/simpledrums2/ssplugingui.cpp b/muse2/synti/simpledrums2/ssplugingui.cpp index 4ccb9bcc..c2cd37f9 100644 --- a/muse2/synti/simpledrums2/ssplugingui.cpp +++ b/muse2/synti/simpledrums2/ssplugingui.cpp @@ -163,10 +163,14 @@ SS_PluginFront::SS_PluginFront(QWidget* parent, int in_fxid) setFocusPolicy(Qt::NoFocus); setMinimumSize(SS_PLUGINFRONT_MINWIDTH, SS_PLUGINFRONT_MINHEIGHT); setMaximumSize(SS_PLUGINGUI_MAX_WIDTH, SS_PLUGINFRONT_MINHEIGHT); + //layout->setSpacing(1); + //layout->setMargin(1); QVBoxLayout* bigLayout = new QVBoxLayout(this); bigLayout->setContentsMargins(SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN, SS_PLUGINFRONT_MARGIN); bigLayout->setAlignment(Qt::AlignTop); + bigLayout->setSpacing(1); + bigLayout->setMargin(1); //TODO bigLayout->setResizeMode(QLayout::SetNoConstraint); layout = new QHBoxLayout; |