Fixed barcode scanner issue on Windows with czech keyboard.
This commit is contained in:
@@ -13,5 +13,6 @@
|
||||
#include "settingsform.h"
|
||||
#include "enums.h"
|
||||
#include "objectbinder.h"
|
||||
#include "helper.h"
|
||||
|
||||
#endif // CORE_H
|
||||
|
||||
+4
-2
@@ -66,7 +66,8 @@ SOURCES += \
|
||||
csvimporter.cpp \
|
||||
importdialog.cpp \
|
||||
importprogress.cpp \
|
||||
reporting/variablefiller.cpp
|
||||
reporting/variablefiller.cpp \
|
||||
helper.cpp
|
||||
|
||||
HEADERS += core.h\
|
||||
core_global.h \
|
||||
@@ -132,7 +133,8 @@ HEADERS += core.h\
|
||||
iimportprogress.h \
|
||||
importdialog.h \
|
||||
importprogress.h \
|
||||
reporting/variablefiller.h
|
||||
reporting/variablefiller.h \
|
||||
helper.h
|
||||
|
||||
unix {
|
||||
target.path = /usr/lib
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
#include "helper.h"
|
||||
#include "define.h"
|
||||
|
||||
const QMap<QString, QString> Helper::m_numMap{
|
||||
{"+", "1"},
|
||||
{"ě", "2"},
|
||||
{"š", "3"},
|
||||
{"č", "4"},
|
||||
{"ř", "5"},
|
||||
{"ž", "6"},
|
||||
{"ý", "7"},
|
||||
{"á", "8"},
|
||||
{"í", "9"},
|
||||
{"é", "0"}
|
||||
};
|
||||
|
||||
Helper::Helper()
|
||||
{
|
||||
}
|
||||
|
||||
QString Helper::replaceByNumbers(const QString &str)
|
||||
{
|
||||
QString ret;
|
||||
|
||||
std::for_each(ALL(str), [&](QChar c){
|
||||
QString replaced = m_numMap[c];
|
||||
|
||||
if (replaced.isEmpty())
|
||||
{
|
||||
ret.append(c);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret.append(replaced);
|
||||
}
|
||||
});
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
#ifndef HELPER_H
|
||||
#define HELPER_H
|
||||
|
||||
#include <QString>
|
||||
#include <QMap>
|
||||
|
||||
class Helper
|
||||
{
|
||||
public:
|
||||
Helper();
|
||||
|
||||
static QString replaceByNumbers(const QString &str);
|
||||
|
||||
private:
|
||||
static const QMap<QString, QString> m_numMap;
|
||||
};
|
||||
|
||||
#endif // HELPER_H
|
||||
+9
-1
@@ -541,11 +541,19 @@ void ShopForm::on_btnAddItem_clicked()
|
||||
|
||||
void ShopForm::on_commoditySearch_textChanged(const QString &text)
|
||||
{
|
||||
QString replacedText = text;
|
||||
|
||||
if (ui->numOnly->isChecked())
|
||||
{
|
||||
replacedText = Helper::replaceByNumbers(text);
|
||||
ui->commoditySearch->setText(replacedText);
|
||||
}
|
||||
|
||||
QSortFilterProxyModel proxy;
|
||||
proxy.setSourceModel(m_commodityModel);
|
||||
proxy.setFilterKeyColumn(0);
|
||||
proxy.setFilterCaseSensitivity(Qt::CaseInsensitive);
|
||||
proxy.setFilterFixedString(text);
|
||||
proxy.setFilterFixedString(replacedText);
|
||||
|
||||
auto moveToIndex = [this](const QModelIndex &matchingIndex) {
|
||||
ui->commodityTable->scrollTo(matchingIndex,QAbstractItemView::EnsureVisible);
|
||||
|
||||
+8
-1
@@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>975</width>
|
||||
<width>988</width>
|
||||
<height>643</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -45,6 +45,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="numOnly">
|
||||
<property name="text">
|
||||
<string>Replace chars by numbers</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="commoditySearch"/>
|
||||
</item>
|
||||
|
||||
Reference in New Issue
Block a user