Subversion Repositories tpanel

Rev

Rev 168 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 168 Rev 169
Line 639... Line 639...
639
        dirEntry = dir->getEntryWithPart(such, false);
639
        dirEntry = dir->getEntryWithPart(such, false);
640
 
640
 
641
    return dirEntry;
641
    return dirEntry;
642
}
642
}
643
 
643
 
644
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, const string& family2)
645
{
645
{
646
    DECL_TRACER("TSystemDraw::getBorder(const string &family, BORDER_t *border)");
646
    DECL_TRACER("TSystemDraw::getBorder(const string &family, LINE_TYPE_t lt, BORDER_t *border, const string& family2)");
647
 
647
 
648
    if (!border || family.empty() || mDraw.borders.size() == 0)
648
    if (!border || family.empty() || mDraw.borders.size() == 0)
649
        return false;
649
        return false;
650
 
650
 
651
    // Find the border details
651
    // Find the border details
Line 677... Line 677...
677
                            case LT_ON:     fullName = styIter->on; break;
677
                            case LT_ON:     fullName = styIter->on; break;
678
                            case LT_DRAG:   fullName = styIter->drag; break;
678
                            case LT_DRAG:   fullName = styIter->drag; break;
679
                            case LT_DROP:   fullName = styIter->drop; break;
679
                            case LT_DROP:   fullName = styIter->drop; break;
680
                        }
680
                        }
681
 
681
 
-
 
682
 
682
                        break;
683
                        break;
683
                    }
684
                    }
684
                }
685
                }
685
            }
686
            }
686
 
687
 
Line 699... Line 700...
699
    }
700
    }
700
 
701
 
701
    dir::TDirectory dir(mPath + "/borders");
702
    dir::TDirectory dir(mPath + "/borders");
702
    dir.setStripPath(true);
703
    dir.setStripPath(true);
703
    vector<BORDER_DATA_t>::iterator brdIter;
704
    vector<BORDER_DATA_t>::iterator brdIter;
-
 
705
    string dataName = (family2.length() > 0 ? family2 : fullName);
704
 
706
 
705
    for (brdIter = mDraw.borderData.begin(); brdIter != mDraw.borderData.end(); brdIter++)
707
    for (brdIter = mDraw.borderData.begin(); brdIter != mDraw.borderData.end(); brdIter++)
706
    {
708
    {
707
        if (brdIter->name.compare(fullName) == 0)
709
        if (brdIter->name.compare(dataName) == 0)
708
        {
710
        {
709
            int num = dir.scanFiles(brdIter->baseFile + "_");
711
            int num = dir.scanFiles(brdIter->baseFile + "_");
710
 
712
 
711
            if (num < 8)
713
            if (num < 8)
712
                continue;
714
                continue;