Compare commits
2 Commits
a6847f2661
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| e61bafc4dc | |||
| 507754985c |
BIN
UIs/BeetRoundWidgets/assets/application-icon.png
Normal file
BIN
UIs/BeetRoundWidgets/assets/application-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@ -1,7 +1,6 @@
|
|||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
<file>software-application.png</file>
|
<file>no-picture.png</file>
|
||||||
<file>feature.png</file>
|
<file>application-icon.png</file>
|
||||||
<file>no-picture-taking.png</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget* parent)
|
|||||||
setWindowTitle(QCoreApplication::applicationName() + " [*]");
|
setWindowTitle(QCoreApplication::applicationName() + " [*]");
|
||||||
|
|
||||||
/// application icon
|
/// application icon
|
||||||
const QString iconString = "://feature.png";
|
const QString iconString = "://application-icon.png";
|
||||||
#ifdef QT_DEBUG
|
#ifdef QT_DEBUG
|
||||||
QPixmap pixmap = QPixmap(iconString);
|
QPixmap pixmap = QPixmap(iconString);
|
||||||
QTransform transform = QTransform();
|
QTransform transform = QTransform();
|
||||||
@ -163,6 +163,11 @@ void MainWindow::onAboutClicked() {
|
|||||||
"Solidarische Landwirtschaft (SoLaWi))."
|
"Solidarische Landwirtschaft (SoLaWi))."
|
||||||
"<br><br><a href=\"https://working-copy.org/\">Working-Copy_Collective website</a>"
|
"<br><br><a href=\"https://working-copy.org/\">Working-Copy_Collective website</a>"
|
||||||
"<br><br><a href=\"mailto:support@working-copy.org\">Mail to support</a>"
|
"<br><br><a href=\"mailto:support@working-copy.org\">Mail to support</a>"
|
||||||
|
"<br><br>Icon credits:"
|
||||||
|
"<br><a href=\"https://www.flaticon.com/free-icons/money\" title=\"money "
|
||||||
|
"icons\">Money icons created by Freepik - Flaticon</a>"
|
||||||
|
"<br><a href=\"https://www.flaticon.com/free-icons/no-photo\" title=\"no photo "
|
||||||
|
"icons\">No photo icons created by kerismaker - Flaticon</a>"
|
||||||
"<br><br>It uses the <a href=\"https://qt.io\">Qt Framework</a>.")
|
"<br><br>It uses the <a href=\"https://qt.io\">Qt Framework</a>.")
|
||||||
.arg(applicationName)
|
.arg(applicationName)
|
||||||
.arg(APPLICATION_VERSION)
|
.arg(APPLICATION_VERSION)
|
||||||
|
|||||||
@ -262,7 +262,7 @@ void ItemDetailMapper::onCurrentIndexChanged(const QModelIndex& current,
|
|||||||
void ItemDetailMapper::updateQRCode(const QString text) {
|
void ItemDetailMapper::updateQRCode(const QString text) {
|
||||||
QImage unscaledImage;
|
QImage unscaledImage;
|
||||||
if (text.isEmpty()) {
|
if (text.isEmpty()) {
|
||||||
unscaledImage = QImage("://no-picture-taking.png");
|
unscaledImage = QImage("://no-picture.png");
|
||||||
} else {
|
} else {
|
||||||
unscaledImage = m_generator.generateQr(text);
|
unscaledImage = m_generator.generateQr(text);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,6 +53,8 @@ QByteArray JsonParser::itemValuesListToJson(const QList<ModelItemValues>& itemVa
|
|||||||
const QVariant value = itemValues.value(role);
|
const QVariant value = itemValues.value(role);
|
||||||
if (STRING_ROLES.contains(role)) {
|
if (STRING_ROLES.contains(role)) {
|
||||||
itemObject.insert(roleName, value.toString());
|
itemObject.insert(roleName, value.toString());
|
||||||
|
} else if (TYPE_ROLES.contains(role)) {
|
||||||
|
itemObject.insert(roleName, value.toString());
|
||||||
} else if (INT_ROLES.contains(role)) {
|
} else if (INT_ROLES.contains(role)) {
|
||||||
itemObject.insert(roleName, value.toInt());
|
itemObject.insert(roleName, value.toInt());
|
||||||
} else if (DOUBLE_ROLES.contains(role)) {
|
} else if (DOUBLE_ROLES.contains(role)) {
|
||||||
|
|||||||
@ -164,7 +164,6 @@ void GenericCore::onLoginSuccessful() {
|
|||||||
|
|
||||||
void GenericCore::onBiddingsChanged(const QList<bidding> biddings) {
|
void GenericCore::onBiddingsChanged(const QList<bidding> biddings) {
|
||||||
qInfo() << "onBiddingsChanged: biddings:" << biddings.count();
|
qInfo() << "onBiddingsChanged: biddings:" << biddings.count();
|
||||||
// NEXT merge biddings into model
|
|
||||||
m_mainModel->updateBiddings(biddings);
|
m_mainModel->updateBiddings(biddings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user