Changeset 2ec741cc25c0a82da91ae2c1d6b3f1121b4ee3be

Timestamp:

21/09/06 00:00:56 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[f183c68634fddd55a1f82977b2f2f39e76861917]

git-author:

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

Message:

Cleanup

Files:

• modules/gui/qt4/main_interface.cpp (modified) (6 diffs)

modules/gui/qt4/main_interface.cpp

@@ -48 +48 @@
-#endif
-
+#define BUTTON_SET( button, image, tooltip ) ui.button##Button->setText(""); \
+    ui.button##Button->setIcon( QIcon( ":/pixmaps/"#image ) ); \
+    ui.button##Button->setToolTip( tooltip );
+
-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
-                             vlc_value_t, void *);
@@ -138 +142 @@
-    ui.hboxLayout->insertWidget( 0, slider );
-
+    BUTTON_SET( prev, previous.png, qtr( "Previous" ) );
+    BUTTON_SET( next, next.png , qtr( "Next" ) );
+    BUTTON_SET( play, play.png , qtr( "Play" ) );
+    BUTTON_SET( stop, stop.png , qtr( "Stop" )  );
-    ui.discFrame->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
-
@@ -166 +174 @@
-    playlistEmbeddedFlag = true;
-    /// \todo fetch playlist settings
+    BUTTON_SET( playlist, volume-low.png, playlistEmbeddedFlag ?
+                                                qtr( "Show playlist" ) :
+                                                qtr( "Open playlist" ) );
-
-    /* Set initial size */
@@ -174 +185 @@
-    {
-        videoWidget = new VideoWidget( p_intf );
-1
+PREF_W
-        videoWidget->resize( videoWidget->widgetSize );
-        videoWidget->hide();
@@ -195 +206 @@
-
-    calculateInterfaceSize();
+    fprintf( stderr, "Resize to %ix%i\n", mainSize.width(), mainSize.height() );
-    resize( mainSize );
-    mainSize = size();
@@ -225 +237 @@
-        height = videoWidget->widgetSize.height();
-        fprintf( stderr, "Video Size %ix%i\n", videoWidget->widgetSize.width(), videoWidget->widgetSize.height() );
+    }
+    else
+    {
+        width = PREF_W - addSize.width();
+        height = PREF_H - addSize.height();
-    }
-    mainSize.setWidth( width + addSize.width() );