8 changes: 0 additions & 8 deletions src/libkstapp/changedatasampledialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>ChangeDataSampleDialog</class>
<widget class="QDialog" name="ChangeDataSampleDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>590</width>
<height>419</height>
</rect>
</property>
<property name="windowTitle">
<string>Change Data Samples</string>
</property>
Expand Down
8 changes: 0 additions & 8 deletions src/libkstapp/curvetab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>CurveTab</class>
<widget class="QWidget" name="CurveTab">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>534</width>
<height>376</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="GroupBox">
Expand Down
119 changes: 84 additions & 35 deletions src/libkstapp/differentiatecurvesdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>DifferentiateCurvesDialog</class>
<widget class="QDialog" name="DifferentiateCurvesDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>505</width>
<height>399</height>
</rect>
</property>
<property name="windowTitle">
<string>Differentiate Curves</string>
</property>
Expand All @@ -20,12 +12,30 @@
<string>Property Selection and Cycle Order</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="1">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="1">
Expand Down Expand Up @@ -102,7 +112,16 @@
</item>
<item row="0" column="0" rowspan="3">
<layout class="QVBoxLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand All @@ -122,7 +141,16 @@
</item>
<item row="0" column="2" rowspan="3">
<layout class="QVBoxLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -181,28 +209,30 @@
<string>Options</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<property name="topMargin">
<number>0</number>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
</size>
<property name="rightMargin">
<number>0</number>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="1">
Expand All @@ -224,9 +254,31 @@
</item>
</layout>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
Expand Down Expand Up @@ -266,12 +318,9 @@
</layout>
</item>
<item row="0" column="3">
<spacer>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down
35 changes: 13 additions & 22 deletions src/libkstapp/filtermultipledialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>FilterMultipleDialog</class>
<widget class="QDialog" name="FilterMultipleDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>992</width>
<height>751</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
Expand Down Expand Up @@ -61,7 +53,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string> </string>
<string/>
</property>
</widget>
</item>
Expand Down Expand Up @@ -161,6 +153,12 @@
</item>
<item row="1" column="0" colspan="2">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
Expand All @@ -183,6 +181,12 @@
</item>
<item row="2" column="0" rowspan="4">
<widget class="QFrame" name="_inputOutputBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
Expand Down Expand Up @@ -221,19 +225,6 @@
</property>
</widget>
</item>
<item row="5" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
Expand Down
18 changes: 12 additions & 6 deletions src/widgets/scalarselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@ ScalarSelector::ScalarSelector(QWidget *parent, ObjectStore *store)
_defaultsSet = false;
setupUi(this);

int size = style()->pixelMetric(QStyle::PM_SmallIconSize);

QIcon icon = KstGetIcon("kst_scalarnew");
_newScalar->setIcon(icon);
_editScalar->setIcon(KstGetIcon("kst_scalaredit"));

_newScalar->setFixedSize(size + 8, size + 8);
_editScalar->setFixedSize(size + 8, size + 8);
_selectScalar->setFixedSize(size + 8, size + 8);
_newScalar->setFixedSize(iconWidth(), iconWidth());
_editScalar->setFixedSize(iconWidth(), iconWidth());
_selectScalar->setFixedSize(iconWidth(), iconWidth());

_scalarListSelector = new ScalarListSelector(this);

_scalar->resize(10,5);
//_scalar->resize(10,5);
connect(_newScalar, SIGNAL(pressed()), this, SLOT(newScalar()));
connect(_editScalar, SIGNAL(pressed()), this, SLOT(editScalar()));
connect(_selectScalar, SIGNAL(pressed()), this, SLOT(selectScalar()));
Expand All @@ -54,6 +52,14 @@ ScalarSelector::ScalarSelector(QWidget *parent, ObjectStore *store)
ScalarSelector::~ScalarSelector() {
}

int ScalarSelector::iconWidth() const {
return fontMetrics().lineSpacing()*4/3;
}

QSize ScalarSelector::minimumSizeHint() const {
return QSize(15*fontMetrics().width("m")+ 3 * iconWidth(), iconWidth());
}


void ScalarSelector::setObjectStore(ObjectStore *store) {
_store = store;
Expand Down
3 changes: 3 additions & 0 deletions src/widgets/scalarselector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ class KSTWIDGETS_EXPORT ScalarSelector : public QWidget, public Ui::ScalarSelect

void setDefaultValue(double value);

virtual QSize minimumSizeHint () const;

int iconWidth() const;

Q_SIGNALS:
void selectionChanged(const QString&);
Expand Down
36 changes: 15 additions & 21 deletions src/widgets/scalarselector.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,27 @@
<rect>
<x>0</x>
<y>0</y>
<width>230</width>
<height>27</height>
<width>120</width>
<height>26</height>
</rect>
</property>
<property name="whatsThis">
<string>Select a scalar to utilize. If you wish to create a new scalar, select the icon to the right.</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
Expand All @@ -29,25 +41,13 @@
</item>
<item row="0" column="1">
<widget class="QToolButton" name="_selectScalar">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="_newScalar">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Create a new scalar.</string>
</property>
Expand All @@ -61,12 +61,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Edit selected scalar.</string>
</property>
Expand Down
Loading