Compare commits

..

1 Commits

Author SHA1 Message Date
janrupf
3bdf63b0ee GH-2065 Strip non ASCII chars 2019-06-22 01:35:07 +02:00
3 changed files with 7 additions and 5 deletions

View File

@@ -304,6 +304,10 @@ QString RemoveInvalidFilenameChars(QString string, QChar replaceWith)
{
string[i] = replaceWith;
}
else if(string[i] > 127) // non ASCII
{
string[i] = replaceWith;
}
}
return string;
}

View File

@@ -661,7 +661,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
// Create the instance list widget
{
view = new GroupView(ui->centralWidget);
view->setTextElideMode(Qt::TextElideMode::ElideRight);
view->setSelectionMode(QAbstractItemView::SingleSelection);
// FIXME: leaks ListViewDelegate

View File

@@ -34,6 +34,7 @@ static void viewItemTextLayout(QTextLayout &textLayout, int lineWidth, qreal &he
height = 0;
widthUsed = 0;
textLayout.beginLayout();
QString str = textLayout.text();
while (true)
{
QTextLine line = textLayout.createLine();
@@ -189,13 +190,11 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
// FIXME: Things go really weird with long instance names
// const int iconSize = style->pixelMetric(QStyle::PM_IconViewIconSize);
const int iconSize = 48;
QRect iconbox = opt.rect;
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr, opt.widget) + 1;
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, opt.widget) + 1;
QRect textRect = opt.rect;
textRect.setWidth(qMin(textRect.width(), iconbox.width()));
QRect textHighlightRect = textRect;
// clip the decoration on top, remove width padding
textRect.adjust(textMargin, iconSize + textMargin + 5, -textMargin, 0);
@@ -300,7 +299,7 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
const int lineCount = textLayout.lineCount();
const QRect layoutRect = QStyle::alignedRect(
opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
const QPointF position = layoutRect.topLeft();
for (int i = 0; i < lineCount; ++i)
{