780 changes: 439 additions & 341 deletions src/libkstapp/labeltab.ui
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions src/libkstapp/legendtab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ LegendTab::LegendTab(QWidget *parent)
_add->setToolTip(tr("Select: Alt+s"));
_remove->setToolTip(tr("Remove: Alt+r"));

_bold->setFixedWidth(32);
_bold->setFixedHeight(32);
int h = fontMetrics().lineSpacing();
_bold->setFixedWidth(h);
_bold->setFixedHeight(h);
_bold->setIcon(KstGetIcon("kst_bold"));
_italic->setFixedWidth(32);
_italic->setFixedHeight(32);
_italic->setFixedWidth(h);
_italic->setFixedHeight(h);
_italic->setIcon(KstGetIcon("kst_italic"));
_labelColor->setFixedWidth(32);
_labelColor->setFixedHeight(32);
_labelColor->setFixedWidth(h);
_labelColor->setFixedHeight(h);


connect(_add, SIGNAL(clicked()), this, SLOT(addButtonClicked()));
Expand Down
11 changes: 7 additions & 4 deletions src/libkstapp/overridelabeltab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ OverrideLabelTab::OverrideLabelTab(QString title, QWidget *parent)
: DialogTab(parent), _fontDirty(false) {

setupUi(this);
int h = fontMetrics().lineSpacing();
_bold->setIcon(KstGetIcon("kst_bold"));
_bold->setFixedWidth(32);
_bold->setFixedWidth(h);
_bold->setFixedHeight(h);
_italic->setIcon(KstGetIcon("kst_italic"));
_italic->setFixedWidth(32);
_labelColor->setFixedWidth(32);
_labelColor->setFixedHeight(32);
_italic->setFixedWidth(h);
_italic->setFixedHeight(h);
_labelColor->setFixedWidth(h);
_labelColor->setFixedHeight(h);

setTabTitle(title);

Expand Down
144 changes: 71 additions & 73 deletions src/libkstapp/overridelabeltab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@
<rect>
<x>0</x>
<y>0</y>
<width>451</width>
<height>271</height>
<width>1425</width>
<height>858</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="_Label_11">
<item row="1" column="2">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string> points</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="_italic">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -33,55 +37,43 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font &amp;size:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="checkable">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>_fontSize</cstring>
<property name="si" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="_fontSize">
<item row="1" column="5">
<widget class="Kst::ColorButton" name="_labelColor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-25.000000000000000</double>
</property>
<property name="singleStep">
<double>1.000000000000000</double>
<property name="si" stdset="0">
<string/>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QPushButton" name="_italic">
<item row="1" column="0">
<widget class="QLabel" name="_Label_11">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
<property name="text">
<string>Font si&amp;ze:</string>
</property>
<property name="checkable">
<bool>true</bool>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="si" stdset="0">
<string notr="true">override label italic</string>
<property name="buddy">
<cstring>_fontSize</cstring>
</property>
</widget>
</item>
Expand All @@ -91,13 +83,13 @@
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font famil&amp;y:</string>
<string>Font fa&amp;mily:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand All @@ -107,14 +99,23 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="6">
<widget class="QFontComboBox" name="_family">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="_fontSize">
<property name="enabled">
<bool>false</bool>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-25.000000000000000</double>
</property>
<property name="singleStep">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="4">
<item row="1" column="3">
<widget class="QPushButton" name="_bold">
<property name="enabled">
<bool>false</bool>
Expand All @@ -125,58 +126,55 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string notr="true">override label bold</string>
<string/>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="_useDefault">
<property name="text">
<string>&amp;Use plot default font</string>
<item row="1" column="6">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="checked">
<bool>true</bool>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="1" column="6">
<widget class="Kst::ColorButton" name="_labelColor">
<item row="2" column="1" colspan="6">
<widget class="QFontComboBox" name="_family">
<property name="enabled">
<bool>false</bool>
</property>
<property name="si" stdset="0">
<string notr="true">override label color</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label">
<item row="0" column="0" colspan="7">
<widget class="QCheckBox" name="_useDefault">
<property name="text">
<string> points</string>
<string>&amp;Use plot default font</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>129</height>
<height>659</height>
</size>
</property>
</spacer>
Expand Down
14 changes: 8 additions & 6 deletions src/libkstapp/themedialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ ThemeDialog::ThemeDialog(QWidget *parent) : QDialog(parent) {
connect(_buttonBox, SIGNAL(clicked(QAbstractButton*)),
this, SLOT(buttonClicked(QAbstractButton*)));

_bold->setFixedWidth(32);
_bold->setFixedHeight(32);
int h = fontMetrics().lineSpacing();

_bold->setFixedWidth(h);
_bold->setFixedHeight(h);
_bold->setIcon(KstGetIcon("kst_bold"));
_italic->setFixedWidth(32);
_italic->setFixedHeight(32);
_italic->setFixedWidth(h);
_italic->setFixedHeight(h);
_italic->setIcon(KstGetIcon("kst_italic"));
_labelColor->setFixedWidth(32);
_labelColor->setFixedHeight(32);
_labelColor->setFixedWidth(h);
_labelColor->setFixedHeight(h);

_applyToExisting->setChecked(true);
_saveAsDefault->setChecked(true);
Expand Down