Git commit 883cd08469d8751dfab8cbac298dc8ed22a602bd by Barth Netterfield.
Committed on 30/01/2016 at 21:20.
Pushed by netterfield into branch 'master'.
HiDPI fixes for data wizard first page.
M +3 -0 src/libkstapp/datawizard.cpp
M +3 -3 src/libkstapp/datawizardpagedatasource.ui
M +18 -5 src/libkstapp/equationtab.ui
M +10 -3 src/widgets/datasourceselector.cpp
http://commits.kde.org/kst-plot/883cd08469d8751dfab8cbac298dc8ed22a602bd
diff --git a/src/libkstapp/datawizard.cpp b/src/libkstapp/datawizard.cpp
index 4f76162..9ce673a 100644
--- a/src/libkstapp/datawizard.cpp
+++ b/src/libkstapp/datawizard.cpp
@@ -66,6 +66,9 @@ DataWizardPageDataSource::DataWizardPageDataSource(Object=
Store *store, QWidget *
_updateBox->addItem(tr("Change Detection", "update when a change is dete=
cted"));
_updateBox->addItem(tr("No Update", "do not update the file"));
updateUpdateBox();
+
+ int h =3D fontMetrics().lineSpacing();
+ _url->setFixedHeight(h*4/3);
}
=
=
diff --git a/src/libkstapp/datawizardpagedatasource.ui b/src/libkstapp/data=
wizardpagedatasource.ui
index e1c9a6d..df2ea8c 100644
--- a/src/libkstapp/datawizardpagedatasource.ui
+++ b/src/libkstapp/datawizardpagedatasource.ui
@@ -6,8 +6,8 @@
0
0
- 670
- 420
+ 850
+ 569
@@ -45,7 +45,7 @@ p, li { white-space: pre-wrap; }
-
-
+
0
0
diff --git a/src/libkstapp/equationtab.ui b/src/libkstapp/equationtab.ui
index b242831..9641441 100644
--- a/src/libkstapp/equationtab.ui
+++ b/src/libkstapp/equationtab.ui
@@ -6,11 +6,14 @@
0
0
- 648
+ 765
360
+
-
+
+
-
@@ -26,7 +29,7 @@
- Eq&uation:
+ E&quation:
false
@@ -85,10 +88,20 @@
- -
-
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
- -
+
-
diff --git a/src/widgets/datasourceselector.cpp b/src/widgets/datasourcesel=
ector.cpp
index 150b7ea..3675f5c 100644
--- a/src/widgets/datasourceselector.cpp
+++ b/src/widgets/datasourceselector.cpp
@@ -47,17 +47,23 @@ void DataSourceSelector::setup() {
=
_fileEdit =3D new QLineEdit(this);
_fileButton =3D new QToolButton(this);
- _fileButton->setProperty("si","file browse button");
+
+ int h =3D fontMetrics().lineSpacing()*4/3;
+
+ _fileEdit->setFixedHeight(h);
=
QHBoxLayout * layout =3D new QHBoxLayout(this);
layout->setMargin(0);
layout->addWidget(_fileEdit);
layout->addWidget(_fileButton);
+
+ _fileButton->setFixedSize(h,h);
setLayout(layout);
=
- int size =3D style()->pixelMetric(QStyle::PM_SmallIconSize);
+ //int size =3D style()->pixelMetric(QStyle::PM_SmallIconSize);
+ _fileButton->setFixedSize(h,h);
_fileButton->setIcon(KstGetIcon("kst_changefile"));
- _fileButton->setFixedSize(size + 8, size + 8);
+ //qDebug() << "file button small icon size" << size;
=
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
//connect (_fileEdit, SIGNAL(textChanged(const QString &)), this, SIGNAL=
(changed(const QString &)));
@@ -72,6 +78,7 @@ void DataSourceSelector::setup() {
completer->setModel(dirModel); =
=
_fileEdit->setCompleter(completer);
+ setFixedHeight(h);
}
=
=