[vlc-devel] [PATCH 6/7] Puzzle: UI control for the new features
Vianney Boyer
vlcvboyer at gmail.com
Mon Apr 15 14:18:41 CEST 2013
From: Vianney BOYER <vlcvboyer at gmail.com>
Date: Sun, 14 Apr 2013 12:35:04 +0200
Subject: [PATCH 6/7] Puzzle: UI control for the new features
---
modules/gui/qt4/components/extended_panels.cpp | 12 +-
modules/gui/qt4/ui/video_effects.ui | 295
+++++++++++++++++-------
2 files changed, 228 insertions(+), 79 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 7c87b9c..365a75a 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -1,7 +1,7 @@
/*****************************************************************************
* extended_panels.cpp : Extended controls panels
****************************************************************************
- * Copyright (C) 2006-2012 the VideoLAN team
+ * Copyright (C) 2006-2013 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub at videolan.org>
@@ -188,7 +188,14 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf,
QTabWidget *_parent ) :
SETUP_VFILTER( puzzle )
SETUP_VFILTER_OPTION( puzzleRowsSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( puzzleColsSpin, valueChanged( int ) )
- SETUP_VFILTER_OPTION( puzzleBlackSlotCheck, stateChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleBorderSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzlePreviewCheck, stateChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzlePreviewSizeSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleShapeSizeSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleAutoShuffleSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleAutoSolveSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleRotationCombo, currentIndexChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleModeCombo, currentIndexChanged( int ) )
SETUP_VFILTER( magnify )
@@ -1339,6 +1346,7 @@ void Equalizer::setCorePreset( int i_preset )
sliderDatas.count() ) ; i++ )
sliderDatas[i]->setValue( eqz_preset_10b[i_preset].f_amp[i] );
+
vlc_object_t *p_aout = (vlc_object_t *)THEMIM->getAout();
if( p_aout )
{
diff --git a/modules/gui/qt4/ui/video_effects.ui
b/modules/gui/qt4/ui/video_effects.ui
index 2d21e43..6b4011d 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -864,80 +864,6 @@
</layout>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QGroupBox" name="puzzleEnable">
- <property name="title">
- <string>Puzzle game</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_27">
- <property name="text">
- <string>Rows</string>
- </property>
- <property name="buddy">
- <cstring>puzzleRowsSpin</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="puzzleRowsSpin">
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>16</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_26">
- <property name="text">
- <string>Columns</string>
- </property>
- <property name="buddy">
- <cstring>puzzleColsSpin</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="puzzleColsSpin">
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>16</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="puzzleBlackSlotCheck">
- <property name="text">
- <string>Black slot</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_8">
@@ -1794,6 +1720,224 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tab_4">
+ <attribute name="title">
+ <string>Game</string>
+ </attribute>
+ <widget class="QGroupBox" name="puzzleEnable">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>521</width>
+ <height>241</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Puzzle</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_21">
+ <item row="17" column="0">
+ <widget class="QLabel" name="label_33">
+ <property name="text">
+ <string>Auto solve</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="4">
+ <widget class="QSlider" name="puzzlePreviewSizeSlider">
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1" colspan="4">
+ <widget class="QSlider" name="puzzleShapeSizeSlider">
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="pageStep">
+ <number>5</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="puzzlePreviewCheck">
+ <property name="text">
+ <string>Preview</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_45">
+ <property name="text">
+ <string>shape size</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_26">
+ <property name="text">
+ <string>border</string>
+ </property>
+ </widget>
+ </item>
+ <item row="18" column="0">
+ <widget class="QLabel" name="label_27">
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Auto shuffle</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="1" colspan="4">
+ <widget class="QSlider" name="puzzleAutoSolveSlider">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>30000</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>1000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="18" column="1" colspan="4">
+ <widget class="QSlider" name="puzzleAutoShuffleSlider">
+ <property name="maximum">
+ <number>30000</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>1000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="4">
+ <widget class="QSlider" name="puzzleBorderSlider">
+ <property name="maximum">
+ <number>25</number>
+ </property>
+ <property name="pageStep">
+ <number>5</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="5">
+ <widget class="QComboBox" name="puzzleRotationCombo"/>
+ </item>
+ <item row="1" column="0" colspan="3">
+ <widget class="QComboBox" name="puzzleModeCombo"/>
+ </item>
+ <item row="1" column="4">
+ <widget class="QSpinBox" name="puzzleColsSpin">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> col</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QSpinBox" name="puzzleRowsSpin">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> row</string>
+ </property>
+ <property name="prefix">
+ <string/>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
</widget>
<tabstops>
<tabstop>adjustEnable</tabstop>
@@ -1816,9 +1960,6 @@
<tabstop>rotateEnable</tabstop>
<tabstop>rotateAngleDial</tabstop>
<tabstop>transformTypeCombo</tabstop>
- <tabstop>puzzleRowsSpin</tabstop>
- <tabstop>puzzleColsSpin</tabstop>
- <tabstop>puzzleBlackSlotCheck</tabstop>
<tabstop>colorthresEnable</tabstop>
<tabstop>colorthresColorText</tabstop>
<tabstop>colorthresSaturationthresSlider</tabstop>
--
1.7.9.5
More information about the vlc-devel
mailing list