| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #include "SkSettingsWidget.h" | 10 #include "SkSettingsWidget.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 fRasterLabel.setText("Raster: "); | 55 fRasterLabel.setText("Raster: "); |
| 56 fRasterLabel.setMinimumWidth(178); | 56 fRasterLabel.setMinimumWidth(178); |
| 57 fRasterLabel.setMaximumWidth(178); | 57 fRasterLabel.setMaximumWidth(178); |
| 58 | 58 |
| 59 fRasterCheckBox.setChecked(true); | 59 fRasterCheckBox.setChecked(true); |
| 60 | 60 |
| 61 fOverdrawVizLabel.setText(" Overdraw Viz: "); | 61 fOverdrawVizLabel.setText(" Overdraw Viz: "); |
| 62 fOverdrawVizLabel.setMinimumWidth(178); | 62 fOverdrawVizLabel.setMinimumWidth(178); |
| 63 fOverdrawVizLabel.setMaximumWidth(178); | 63 fOverdrawVizLabel.setMaximumWidth(178); |
| 64 | 64 |
| 65 fMegaVizLabel.setText(" Mega Viz: "); |
| 66 fMegaVizLabel.setMinimumWidth(178); |
| 67 fMegaVizLabel.setMaximumWidth(178); |
| 68 |
| 65 #if SK_SUPPORT_GPU | 69 #if SK_SUPPORT_GPU |
| 66 fGLLabel.setText("OpenGL: "); | 70 fGLLabel.setText("OpenGL: "); |
| 67 fGLLabel.setMinimumWidth(178); | 71 fGLLabel.setMinimumWidth(178); |
| 68 fGLLabel.setMaximumWidth(178); | 72 fGLLabel.setMaximumWidth(178); |
| 69 | 73 |
| 70 fGLMSAAButtonGroup.setTitle("MSAA"); | 74 fGLMSAAButtonGroup.setTitle("MSAA"); |
| 71 fGLMSAAButtonGroup.setMinimumWidth(178); | 75 fGLMSAAButtonGroup.setMinimumWidth(178); |
| 72 fGLMSAAButtonGroup.setMaximumWidth(178); | 76 fGLMSAAButtonGroup.setMaximumWidth(178); |
| 73 fGLMSAAButtonGroup.setEnabled(fGLCheckBox.isChecked()); | 77 fGLMSAAButtonGroup.setEnabled(fGLCheckBox.isChecked()); |
| 74 | 78 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 102 fFilterLayout.addWidget(&fFilterCombo); | 106 fFilterLayout.addWidget(&fFilterCombo); |
| 103 fFilterButtonGroup.setLayout(&fFilterLayout); | 107 fFilterButtonGroup.setLayout(&fFilterLayout); |
| 104 | 108 |
| 105 connect(&fFilterCombo, SIGNAL(activated(int)), this, | 109 connect(&fFilterCombo, SIGNAL(activated(int)), this, |
| 106 SIGNAL(texFilterSettingsChanged())); | 110 SIGNAL(texFilterSettingsChanged())); |
| 107 } | 111 } |
| 108 | 112 |
| 109 fRasterLayout.addWidget(&fRasterLabel); | 113 fRasterLayout.addWidget(&fRasterLabel); |
| 110 fRasterLayout.addWidget(&fRasterCheckBox); | 114 fRasterLayout.addWidget(&fRasterCheckBox); |
| 111 | 115 |
| 112 fOverdrawVizLayout.addWidget(&fOverdrawVizLabel); | 116 fVizLayout.addWidget(&fOverdrawVizLabel); |
| 113 fOverdrawVizLayout.addWidget(&fOverdrawVizCheckBox); | 117 fVizLayout.addWidget(&fOverdrawVizCheckBox); |
| 118 fVizLayout.addWidget(&fMegaVizLabel); |
| 119 fVizLayout.addWidget(&fMegaVizCheckBox); |
| 114 | 120 |
| 115 #if SK_SUPPORT_GPU | 121 #if SK_SUPPORT_GPU |
| 116 fGLLayout.addWidget(&fGLLabel); | 122 fGLLayout.addWidget(&fGLLabel); |
| 117 fGLLayout.addWidget(&fGLCheckBox); | 123 fGLLayout.addWidget(&fGLCheckBox); |
| 118 #endif | 124 #endif |
| 119 | 125 |
| 120 fCanvasLayout.setSpacing(6); | 126 fCanvasLayout.setSpacing(6); |
| 121 fCanvasLayout.setContentsMargins(11,11,11,11); | 127 fCanvasLayout.setContentsMargins(11,11,11,11); |
| 122 fCanvasLayout.addLayout(&fRasterLayout); | 128 fCanvasLayout.addLayout(&fRasterLayout); |
| 123 fCanvasLayout.addLayout(&fOverdrawVizLayout); | 129 fCanvasLayout.addLayout(&fVizLayout); |
| 124 #if SK_SUPPORT_GPU | 130 #if SK_SUPPORT_GPU |
| 125 fCanvasLayout.addLayout(&fGLLayout); | 131 fCanvasLayout.addLayout(&fGLLayout); |
| 126 fCanvasLayout.addWidget(&fGLMSAAButtonGroup); | 132 fCanvasLayout.addWidget(&fGLMSAAButtonGroup); |
| 127 #endif | 133 #endif |
| 128 fCanvasLayout.addWidget(&fFilterButtonGroup); | 134 fCanvasLayout.addWidget(&fFilterButtonGroup); |
| 129 | 135 |
| 130 // Command Toggle | 136 // Command Toggle |
| 131 fCommandToggle.setText("Command Scrolling Preferences"); | 137 fCommandToggle.setText("Command Scrolling Preferences"); |
| 132 fCommandFrame.setFrameShape(QFrame::StyledPanel); | 138 fCommandFrame.setFrameShape(QFrame::StyledPanel); |
| 133 fCommandFrame.setFrameShadow(QFrame::Raised); | 139 fCommandFrame.setFrameShadow(QFrame::Raised); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 fCurrentCommandBox.setText(QString::number(newCommand)); | 202 fCurrentCommandBox.setText(QString::number(newCommand)); |
| 197 } | 203 } |
| 198 | 204 |
| 199 void SkSettingsWidget::updateHit(int newHit) { | 205 void SkSettingsWidget::updateHit(int newHit) { |
| 200 fCommandHitBox.setText(QString::number(newHit)); | 206 fCommandHitBox.setText(QString::number(newHit)); |
| 201 } | 207 } |
| 202 | 208 |
| 203 void SkSettingsWidget::setZoomText(float scale) { | 209 void SkSettingsWidget::setZoomText(float scale) { |
| 204 fZoomBox.setText(QString::number(scale*100, 'f', 0).append("%")); | 210 fZoomBox.setText(QString::number(scale*100, 'f', 0).append("%")); |
| 205 } | 211 } |
| OLD | NEW |