Changeset f15c486bef6a06353326f24387a527e4b6b72088

Timestamp:

07/18/06 20:57:19 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1153249039 +0000

git-parent:

[f6ef9859ac452f74c2303ac999eddc7be33bf60b]

git-author:

Clément Stenac <zorglub@videolan.org> 1153249039 +0000

Message:

* Fix a number of encoding bugs
* add "make nice" in modules to call ./compile

Files:

• bootstrap (modified) (1 diff)
• modules/gui/qt4/Modules.am (modified) (1 diff)
• modules/gui/qt4/menus.cpp (modified) (9 diffs)
• modules/gui/qt4/qt4.hpp (modified) (1 diff)

bootstrap

@@ -222 +222 @@
-
-all: all-modules
+
+nice:
+    \$(top_builddir)/compile
-
-# Find out which modules were enabled and tell make to build them

modules/gui/qt4/Modules.am

@@ -68 +68 @@
-    @echo "$(UIC) $< -> $@"
-    rm -f $@
-_(a
+QString::fromUtf8(_(a)
-    $(UIC) -tr "Q_" $< >> $@
-

modules/gui/qt4/menus.cpp

@@ -118 +118 @@
-    THEDP->menusUpdateMapper->setMapping( menu, f ); }
-
-_
-_
-_
-_
-_
-
-_
+qtr
+qtr
+qtr
+qtr
+qtr
+
+qtr
-}
-
@@ -130 +130 @@
-{
-    QMenu *menu = new QMenu();
-_
-_
+qtr
+qtr
-    menu->addSeparator();
-_
+qtr
-    menu->addSeparator();
-_
+qtr
-    return menu;
-}
@@ -145 +145 @@
-    {
-        QMenu *intfmenu = InterfacesMenu( p_intf, NULL );
-_
+qtr
-        menu->addMenu( intfmenu );
-        /** \todo ADD EXT GUI HERE */
-        menu->addSeparator();
-    }
-_
-_
-_
+qtr
+qtr
+qtr
-    menu->addSeparator();
-_
+qtr
-    return menu;
-}
@@ -262 +262 @@
-#define POPUP_STATIC_ENTRIES \
-    vlc_value_t val; \
-_
-_
-_
+qtr
+qtr
+qtr
-    if( p_input ) \
-    { \
-        var_Get( p_input, "state", &val ); \
-        if( val.i_int == PAUSE_S ) \
-_
+qtr
-        else \
-_
+qtr
-    } \
-    else if( THEPL->i_size && THEPL->i_enabled ) \
-_
+qtr
-    \
-    QMenu *intfmenu = InterfacesMenu( p_intf, NULL ); \
-_
+qtr
-    menu->addMenu( intfmenu ); \
-    \
-    QMenu *toolsmenu = ToolsMenu( p_intf, false ); \
-_
+qtr
-    menu->addMenu( toolsmenu ); \
-     
@@ -414 +414 @@
-    int i;
-
-_
+qtr
-                       action->setEnabled( false ); }
-
@@ -542 +542 @@
-        {
-            QMenu *submenu = new QMenu();
-
+
+
-            if( CreateChoicesMenu( submenu, psz_var, p_object, true ) == 0)
-                menu->addMenu( submenu );
@@ -552 +553 @@
-    }
-
-
+
+
-
-    switch( i_type & VLC_VAR_TYPE )
@@ -619 +621 @@
-        case VLC_VAR_VARIABLE:
-            CreateChoicesMenu( subsubmenu, CURVAL.psz_string, p_object, false );
-
+
+
-            submenu->addMenu( subsubmenu );
-            break;
@@ -711 +714 @@
-    if( p_object == NULL ) return;
-
+    fprintf( stderr, "Setting %s on %i\n", itemData->psz_var, 
+                   p_object->i_object_id );
-    var_Set( p_object, itemData->psz_var, itemData->val );
-    vlc_object_release( p_object );

modules/gui/qt4/qt4.hpp

@@ -51 +51 @@
-#define THEMIM MainInputManager::getInstance( NULL )
-
+#define qtr( i ) QString::fromUtf8( _(i) )
+
-static int DialogEvent_Type = QEvent::User + 1;
-