Code maintenance for Qt 5:

- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-19 02:07:01 +00:00
parent 30103ef5f2
commit 3e15a7bb86
15 changed files with 136 additions and 147 deletions
retroshare-gui/src/gui

View file

@ -17,89 +17,88 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "LogoBar.h"
#include <util/RetroStyleLabel.h>
#include <util/MouseEventFilter.h>
#include <QtGui>
LogoBar::LogoBar(QWidget * parent)
: QFrame(parent) {
init();
}
LogoBar::~LogoBar() {
}
void LogoBar::init() {
setFrameShape(QFrame::NoFrame);
//LogoButton
_logoButton = new RetroStyleLabel(this);
_logoButton->setPixmaps(
QPixmap(":/images/logobar/rslogo2.png"), //Start
QPixmap(), //End
QPixmap(), //Fill
QPixmap(":/images/logobar/rslogo2.png"), //Start
QPixmap(), //End
QPixmap() //Fill
);
_logoButton->setMaximumSize(QSize(110, 65));
_logoButton->setMinimumSize(QSize(110, 65));
connect(_logoButton, SIGNAL(clicked()), SLOT(logoButtonClickedSlot()));
//FillLabel1
RetroStyleLabel * FillLabel1 = new RetroStyleLabel(this);
FillLabel1->setPixmaps(
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
);
//FillLabel2
RetroStyleLabel * FillLabel2 = new RetroStyleLabel(this);
FillLabel2->setPixmaps(
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
);
QGridLayout * layout = new QGridLayout(this);
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(FillLabel1, 0, 0);
layout->addWidget(_logoButton, 0, 1);
layout->addWidget(FillLabel2, 0, 2);
}
void LogoBar::setEnabledLogoButton(bool enable) {
_logoButton->setEnabled(enable);
}
void LogoBar::logoButtonClickedSlot() {
logoButtonClicked();
}
****************************************************************/
#include "LogoBar.h"
#include <util/RetroStyleLabel.h>
#include <util/MouseEventFilter.h>
#include <QGridLayout>
LogoBar::LogoBar(QWidget * parent)
: QFrame(parent) {
init();
}
LogoBar::~LogoBar() {
}
void LogoBar::init() {
setFrameShape(QFrame::NoFrame);
//LogoButton
_logoButton = new RetroStyleLabel(this);
_logoButton->setPixmaps(
QPixmap(":/images/logobar/rslogo2.png"), //Start
QPixmap(), //End
QPixmap(), //Fill
QPixmap(":/images/logobar/rslogo2.png"), //Start
QPixmap(), //End
QPixmap() //Fill
);
_logoButton->setMaximumSize(QSize(110, 65));
_logoButton->setMinimumSize(QSize(110, 65));
connect(_logoButton, SIGNAL(clicked()), SLOT(logoButtonClickedSlot()));
//FillLabel1
RetroStyleLabel * FillLabel1 = new RetroStyleLabel(this);
FillLabel1->setPixmaps(
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
);
//FillLabel2
RetroStyleLabel * FillLabel2 = new RetroStyleLabel(this);
FillLabel2->setPixmaps(
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
QPixmap(), //Start
QPixmap(), //End
QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
);
QGridLayout * layout = new QGridLayout(this);
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(FillLabel1, 0, 0);
layout->addWidget(_logoButton, 0, 1);
layout->addWidget(FillLabel2, 0, 2);
}
void LogoBar::setEnabledLogoButton(bool enable) {
_logoButton->setEnabled(enable);
}
void LogoBar::logoButtonClickedSlot() {
logoButtonClicked();
}