bhrebec/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OTHER: Replaced SmallNumberDisplay

Browse source
This commit is contained in:
Thomas Frauendorfer 2008-07-11 03:41:45 +02:00
parent a89be5dd9b
commit 058e2d0987
10 changed files with 153 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/mainwindow/maindisplay.cpp
View file

@ -28,7 +28,7 @@
#include "TextBar.h"
#include "timedisplay.h"
#include "Skin.h"
#include "SmallNumberDisplay.h"
#include "pixmapnumberdisplay.h"
#include "stereomono.h"
#include "posbar.h"
#include "playstatus.h"
@ -63,13 +63,17 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
m_time->move (36, 26);
connect (m_time, SIGNAL(clicked()), m_mw, SLOT(toggleTime()));
m_kbps = new SmallNumberDisplay (this, 15);
m_kbps = new PixmapNumberDisplay (this);
m_kbps->resize (15, 6);
m_kbps->move (111, 43);
m_kbps->setNumber (128, 3);
m_kbps->setDigits (3);
m_kbps->setValue (0);
m_khz = new SmallNumberDisplay (this, 10);
m_khz = new PixmapNumberDisplay (this);
m_khz->resize (10, 6);
m_khz->move (156, 43);
m_khz->setNumber (44, 2);
m_khz->setDigits (2);
m_khz->setValue (0);
m_stereo = new StereoMono (this);
m_stereo->move (212, 41);
@ -119,7 +123,7 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
void
MainDisplay::handleDisconnected ()
{
QMessageBox::critical( this, "xmms2 daemon disconnecte",
QMessageBox::critical( this, "xmms2 daemon disconnected",
"The xmms2 deamon has disconnected\n"
"This could be because the server crashed\n"
"or because another client has shut down the sever.",
@ -173,6 +177,8 @@ MainDisplay::setPixmaps (Skin *skin)
/* update some other widgets */
m_time->setPixmaps (skin->getNumbers ());
m_kbps->setPixmaps (skin->getSmallNumbers ());
m_khz->setPixmaps (skin->getSmallNumbers ());
}
void
@ -236,15 +242,15 @@ MainDisplay::setMediainfo (const Xmms::PropDict &info)
m_text->setText (n);
if (info.contains ("bitrate")) {
m_kbps->setNumber (info.get<int32_t> ("bitrate")/1000, 3);
m_kbps->setValue (info.get<int32_t> ("bitrate")/1000);
} else {
m_kbps->setNumber (0, 1);
m_kbps->setValue (0);
}
if (info.contains ("samplerate")) {
m_khz->setNumber (info.get<int32_t> ("samplerate")/1000, 2);
m_khz->setValue (info.get<int32_t> ("samplerate")/1000);
} else {
m_khz->setNumber(0, 1);
m_khz->setValue(0);
}
if (info.contains ("channels") &&
info.get<int32_t> ("channels") > 1) {

8
src/mainwindow/maindisplay.h
View file

@ -33,10 +33,10 @@ class MainDisplay;
#include "Display.h"
class PixmapButton;
class PixmapNumberDisplay;
class PixmapSlider;
class TextScroller;
class TimeDisplay;
class SmallNumberDisplay;
class StereoMono;
class PosBar;
class Slider;
@ -55,9 +55,6 @@ class MainDisplay : public SkinDisplay
TextScroller *m_text;
TimeDisplay *m_time;
SmallNumberDisplay *m_kbps;
SmallNumberDisplay *m_khz;
StereoMono *m_stereo;
PosBar *m_posbar;
PixmapSlider *m_vslider;
@ -94,6 +91,9 @@ class MainDisplay : public SkinDisplay
PixmapButton *m_shuffle;
PixmapButton *m_repeat;
PixmapNumberDisplay *m_kbps;
PixmapNumberDisplay *m_khz;
MainWindow *m_mw;
ClutterBar *m_clutterbar;

1
src/mainwindow/shadeddisplay.cpp
View file

@ -23,7 +23,6 @@
#include "pixmapbutton.h"
#include "timedisplay.h"
#include "SmallNumberDisplay.h"
#include "TextBar.h"
#include "Skin.h"
#include "mainwindow.h"