| Line 621... |
Line 621... |
| 621 |
default:
|
621 |
default:
|
| 622 |
MSG_WARNING("Unknown data element \"" << mActElement << "\" with content \"" << content << "\"");
|
622 |
MSG_WARNING("Unknown data element \"" << mActElement << "\" with content \"" << content << "\"");
|
| 623 |
}
|
623 |
}
|
| 624 |
}
|
624 |
}
|
| 625 |
|
625 |
|
| - |
|
626 |
string TSystemDraw::getDirEntry(dir::TDirectory* dir, const string& part, bool alpha)
|
| - |
|
627 |
{
|
| - |
|
628 |
DECL_TRACER("TSystemDraw::getDirEntry(dir::TDirectory* dir, const string& part, bool precice)");
|
| - |
|
629 |
|
| - |
|
630 |
string such = part;
|
| - |
|
631 |
|
| - |
|
632 |
if (alpha)
|
| - |
|
633 |
such += "_alpha";
|
| - |
|
634 |
|
| - |
|
635 |
string dirEntry = dir->getEntryWithPart(such, true);
|
| - |
|
636 |
such = part;
|
| - |
|
637 |
|
| - |
|
638 |
if (dirEntry.empty())
|
| - |
|
639 |
dirEntry = dir->getEntryWithPart(such, false);
|
| - |
|
640 |
|
| - |
|
641 |
return dirEntry;
|
| - |
|
642 |
}
|
| - |
|
643 |
|
| 626 |
bool TSystemDraw::getBorder(const string &family, LINE_TYPE_t lt, BORDER_t *border)
|
644 |
bool TSystemDraw::getBorder(const string &family, LINE_TYPE_t lt, BORDER_t *border)
|
| 627 |
{
|
645 |
{
|
| 628 |
DECL_TRACER("TSystemDraw::getBorder(const string &family, BORDER_t *border)");
|
646 |
DECL_TRACER("TSystemDraw::getBorder(const string &family, BORDER_t *border)");
|
| 629 |
|
647 |
|
| 630 |
if (!border || family.empty() || mDraw.borders.size() == 0)
|
648 |
if (!border || family.empty() || mDraw.borders.size() == 0)
|
| Line 688... |
Line 706... |
| 688 |
int num = dir.scanFiles(brdIter->baseFile + "_");
|
706 |
int num = dir.scanFiles(brdIter->baseFile + "_");
|
| 689 |
|
707 |
|
| 690 |
if (num < 8)
|
708 |
if (num < 8)
|
| 691 |
continue;
|
709 |
continue;
|
| 692 |
|
710 |
|
| 693 |
border->b = mPath + "/borders/" + dir.getEntryWithPart("_b", true);
|
711 |
border->b = mPath + "/borders/" + getDirEntry(&dir, "_b", (lt == LT_ON) ? true : false);
|
| 694 |
border->bl = mPath + "/borders/" + dir.getEntryWithPart("_bl", true);
|
712 |
border->bl = mPath + "/borders/" + getDirEntry(&dir, "_bl", (lt == LT_ON) ? true : false);
|
| 695 |
border->br = mPath + "/borders/" + dir.getEntryWithPart("_br", true);
|
713 |
border->br = mPath + "/borders/" + getDirEntry(&dir, "_br", (lt == LT_ON) ? true : false);
|
| 696 |
border->l = mPath + "/borders/" + dir.getEntryWithPart("_l", true);
|
714 |
border->l = mPath + "/borders/" + getDirEntry(&dir, "_l", (lt == LT_ON) ? true : false);
|
| 697 |
border->r = mPath + "/borders/" + dir.getEntryWithPart("_r", true);
|
715 |
border->r = mPath + "/borders/" + getDirEntry(&dir, "_r", (lt == LT_ON) ? true : false);
|
| 698 |
border->t = mPath + "/borders/" + dir.getEntryWithPart("_t", true);
|
716 |
border->t = mPath + "/borders/" + getDirEntry(&dir, "_t", (lt == LT_ON) ? true : false);
|
| 699 |
border->tl = mPath + "/borders/" + dir.getEntryWithPart("_tl", true);
|
717 |
border->tl = mPath + "/borders/" + getDirEntry(&dir, "_tl", (lt == LT_ON) ? true : false);
|
| 700 |
border->tr = mPath + "/borders/" + dir.getEntryWithPart("_tr", true);
|
718 |
border->tr = mPath + "/borders/" + getDirEntry(&dir, "_tr", (lt == LT_ON) ? true : false);
|
| 701 |
border->border = *brdIter;
|
719 |
border->border = *brdIter;
|
| 702 |
MSG_DEBUG("Bottom : " << border->b);
|
720 |
MSG_DEBUG("Bottom : " << border->b);
|
| 703 |
MSG_DEBUG("Top : " << border->t);
|
721 |
MSG_DEBUG("Top : " << border->t);
|
| 704 |
MSG_DEBUG("Left : " << border->l);
|
722 |
MSG_DEBUG("Left : " << border->l);
|
| 705 |
MSG_DEBUG("Right : " << border->r);
|
723 |
MSG_DEBUG("Right : " << border->r);
|