Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eoin O'Neill
Krita
Commits
4c86c614
Commit
4c86c614
authored
Apr 07, 2014
by
Halla Rempt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up the layout of the filter settings pages
Patch by Ghevan CCMAIL:ghevan@gmail.com
parent
e5813668
Changes
28
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
1792 additions
and
1185 deletions
+1792
-1185
krita/plugins/filters/blur/wdg_gaussian_blur.ui
krita/plugins/filters/blur/wdg_gaussian_blur.ui
+68
-17
krita/plugins/filters/blur/wdg_lens_blur.ui
krita/plugins/filters/blur/wdg_lens_blur.ui
+44
-36
krita/plugins/filters/blur/wdg_motion_blur.ui
krita/plugins/filters/blur/wdg_motion_blur.ui
+104
-63
krita/plugins/filters/blur/wdgblur.ui
krita/plugins/filters/blur/wdgblur.ui
+5
-2
krita/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
krita/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
+1
-0
krita/plugins/filters/colors/wdgcolortoalphabase.ui
krita/plugins/filters/colors/wdgcolortoalphabase.ui
+122
-48
krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
.../filters/colorsfilters/kis_brightness_contrast_filter.cpp
+3
-1
krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
...a/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+1
-0
krita/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
.../plugins/filters/colorsfilters/wdg_brightness_contrast.ui
+161
-121
krita/plugins/filters/colorsfilters/wdg_color_balance.ui
krita/plugins/filters/colorsfilters/wdg_color_balance.ui
+245
-131
krita/plugins/filters/colorsfilters/wdg_desaturate.ui
krita/plugins/filters/colorsfilters/wdg_desaturate.ui
+58
-34
krita/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
krita/plugins/filters/colorsfilters/wdg_hsv_adjustment.ui
+97
-68
krita/plugins/filters/colorsfilters/wdg_perchannel.ui
krita/plugins/filters/colorsfilters/wdg_perchannel.ui
+184
-203
krita/plugins/filters/dodgeburn/DodgeBurnConfigurationBaseWidget.ui
...ins/filters/dodgeburn/DodgeBurnConfigurationBaseWidget.ui
+3
-3
krita/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
...plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
+23
-27
krita/plugins/filters/levelfilter/kis_level_filter.cpp
krita/plugins/filters/levelfilter/kis_level_filter.cpp
+4
-3
krita/plugins/filters/levelfilter/wdg_level.ui
krita/plugins/filters/levelfilter/wdg_level.ui
+107
-101
krita/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
krita/plugins/filters/phongbumpmap/wdgphongbumpmap.ui
+225
-77
krita/plugins/filters/randompickfilter/wdgrandompickoptions.ui
.../plugins/filters/randompickfilter/wdgrandompickoptions.ui
+34
-46
krita/plugins/filters/wavefilter/wdgwaveoptions.ui
krita/plugins/filters/wavefilter/wdgwaveoptions.ui
+115
-95
krita/ui/forms/wdgfilterdialog.ui
krita/ui/forms/wdgfilterdialog.ui
+82
-46
krita/ui/forms/wdgfilterselector.ui
krita/ui/forms/wdgfilterselector.ui
+51
-23
krita/ui/forms/wdggenerators.ui
krita/ui/forms/wdggenerators.ui
+15
-14
krita/ui/widgets/kis_filter_selector_widget.cc
krita/ui/widgets/kis_filter_selector_widget.cc
+5
-2
krita/ui/widgets/kis_gradient_slider.cpp
krita/ui/widgets/kis_gradient_slider.cpp
+26
-23
krita/ui/widgets/kis_multi_bool_filter_widget.cc
krita/ui/widgets/kis_multi_bool_filter_widget.cc
+1
-1
krita/ui/widgets/kis_multi_double_filter_widget.cc
krita/ui/widgets/kis_multi_double_filter_widget.cc
+4
-0
krita/ui/widgets/kis_multi_integer_filter_widget.cc
krita/ui/widgets/kis_multi_integer_filter_widget.cc
+4
-0
No files found.
krita/plugins/filters/blur/wdg_gaussian_blur.ui
View file @
4c86c614
...
...
@@ -6,20 +6,61 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
407
</width>
<height>
15
0
</height>
<width>
385
</width>
<height>
9
0
</height>
</rect>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<item
row=
"0"
column=
"2"
>
<widget
class=
"KisDoubleSliderSpinBox"
name=
"horizontalRadius"
native=
"true"
>
<zorder>
verticalRadius
</zorder>
<zorder>
verticalRadius
</zorder>
<zorder>
aspectButton
</zorder>
<zorder>
aspectButton
</zorder>
</widget>
<item
row=
"0"
column=
"1"
>
<widget
class=
"KisDoubleSliderSpinBox"
name=
"horizontalRadius"
native=
"true"
/>
</item>
<item
row=
"0"
column=
"2"
rowspan=
"2"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
stretch=
"1,0,1"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
1
</width>
<height>
1
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"KoAspectButton"
name=
"aspectButton"
native=
"true"
>
<property
name=
"minimumSize"
>
<size>
<width>
2
</width>
<height>
10
</height>
</size>
</property>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
1
</width>
<height>
1
</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_2"
>
...
...
@@ -41,12 +82,7 @@
</property>
</widget>
</item>
<item
row=
"1"
column=
"2"
>
<widget
class=
"KisDoubleSliderSpinBox"
name=
"verticalRadius"
native=
"true"
>
<zorder>
aspectButton
</zorder>
</widget>
</item>
<item
row=
"3"
column=
"2"
>
<item
row=
"2"
column=
"1"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
...
...
@@ -59,10 +95,25 @@
</property>
</spacer>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"KisDoubleSliderSpinBox"
name=
"verticalRadius"
native=
"true"
>
<zorder>
aspectButton
</zorder>
</widget>
</item>
</layout>
</item>
<item>
<widget
class=
"KoAspectButton"
name=
"aspectButton"
native=
"true"
/>
<spacer
name=
"verticalSpacer_3"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
1
</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
...
...
krita/plugins/filters/blur/wdg_lens_blur.ui
View file @
4c86c614
...
...
@@ -6,11 +6,14 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
330
</width>
<width>
232
</width>
<height>
263
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"sizePolicy"
>
...
...
@@ -33,40 +36,6 @@
</property>
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"irisShapeCombo"
>
<item>
<property
name=
"text"
>
<string>
Triangle
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Quadrilateral (4)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Pentagon (5)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Hexagon (6)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Heptagon (7)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Octagon (8)
</string>
</property>
</item>
</widget>
</item>
<item
row=
"2"
column=
"0"
colspan=
"3"
>
<widget
class=
"KIntNumInput"
name=
"irisRadiusSlider"
>
<property
name=
"label"
>
...
...
@@ -102,6 +71,40 @@
</property>
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"irisShapeCombo"
>
<item>
<property
name=
"text"
>
<string>
Triangle
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Quadrilateral (4)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Pentagon (5)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Hexagon (6)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Heptagon (7)
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Octagon (8)
</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
...
...
@@ -113,7 +116,7 @@
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>
<height>
18
</height>
</size>
</property>
</spacer>
...
...
@@ -127,6 +130,11 @@
<header>
knuminput.h
</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>
irisShapeCombo
</tabstop>
<tabstop>
irisRadiusSlider
</tabstop>
<tabstop>
irisRotationSlider
</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
krita/plugins/filters/blur/wdg_motion_blur.ui
View file @
4c86c614
...
...
@@ -6,101 +6,137 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
36
5
</width>
<height>
172
</height>
<width>
24
5
</width>
<height>
256
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<item
row=
"2"
column=
"0"
colspan=
"2"
>
<spacer>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Expanding
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
20
</height>
</size>
</property>
</spacer>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<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>
<widget
class=
"QDial"
name=
"blurAngleDial"
>
<property
name=
"minimumSize"
>
<size>
<width>
100
</width>
<height>
100
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
100
</width>
<height>
100
</height>
</size>
</property>
<property
name=
"maximum"
>
<number>
360
</number>
</property>
<property
name=
"value"
>
<number>
274
</number>
</property>
<property
name=
"sliderPosition"
>
<number>
274
</number>
</property>
<property
name=
"invertedAppearance"
>
<bool>
false
</bool>
</property>
<property
name=
"wrapping"
>
<bool>
true
</bool>
</property>
<property
name=
"notchesVisible"
>
<bool>
false
</bool>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"KIntNumInput"
name=
"blurLength"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
<item>
<widget
class=
"KIntNumInput"
name=
"blurAngleSlider"
>
<property
name=
"focusPolicy"
>
<enum>
Qt::StrongFocus
</enum>
</property>
<property
name=
"label"
>
<string>
Length
</string>
<string>
Angle
</string>
</property>
<property
name=
"minimum"
>
<number>
0
</number>
</property>
<property
name=
"maximum"
>
<number>
256
</number>
<number>
360
</number>
</property>
<property
name=
"suffix"
>
<string>
°
</string>
</property>
<property
name=
"sliderEnabled"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item
row=
"0"
column=
"0"
>
<widget
class=
"KIntNumInput"
name=
"blurAngleSlider"
>
<item>
<widget
class=
"KIntNumInput"
name=
"blurLength"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"label"
>
<string>
Angle
</string>
<string>
Length
</string>
</property>
<property
name=
"minimum"
>
<number>
0
</number>
</property>
<property
name=
"maximum"
>
<number>
360
</number>
</property>
<property
name=
"suffix"
>
<string>
°
</string>
<number>
256
</number>
</property>
<property
name=
"sliderEnabled"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QDial"
name=
"blurAngleDial"
>
<property
name=
"minimumSize"
>
<size>
<width>
50
</width>
<height>
50
</height>
</size>
<item>
<spacer>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"maximumSize"
>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Expanding
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
5
0
</width>
<height>
50
</height>
<width>
2
0
</width>
<height>
18
</height>
</size>
</property>
<property
name=
"maximum"
>
<number>
360
</number>
</property>
<property
name=
"value"
>
<number>
274
</number>
</property>
<property
name=
"sliderPosition"
>
<number>
274
</number>
</property>
<property
name=
"invertedAppearance"
>
<bool>
false
</bool>
</property>
<property
name=
"wrapping"
>
<bool>
true
</bool>
</property>
<property
name=
"notchesVisible"
>
<bool>
false
</bool>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>
...
...
@@ -111,6 +147,11 @@
<header>
knuminput.h
</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>
blurAngleDial
</tabstop>
<tabstop>
blurAngleSlider
</tabstop>
<tabstop>
blurLength
</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
krita/plugins/filters/blur/wdgblur.ui
View file @
4c86c614
...
...
@@ -6,11 +6,14 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
2
61
</width>
<height>
17
2
</height>
<width>
2
80
</width>
<height>
17
8
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"textLabel1"
>
<property
name=
"text"
>
...
...
krita/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
View file @
4c86c614
...
...
@@ -43,6 +43,7 @@ KisWdgColorToAlpha::KisWdgColorToAlpha(QWidget * parent)
{
m_widget
=
new
Ui_WdgColorToAlphaBase
();
m_widget
->
setupUi
(
this
);
m_widget
->
textLabel1
->
hide
();
connect
(
m_widget
->
colorSelector
,
SIGNAL
(
colorChanged
(
const
QColor
&
)),
SLOT
(
slotColorSelectorChanged
(
const
QColor
&
)));
connect
(
m_widget
->
intThreshold
,
SIGNAL
(
valueChanged
(
int
)),
SIGNAL
(
sigConfigurationItemChanged
()));
connect
(
m_widget
->
btnCustomColor
,
SIGNAL
(
changed
(
const
QColor
&
)),
SLOT
(
slotCustomColorSelected
(
const
QColor
&
)));
...
...
krita/plugins/filters/colors/wdgcolortoalphabase.ui
View file @
4c86c614
...
...
@@ -6,29 +6,38 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
3
23
</width>
<height>
254
</height>
<width>
3
02
</width>
<height>
339
</height>
</rect>
</property>
<layout
class=
"QFormLayout"
name=
"formLayout"
>
<property
name=
"fieldGrowthPolicy"
>
<enum>
QFormLayout::ExpandingFieldsGrow
</enum>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"textLabel1"
>
<property
name=
"text"
>
<string>
Color:
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
</set>
</property>
<property
name=
"wordWrap"
>
<bool>
false
</bool>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<widget
class=
"QLabel"
name=
"textLabel1"
>
<property
name=
"text"
>
<string>
Color:
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
</set>
</property>
<property
name=
"wordWrap"
>
<bool>
false
</bool>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
...
...
@@ -36,44 +45,96 @@
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
4
0
</width>
<height>
2
0
</height>
<width>
2
0
</width>
<height>
0
</height>
</size>
</property>
</spacer>
</item>
<item>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget
class=
"KoTriangleColorSelector"
name=
"colorSelector"
native=
"true"
/>
</item>
<item>
<widget
class=
"KColorButton"
name=
"btnCustomColor"
>
<property
name=
"autoDefault"
>
<bool>
false
</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"
QLabel"
name=
"textLabel1_2
"
>
<property
name=
"
text
"
>
<s
tring>
Threshold:
</string
>
</property
>
<property
name=
"alignment"
>
<
set>
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
</set
>
<item>
<widget
class=
"
KoTriangleColorSelector"
name=
"colorSelector"
native=
"true
"
>
<property
name=
"
sizePolicy
"
>
<s
izepolicy
hsizetype=
"Expanding"
vsizetype=
"Expanding"
>
<horstretch>
0
</horstretch
>
<verstretch>
0
</verstretch
>
<
/sizepolicy
>
</property>
<property
name=
"wordWrap"
>
<bool>
false
</bool>
<property
name=
"minimumSize"
>
<size>
<width>
180
</width>
<height>
180
</height>
</size>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<item
row=
"1"
column=
"0"
>
<spacer
name=
"horizontalSpacer_2"
>
<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=
"1"
column=
"1"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>