comparison widgets/CSVFormatDialog.cpp @ 922:26da827e8fb5 tonioni

Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 50be12cf2802
children 2633a1d73e39
comparison
equal deleted inserted replaced
921:4968bbaf1ed8 922:26da827e8fb5
28 #include <QComboBox> 28 #include <QComboBox>
29 #include <QLabel> 29 #include <QLabel>
30 #include <QDialogButtonBox> 30 #include <QDialogButtonBox>
31 31
32 #include <iostream> 32 #include <iostream>
33 #include <cmath>
33 34
34 #include "base/Debug.h" 35 #include "base/Debug.h"
35 36
36 CSVFormatDialog::CSVFormatDialog(QWidget *parent, CSVFormat format, 37 CSVFormatDialog::CSVFormatDialog(QWidget *parent, CSVFormat format,
37 int maxDisplayCols) : 38 int maxDisplayCols) :
60 QPalette palette = exampleFrame->palette(); 61 QPalette palette = exampleFrame->palette();
61 palette.setColor(QPalette::Window, palette.color(QPalette::Base)); 62 palette.setColor(QPalette::Window, palette.color(QPalette::Base));
62 exampleFrame->setPalette(palette); 63 exampleFrame->setPalette(palette);
63 64
64 QFont fp; 65 QFont fp;
65 fp.setPointSize(fp.pointSize() * 0.9); 66 fp.setPointSize(int(floor(fp.pointSize() * 0.9)));
66 // fp.setFixedPitch(true); 67 // fp.setFixedPitch(true);
67 // fp.setStyleHint(QFont::TypeWriter); 68 // fp.setStyleHint(QFont::TypeWriter);
68 // fp.setFamily("Monospaced"); 69 // fp.setFamily("Monospaced");
69 70
70 int columns = format.getColumnCount(); 71 int columns = format.getColumnCount();