Don't let the textscroller in shaded mode use more space then available.
This commit is contained in:
parent
94404d0bc1
commit
d88f3b273c
3 changed files with 5 additions and 4 deletions
|
@ -18,7 +18,7 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
|
||||||
m_number2->move (147, 4);
|
m_number2->move (147, 4);
|
||||||
m_number2->setNumber (0, 2);
|
m_number2->setNumber (0, 2);
|
||||||
|
|
||||||
m_title = new TextScroller (this, 48, 7, "shaded");
|
m_title = new TextScroller (this, 39, 7, "shaded");
|
||||||
m_title->move (79, 4);
|
m_title->move (79, 4);
|
||||||
m_title->setText ("Promoe 0.1");
|
m_title->setText ("Promoe 0.1");
|
||||||
|
|
||||||
|
|
3
Skin.cpp
3
Skin.cpp
|
@ -119,7 +119,8 @@ Skin::getPixmap (QString f, QDir dir)
|
||||||
QFileInfoList list = dir.entryInfoList();
|
QFileInfoList list = dir.entryInfoList();
|
||||||
for (int i = 0; i < list.size(); ++i) {
|
for (int i = 0; i < list.size(); ++i) {
|
||||||
QFileInfo fileInfo = list.at(i);
|
QFileInfo fileInfo = list.at(i);
|
||||||
if (fileInfo.fileName().toLower() == f) {
|
QString fname = fileInfo.fileName().toLower();
|
||||||
|
if (fname.section(".", 0, 0) == f) {
|
||||||
return QPixmap (fileInfo.filePath());
|
return QPixmap (fileInfo.filePath());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
|
||||||
path.append ("/.xmms2/clients/promoe/skins/");
|
path.append ("/.xmms2/clients/promoe/skins/");
|
||||||
QDir d;
|
QDir d;
|
||||||
|
|
||||||
new SkinChooserItem (QIcon (":CleanAMP/main.bmp"), "CleanAMP (default)", ":CleanAMP/", this);
|
new SkinChooserItem (QIcon (":CleanAMP/main.png"), "CleanAMP (default)", ":CleanAMP/", this);
|
||||||
|
|
||||||
d.setPath (path);
|
d.setPath (path);
|
||||||
d.setFilter (QDir::Dirs);
|
d.setFilter (QDir::Dirs);
|
||||||
|
@ -57,7 +57,7 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
|
||||||
for (int i = 0; i < list.size(); ++i) {
|
for (int i = 0; i < list.size(); ++i) {
|
||||||
QFileInfo fileInfo = list.at(i);
|
QFileInfo fileInfo = list.at(i);
|
||||||
QDir dir (fileInfo.filePath());
|
QDir dir (fileInfo.filePath());
|
||||||
QPixmap p = Skin::getPixmap ("main.bmp", dir);
|
QPixmap p = Skin::getPixmap ("main", dir);
|
||||||
if (!p.isNull()) {
|
if (!p.isNull()) {
|
||||||
new SkinChooserItem (QIcon (p), dir.dirName(), dir.absolutePath(), this);
|
new SkinChooserItem (QIcon (p), dir.dirName(), dir.absolutePath(), this);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue