comparison main/PreferencesDialog.cpp @ 242:cf8748822f4d sv1-v1.2pre5

* fix compile error on OS/X
author Chris Cannam
date Wed, 13 Feb 2008 12:47:17 +0000
parents 99fa3387dfef
children 92cad26f44a1
comparison
equal deleted inserted replaced
241:9aace07f6082 242:cf8748822f4d
150 showSplash->setCheckState(m_showSplash ? Qt::Checked : Qt::Unchecked); 150 showSplash->setCheckState(m_showSplash ? Qt::Checked : Qt::Unchecked);
151 connect(showSplash, SIGNAL(stateChanged(int)), 151 connect(showSplash, SIGNAL(stateChanged(int)),
152 this, SLOT(showSplashChanged(int))); 152 this, SLOT(showSplashChanged(int)));
153 153
154 #ifndef Q_WS_MAC 154 #ifndef Q_WS_MAC
155
156 QComboBox *bgMode = new QComboBox; 155 QComboBox *bgMode = new QComboBox;
157 int bg = prefs->getPropertyRangeAndValue("Background Mode", &min, &max, 156 int bg = prefs->getPropertyRangeAndValue("Background Mode", &min, &max,
158 &deflt); 157 &deflt);
159 m_backgroundMode = bg; 158 m_backgroundMode = bg;
160 for (i = min; i <= max; ++i) { 159 for (i = min; i <= max; ++i) {
191 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel 190 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
192 ("Property Box Layout"))), 191 ("Property Box Layout"))),
193 row, 0); 192 row, 0);
194 subgrid->addWidget(propertyLayout, row++, 1, 1, 2); 193 subgrid->addWidget(propertyLayout, row++, 1, 1, 2);
195 194
195 #ifndef Q_WS_MAC
196 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel 196 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
197 ("Background Mode"))), 197 ("Background Mode"))),
198 row, 0); 198 row, 0);
199 subgrid->addWidget(bgMode, row++, 1, 1, 2); 199 subgrid->addWidget(bgMode, row++, 1, 1, 2);
200 #endif
200 201
201 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel 202 subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
202 ("View Font Size"))), 203 ("View Font Size"))),
203 row, 0); 204 row, 0);
204 subgrid->addWidget(fontSize, row++, 1, 1, 2); 205 subgrid->addWidget(fontSize, row++, 1, 1, 2);