Icons

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 32ccad75348f2c42696c02c9b6cbb445a9f512a1..2427acc172a9d449eed2205114acc84c1c54b665 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -42,12 +42,16 @@ nodist_SOURCES_qt4 = \
                components/preferences.moc.cpp \
                components/open.moc.cpp \
                components/playlist/panels.moc.cpp \
-               util/input_slider.moc.cpp
+               util/input_slider.moc.cpp \
+        resources.cpp
 
 if ENABLE_QT4
 BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
 endif
 
+resources.cpp:
+       rm -f resources.cpp
+       $(RCC) res.qrc > resources.cpp
 
 $(MOCCPP): %.moc.cpp: %.hpp
        @echo "$(MOC) $< -> $@"

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8d397996c23e5c796f261310d0c18dcf78b883ef..9575fc38539de4d1afacd91b77897f8812c1de5d 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -37,12 +37,22 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QMainWindow(), p_intf(
     setCentralWidget( main );
     setWindowTitle( _("VLC media player") );
     ui.setupUi( centralWidget() );
+
     slider = new InputSlider( Qt::Horizontal, ui.sliderBox );
     QVBoxLayout *box_layout = new QVBoxLayout();
     box_layout->addWidget( slider );
     ui.sliderBox->setLayout( box_layout );
+    ui.prevButton->setIcon( QIcon( ":/pixmaps/previous.png" ) );
+    ui.nextButton->setIcon( QIcon( ":/pixmaps/next.png" ) );
+    ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
+    ui.stopButton->setIcon( QIcon( ":/pixmaps/stop.png" ) );
+    ui.volLowLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+    ui.volHighLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
+
     resize( QSize( 450, 80 ) );
 
+    //QVLCMenu::createMenuBar();
+
     /* Init input manager */
     MainInputManager::getInstance( p_intf );
 

diff --git a/modules/gui/qt4/pixmaps/next.png b/modules/gui/qt4/pixmaps/next.png
new file mode 100644 (file)
index 0000000..6b5a1a1
Binary files /dev/null and b/modules/gui/qt4/pixmaps/next.png differ

diff --git a/modules/gui/qt4/pixmaps/play.png b/modules/gui/qt4/pixmaps/play.png
new file mode 100644 (file)
index 0000000..eac4083
Binary files /dev/null and b/modules/gui/qt4/pixmaps/play.png differ

diff --git a/modules/gui/qt4/pixmaps/previous.png b/modules/gui/qt4/pixmaps/previous.png
new file mode 100644 (file)
index 0000000..d576c8d
Binary files /dev/null and b/modules/gui/qt4/pixmaps/previous.png differ

diff --git a/modules/gui/qt4/pixmaps/stop.png b/modules/gui/qt4/pixmaps/stop.png
new file mode 100644 (file)
index 0000000..9ad6873
Binary files /dev/null and b/modules/gui/qt4/pixmaps/stop.png differ

diff --git a/modules/gui/qt4/pixmaps/volume-high.png b/modules/gui/qt4/pixmaps/volume-high.png
new file mode 100644 (file)
index 0000000..ec8f00b
Binary files /dev/null and b/modules/gui/qt4/pixmaps/volume-high.png differ

diff --git a/modules/gui/qt4/pixmaps/volume-low.png b/modules/gui/qt4/pixmaps/volume-low.png
new file mode 100644 (file)
index 0000000..4d7239f
Binary files /dev/null and b/modules/gui/qt4/pixmaps/volume-low.png differ

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
new file mode 100644 (file)
index 0000000..8d30936
--- /dev/null
+++ b/modules/gui/qt4/res.qrc
@@ -0,0 +1,9 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource>
+  <file>pixmaps/play.png</file>
+  <file>pixmaps/stop.png</file>
+  <file>pixmaps/previous.png</file>
+  <file>pixmaps/next.png</file>
+ </qresource>
+</RCC>

diff --git a/modules/gui/qt4/ui/main_interface.ui b/modules/gui/qt4/ui/main_interface.ui
index dc83d0911e4d6c916c1196c03f82444e665052bf..d7e390e9f0a5ce530de2b69934aacf0de639e7fc 100644 (file)
--- a/modules/gui/qt4/ui/main_interface.ui
+++ b/modules/gui/qt4/ui/main_interface.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>80</height>
+    <width>428</width>
+    <height>79</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -46,7 +46,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QFrame" name="frame" >
+      <widget class="QFrame" name="discFrame" >
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>0</hsizetype>
@@ -83,8 +83,11 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
-        <string>Prev</string>
+       <property name="iconSize" >
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -99,7 +102,13 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Play</string>
+        <string/>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -114,7 +123,13 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Stop</string>
+        <string/>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -129,7 +144,13 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Next</string>
+        <string/>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -146,6 +167,27 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QLabel" name="volLowLabel" >
+       <property name="text" >
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSlider" name="volumeSlider" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="volHighLabel" >
+       <property name="text" >
+        <string/>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="playlistButton" >
        <property name="text" >