From ddb69692c44d26b2c7454d807c04a52464febf25 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 22 Sep 2010 00:29:11 +0200 Subject: [PATCH] Qt4: rework on the video effect dialog Changing places of items depending on their actual usefulness Removing one tab Reordering tabs according to usefulness Reordering of tab order and buddies --- modules/gui/qt4/ui/video_effects.ui | 773 ++++++++++++++++------------ 1 file changed, 447 insertions(+), 326 deletions(-) diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui index 193c12d268..2ecb66f723 100644 --- a/modules/gui/qt4/ui/video_effects.ui +++ b/modules/gui/qt4/ui/video_effects.ui @@ -6,8 +6,8 @@ 0 0 - 619 - 308 + 542 + 276 @@ -17,11 +17,14 @@ Basic - - - + + + + + true + - Sharpen + Image adjust true @@ -29,21 +32,21 @@ false - + - + - Sigma + Hue + + + hueSlider - + - 200 - - - 10 + 360 Qt::Horizontal @@ -52,81 +55,55 @@ QSlider::TicksBelow - 100 + 60 - - - - - - - true - - - Image adjust - - - true - - - false - - - - 0 - - - - - 360 - - - Qt::Horizontal - - - QSlider::TicksBothSides + + + + Brightness - - 60 + + brightnessSlider - - + + - 500 + 200 Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 50 - - - - 300 - - - Qt::Horizontal + + + + Brightness Threshold - - QSlider::TicksBothSides + + + + + + Contrast - - 100 + + contrastSlider - - + + 200 @@ -134,78 +111,116 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow - 100 + 50 - - + + + + Saturation + + + saturationSlider + + + + + - 200 + 300 Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow - 100 + 50 - + Gamma - - - - - - Contrast + + gammaSlider - - - - Brightness + + + + 1000 - - - - - - Saturation + + Qt::Horizontal + + + QSlider::TicksBelow + + + 100 + + + + + + + Sharpen + + + true + + + false + + - + - Hue + Sigma + + + sharpenSigmaSlider - - - - Brightness threshold + + + + 200 + + + 10 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 50 - - + + - Transform + Motion blur true @@ -213,14 +228,43 @@ false - + - + + + Factor + + + blurFactorSlider + + + + + + + 1 + + + 127 + + + 80 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 16 + + - + Gradient @@ -237,6 +281,9 @@ Radius + + gradfunRadiusSlider + @@ -276,6 +323,9 @@ Top + + cropTopPx + @@ -293,6 +343,9 @@ Left + + cropLeftPx + @@ -310,6 +363,9 @@ Right + + cropRightPx + @@ -327,6 +383,9 @@ Bottom + + cropBotPx + @@ -375,15 +434,71 @@ Geometry - + + + + Transform + + + true + + + false + + + + + + + + + Magnification/Zoom - + + + + Rotate + + + true + + + false + + + + + + 359 + + + 180 + + + 180 + + + + + + + Angle + + + rotateAngleDial + + + + + + + Puzzle game @@ -433,6 +548,9 @@ Columns + + puzzleColsSpin + @@ -440,15 +558,25 @@ Rows + + puzzleRowsSpin + - - + + + + + Color + + + + - Rotate + Color threshold true @@ -457,57 +585,52 @@ false - - - - 359 + + + + Similarity - - 180 + + colorthresSimilaritythresSlider - - 180 + + + + + + Qt::Horizontal - - + + + + Qt::Horizontal + + + + + - Angle + Saturation + + + colorthresSaturationthresSlider - - - - - - - - Color fun - - - - - - Color extraction - - - true - - - false - - - + Color + + colorthresColorText + - + >HHHHHH;# @@ -517,16 +640,9 @@ - - - Invert colors - - - - - + - Color threshold + Gradient true @@ -534,44 +650,55 @@ false - - - + + + - Similarity - - - - - - - Qt::Horizontal + Mode - - - - Qt::Horizontal + + + + Color - - + + - Saturation + Cartoon + + + + + + + + + + Color extraction + + + true + + + false + + - + Color - + >HHHHHH;# @@ -580,7 +707,7 @@ - + Posterize @@ -615,129 +742,46 @@ - - - - - Image modification - - - - + + - Waves + Invert colors - + Water effect - - - - Psychedelic - - - - + - Noise + Motion detect - - + + - Motion detect + Waves - - - - Motion blur - - - true - - - false + + + + Noise - - - - - Factor - - - - - - - 1 - - - 127 - - - 80 - - - Qt::Horizontal - - - QSlider::TicksBothSides - - - 16 - - - - - - - - Gradient - - - true - - - false + + + + Psychedelic - - - - - Mode - - - - - - - Color - - - - - - - Cartoon - - - - - - - @@ -767,6 +811,9 @@ Edge weightning + + atmoEdgeweightningSlider + @@ -787,7 +834,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 3 @@ -799,6 +846,9 @@ Output Color Filtermode + + atmoFiltermodeCombo + @@ -806,6 +856,9 @@ Brightness (%) + + atmoBrightnessSlider + @@ -826,7 +879,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 10 @@ -841,6 +894,9 @@ Darkness limit + + atmoDarknesslimitSlider + @@ -861,7 +917,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 1 @@ -880,6 +936,9 @@ Filter length (ms) + + atmoMeanlengthSlider + @@ -903,7 +962,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 200 @@ -915,6 +974,9 @@ Filter threshold (%) + + atmoMeanthresholdSlider + @@ -938,7 +1000,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 10 @@ -950,6 +1012,9 @@ Filter smoothness (%) + + atmoPercentnewSlider + @@ -973,7 +1038,7 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 10 @@ -1007,6 +1072,9 @@ Rows + + wallRowsSpin + @@ -1014,6 +1082,9 @@ Columns + + wallColsSpin + @@ -1056,6 +1127,9 @@ Position + + marqPositionCombo + @@ -1063,6 +1137,9 @@ Text + + marqMarqueeText + @@ -1091,6 +1168,9 @@ Rows + + panoramixRowsSpin + @@ -1108,6 +1188,9 @@ Columns + + panoramixColsSpin + @@ -1140,6 +1223,9 @@ Number of clones + + cloneCountSpin + @@ -1174,25 +1260,6 @@ false - - - - - 0 - 0 - - - - - 50 - 0 - - - - Transparency - - - @@ -1204,6 +1271,9 @@ Left + + logoXSpin + @@ -1217,6 +1287,9 @@ Top + + logoYSpin + @@ -1230,6 +1303,9 @@ Logo + + logoFileText + @@ -1255,9 +1331,9 @@ - + - + 255 @@ -1266,14 +1342,14 @@ Qt::Horizontal - QSlider::TicksBothSides + QSlider::TicksBelow 32 - + @@ -1283,9 +1359,15 @@ none + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + logoOpacitySlider + - + @@ -1296,7 +1378,32 @@ full - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + logoOpacitySlider + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + Transparency + + + logoOpacitySlider @@ -1328,6 +1435,9 @@ Top + + eraseYSpin + @@ -1341,6 +1451,9 @@ Left + + eraseXSpin + @@ -1363,6 +1476,9 @@ Mask + + eraseMaskText + @@ -1402,26 +1518,30 @@ - logoEnable - logoFileText - logoYSpin - logoXSpin - logoOpacitySlider - eraseEnable - eraseMaskText - eraseYSpin - eraseXSpin + adjustEnable + hueSlider + brightnessSlider + brightnessThresholdCheck + contrastSlider + saturationSlider + gammaSlider sharpenEnable - transformTypeCombo + sharpenSigmaSlider + motionblurEnable + blurFactorSlider + gradfunEnable + gradfunRadiusSlider cropTopPx cropLeftPx cropRightPx cropBotPx topBotCropSync leftRightCropSync - magnifyEnable + transformEnable + transformTypeCombo rotateEnable rotateAngleDial + magnifyEnable puzzleEnable puzzleRowsSpin puzzleColsSpin @@ -1430,19 +1550,19 @@ colorthresColorText colorthresSaturationthresSlider colorthresSimilaritythresSlider - invertEnable extractEnable extractComponentText gradientEnable gradientModeCombo gradientTypeCheck gradientCartoonCheck - waveEnable - rippleEnable - motionblurEnable - blurFactorSlider + invertEnable motiondetectEnable noiseEnable + posterizeEnable + posterizeLevelSpin + waveEnable + rippleEnable psychedelicEnable atmoEnable atmoEdgeweightningSlider @@ -1464,14 +1584,15 @@ marqPositionCombo cloneEnable cloneCountSpin - brightnessSlider - contrastSlider - hueSlider - adjustEnable - brightnessThresholdCheck - gammaSlider - sharpenSigmaSlider - saturationSlider + logoEnable + logoFileText + logoYSpin + logoXSpin + logoOpacitySlider + eraseEnable + eraseMaskText + eraseYSpin + eraseXSpin -- 2.39.2