Skip to content
Snippets Groups Projects
Commit cdebff5b authored by jpbl's avatar jpbl
Browse files

We added the volume buttons

parent 9b3e31a0
Branches
Tags
No related merge requests found
...@@ -84,7 +84,12 @@ SFLPhoneWindow::initGUIButtons() ...@@ -84,7 +84,12 @@ SFLPhoneWindow::initGUIButtons()
mVolume = new VolumeControl(":/sflphone/images/volume.png", mVolume = new VolumeControl(":/sflphone/images/volume.png",
mMain); mMain);
mVolume->setOrientation(VolumeControl::Vertical); mVolume->setOrientation(VolumeControl::Vertical);
mVolume->move(0,0); mVolume->move(365,91);
mMicVolume = new VolumeControl(":/sflphone/images/volume.png",
mMain);
mMicVolume->setOrientation(VolumeControl::Vertical);
mMicVolume->move(347,91);
} }
......
...@@ -62,6 +62,7 @@ private: ...@@ -62,6 +62,7 @@ private:
JPushButton *mMute; JPushButton *mMute;
VolumeControl *mVolume; VolumeControl *mVolume;
VolumeControl *mMicVolume;
SFLLcd *mLcd; SFLLcd *mLcd;
QLabel *mMain; QLabel *mMain;
......
...@@ -44,23 +44,10 @@ VolumeControl::~VolumeControl() ...@@ -44,23 +44,10 @@ VolumeControl::~VolumeControl()
void void
VolumeControl::resize() VolumeControl::resize()
{ {
if(mOrientation == VolumeControl::Horizontal) { QPixmap q(QString(":/sflphone/images/slider"));
QWidget::resize(QSize(mSlider->size().width(),
mMaxPosition + mSlider->size().height()));
}
else {
QWidget::resize(QSize(mMaxPosition + mSlider->size().width(),
mSlider->size().height()));
}
QPixmap q(TransparentWidget::transparize(QString(":/sflphone/images/slider")));
std::cout << "mask isNull: " << q.mask().isNull() << std::endl;
std::cout << "isNull: " << q.isNull() << std::endl;
std::cout << q.size().width() << "," << q.size().height() << std::endl;
setPixmap(q); setPixmap(q);
if(q.hasAlpha()) { QWidget::resize(q.size());
std::cout << "has alpha" << std::endl; mMaxPosition = q.height() - mSlider->height();
setMask(q.mask());
}
} }
void void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment