Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -175,6 +175,14 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (2.25, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (3.00, @rt_bg_color)
|
||||
|
||||
fg[PRELIGHT] = shade (1.30, @rt_fg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -464,6 +472,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,14 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.35, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.70, @rt_bg_color)
|
||||
|
||||
fg[PRELIGHT] = shade (1.30, @rt_fg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -464,6 +472,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,15 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.45, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.70, @rt_bg_color)
|
||||
bg[SELECTED] = shade (2.00, @rt_bg_color)
|
||||
|
||||
fg[PRELIGHT] = shade (1.30, @rt_fg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -475,6 +484,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.40, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.70, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -464,6 +470,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.40, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.70, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -464,6 +470,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.40, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.70, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -464,6 +470,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -177,6 +177,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.20, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.50, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -815,6 +821,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.20, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.50, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -465,6 +471,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.15, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.40, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -465,6 +471,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -175,6 +175,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.15, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.40, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -452,6 +458,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
@@ -158,6 +158,12 @@ style "clearlooks-scale" {
|
||||
}
|
||||
}
|
||||
|
||||
style "clearlooks-thresholdselector" {
|
||||
|
||||
bg[ACTIVE] = shade (1.15, @rt_bg_color)
|
||||
bg[PRELIGHT] = shade (1.25, @rt_bg_color)
|
||||
}
|
||||
|
||||
style "clearlooks-vscale" {
|
||||
|
||||
engine "clearlooks" {
|
||||
@@ -405,6 +411,7 @@ widget "*.partialPasteHeader.*" style "clearlooks-frame_title"
|
||||
widget "*.partialPasteHeaderSep" style "clearlooks-partialPasteHeaderSep"
|
||||
widget "*.histButton" style "clearlooks-histButton"
|
||||
widget "*.FramelessSpinButton" style "clearlooks-framelessspinbutton"
|
||||
widget "*.ThresholdSelector" style "clearlooks-thresholdselector"
|
||||
|
||||
# The window of the tooltip is called "gtk-tooltip"
|
||||
##################################################################
|
||||
|
Reference in New Issue
Block a user