← Back to branch summary

~siretart/gxine/bug.542506

« back to all changes in this revision

Viewing changes to misc/toolbar-window.xml

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-03-21 11:24:59 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080321112459-igb0jy01nytpdrzt
Tags: 0.5.901-1ubuntu1
https://launchpad.net/bugs/204563
https://launchpad.net/bugs/128864
* merge debian changes for hardy PPA. Remaining changes:
  - debian/control: added Xb-Npp-xxx tags accordingly to "firefox distro
    add-on suport" spec,
    (https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support)
* Feature Freeze exception granted in LP: #204563
* New upstream release fixes playing DVDs. LP: #128864
* mime.default: add "x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;"
  to get it listed as a player for dvd and video cds in nautilus. Thanks to
  Sebastien Bacher for the hint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
misc/toolbar-window.xml
26
26
   <button image="gtk-index" relief="none" tip="~Show/hide the playlist"
27
27
           onclick="playlist_show ();" accept-drop="1" autoplay="0"
28
28
           />
29
 
   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V settings"
 
29
   <button image="gtk-properties" relief="none" tip="~Show/hide the A/V controls"
30
30
           onclick="settings_show ();"
31
31
           />
32
 
   <label text="" box-expand="1" />
33
 
   <label text="" box-expand="1"/>
 
32
   <label text="" box-expand="1" width="20" />
34
33
   <end />
35
 
   <control type="audio channel" />
36
 
   <control type="volume" width="105" box-expand="1" box-fill="1" />
 
34
   <hbox spacing="0" padding="0">
 
35
    <image stock="gxine-settings-audio-channel" />
 
36
    <control type="audio channel" />
 
37
   </hbox>
 
38
   <control type="volume" vertical="1" popup="1" window-height="120"
 
39
            inverted="1" image="gxine-settings-volume" relief="none" />
37
40
   <control type="mute" />
38
41
  </hbox>
39
42
</vbox>