Changeset ec725cdc50c7b23539c4d455b1d5edb03c7e764b

Timestamp:

06/23/08 17:58:37 (2 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1214236717 +0200

git-parent:

[51b21bc3a21f925a30fd5401bafe50ffedcba382]

git-author:

Lukas Durfina <lukas.durfina@gmail.com> 1214222929 +0200

Message:

Fix teletex buttons

uninitialized variable and synchro with fs controller

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

Files:

• modules/gui/qt4/components/interface_widgets.cpp (modified) (3 diffs)
• modules/gui/qt4/components/interface_widgets.hpp (modified) (1 diff)
• modules/gui/qt4/input_manager.cpp (modified) (4 diffs)
• modules/gui/qt4/input_manager.hpp (modified) (2 diffs)

modules/gui/qt4/components/interface_widgets.cpp

@@ -486 +486 @@
-    telexLayout->setMargin( 0 );
-
-QPushButton  *
+
-    setupSmallButton( telexOn );
-    telexLayout->addWidget( telexOn );
@@ -504 +504 @@
-    telexLayout->addWidget( telexPage );
-
-
+
+
-    telexFrame->hide(); /* default hidden */
-
-    CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(),
-             telexGotoPage( int ) );
-
-
-
+
+
+
+
+
+
+
-    CONNECT( telexOn, clicked( bool ), THEMIM->getIM(),
-             telexToggle( bool ) );
+    CONNECT( THEMIM->getIM(), toggleTelexButtons(),
+              this, toggleTeletext() );
+    b_telexEnabled = false;
-    telexTransparent->setEnabled( false );
-    telexPage->setEnabled( false );
-
-
-
+
-    CONNECT( telexTransparent, clicked( bool ),
-             THEMIM->getIM(), telexSetTransparency() );
+    CONNECT( THEMIM->getIM(), toggleTelexTransparency(),
+              this, toggleTeletextTransparency() );
-    CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
-             telexFrame, setVisible( bool ) );
@@ -1147 +1156 @@
-                        showFullscreenControllCallback, (void *) p_fs );
-        b_registered = false;
+    }
+
+    if ( !var_GetBool( p_vout, "fullscreen" ) )
-        p_fs->hide();
-    }
-
-    return VLC_SUCCESS;

modules/gui/qt4/components/interface_widgets.hpp

@@ -204 +204 @@
-    QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
-    QPushButton         *playButton, *fullscreenButton, *extSettingsButton;
-
+, *telexOn
-    QSpinBox            *telexPage;
-    QToolButton         *slowerButton, *fasterButton;

modules/gui/qt4/input_manager.cpp

@@ -417 +417 @@
-        }
-    }
+    emit setNewTelexPage( page );
-}
-
@@ -427 +428 @@
-        vlc_value_t val;
-        vlc_object_t *p_vbi;
+        var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        b_enabled = (val.i_int > 0);
-        p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
-                    "zvbi", FIND_ANYWHERE );
@@ -433 +436 @@
-            i_page = var_GetInteger( p_vbi, "vbi-page" );
-            vlc_object_release( p_vbi );
+            i_page = b_enabled ? i_page : 0;
+            telexGotoPage( i_page );
-        }
-        var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
-        b_enabled = (val.i_int > 0);
-    }
-    emit teletextEnabled( b_enabled );
-
-
+
+
+
+
+
-}
-
@@ -456 +462 @@
-        }
-    }
+    emit toggleTelexTransparency();
-}
-

modules/gui/qt4/input_manager.hpp

@@ -104 +104 @@
-    void telexGotoPage( int ); ///< Goto teletext page
-    void telexToggle( bool );  ///< Enable disable teletext buttons
+    void telexToggleButtons(); ///< Toggle buttons after click
-    void telexSetTransparency(); ///< Set transparency on teletext background
-
@@ -120 +121 @@
-    /// Teletext
-    void teletextEnabled( bool );
+    void toggleTelexButtons();
+    void toggleTelexTransparency();
+    void setNewTelexPage( int );
-};
-