#include <QListWidgetItem>
#include <QString>
+#include <cstdio>
+
using namespace std;
namespace lyx {
QString getBlock(char_type c)
{
// store an educated guess for the next search
+ // FIXME THREAD
static int lastBlock = 0;
// "clever reset"
// guessing was wrong so far. do a real search.
int i = 0;
- while (c > unicode_blocks[i].end && i < no_blocks)
+ while (i < no_blocks && c > unicode_blocks[i].end)
++i;
if (i == no_blocks)
return QString();
{
public:
Model(GuiSymbols * parent)
- : QAbstractItemModel(parent), parent_(parent)
+ : QAbstractItemModel(parent)
{}
QModelIndex index(int row, int column, QModelIndex const &) const
static QString const strCharacter = qt_("Character: ");
static QString const strCodePoint = qt_("Code Point: ");
+ // FIXME THREAD
static char codeName[10];
char_type c = symbols_.at(index.row());
void setSymbols(QList<char_type> const & symbols)
{
+ QAbstractItemModel::beginResetModel();
symbols_ = symbols;
- QAbstractItemModel::reset();
+ QAbstractItemModel::endResetModel();
}
private:
friend class GuiSymbols;
- GuiSymbols * parent_;
-
+
QList<char_type> symbols_;
};
setFocusProxy(symbolsLW);
symbolsLW->setViewMode(QListView::IconMode);
- symbolsLW->setUniformItemSizes(true);
// increase the display size of the symbols a bit
- QFont font= symbolsLW->font();
- int size = font.pointSize() + 3;
+ QFont font = symbolsLW->font();
+ const int size = font.pointSize() + 3;
font.setPointSize(size);
symbolsLW->setFont(font);
+ QFontMetrics fm(font);
+ const int cellHeight = fm.height() + 2;
+ // FIXME: using at least cellHeight because of
+ // QFontMetrics::maxWidth() is returning 0 with Qt/Cocoa on Mac OS
+ const int cellWidth = max(cellHeight, fm.maxWidth() + 2);
+ symbolsLW->setGridSize(QSize(cellWidth, cellHeight));
symbolsLW->setModel(model_);
}
char_type c = *it;
if (!update_combo && !show_all && (c <= range_start || c >= range_end))
continue;
-#if QT_VERSION >= 0x040300
QChar::Category const cat = QChar::category(uint(c));
-#else
- QChar::Category const cat = QChar(uint(c)).category();
-#endif
// we do not want control or space characters
if (cat == QChar::Other_Control || cat == QChar::Separator_Space)
continue;
++numItem;
- if (show_all || c >= range_start && c <= range_end)
+ if (show_all || (c >= range_start && c <= range_end))
s.append(c);
if (update_combo) {
QString block = getBlock(c);