comparison src/MainWindow.cpp @ 440:14aa33dc2a54

Level-pan widget sizing for OS/X
author Chris Cannam
date Tue, 31 Mar 2015 14:46:40 +0100
parents 548433164338
children 12f2c987e2b5
comparison
equal deleted inserted replaced
439:2a9ffc3ea1b0 440:14aa33dc2a54
1156 m_playAudio = toolbar->addAction(il.load("speaker"), tr("Play Audio")); 1156 m_playAudio = toolbar->addAction(il.load("speaker"), tr("Play Audio"));
1157 m_playAudio->setCheckable(true); 1157 m_playAudio->setCheckable(true);
1158 connect(m_playAudio, SIGNAL(triggered()), this, SLOT(playAudioToggled())); 1158 connect(m_playAudio, SIGNAL(triggered()), this, SLOT(playAudioToggled()));
1159 connect(this, SIGNAL(canPlayWaveform(bool)), m_playAudio, SLOT(setEnabled(bool))); 1159 connect(this, SIGNAL(canPlayWaveform(bool)), m_playAudio, SLOT(setEnabled(bool)));
1160 1160
1161 m_audioLPW->setImageSize(m_viewManager->scalePixelSize(26)); 1161 int lpwSize, bigLpwSize;
1162 #ifdef Q_OS_MAC
1163 lpwSize = m_viewManager->scalePixelSize(32); // Mac toolbars are fatter
1164 bigLpwSize = lpwSize * 2.2;
1165 #else
1166 lpwSize = m_viewManager->scalePixelSize(26);
1167 bigLpwSize = lpwSize * 2.8;
1168 #endif
1169
1170 m_audioLPW->setImageSize(lpwSize);
1171 m_audioLPW->setBigImageSize(bigLpwSize);
1162 toolbar->addWidget(m_audioLPW); 1172 toolbar->addWidget(m_audioLPW);
1163 1173
1164 // Pitch (f0) 1174 // Pitch (f0)
1165 QLabel *spacer = new QLabel; // blank 1175 QLabel *spacer = new QLabel; // blank
1166 spacer->setFixedWidth(m_viewManager->scalePixelSize(30)); 1176 spacer->setFixedWidth(m_viewManager->scalePixelSize(30));
1175 m_playPitch = toolbar->addAction(il.load("speaker"), tr("Play Pitch Track")); 1185 m_playPitch = toolbar->addAction(il.load("speaker"), tr("Play Pitch Track"));
1176 m_playPitch->setCheckable(true); 1186 m_playPitch->setCheckable(true);
1177 connect(m_playPitch, SIGNAL(triggered()), this, SLOT(playPitchToggled())); 1187 connect(m_playPitch, SIGNAL(triggered()), this, SLOT(playPitchToggled()));
1178 connect(this, SIGNAL(canPlayPitch(bool)), m_playPitch, SLOT(setEnabled(bool))); 1188 connect(this, SIGNAL(canPlayPitch(bool)), m_playPitch, SLOT(setEnabled(bool)));
1179 1189
1180 m_pitchLPW->setImageSize(m_viewManager->scalePixelSize(26)); 1190 m_pitchLPW->setImageSize(lpwSize);
1191 m_pitchLPW->setBigImageSize(bigLpwSize);
1181 toolbar->addWidget(m_pitchLPW); 1192 toolbar->addWidget(m_pitchLPW);
1182 } else { 1193 } else {
1183 m_playPitch = 0; 1194 m_playPitch = 0;
1184 } 1195 }
1185 1196
1197 m_playNotes = toolbar->addAction(il.load("speaker"), tr("Play Notes")); 1208 m_playNotes = toolbar->addAction(il.load("speaker"), tr("Play Notes"));
1198 m_playNotes->setCheckable(true); 1209 m_playNotes->setCheckable(true);
1199 connect(m_playNotes, SIGNAL(triggered()), this, SLOT(playNotesToggled())); 1210 connect(m_playNotes, SIGNAL(triggered()), this, SLOT(playNotesToggled()));
1200 connect(this, SIGNAL(canPlayNotes(bool)), m_playNotes, SLOT(setEnabled(bool))); 1211 connect(this, SIGNAL(canPlayNotes(bool)), m_playNotes, SLOT(setEnabled(bool)));
1201 1212
1202 m_notesLPW->setImageSize(m_viewManager->scalePixelSize(26)); 1213 m_notesLPW->setImageSize(lpwSize);
1214 m_notesLPW->setBigImageSize(bigLpwSize);
1203 toolbar->addWidget(m_notesLPW); 1215 toolbar->addWidget(m_notesLPW);
1204 } else { 1216 } else {
1205 m_playNotes = 0; 1217 m_playNotes = 0;
1206 } 1218 }
1207 1219