* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Cursor.h"
#include "Encoding.h"
#include "FuncRequest.h"
#include <QListWidgetItem>
#include <QString>
+#include <cstdio>
+
using namespace std;
namespace lyx {
/// name of unicode block, start and end code point
struct UnicodeBlocks {
- QString name;
+ char const * name;
char_type start;
char_type end;
};
QString getBlock(char_type c)
{
// store an educated guess for the next search
+ // FIXME THREAD
static int lastBlock = 0;
// "clever reset"
// c falls into a covered area, and we can guess which
if (c >= unicode_blocks[lastBlock].start
&& c <= unicode_blocks[lastBlock].end)
- return unicode_blocks[lastBlock].name;
+ return qt_(unicode_blocks[lastBlock].name);
// c falls into an uncovered area, but we can guess which
if (c > unicode_blocks[lastBlock].end
// 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();
lastBlock = i;
//LYXERR0("fail: " << int(c) << ' ' << lastBlock);
- return unicode_blocks[lastBlock].name;
+ return qt_(unicode_blocks[lastBlock].name);
}
{
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_);
}
void GuiSymbols::scrollToItem(QString const & category)
{
- if (used_blocks.find(category) != used_blocks.end()) {
- int row = used_blocks[category];
- QModelIndex index = symbolsLW->model()->index(row, 0, QModelIndex());
- symbolsLW->scrollTo(index, QAbstractItemView::PositionAtTop);
- }
+ if (used_blocks.find(category) == used_blocks.end())
+ return;
+ int row = used_blocks[category];
+ QModelIndex index = symbolsLW->model()->index(row, 0, QModelIndex());
+ symbolsLW->scrollTo(index, QAbstractItemView::PositionAtTop);
}
+
void GuiSymbols::updateSymbolList(bool update_combo)
{
QString category = categoryCO->currentText();
if (!show_all) {
for (int i = 0 ; i < no_blocks; ++i)
- if (unicode_blocks[i].name == category) {
+ if (qt_(unicode_blocks[i].name) == category) {
range_start = unicode_blocks[i].start;
range_end = unicode_blocks[i].end;
break;
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 const qc = uint(c);
- QChar::Category const cat = qc.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);
} // namespace frontend
} // namespace lyx
-#include "GuiSymbols_moc.cpp"
+#include "moc_GuiSymbols.cpp"