From f1bbf54244f4ce85117c530499cec00894707969 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Tue, 2 Mar 2021 17:05:01 +0100 Subject: [PATCH] [fonts] set to pt instead of px to work better with hdpi screens --- main.cpp | 1 - pylonrecorder.cpp | 30 +++++++++++++++--------------- pylonrecorder.h | 6 +++--- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/main.cpp b/main.cpp index 88b8e05..ed46de5 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,6 @@ int main(int argc, char *argv[]) QGuiApplication::setOrganizationDomain("neuroetho.uni-tuebingen.de"); QGuiApplication::setApplicationName("PylonRecorder"); QGuiApplication::setApplicationVersion("0.1.0"); - QCommandLineParser commandLineParser; commandLineParser.addHelpOption(); commandLineParser.addPositionalArgument(PylonRecorder::tr("[file]"), PylonRecorder::tr("Image file to open.")); diff --git a/pylonrecorder.cpp b/pylonrecorder.cpp index c41f02b..6643e34 100644 --- a/pylonrecorder.cpp +++ b/pylonrecorder.cpp @@ -68,33 +68,33 @@ PylonRecorder::PylonRecorder(QWidget *parent) progressPalette.setBrush(QPalette::Highlight, QBrush(color)); preassureBar->setPalette(progressPalette); QLabel *preassureLabel = new QLabel("Buffer preassure:", this); - preassureLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;font-weight: Bold}"); + preassureLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;font-weight: Bold}"); loadBar = new QProgressBar(this); loadBar->setRange(0, defaultBufferSize); loadBar->setFixedSize(200, 25); QLabel *loadLabel = new QLabel("Load:", this); - loadLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;font-weight: Bold}"); + loadLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;font-weight: Bold}"); writingLabel = new QLabel("writing"); writingLabel->setEnabled(false); - writingLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;}"); + writingLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;}"); grabbingLabel = new QLabel("grabbing"); grabbingLabel->setEnabled(false); - grabbingLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;}"); + grabbingLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;}"); labelSwitch = false; cameraConnectedLabel = new QLabel("not connected"); cameraConnectedLabel->setStyleSheet("QLabel { color : red; }"); - cameraConnectedLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;}"); + cameraConnectedLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;}"); fileLabel = new QLabel(); - fileLabel->setStyleSheet("QLabel{font-size: 11px;font-family: Arial;}"); + fileLabel->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial;}"); QLabel *camHeader = new QLabel("Camera:"); - camHeader->setStyleSheet("QLabel{font-size: 11px;font-family: Arial; font-weight: Bold}"); + camHeader->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial; font-weight: Bold}"); QLabel *statusHeader = new QLabel("Status:"); - statusHeader->setStyleSheet("QLabel{font-size: 11px;font-family: Arial; font-weight: Bold}"); + statusHeader->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial; font-weight: Bold}"); QLabel *fileHeader = new QLabel("Output file:"); - fileHeader->setStyleSheet("QLabel{font-size: 11px;font-family: Arial; font-weight: Bold}"); + fileHeader->setStyleSheet("QLabel{font-size: 11pt;font-family: Arial; font-weight: Bold}"); statusBar()->addWidget(camHeader); statusBar()->addWidget(cameraConnectedLabel); @@ -436,7 +436,7 @@ void PylonRecorder::createActions() { framerateSpinner->setSuffix("Hz"); framerateSpinner->setFixedSize(80, 25); framerateSpinner->setValue(defaultFrameRate); - framerateSpinner->setStyleSheet("QSpinBox{font-size: 10px;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); + framerateSpinner->setStyleSheet("QSpinBox{font-size: 10pt;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); //framerateSpinner->setStyleSheet("QSpinBox{font-size: 10px;font-family: Arial;color: rgb(255, 255, 255);background-color: rgb(38,56,76);}"); buffersizeSpinner = new QSpinBox(); @@ -444,26 +444,26 @@ void PylonRecorder::createActions() { buffersizeSpinner->setSingleStep(25); buffersizeSpinner->setValue(defaultBufferSize); buffersizeSpinner->setFixedSize(100, 25); - buffersizeSpinner->setStyleSheet("QSpinBox{font-size: 10px;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); + buffersizeSpinner->setStyleSheet("QSpinBox{font-size: 10pt;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); exposureSpinner = new QSpinBox(); exposureSpinner->setRange(10, 50000); exposureSpinner->setSingleStep(50); exposureSpinner->setValue(defaultExposureTime); exposureSpinner->setFixedSize(120, 25); - exposureSpinner->setStyleSheet("QSpinBox{font-size: 10px;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); + exposureSpinner->setStyleSheet("QSpinBox{font-size: 10pt;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); gainSpinner = new QSpinBox(); gainSpinner->setRange(0, 24); gainSpinner->setSingleStep(1); gainSpinner->setValue(defaultGain); gainSpinner->setFixedSize(80, 25); - gainSpinner->setStyleSheet("QSpinBox{font-size: 10px;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); + gainSpinner->setStyleSheet("QSpinBox{font-size: 10pt;font-family: Arial;color: rgb(0, 0, 0);background-color: rgb(255,255,255);}"); dryRunCheckBox = new QCheckBox("Dry run, no writing"); dryRunCheckBox->setChecked(false); - dryRunCheckBox->setFixedSize(150, 25); - dryRunCheckBox->setStyleSheet("QCheckBox{font-size: 12px;font-family: Arial;color: rgb(0, 0, 0);}"); + dryRunCheckBox->setFixedHeight(25); + dryRunCheckBox->setStyleSheet("QCheckBox{font-size: 12pt;font-family: Arial;color: rgb(0, 0, 0);}"); QToolBar *toolbar = addToolBar("main toolbar"); toolbar->addAction(exitAct); diff --git a/pylonrecorder.h b/pylonrecorder.h index ca73776..9de9993 100644 --- a/pylonrecorder.h +++ b/pylonrecorder.h @@ -94,9 +94,9 @@ private: Writer *writer; bool grabbing, stopRequest, writing, labelSwitch, dryRun; QPalette progressPalette; - QString activeLabelStyleHigh = "QLabel { font-size: 10px;font-family: Arial; color : red; }"; - QString activeLabelStyleLow = "QLabel { font-size: 10px;font-family: Arial; color : cmyk(0, 255, 255, 0, 50); }"; - QString inactiveLabelStyle = ("QLabel { font-size: 10px;font-family: Arial; color :gray; }"); + QString activeLabelStyleHigh = "QLabel { font-size: 10pt;font-family: Arial; color : red; }"; + QString activeLabelStyleLow = "QLabel { font-size: 10pt;font-family: Arial; color : cmyk(0, 255, 255, 0, 50); }"; + QString inactiveLabelStyle = ("QLabel { font-size: 10pt;font-family: Arial; color :gray; }"); QSpinBox *framerateSpinner, *buffersizeSpinner, *exposureSpinner, *gainSpinner; QAction *selectStorageAction, *storeSettingsAction; QString storageLocation = "";